felschr/nixos-config
1
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix(neovim): fix lsp capabilities & attach handling

Browse source
This commit is contained in:
Felix Schröter 2022-07-30 08:42:20 +02:00
parent a1b24cb746
commit aee9d91355
Signed by: felschr
GPG key ID: 671E39E6744C807D
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
home/editors/neovim/lsp/lsp.lua
View file

@ -17,8 +17,8 @@ local on_attach = function(client, bufnr)
end end
-- format on save -- format on save
local diagnosticls_on_attach = function(_, bufnr) local diagnosticls_on_attach = function(client, bufnr)
on_attach(_, bufnr) on_attach(client, bufnr)
vim.api.nvim_create_autocmd("BufWritePre", { vim.api.nvim_create_autocmd("BufWritePre", {
callback = function() callback = function()
vim.lsp.buf.formatting_seq_sync(nil, nil, { "tsserver", "diagnosticls" }) vim.lsp.buf.formatting_seq_sync(nil, nil, { "tsserver", "diagnosticls" })
@ -68,6 +68,7 @@ for _, lsp in ipairs(servers) do
end end
config.rust_analyzer.setup{ config.rust_analyzer.setup{
on_attach = on_attach,
capabilities = capabilities, capabilities = capabilities,
root_dir = config.util.root_pattern("Cargo.toml", "rust-project.json", ".git"), root_dir = config.util.root_pattern("Cargo.toml", "rust-project.json", ".git"),
settings = { settings = {
@ -78,6 +79,7 @@ config.rust_analyzer.setup{
} }
config.omnisharp.setup{ config.omnisharp.setup{
on_attach = on_attach,
capabilities = capabilities, capabilities = capabilities,
cmd = {"OmniSharp", "--languageserver", "--hostPID", tostring(pid)}, cmd = {"OmniSharp", "--languageserver", "--hostPID", tostring(pid)},
} }
@ -87,6 +89,7 @@ table.insert(runtime_path, "lua/?.lua")
table.insert(runtime_path, "lua/?/init.lua") table.insert(runtime_path, "lua/?/init.lua")
config.sumneko_lua.setup { config.sumneko_lua.setup {
on_attach = on_attach,
capabilities = capabilities, capabilities = capabilities,
settings = { settings = {
Lua = { Lua = {
@ -109,6 +112,7 @@ config.sumneko_lua.setup {
config.diagnosticls.setup { config.diagnosticls.setup {
on_attach = diagnosticls_on_attach, on_attach = diagnosticls_on_attach,
capabilities = capabilities,
filetypes = { filetypes = {
"javascript", "javascript",
"javascript.jsx", "javascript.jsx",