holm/LunarVim.LunarVim
1
0
Fork 0
mirror of https://github.com/LunarVim/LunarVim.git synced 2025-08-04 10:05:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

updates for lua

Browse source
This commit is contained in:
Chris 2021-03-11 20:35:11 -05:00
parent 46b3191530
commit bb9b6bbc5d
8 changed files with 100 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lua/lsp/general-ls.lua Normal file
View file

@ -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
}
}
}
}
}

60
lua/lsp/lua-ls.lua
View file

@ -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}
}
}
}
}