PowerUser/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nvim: fix error relating to lua lsp loading

Browse source
This commit is contained in:
PowerUser64 2021-11-15 21:44:52 -08:00
parent 8715300a8f
commit ffc613da83
1 changed files with 34 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

64
.config/nvim/lua/blake/lsp.lua
View file

@ -212,7 +212,7 @@ M.lspconfig = function()
bashls = 'bash-language-server', bashls = 'bash-language-server',
} }
for lsp, exe in pairs(lsp_servers) do for lsp, exe in pairs(lsp_servers) do
if (vim.fn.executable(exe) == 1) then if (vim.fn.executable(exe) == true) then
nvim_lsp[lsp].setup { nvim_lsp[lsp].setup {
on_attach = on_attach, on_attach = on_attach,
flags = { flags = {
@ -223,7 +223,6 @@ M.lspconfig = function()
end end
-- Custom servers >>> -- Custom servers >>>
-- lua >>> -- lua >>>
-- From kickstart.nvim:
local sumneko_root_path local sumneko_root_path
local sumneko_binary local sumneko_binary
if (vim.fn.exepath('lua-language-server') ~= '') then if (vim.fn.exepath('lua-language-server') ~= '') then
@ -236,38 +235,41 @@ M.lspconfig = function()
sumneko_binary = sumneko_root_path .. '/lua-language-server' sumneko_binary = sumneko_root_path .. '/lua-language-server'
end end
-- Make runtime files discoverable to the server -- From kickstart.nvim:
local runtime_path = vim.split(package.path, ';') if (vim.fn.executable(sumneko_binary) == true) then
table.insert(runtime_path, 'lua/?.lua') -- Make runtime files discoverable to the server
table.insert(runtime_path, 'lua/?/init.lua') local runtime_path = vim.split(package.path, ';')
table.insert(runtime_path, 'lua/?.lua')
table.insert(runtime_path, 'lua/?/init.lua')
require('lspconfig').sumneko_lua.setup { require('lspconfig').sumneko_lua.setup {
cmd = { sumneko_binary, '-E', sumneko_root_path .. '/main.lua' }, cmd = { sumneko_binary, '-E', sumneko_root_path .. '/main.lua' },
on_attach = on_attach, on_attach = on_attach,
capabilities = capabilities, capabilities = capabilities,
settings = { settings = {
Lua = { Lua = {
runtime = { runtime = {
-- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
version = 'LuaJIT', version = 'LuaJIT',
-- Setup your lua path -- Setup your lua path
path = runtime_path, path = runtime_path,
}, },
diagnostics = { diagnostics = {
-- Get the language server to recognize the `vim` global -- Get the language server to recognize the `vim` global
globals = { 'vim' }, globals = { 'vim' },
}, },
workspace = { workspace = {
-- Make the server aware of Neovim runtime files -- Make the server aware of Neovim runtime files
library = vim.api.nvim_get_runtime_file('', true), library = vim.api.nvim_get_runtime_file('', true),
}, },
-- Do not send telemetry data containing a randomized but unique identifier -- Do not send telemetry data containing a randomized but unique identifier
telemetry = { telemetry = {
enable = false, enable = false,
},
}, },
}, },
}, }
} end
-- lua <<< -- lua <<<
-- Custom servers <<< -- Custom servers <<<
-- Load servers <<< -- Load servers <<<