From c07e126c2fcae8ef7e81d1b113dd5ef2669ab23f Mon Sep 17 00:00:00 2001 From: Gustaf Rydholm Date: Mon, 19 Apr 2021 22:46:03 +0200 Subject: Working lsp in nvim --- .config/nvim/lua/lsp/efm-general-ls.lua | 117 ++++++++++++++++++++++++++++++++ .config/nvim/lua/lsp/init.lua | 2 +- .config/nvim/lua/lsp/latex-ls.lua | 4 ++ .config/nvim/lua/lsp/lua-ls.lua | 2 +- 4 files changed, 123 insertions(+), 2 deletions(-) create mode 100644 .config/nvim/lua/lsp/efm-general-ls.lua create mode 100644 .config/nvim/lua/lsp/latex-ls.lua (limited to '.config/nvim/lua/lsp') diff --git a/.config/nvim/lua/lsp/efm-general-ls.lua b/.config/nvim/lua/lsp/efm-general-ls.lua new file mode 100644 index 0000000..16f3037 --- /dev/null +++ b/.config/nvim/lua/lsp/efm-general-ls.lua @@ -0,0 +1,117 @@ +-- Example configuations here: https://github.com/mattn/efm-langserver +-- TODO this file needs to be refactored eache lang should be it's own file +-- python +local python_arguments = {} + +-- TODO replace with path argument +local flake8 = { + LintCommand = "flake8 --ignore=E501 --stdin-display-name ${INPUT} -", + lintStdin = true, + lintFormats = {"%f:%l:%c: %m"} +} + +local isort = {formatCommand = "isort --quiet -", formatStdin = true} + +local yapf = {formatCommand = "yapf --quiet", formatStdin = true} +local black = {formatCommand = "black --quiet -", formatStdin = true} + +if O.python.linter == 'flake8' then table.insert(python_arguments, flake8) end + +if O.python.isort then table.insert(python_arguments, isort) end + +if O.python.formatter == 'yapf' then + table.insert(python_arguments, yapf) +elseif O.python.formatter == 'black' then + table.insert(python_arguments, black) +end + +-- lua +local lua_arguments = {} + +local luaFormat = { + formatCommand = "lua-format -i --no-keep-simple-function-one-line --column-limit=120", + formatStdin = true +} + +local lua_fmt = { + formatCommand = "luafmt --indent-count 2 --line-width 120 --stdin", + formatStdin = true +} + +if O.lua.formatter == 'lua-format' then + table.insert(lua_arguments, luaFormat) +elseif O.lua.formatter == 'lua-fmt' then + table.insert(lua_arguments, lua_fmt) +end + +-- sh +local sh_arguments = {} + +local shfmt = {formatCommand = 'shfmt -ci -s -bn', formatStdin = true} + +local shellcheck = { + LintCommand = 'shellcheck -f gcc -x', + lintFormats = {'%f:%l:%c: %trror: %m', '%f:%l:%c: %tarning: %m', '%f:%l:%c: %tote: %m'} +} + +if O.sh.formatter == 'shfmt' then table.insert(sh_arguments, shfmt) end + +if O.sh.linter == 'shellcheck' then table.insert(sh_arguments, shellcheck) end + +-- tsserver/web javascript react, vue, json, html, css, yaml +local prettier = {formatCommand = "prettier --stdin-filepath ${INPUT}", formatStdin = true} +-- You can look for project scope Prettier and Eslint with e.g. vim.fn.glob("node_modules/.bin/prettier") etc. If it is not found revert to global Prettier where needed. +-- local prettier = {formatCommand = "./node_modules/.bin/prettier --stdin-filepath ${INPUT}", formatStdin = true} + +local eslint = { + lintCommand = "./node_modules/.bin/eslint -f unix --stdin --stdin-filename ${INPUT}", + lintIgnoreExitCode = true, + lintStdin = true, + lintFormats = {"%f:%l:%c: %m"}, + formatCommand = "./node_modules/.bin/eslint --fix-to-stdout --stdin --stdin-filename=${INPUT}", + formatStdin = true +} + +local tsserver_args = {} + +if O.tsserver.formatter == 'prettier' then table.insert(tsserver_args, prettier) end + +if O.tsserver.linter == 'eslint' then table.insert(tsserver_args, eslint) end + +-- local markdownlint = { +-- -- TODO default to global lintrc +-- -- lintcommand = 'markdownlint -s -c ./markdownlintrc', +-- lintCommand = 'markdownlint -s', +-- lintStdin = true, +-- lintFormats = {'%f:%l %m', '%f:%l:%c %m', '%f: %l: %m'} +-- } + +local markdownPandocFormat = {formatCommand = 'pandoc -f markdown -t gfm -sp --tab-stop=2', formatStdin = true} + +require"lspconfig".efm.setup { + -- init_options = {initializationOptions}, + cmd = {DATA_PATH .. "/lspinstall/efm/efm-langserver"}, + init_options = {documentFormatting = true, codeAction = false}, + filetypes = {"lua", "python", "javascriptreact", "javascript", "sh", "html", "css", "json", "yaml", "markdown"}, + settings = { + rootMarkers = {".git/"}, + languages = { + python = python_arguments, + lua = lua_arguments, + sh = sh_arguments, + javascript = tsserver_args, + javascriptreact = tsserver_args, + html = {prettier}, + css = {prettier}, + json = {prettier}, + yaml = {prettier}, + markdown = {markdownPandocFormat} + -- javascriptreact = {prettier, eslint}, + -- javascript = {prettier, eslint}, + -- markdown = {markdownPandocFormat, markdownlint}, + } + } +} + +-- Also find way to toggle format on save +-- maybe this will help: https://superuser.com/questions/439078/how-to-disable-autocmd-or-augroup-in-vim diff --git a/.config/nvim/lua/lsp/init.lua b/.config/nvim/lua/lsp/init.lua index 4488b52..b07858b 100644 --- a/.config/nvim/lua/lsp/init.lua +++ b/.config/nvim/lua/lsp/init.lua @@ -100,4 +100,4 @@ end -- and map buffer local keybindings when the language server attaches -- local servers = {"pyright", "tsserver"} -- for _, lsp in ipairs(servers) do nvim_lsp[lsp].setup {on_attach = on_attach} end -return lsp_configv +return lsp_config diff --git a/.config/nvim/lua/lsp/latex-ls.lua b/.config/nvim/lua/lsp/latex-ls.lua new file mode 100644 index 0000000..179c143 --- /dev/null +++ b/.config/nvim/lua/lsp/latex-ls.lua @@ -0,0 +1,4 @@ +require'lspconfig'.texlab.setup{ + cmd = {DATA_PATH .. "/lspinstall/latex/texlab"}, + on_attach = require'lsp'.common_on_attach +} diff --git a/.config/nvim/lua/lsp/lua-ls.lua b/.config/nvim/lua/lsp/lua-ls.lua index d640bc4..775eb92 100644 --- a/.config/nvim/lua/lsp/lua-ls.lua +++ b/.config/nvim/lua/lsp/lua-ls.lua @@ -19,7 +19,7 @@ require'lspconfig'.sumneko_lua.setup { }, workspace = { -- Make the server aware of Neovim runtime files - library = {[vim.fn.expand('$VIMRUNTIME/lua')] = true, [vim.fn.expand($VIMRUNTIME/lua/vim/lsp')] = true}, + library = {[vim.fn.expand('$VIMRUNTIME/lua')] = true, [vim.fn.expand('$VIMRUNTIME/lua/vim/lsp')] = true}, maxPreload = 10000 } } -- cgit v1.2.3-70-g09d2