diff options
Diffstat (limited to 'lua/lsp')
| -rw-r--r-- | lua/lsp/general-ls.lua | 15 | ||||
| -rw-r--r-- | lua/lsp/lua-ls.lua | 60 |
2 files changed, 40 insertions, 35 deletions
diff --git a/lua/lsp/general-ls.lua b/lua/lsp/general-ls.lua new file mode 100644 index 00000000..fa28dbcf --- /dev/null +++ b/lua/lsp/general-ls.lua @@ -0,0 +1,15 @@ +require"lspconfig".efm.setup { + init_options = {documentFormatting = true}, + filetypes = {"lua"}, + settings = { + rootMarkers = {".git/"}, + languages = { + lua = { + { + formatCommand = "lua-format -i --no-keep-simple-function-one-line --no-break-after-operator --column-limit=150 --break-after-table-lb", + formatStdin = true + } + } + } + } +} diff --git a/lua/lsp/lua-ls.lua b/lua/lsp/lua-ls.lua index 22ffb529..c04219a9 100644 --- a/lua/lsp/lua-ls.lua +++ b/lua/lsp/lua-ls.lua @@ -1,47 +1,37 @@ -- https://github.com/sumneko/lua-language-server/wiki/Build-and-Run-(Standalone) --- TODO fix for different systems and put variable for user - -user="chris" +USER = vim.fn.expand('$USER') local sumneko_root_path = "" local sumneko_binary = "" -local system_name if vim.fn.has("mac") == 1 then - sumneko_root_path = "/Users/"..user.."/.config/nvim/lua-language-server" - sumneko_binary = "/Users/"..user.."/.config/nvim/lua-language-server/bin/macOS/lua-language-server" + sumneko_root_path = "/Users/" .. USER .. "/.config/nvim/lua-language-server" + sumneko_binary = "/Users/" .. USER .. "/.config/nvim/lua-language-server/bin/macOS/lua-language-server" elseif vim.fn.has("unix") == 1 then - sumneko_root_path = "/home/"..user.."/.config/nvim/lua-language-server" - sumneko_binary = "/home/"..user.."/.config/nvim/lua-language-server/bin/Linux/lua-language-server" -elseif vim.fn.has('win32') == 1 then - -- sumneko_root_path = "/Users/chris/.config/nvim/lua-language-server" - -- sumneko_binary = "/Users/chris/.config/nvim/lua-language-server/bin/macOS/lua-language-server" - print("Unsupported system for me") + sumneko_root_path = "/home/" .. USER .. "/.config/nvim/lua-language-server" + sumneko_binary = "/home/" .. USER .. "/.config/nvim/lua-language-server/bin/Linux/lua-language-server" else - print("Unsupported system for sumneko") + print("Unsupported system for sumneko") end require'lspconfig'.sumneko_lua.setup { - cmd = {sumneko_binary, "-E", sumneko_root_path .. "/main.lua"}; - settings = { - Lua = { - runtime = { - -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) - version = 'LuaJIT', - -- Setup your lua path - path = vim.split(package.path, ';'), - }, - diagnostics = { - -- Get the language server to recognize the `vim` global - globals = {'vim'}, - }, - workspace = { - -- Make the server aware of Neovim runtime files - library = { - [vim.fn.expand('$VIMRUNTIME/lua')] = true, - [vim.fn.expand('$VIMRUNTIME/lua/vim/lsp')] = true, - }, - }, - }, - }, + cmd = {sumneko_binary, "-E", sumneko_root_path .. "/main.lua"}, + settings = { + Lua = { + runtime = { + -- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim) + version = 'LuaJIT', + -- Setup your lua path + path = vim.split(package.path, ';') + }, + diagnostics = { + -- Get the language server to recognize the `vim` global + globals = {'vim'} + }, + workspace = { + -- Make the server aware of Neovim runtime files + library = {[vim.fn.expand('$VIMRUNTIME/lua')] = true, [vim.fn.expand('$VIMRUNTIME/lua/vim/lsp')] = true} + } + } + } } |