merge: develop <--- fix/cmp-lsp-and-lua-dev-rename

* HEAD
| \
| * eaa530e <github@luxolus.com> nvim/plug: lua-dev -> neodev
| * 5798da7 <github@luxolus.com> nvim/plug/lspconfig: use cmp.defaults_capabilities/0
| /
| develop

Signed-off-by: Bazaah <github@luxolus.com>

nvim/lua/psoxizsh/lsp/preset.lua

@@ -63,17 +63,15 @@ M.Lua = {
   name  = 'sumneko_lua',
   ft    = 'lua',
   setup = function(server, settings, override)
-    -- Globally enable Neovim support
+    require('neodev').setup({ lspconfig = false })
-    require('lua-dev').setup(override({
-      override = function(_, o)
-        o.enabled = true
-        o.runtime = true
-        o.types   = true
-        o.plugins = true
-      end
-    }))
 
-    server.setup(settings)
+    local defaults = {
+      before_init = require('neodev.lsp').before_init
+    }
+
+    server.setup(override(
+      vim.tbl_deep_extend('keep', settings, defaults))
+    )
   end,
 }
 

nvim/lua/psoxizsh/plugins/config/lspconfig.lua

@@ -10,9 +10,7 @@ return function()
   end
 
   -- Update LSP capabilities we send to servers to include the features supported by nvim-cmp
-  defaults.capabilities = cmp.update_capabilities(lspconfig.util.default_config.capabilities)
+  defaults.capabilities = cmp.default_capabilities()
-  -- Dependent on a snippet manager in nvim-cmp (currently using vsnip)
-  defaults.capabilities.textDocument.completion.completionItem.snippetSupport = true
 
   -- Ideally, this would be registered on some Psoxizsh.Plug.Post autocmd
   -- but I don't feel like refactoring psoxizsh.plugin now.

nvim/lua/psoxizsh/plugins/plug.lua

@@ -103,8 +103,8 @@ local plugins = {
       config = require 'psoxizsh.plugins.config.nlsp-settings'
   },
   { 'simrat39/rust-tools.nvim' },
-  { 'folke/lua-dev.nvim',
+  { 'folke/neodev.nvim',
-      as = 'lua-dev',
+      as = 'neodev',
   },
   { 'vim-perl/vim-perl',
       ft = 'perl',