diff --git a/lua/init-efm-langserver.lua b/lua/init-efm-langserver.lua index d685bfe..7af7b43 100644 --- a/lua/init-efm-langserver.lua +++ b/lua/init-efm-langserver.lua @@ -41,7 +41,7 @@ local luaformat = { local util = require "lspconfig".util local on_attach_efm = function(client) if client.resolved_capabilities.document_formatting then - vim.cmd [[augroup efm_formatting]] + vim.cmd [[augroup lsp_formatting]] vim.cmd [[autocmd!]] vim.cmd [[autocmd BufWritePre :lua vim.lsp.buf.formatting_seq_sync({}, 1000)]] vim.cmd [[augroup END]] diff --git a/lua/init-lspconfig.lua b/lua/init-lspconfig.lua index ad125d6..2b38694 100644 --- a/lua/init-lspconfig.lua +++ b/lua/init-lspconfig.lua @@ -54,6 +54,11 @@ local on_attach = function(client, bufnr) -- buf_set_keymap('n', 'wr', 'lua vim.lsp.buf.remove_workspace_folder()', opts) -- buf_set_keymap('n', 'wl', 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', opts) + if client.name == 'tsserver' then + print('tsserver - disabling formatting') + client.resolved_capabilities.document_formatting = false; + end + if client.resolved_capabilities.document_formatting then vim.cmd [[augroup lsp_formatting]] vim.cmd [[autocmd!]] diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add index d309946..8fcd875 100644 --- a/spell/en.utf-8.add +++ b/spell/en.utf-8.add @@ -176,3 +176,5 @@ movie multivariable Unsetting ajax +mimetype +thumbnailers diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl index 9eee6c1..0e337da 100644 Binary files a/spell/en.utf-8.add.spl and b/spell/en.utf-8.add.spl differ