neovim

commit f7b6814dee192bfe17b9eac5753c6f34a80ed52f
parent 31050410e05d261786628cfcb1e1a1f930392a06
Author: Tomas Nemec <nemi@skaut.cz>
Date:   Wed, 20 Oct 2021 13:14:42 +0200

update

Diffstat:
M
lua/tms/lsp/init.lua
 | 
5
++++-
M
lua/tms/plugins.lua
 | 
6
+++---

2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/lua/tms/lsp/init.lua b/lua/tms/lsp/init.lua
@@ -69,13 +69,16 @@ M.setup = function()
       }
     elseif server.name == 'gopls' then
       opts.root_dir = lspc.util.root_pattern('go.mod', '.git', vim.fn.getcwd())
+    elseif server.name == 'efm' then
+      opts.init_options = {documentFormatting = true}
+      opts.settings = efm.settings
+      opts.filetypes = efm.filetypes()
     end
     opts.on_attach = custom_attach
     opts.capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
     server:setup(opts)
     vim.cmd [[ do User LspAttachBuffers ]]
   end)
-  lspc.efm.setup(servers.efm(custom_attach))
   lspc.dartls.setup(servers.dartls(custom_attach))
   lspc.gdscript.setup(servers.gdscript(custom_attach))
 end
diff --git a/lua/tms/plugins.lua b/lua/tms/plugins.lua
@@ -2,7 +2,7 @@ local packer = nil
 local function init()
   if packer == nil then
     packer = require('packer')
-   packer.init()
+    packer.init()
   end
 
   local use = packer.use
@@ -304,7 +304,7 @@ local function init()
       'hrsh7th/cmp-calc',
       'ray-x/cmp-treesitter',
       'uga-rosa/cmp-dictionary',
-      'L3MON4D3/LuaSnip',
+      'saadparwaiz1/cmp_luasnip',
     },
     config = function()
       local luasnip = require('luasnip')
@@ -318,7 +318,7 @@ local function init()
       cmp.setup({
         completion = {autocomplete = false},
         documentation = {border = 'single'},
-        snippet = function(args) require('luasnip').lsp_expand(args.body) end,
+        snippet = {expand = function(args) require('luasnip').lsp_expand(args.body) end},
         mapping = {
           ['<C-d>'] = cmp.mapping.scroll_docs(-4),
           ['<C-f>'] = cmp.mapping.scroll_docs(4),