diff options
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/lsp/go-ls.lua | 2 | ||||
| -rw-r--r-- | lua/lsp/js-ts-ls.lua | 36 | ||||
| -rw-r--r-- | lua/lsp/json-ls.lua | 6 | ||||
| -rw-r--r-- | lua/lsp/ruby-ls.lua | 17 | ||||
| -rw-r--r-- | lua/lsp/rust-ls.lua | 2 |
5 files changed, 38 insertions, 25 deletions
diff --git a/lua/lsp/go-ls.lua b/lua/lsp/go-ls.lua index 4af87a9d..b2d6a82a 100644 --- a/lua/lsp/go-ls.lua +++ b/lua/lsp/go-ls.lua @@ -9,7 +9,7 @@ require'lspconfig'.gopls.setup { if O.lang.go.autoformat then require('lv-utils').define_augroups({ _go_format = { - 'BufWritePre', '*.go', 'lua vim.lsp.buf.formatting_sync(nil,1000)' + {'BufWritePre', '*.go', 'lua vim.lsp.buf.formatting_sync(nil,1000)'} }, _go = { -- Go generally requires Tabs instead of spaces. diff --git a/lua/lsp/js-ts-ls.lua b/lua/lsp/js-ts-ls.lua index 0006dab7..6fe4dd63 100644 --- a/lua/lsp/js-ts-ls.lua +++ b/lua/lsp/js-ts-ls.lua @@ -25,31 +25,43 @@ require'lspconfig'.tsserver.setup { "jsconfig.json", ".git"), settings = {documentFormatting = false}, handlers = { - ["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic - .on_publish_diagnostics, - { - virtual_text = O.lang.tsserver.diagnostics.virtual_text, - signs = O.lang.tsserver.diagnostics.signs, - underline = O.lang.tsserver.diagnostics.underline, - update_in_insert = true + ["textDocument/publishDiagnostics"] = vim.lsp.with( + vim.lsp.diagnostic.on_publish_diagnostics, { + virtual_text = O.lang.tsserver.diagnostics.virtual_text, + signs = O.lang.tsserver.diagnostics.signs, + underline = O.lang.tsserver.diagnostics.underline, + update_in_insert = true - }) + }) } } if O.lang.tsserver.autoformat then require('lv-utils').define_augroups({ _javascript_autoformat = { - 'BufWritePre', '*.js', 'lua vim.lsp.buf.formatting_sync(nil, 1000)' + { + + 'BufWritePre', '*.js', + 'lua vim.lsp.buf.formatting_sync(nil, 1000)' + } }, _javascriptreact_autoformat = { - 'BufWritePre', '*.jsx', 'lua vim.lsp.buf.formatting_sync(nil, 1000)' + { + 'BufWritePre', '*.jsx', + 'lua vim.lsp.buf.formatting_sync(nil, 1000)' + } }, _typescript_autoformat = { - 'BufWritePre', '*.ts', 'lua vim.lsp.buf.formatting_sync(nil, 1000)' + { + 'BufWritePre', '*.ts', + 'lua vim.lsp.buf.formatting_sync(nil, 1000)' + } }, _typescriptreact_autoformat = { - 'BufWritePre', '*.tsx', 'lua vim.lsp.buf.formatting_sync(nil, 1000)' + { + 'BufWritePre', '*.tsx', + 'lua vim.lsp.buf.formatting_sync(nil, 1000)' + } } }) end diff --git a/lua/lsp/json-ls.lua b/lua/lsp/json-ls.lua index 7d3c3716..3a565095 100644 --- a/lua/lsp/json-ls.lua +++ b/lua/lsp/json-ls.lua @@ -19,8 +19,10 @@ require'lspconfig'.jsonls.setup { if O.lang.json.autoformat then require('lv-utils').define_augroups({ _json_format = { - 'BufWritePre', '*.json', - 'lua vim.lsp.buf.formatting_sync(nil, 1000)' + { + 'BufWritePre', '*.json', + 'lua vim.lsp.buf.formatting_sync(nil, 1000)' + } } }) end diff --git a/lua/lsp/ruby-ls.lua b/lua/lsp/ruby-ls.lua index 960b220a..f46a71f8 100644 --- a/lua/lsp/ruby-ls.lua +++ b/lua/lsp/ruby-ls.lua @@ -3,15 +3,14 @@ require'lspconfig'.solargraph.setup { cmd = {DATA_PATH .. "/lspinstall/ruby/solargraph/solargraph", "--stdio"}, on_attach = require'lsp'.common_on_attach, handlers = { - ["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic - .on_publish_diagnostics, - { - virtual_text = O.lang.ruby.diagnostics.virtual_text, - signs = O.lang.ruby.diagnostics.signs, - underline = O.lang.ruby.diagnostics.underline, - update_in_insert = true + ["textDocument/publishDiagnostics"] = vim.lsp.with( + vim.lsp.diagnostic.on_publish_diagnostics, { + virtual_text = O.lang.ruby.diagnostics.virtual_text, + signs = O.lang.ruby.diagnostics.signs, + underline = O.lang.ruby.diagnostics.underline, + update_in_insert = true - }) + }) }, filetypes = O.lang.ruby.filetypes } @@ -19,7 +18,7 @@ require'lspconfig'.solargraph.setup { if O.lang.ruby.autoformat then require('lv-utils').define_augroups({ _ruby_format = { - 'BufWritePre', '*.rb', 'lua vim.lsp.buf.formatting_sync(nil,1000)' + {'BufWritePre', '*.rb', 'lua vim.lsp.buf.formatting_sync(nil,1000)'} } }) end diff --git a/lua/lsp/rust-ls.lua b/lua/lsp/rust-ls.lua index 22f66f2d..d210cadb 100644 --- a/lua/lsp/rust-ls.lua +++ b/lua/lsp/rust-ls.lua @@ -80,7 +80,7 @@ vim.api.nvim_exec([[ if O.lang.rust.autoformat then require('lv-utils').define_augroups({ _rust_format = { - 'BufWritePre', '*.rs', 'lua vim.lsp.buf.formatting_sync(nil,1000)' + {'BufWritePre', '*.rs', 'lua vim.lsp.buf.formatting_sync(nil,1000)'} } }) end |