Compare commits

...

2 Commits

Author SHA1 Message Date
Rob Watson
eedc2e1d1b nvimrc: Update lua_ls config 2023-02-28 17:18:28 +01:00
Rob Watson
9f91f1e6de nvimrc: Update rust_analyzer config 2023-02-28 17:18:17 +01:00

23
nvimrc
View File

@ -766,6 +766,7 @@ nvim_lsp.gopls.setup{
-- Rust -- Rust
nvim_lsp.rust_analyzer.setup{ nvim_lsp.rust_analyzer.setup{
capabilities = capabilities,
on_attach = on_attach, on_attach = on_attach,
settings = { settings = {
["rust-analyzer"] = { ["rust-analyzer"] = {
@ -781,8 +782,11 @@ nvim_lsp.rust_analyzer.setup{
}, },
}, },
procMacro = { procMacro = {
enable = true enable = false,
}, },
diagnostics = {
disabled = { "unresolved-proc-macro" },
}
} }
} }
} }
@ -840,24 +844,15 @@ nvim_lsp.diagnosticls.setup{
-- Lua -- Lua
local system_name local lua_ls_root_path = os.getenv("HOME").."/dev/lua-language-server"
if vim.fn.has("mac") == 1 then local lua_ls_binary = lua_ls_root_path.."/bin/lua-language-server"
system_name = "macOS"
elseif vim.fn.has("unix") == 1 then
system_name = "Linux"
else
print("Unsupported system for sumneko")
end
local sumneko_root_path = os.getenv("HOME").."/dev/lua-language-server"
local sumneko_binary = sumneko_root_path.."/bin/"..system_name.."/lua-language-server"
local runtime_path = vim.split(package.path, ';') local runtime_path = vim.split(package.path, ';')
table.insert(runtime_path, "lua/?.lua") table.insert(runtime_path, "lua/?.lua")
table.insert(runtime_path, "lua/?/init.lua") table.insert(runtime_path, "lua/?/init.lua")
nvim_lsp.sumneko_lua.setup { nvim_lsp.lua_ls.setup {
cmd = {sumneko_binary, "-E", sumneko_root_path .. "/main.lua"}; cmd = {lua_ls_binary, "-E", lua_ls_root_path .. "/main.lua"};
settings = { settings = {
Lua = { Lua = {
runtime = { runtime = {