From 2f1202a6691e244524d682c52b293c47a82ad947 Mon Sep 17 00:00:00 2001 From: Just Midi Date: Fri, 27 Aug 2021 06:21:53 +0000 Subject: [PATCH] Squashed commit of the following: commit 6179a86a754f143e71a895b82f74c62ad4d29964 Author: Just Midi Date: Fri Aug 27 06:18:00 2021 +0000 Removed && in zls install removed && in favor of scripts on separate lines commit 4ca63a5884daa0b61cb7c8aa37247a7501be10d6 Author: Just Midi Date: Thu Aug 26 07:15:27 2021 +0000 True lazy loading, lsp installs, and nvim-compe Installation scripts for: + bashls + ccls + clangd + pylsp + pyright + sumneko + zls And adjusted a few keymaps commit 052b4513c25a1e4f28841e3e22ac01c8a820e711 Author: Just Midi Date: Wed Aug 11 20:52:37 2021 +0000 Base LSP + loads LSP server based on file type + imports native-lsp (our's) and lspconfig (foreign) + key mappings for lsp --- init.lua | 3 +- lua/keymap/init.lua | 43 +++---- lua/native-lsp/init.lua | 181 ++++++++++++++++++++++++++++++ lua/native-lsp/nvim-compe.lua | 95 ++++++++++++++++ scripts/install_bashls_server.sh | 8 ++ scripts/install_ccls_server.sh | 14 +++ scripts/install_clangd_server.sh | 4 + scripts/install_pylsp_server.sh | 8 ++ scripts/install_pyright_server.sh | 8 ++ scripts/install_sumneko_lua.sh | 17 +++ scripts/install_zls_server.sh | 10 ++ scripts/query_dependency.sh | 7 ++ 12 files changed, 376 insertions(+), 22 deletions(-) create mode 100644 lua/native-lsp/init.lua create mode 100644 lua/native-lsp/nvim-compe.lua create mode 100644 scripts/install_bashls_server.sh create mode 100644 scripts/install_ccls_server.sh create mode 100644 scripts/install_clangd_server.sh create mode 100644 scripts/install_pylsp_server.sh create mode 100644 scripts/install_pyright_server.sh create mode 100644 scripts/install_sumneko_lua.sh create mode 100644 scripts/install_zls_server.sh create mode 100644 scripts/query_dependency.sh diff --git a/init.lua b/init.lua index e74f054..a968659 100755 --- a/init.lua +++ b/init.lua @@ -22,7 +22,8 @@ env = vim.env -- environment variables local modules = { 'general', 'keymap', - 'ui' + 'ui', + 'native-lsp' } local async diff --git a/lua/keymap/init.lua b/lua/keymap/init.lua index d40a57b..568b57d 100755 --- a/lua/keymap/init.lua +++ b/lua/keymap/init.lua @@ -275,27 +275,28 @@ end map('n', 'p', ':lua pm_sync()', {noremap = true}) -- LSP -function lsp_shortcuts() - local lsp_commands = { - new = {'d','r','f','t','x','a','c','C','h','s','m'}, - old = { - '#textDocument_definition', -- d - '#textDocument_rename', -- r - '#textDocument_formatting', -- f - '#textDocument_typeDefinition', -- t - '#textDocument_references', -- x - '_workspace_applyEdit', -- a - '#textDocument_completion', -- c - '#textDocument_codeAction', -- C - '#textDocument_hover', -- h - '_textDocument_documentSymbol', -- s - '_contextMenu' -- m - } +local lsp_commands = { + new = {'h','d','D','r','f','n','i','s','S','<','>','a'}, + old = { + 'buf.hover', -- h + 'buf.definition', -- d + 'buf.declaration', -- D + 'buf.references', -- r + 'buf.formatting', -- f + 'buf.rename', -- n + 'buf.implementation', -- i + 'buf.document_symbol', -- s + 'buf.signature_help', -- S + 'diagnostic.goto_prev', -- < + 'diagnostic.goto_next', -- > + 'buf.code_action' -- a } - for i = 1, #lspcommands.new do - for _,f in pairs(modes_map({'n'})) do - f('l'..key_pair.new[i], - ':call LanguageClient'..key_pair.old[i]..'()', {noremap = true}) - end +} +for i = 1, #lsp_commands.new do + for _,f in pairs(modes_map({'n'})) do + f('l'..lsp_commands.new[i], + 'lua vim.lsp.'..lsp_commands.old[i]..'()', + {noremap = true} + ) end end diff --git a/lua/native-lsp/init.lua b/lua/native-lsp/init.lua new file mode 100644 index 0000000..71912b3 --- /dev/null +++ b/lua/native-lsp/init.lua @@ -0,0 +1,181 @@ +-- see `:help` for any questions +-- use `&` to show value of vimscript variable + + +-- API -- +-- o = vim.o -- options +-- go = vim.go -- only-global options +-- bo = vim.bo -- buffer local options +-- wo = vim.wo -- window local options + +-- cmd = vim.cmd -- vim commands +-- fn = vim.fn -- vim functions +-- opt = vim.opt -- vim option object + +-- g = vim.g -- global variables +-- b = vim.b -- buffer local variables +-- w = vim.w -- window local variables +-- t = vim.t -- tab local variables +-- v = vim.v -- variables +-- env = vim.env -- environment variables + +-- dependent on https://github.com/neovim/nvim-lspconfig +local lspconfig = require 'lspconfig' + +function lsp_init() + -- https://github.com/neovim/nvim-lspconfig/blob/master/CONFIG.md + local lsp_filetype = { + ['ada'] = {'als'}, + ['aspnetcorerazor'] = {'tailwindcss'}, + ['astro'] = {'tailwindcss'}, + ['astro-markdown'] = {'tailwindcss'}, + ['beancount'] = {'beancount'}, + ['bib'] = {'texlab'}, + ['bicep'] = {'bicep'}, + ['blade'] = {'tailwindcss'}, + ['c'] = {'ccls','clangd','sourcekit'}, + ['clojure'] = {'clojure_lsp'}, + ['cmake'] = {'cmake'}, + -- = {'config'}, + ['cpp'] = {'ccls','clangd','sourcekit'}, + ['crystal'] = {'crystalline','scry'}, + ['css'] = {'cssls','stylelint_lsp','tailwindcss'}, + ['d'] = {'serve_d'}, + ['dart'] = {'dartls'}, + ['dhall'] = {'dhall_lsp_server'}, + ['django-html'] = {'tailwindcss'}, + ['Dockerfile'] = {'dockerls'}, + ['dockerfile'] = {'dockerls'}, + ['dot'] = {'dotls'}, + -- = {'diagnostics'}, + ['edge'] = {'tailwindcss'}, + ['edn'] = {'clojure_lsp'}, + ['eelixir'] = {'elixirls','tailwindcss'}, + -- = {'efm'}, + ['elixir'] = {'elixirls'}, + ['elm'] = {'elmls'}, + ['ejs'] = {'tailwindcss'}, + ['erb'] = {'tailwindcss'}, + ['erlang'] = {'erlangls'}, + ['eruby'] = {'tailwindcss'}, + ['fortran'] = {'fortls'}, + ['fsharp'] = {'fsautocomplete'}, + ['gd'] = {'gdscript'}, + ['gdscript'] = {'gdscript'}, + ['gdscript3'] = {'gdscript'}, + ['genie'] = {'vala_ls'}, + ['go'] = {'gopls'}, + ['gohtml'] = {'tailwindcss'}, + ['gomod'] = {'gopls'}, + ['graphql'] = {'graphql'}, + ['groovy'] = {'groovyls'}, + ['haml'] = {'tailwindcss'}, + ['handlebars'] = {'ember','tailwindcss'}, + ['haskell'] = {'ghcide','hie','hls'}, + ['haxe'] = {'haxe_language_server'}, + ['hbs'] = {'tailwindcss'}, + -- = {'health'}, + ['help'] = {}, + ['html'] = {'angular','html','tailwindcss'}, + ['html-eex'] = {'tailwindcss'}, + ['jade'] = {'tailwindcss'}, + ['java'] = {'java_language_server','jdtls'}, + ['javascript'] = {'denols','ember','flow','rome','stylelint_lsp','tsserver','tailwindcss'}, + ['javascriptreact'] = {'denols','flow','rome','stylelint_lsp','tsserver','tailwindcss'}, + ['javascript.jsx'] = {'denols','flow','tsserver'}, + ['json'] = {'jsonls','rome'}, + ['julia'] = {'julials'}, + ['kotlin'] = {'kotlin_language_server'}, + ['leaf'] = {'tailwindcss'}, + ['lean'] = {'leanls'}, + ['lean3'] = {'lean3ls'}, + ['less'] = {'cssls','stylelint_lsp','tailwindcss'}, + ['lhaskell'] = {'ghcide','hls'}, + -- = {'lspinfo'}, + ['liquid'] = {'tailwindcss'}, + ['lua'] = {'sumneko_lua'}, + ['markdown'] = {'zeta_note','tailwindcss'}, + ['mdx'] = {'tailwindcss'}, + ['mint'] = {'mint'}, + ['mustache'] = {'tailwindcss'}, + ['mysql'] = {'sqlls','sqls'}, + ['nim'] = {'nimls'}, + ['nix'] = {'rnix'}, + ['njk'] = {'tailwindcss'}, + ['nunjucks'] = {'tailwindcss'}, + ['objc'] = {'ccls','clangd'}, + ['objcpp'] = {'ccls','clangd'}, + ['objective-c'] = {'sourcekit'}, + ['objective-cpp'] = {'sourcekit'}, + ['ocaml'] = {'ocamlls','ocamllsp'}, + ['ocaml.menhir'] = {'ocamllsp'}, + ['ocaml.interface'] = {'ocamllsp'}, + ['ocaml.ocamllex'] = {'ocamllsp'}, + ['perl'] = {'perlls','perlpls'}, + ['php'] = {'intelephense','phpactor','tailwindcss'}, + ['prisma'] = {'prismals'}, + ['ps1'] = {'powershell_es'}, + ['puppet'] = {'puppet'}, + ['purescript'] = {'purescriptls'}, + ['python'] = {'jedi_language_server','pylsp','pyright'}, + ['ql'] = {'codeqlls'}, + ['r'] = {'r_language_server'}, + ['racket'] = {'racket_langserver'}, + ['razor'] = {'tailwindcss'}, + ['reason'] = {'ocamlls','ocamllsp','tailwindcss'}, + ['rescript'] = {'rescript','tailwindcss'}, + ['rmd'] = {'r_language_server'}, + ['ruby'] = {'solargraph','sorbet'}, + ['rust'] = {'rls','rust_analyzer'}, + ['sass'] = {'tailwindcss'}, + ['scala'] = {'metals'}, + ['scheme'] = {'racket_langserver'}, + ['scss'] = {'cssls','stylelint_lsp','tailwindcss'}, + ['sh'] = {'bashls'}, + ['slim'] = {'tailwindcss'}, + ['stylus'] = {'tailwindcss'}, + ['sql'] = {'sqlls','sqls'}, + ['sugarss'] = {'stylelint_lsp','tailwindcss'}, + ['svelte'] = {'svelte','tailwindcss'}, + ['swift'] = {'source'}, + ['systemverilog'] = {'svls'}, + ['tex'] = {'texlab'}, + ['terraform'] = {'tflint','teraformls'}, + ['twig'] = {'tailwindcss'}, + ['typescript'] = {'angular', 'denols','ember','rome','stylelint_lsp','tsserver','tailwindcss'}, + ['typescriptreact'] = {'angular', 'denols','rome','stylelint_lsp','tsserver','tailwindcss'}, + ['typescript.tsx'] = {'angular', 'denols','rome','tsserver'}, + -- = {'util'}, + ['vala'] = {'vala_ls'}, + ['verilog'] = {'svls'}, + ['vim'] = {'vimls'}, + ['vlang'] = {'vls'}, + ['vue'] = {'stylelint_lsp','vuels','tailwindcss'}, + ['wxss'] = {'stylelint_lsp'}, + ['yaml'] = {'ansiblels','yamlls'}, + ['zig'] = {'zls'}, + ['zir'] = {'zls'} + } + + for _,server in pairs(lsp_filetype[bo.filetype]) do + lspconfig[server].setup {} + end +end + +function lsp_format() + local function format_file() + if bo.filetype == x then + vim.lsp.formatting_sync(nil, 100) + end + end + + for _,file in pairs({'javascript', 'python'}) do + format_file(file) + end +end + +cmd('autocmd BufRead * lua lsp_init()') +cmd('autocmd BufWritePre * lua lsp_format()') + + +require 'nvim-compe.lua' diff --git a/lua/native-lsp/nvim-compe.lua b/lua/native-lsp/nvim-compe.lua new file mode 100644 index 0000000..72b5926 --- /dev/null +++ b/lua/native-lsp/nvim-compe.lua @@ -0,0 +1,95 @@ +-- see `:help` for any questions +-- use `&` to show value of vimscript variable + + +-- API -- +-- o = vim.o -- options +-- go = vim.go -- only-global options +-- bo = vim.bo -- buffer local options +-- wo = vim.wo -- window local options + +-- cmd = vim.cmd -- vim commands +-- fn = vim.fn -- vim functions +-- opt = vim.opt -- vim option object + +-- g = vim.g -- global variables +-- b = vim.b -- buffer local variables +-- w = vim.w -- window local variables +-- t = vim.t -- tab local variables +-- v = vim.v -- variables +-- env = vim.env -- environment variables + +-- dependent on https://github.com/hrsh7th/nvim-compe + +require'compe'.setup { + enabled = true; + autocomplete = true; + debug = false; + min_length = 1; + preselect = 'enable'; + throttle_time = 80; + source_timeout = 200; + incomplete_delay = 400; + max_abbr_width = 100; + max_kind_width = 100; + max_menu_width = 100; + documentation = false; + + source = { + path = true; + buffer = true; + calc = true; + vsnip = true; + nvim_lsp = true; + nvim_lua = true; + spell = true; + tags = true; + snippets_nvim = true; + treesitter = true; + }; +} +local t = function(str) + return vim.api.nvim_replace_termcodes(str, true, true, true) +end + +local check_back_space = function() + local col = fn.col('.') - 1 + if col == 0 or fn.getline('.'):sub(col, col):match('%s') then + return true + else + return false + end +end + +-- Use (s-)tab to: +--- move to prev/next item in completion menuone +--- jump to prev/next snippet's placeholder +_G.tab_complete = function() + if fn.pumvisible() == 1 then + return t "" + elseif fn.call("vsnip#available", {1}) == 1 then + return t "(vsnip-expand-or-jump)" + elseif check_back_space() then + return t "" + else + return fn['compe#complete']() + end +end +_G.s_tab_complete = function() + if fn.pumvisible() == 1 then + return t "" + elseif fn.call("vsnip#jumpable", {-1}) == 1 then + return t "(vsnip-jump-prev)" + else + -- If is not working in your terminal, change it to + return t "" + end +end + +map("i", "", "v:lua.tab_complete()", {expr = true}) +map("s", "", "v:lua.tab_complete()", {expr = true}) +map("i", "", "v:lua.s_tab_complete()", {expr = true}) +map("s", "", "v:lua.s_tab_complete()", {expr = true}) + +map('i', '', 'compe#confirm("")', { expr = true }) +map('i', '', 'compe#complete()', { expr = true }) diff --git a/scripts/install_bashls_server.sh b/scripts/install_bashls_server.sh new file mode 100644 index 0000000..fab818a --- /dev/null +++ b/scripts/install_bashls_server.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +source scripts/query_dependencies.sh +query_dep 'npm' + +if response == 'y' then + npm -i -g bash-language-server +fi diff --git a/scripts/install_ccls_server.sh b/scripts/install_ccls_server.sh new file mode 100644 index 0000000..5f0056b --- /dev/null +++ b/scripts/install_ccls_server.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +source scripts/query_dependencies.sh +query_dep 'CMake' +query_dep 'C++17' +query_dep ' + +if response == 'y' then + cd builds + git clone --depth=1 --recursive https://github.com/MaskRay/ccls + cd ccls + cmake -H. -BRelease -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=/path/to/clang+llvm-xxx + cmake --build Release +fi diff --git a/scripts/install_clangd_server.sh b/scripts/install_clangd_server.sh new file mode 100644 index 0000000..0e5e707 --- /dev/null +++ b/scripts/install_clangd_server.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +printf 'Install from clang-tools or similar ' +printf 'with your OS or from releases on LLVM site\n' diff --git a/scripts/install_pylsp_server.sh b/scripts/install_pylsp_server.sh new file mode 100644 index 0000000..9f2ada2 --- /dev/null +++ b/scripts/install_pylsp_server.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +source scripts/query_dependencies.sh +query_dep 'pip' + +if response == 'y' then + pip install python-lsp-server +fi diff --git a/scripts/install_pyright_server.sh b/scripts/install_pyright_server.sh new file mode 100644 index 0000000..383039b --- /dev/null +++ b/scripts/install_pyright_server.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +source scripts/query_dependencies.sh +query_dep 'npm' + +if response == 'y' then + npm -i -g pyright +fi diff --git a/scripts/install_sumneko_lua.sh b/scripts/install_sumneko_lua.sh new file mode 100644 index 0000000..cd5b854 --- /dev/null +++ b/scripts/install_sumneko_lua.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +source scripts/query_dependencies.sh +query_dep 'ninja' +query_dep 'C++17' + +if $response == 'y' then + mkdir -p builds + cd builds + git clone https://github.com/sumneko/lua-language-server + cd lua-language-server + git submodule update --init --recursive + cd 3rd/luamake + compile/install.sh + cd ../.. + ./3rd/luamake/luamake rebuild +fi diff --git a/scripts/install_zls_server.sh b/scripts/install_zls_server.sh new file mode 100644 index 0000000..f8fbd3d --- /dev/null +++ b/scripts/install_zls_server.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +source scripts/query_dependencies.sh +query_dep "xz or xz-utils" + +if response == 'y' then + mkdir -p builds/zls + cd builds/zls + curl -L https://github.com/zigtools/zls/releases/download/0.1.0/x86_64-linux.tar.xz | tar -xJ --strip-components=1 -C . +fi diff --git a/scripts/query_dependency.sh b/scripts/query_dependency.sh new file mode 100644 index 0000000..1cef7d5 --- /dev/null +++ b/scripts/query_dependency.sh @@ -0,0 +1,7 @@ +function query_dep(){ + printf 'Did you install ' + printf $1 + printf '?\n (y/N)' + response='n' + read response +}