Move luasnip configuration into completion

after/plugin/completion.lua

@@ -1,19 +1,12 @@
-local cmp_status_ok, cmp = pcall(require, "cmp")
+local cmp = require "cmp"
-if not cmp_status_ok then
+local ls = require "luasnip"
-  return
-end
-
-local snip_status_ok, luasnip = pcall(require, "luasnip")
-if not snip_status_ok then
-  return
-end
 
 vim.opt.shortmess:append "c"
 
 cmp.setup {
   snippet = {
     expand = function(args)
-      luasnip.lsp_expand(args.body)
+      ls.lsp_expand(args.body)
     end,
   },
 
@@ -21,14 +14,14 @@ cmp.setup {
     ["<C-e>"] = cmp.mapping.close(),
 
     ["<C-h>"] = cmp.mapping(function()
-      if luasnip.locally_jumpable(-1) then
+      if ls.locally_jumpable(-1) then
-        luasnip.jump(-1)
+        ls.jump(-1)
       end
     end, { "i", "s" }),
 
     ["<C-l>"] = cmp.mapping(function()
-      if luasnip.expand_or_locally_jumpable() then
+      if ls.expand_or_locally_jumpable() then
-        luasnip.expand_or_jump()
+        ls.expand_or_jump()
       end
     end, { "i", "s" }),
 
@@ -87,3 +80,80 @@ cmp.setup.filetype({ "sql" }, {
     { name = "buffer" },
   },
 })
+
+local snippet = ls.snippet
+local i = ls.insert_node
+local t = ls.text_node
+
+local shortcut = function(val)
+  if type(val) == "string" then
+    return { t { val }, i(0) }
+  end
+
+  if type(val) == "table" then
+    for k, v in ipairs(val) do
+      if type(v) == "string" then
+        val[k] = t { v }
+      end
+    end
+  end
+
+  return val
+end
+
+local make = function(tbl)
+  local result = {}
+  for k, v in pairs(tbl) do
+    table.insert(result, (snippet({ trig = k, desc = v.desc }, shortcut(v))))
+  end
+
+  return result
+end
+
+local snippets = {}
+
+for _, ft_path in ipairs(vim.api.nvim_get_runtime_file("lua/opdavies/snippets/ft/*.lua", true)) do
+  local ft = vim.fn.fnamemodify(ft_path, ":t:r")
+  snippets[ft] = make(loadfile(ft_path)())
+
+  ls.add_snippets(ft, snippets[ft])
+end
+
+ls.add_snippets("js", snippets.javascript)
+ls.add_snippets("typescript", snippets.javascript)
+ls.add_snippets("vue", snippets.javascript)
+
+require("luasnip.loaders.from_vscode").lazy_load()
+
+ls.config.set_config {
+  enable_autosnippets = true,
+  history = true,
+  updateevents = "TextChanged,TextChangedI",
+}
+
+-- Expand the current item or just to the next item within the snippet.
+vim.keymap.set({ "i", "s" }, "<c-k>", function()
+  if ls.expand_or_jumpable() then
+    ls.expand_or_jump()
+  end
+end, { silent = true })
+
+-- Jump backwards.
+vim.keymap.set({ "i", "s" }, "<c-j>", function()
+  if ls.jumpable(-1) then
+    ls.jump(-1)
+  end
+end, { silent = true })
+
+-- Select within a list of options.
+vim.keymap.set("i", "<c-l>", function()
+  if ls.choice_active() then
+    ls.change_choice(1)
+  end
+end)
+
+vim.keymap.set(
+  "n",
+  "<leader><leader>s",
+  "<cmd>source ~/Code/personal/opdavies.nvim/after/plugin/luasnip.lua<CR>"
+)

after/plugin/luasnip.lua

@@ -1,78 +0,0 @@
-local ls = require "luasnip"
-
-local snippet = ls.snippet
-local i = ls.insert_node
-local t = ls.text_node
-
-local shortcut = function(val)
-  if type(val) == "string" then
-    return { t { val }, i(0) }
-  end
-
-  if type(val) == "table" then
-    for k, v in ipairs(val) do
-      if type(v) == "string" then
-        val[k] = t { v }
-      end
-    end
-  end
-
-  return val
-end
-
-local make = function(tbl)
-  local result = {}
-  for k, v in pairs(tbl) do
-    table.insert(result, (snippet({ trig = k, desc = v.desc }, shortcut(v))))
-  end
-
-  return result
-end
-
-local snippets = {}
-
-for _, ft_path in ipairs(vim.api.nvim_get_runtime_file("lua/opdavies/snippets/ft/*.lua", true)) do
-  local ft = vim.fn.fnamemodify(ft_path, ":t:r")
-  snippets[ft] = make(loadfile(ft_path)())
-
-  ls.add_snippets(ft, snippets[ft])
-end
-
-ls.add_snippets("js", snippets.javascript)
-ls.add_snippets("typescript", snippets.javascript)
-ls.add_snippets("vue", snippets.javascript)
-
-require("luasnip.loaders.from_vscode").lazy_load()
-
-ls.config.set_config {
-  enable_autosnippets = true,
-  history = true,
-  updateevents = "TextChanged,TextChangedI",
-}
-
--- Expand the current item or just to the next item within the snippet.
-vim.keymap.set({ "i", "s" }, "<c-k>", function()
-  if ls.expand_or_jumpable() then
-    ls.expand_or_jump()
-  end
-end, { silent = true })
-
--- Jump backwards.
-vim.keymap.set({ "i", "s" }, "<c-j>", function()
-  if ls.jumpable(-1) then
-    ls.jump(-1)
-  end
-end, { silent = true })
-
--- Select within a list of options.
-vim.keymap.set("i", "<c-l>", function()
-  if ls.choice_active() then
-    ls.change_choice(1)
-  end
-end)
-
-vim.keymap.set(
-  "n",
-  "<leader><leader>s",
-  "<cmd>source ~/Code/github.com/opdavies/dotfiles/config/neovim/after/plugin/luasnip.lua<CR>"
-)