diff options
| author | Shatur95 <genaloner@gmail.com> | 2020-02-25 00:27:11 +0200 |
|---|---|---|
| committer | Shatur95 <genaloner@gmail.com> | 2020-02-25 00:27:11 +0200 |
| commit | dab72e9cca64e74844ccd6a7084b47b281068daa (patch) | |
| tree | 28df1ddb903933753a8fdfe1076885c9b68b27b4 /lua | |
| parent | Fix review issues (diff) | |
| parent | [docgen] Update README.md (diff) | |
| download | nvim-lspconfig-dab72e9cca64e74844ccd6a7084b47b281068daa.tar nvim-lspconfig-dab72e9cca64e74844ccd6a7084b47b281068daa.tar.gz nvim-lspconfig-dab72e9cca64e74844ccd6a7084b47b281068daa.tar.bz2 nvim-lspconfig-dab72e9cca64e74844ccd6a7084b47b281068daa.tar.lz nvim-lspconfig-dab72e9cca64e74844ccd6a7084b47b281068daa.tar.xz nvim-lspconfig-dab72e9cca64e74844ccd6a7084b47b281068daa.tar.zst nvim-lspconfig-dab72e9cca64e74844ccd6a7084b47b281068daa.zip | |
Merge branch 'master' into add_gdscript
Diffstat (limited to 'lua')
32 files changed, 16 insertions, 60 deletions
diff --git a/lua/nvim_lsp/bashls.lua b/lua/nvim_lsp/bashls.lua index a8041d3c..f8d00e9e 100644 --- a/lua/nvim_lsp/bashls.lua +++ b/lua/nvim_lsp/bashls.lua @@ -1,6 +1,5 @@ local configs = require 'nvim_lsp/configs' local util = require 'nvim_lsp/util' -local lsp = vim.lsp local server_name = "bashls" local bin_name = "bash-language-server" @@ -16,7 +15,6 @@ configs[server_name] = { cmd = {"bash-language-server", "start"}; filetypes = {"sh"}; root_dir = vim.loop.os_homedir; - log_level = lsp.protocol.MessageType.Warning; }; on_new_config = function(new_config) local install_info = installer.info() diff --git a/lua/nvim_lsp/ccls.lua b/lua/nvim_lsp/ccls.lua index 3b0293f3..4accfc98 100644 --- a/lua/nvim_lsp/ccls.lua +++ b/lua/nvim_lsp/ccls.lua @@ -1,13 +1,11 @@ local configs = require 'nvim_lsp/configs' local util = require 'nvim_lsp/util' -local lsp = vim.lsp configs.ccls = { default_config = util.utf8_config { cmd = {"ccls"}; filetypes = {"c", "cpp", "objc", "objcpp"}; root_dir = util.root_pattern("compile_commands.json", "compile_flags.txt", ".git"); - log_level = lsp.protocol.MessageType.Warning; }; -- commands = {}; -- on_new_config = function(new_config) end; diff --git a/lua/nvim_lsp/clangd.lua b/lua/nvim_lsp/clangd.lua index 9196e721..59649f8e 100644 --- a/lua/nvim_lsp/clangd.lua +++ b/lua/nvim_lsp/clangd.lua @@ -1,6 +1,5 @@ local configs = require 'nvim_lsp/configs' local util = require 'nvim_lsp/util' -local lsp = vim.lsp local root_pattern = util.root_pattern("compile_commands.json", "compile_flags.txt", ".git") configs.clangd = { @@ -10,7 +9,6 @@ configs.clangd = { root_dir = function(fname) return root_pattern(fname) or util.path.dirname(fname) end; - log_level = lsp.protocol.MessageType.Warning; }; -- commands = {}; -- on_new_config = function(new_config) end; diff --git a/lua/nvim_lsp/configs.lua b/lua/nvim_lsp/configs.lua index b2105b75..3d64a988 100644 --- a/lua/nvim_lsp/configs.lua +++ b/lua/nvim_lsp/configs.lua @@ -4,7 +4,6 @@ local tbl_extend = vim.tbl_extend local configs = {} - function configs.__newindex(t, config_name, config_def) validate { name = {config_name, 's'}; @@ -26,6 +25,7 @@ function configs.__newindex(t, config_name, config_def) local default_config = tbl_extend("keep", config_def.default_config, { log_level = lsp.protocol.MessageType.Warning; + message_level = lsp.protocol.MessageType.Warning; settings = vim.empty_dict(); init_options = vim.empty_dict(); callbacks = {}; @@ -42,7 +42,17 @@ function configs.__newindex(t, config_name, config_def) if params and params.type <= config.log_level then -- TODO(ashkan) remove this after things have settled. assert(lsp.callbacks, "Update to Nvim HEAD. This is an incompatible interface.") - lsp.callbacks[method](err, method, params, client_id) + assert(lsp.callbacks["window/logMessage"], "Callback for window/logMessage notification is not defined") + lsp.callbacks["window/logMessage"](err, method, params, client_id) + end + end + + config.callbacks["window/showMessage"] = function(err, method, params, client_id) + if params and params.type <= config.message_level then + -- TODO(ashkan) remove this after things have settled. + assert(lsp.callbacks and lsp.callbacks[method], "Update to Nvim HEAD. This is an incompatible interface.") + assert(lsp.callbacks["window/showMessage"], "Callback for window/showMessage notification is not defined") + lsp.callbacks["window/showMessage"](err, method, params, client_id) end end diff --git a/lua/nvim_lsp/cssls.lua b/lua/nvim_lsp/cssls.lua index fa6b29cf..c096440a 100644 --- a/lua/nvim_lsp/cssls.lua +++ b/lua/nvim_lsp/cssls.lua @@ -1,6 +1,5 @@ local configs = require 'nvim_lsp/configs' local util = require 'nvim_lsp/util' -local lsp = vim.lsp local server_name = "cssls" local bin_name = "css-languageserver" @@ -20,7 +19,6 @@ configs[server_name] = { root_dir = function(fname) return root_pattern(fname) or vim.loop.os_homedir() end; - log_level = lsp.protocol.MessageType.Warning; settings = { css = { validate = true }, scss = { validate = true }, diff --git a/lua/nvim_lsp/dartls.lua b/lua/nvim_lsp/dartls.lua index e9393728..01581a13 100644 --- a/lua/nvim_lsp/dartls.lua +++ b/lua/nvim_lsp/dartls.lua @@ -1,6 +1,5 @@ local nvim_lsp = require 'nvim_lsp' local configs = require 'nvim_lsp/configs' -local lsp = vim.lsp local server_name = "dartls" local bin_name = "dart" @@ -39,7 +38,6 @@ configs[server_name] = { cmd = {bin_name, analysis_server_snapshot_path(), "--lsp"}; filetypes = {"dart"}; root_dir = nvim_lsp.util.root_pattern("pubspec.yaml"); - log_level = lsp.protocol.MessageType.Warning; init_options = { onlyAnalyzeProjectsWithOpenFiles = "false", suggestFromUnimportedLibraries = "true", diff --git a/lua/nvim_lsp/dockerls.lua b/lua/nvim_lsp/dockerls.lua index 358d83e5..941d2c84 100644 --- a/lua/nvim_lsp/dockerls.lua +++ b/lua/nvim_lsp/dockerls.lua @@ -1,6 +1,5 @@ local configs = require 'nvim_lsp/configs' local util = require 'nvim_lsp/util' -local lsp = vim.lsp local server_name = "dockerls" local bin_name = "docker-langserver" @@ -16,7 +15,6 @@ configs[server_name] = { cmd = {bin_name, "--stdio"}; filetypes = {"Dockerfile", "dockerfile"}; root_dir = util.root_pattern("Dockerfile"); - log_level = lsp.protocol.MessageType.Warning; }; on_new_config = function(new_config) local install_info = installer.info() diff --git a/lua/nvim_lsp/elmls.lua b/lua/nvim_lsp/elmls.lua index c89cc324..827614f5 100644 --- a/lua/nvim_lsp/elmls.lua +++ b/lua/nvim_lsp/elmls.lua @@ -27,7 +27,6 @@ configs[server_name] = { return elm_root_pattern(fname) end end; - log_level = lsp.protocol.MessageType.Warning; init_options = { elmPath = "elm", elmFormatPath = "elm-format", diff --git a/lua/nvim_lsp/flow.lua b/lua/nvim_lsp/flow.lua index b8bb0323..cde064ac 100644 --- a/lua/nvim_lsp/flow.lua +++ b/lua/nvim_lsp/flow.lua @@ -1,13 +1,11 @@ local configs = require 'nvim_lsp/configs' local util = require 'nvim_lsp/util' -local lsp = vim.lsp configs.flow = { default_config = { cmd = {"npm", "run", "flow","lsp"}; filetypes = {"javascript", "javascriptreact", "javascript.jsx"}; root_dir = util.root_pattern(".flowconfig"); - log_level = lsp.protocol.MessageType.Warning; }; docs = { package_json = "https://raw.githubusercontent.com/flowtype/flow-for-vscode/master/package.json"; diff --git a/lua/nvim_lsp/fortls.lua b/lua/nvim_lsp/fortls.lua index d0b19f29..5eceb00c 100644 --- a/lua/nvim_lsp/fortls.lua +++ b/lua/nvim_lsp/fortls.lua @@ -1,13 +1,11 @@ local configs = require 'nvim_lsp/configs' local util = require 'nvim_lsp/util' -local lsp = vim.lsp configs.fortls = { default_config = { cmd = {"fortls"}; filetypes = {"fortran"}; root_dir = util.root_pattern(".fortls"); - log_level = lsp.protocol.MessageType.Warning; settings = { nthreads = 1, }; diff --git a/lua/nvim_lsp/ghcide.lua b/lua/nvim_lsp/ghcide.lua index a07ebfa9..5ec8d583 100644 --- a/lua/nvim_lsp/ghcide.lua +++ b/lua/nvim_lsp/ghcide.lua @@ -1,13 +1,11 @@ local configs = require 'nvim_lsp/configs' local util = require 'nvim_lsp/util' -local lsp = vim.lsp configs.ghcide = { default_config = { cmd = { "ghcide", "--lsp" }; filetypes = { "haskell", "lhaskell" }; root_dir = util.root_pattern("stack.yaml", "hie-bios", "BUILD.bazel", "cabal.config", "package.yaml"); - log_level = lsp.protocol.MessageType.Warning; }; docs = { diff --git a/lua/nvim_lsp/gopls.lua b/lua/nvim_lsp/gopls.lua index 2052b8ca..d853232a 100644 --- a/lua/nvim_lsp/gopls.lua +++ b/lua/nvim_lsp/gopls.lua @@ -1,13 +1,11 @@ local configs = require 'nvim_lsp/configs' local util = require 'nvim_lsp/util' -local lsp = vim.lsp configs.gopls = { default_config = { cmd = {"gopls"}; filetypes = {"go"}; root_dir = util.root_pattern("go.mod", ".git"); - log_level = lsp.protocol.MessageType.Warning; }; -- on_new_config = function(new_config) end; -- on_attach = function(client, bufnr) end; diff --git a/lua/nvim_lsp/hie.lua b/lua/nvim_lsp/hie.lua index 312f1af3..f80789d6 100644 --- a/lua/nvim_lsp/hie.lua +++ b/lua/nvim_lsp/hie.lua @@ -1,13 +1,11 @@ local configs = require 'nvim_lsp/configs' local util = require 'nvim_lsp/util' -local lsp = vim.lsp configs.hie = { default_config = { cmd = {"hie-wrapper"}; filetypes = {"haskell"}; root_dir = util.root_pattern("stack.yaml", "package.yaml", ".git"); - log_level = lsp.protocol.MessageType.Warning; }; docs = { diff --git a/lua/nvim_lsp/intelephense.lua b/lua/nvim_lsp/intelephense.lua index 8cdb5573..2e5416ff 100644 --- a/lua/nvim_lsp/intelephense.lua +++ b/lua/nvim_lsp/intelephense.lua @@ -1,6 +1,5 @@ local configs = require 'nvim_lsp/configs' local util = require 'nvim_lsp/util' -local lsp = vim.lsp local server_name = "intelephense" local bin_name = "intelephense" @@ -22,7 +21,6 @@ configs[server_name] = { -- prefer cwd if root is a descendant return util.path.is_descendant(cwd, root) and cwd or root; end; - log_level = lsp.protocol.MessageType.Warning; }; on_new_config = function(new_config) local install_info = installer.info() diff --git a/lua/nvim_lsp/jsonls.lua b/lua/nvim_lsp/jsonls.lua index 5481b32e..940d608a 100644 --- a/lua/nvim_lsp/jsonls.lua +++ b/lua/nvim_lsp/jsonls.lua @@ -1,6 +1,5 @@ local configs = require 'nvim_lsp/configs' local util = require 'nvim_lsp/util' -local lsp = vim.lsp local server_name = "jsonls" local bin_name = "vscode-json-languageserver" @@ -16,7 +15,6 @@ configs[server_name] = { cmd = {bin_name, "--stdio"}; filetypes = {"json"}; root_dir = util.root_pattern(".git", vim.fn.getcwd()); - log_level = lsp.protocol.MessageType.Warning; }; on_new_config = function(new_config) local install_info = installer.info() diff --git a/lua/nvim_lsp/julials.lua b/lua/nvim_lsp/julials.lua index 16cc83c6..a5a96637 100644 --- a/lua/nvim_lsp/julials.lua +++ b/lua/nvim_lsp/julials.lua @@ -12,7 +12,6 @@ configs.julials = { ]] }; filetypes = {'julia'}; - log_level = vim.lsp.protocol.MessageType.Warning; root_dir = function(fname) return util.find_git_ancestor(fname) or vim.loop.os_homedir() end; diff --git a/lua/nvim_lsp/leanls.lua b/lua/nvim_lsp/leanls.lua index 0efc305c..0582868e 100644 --- a/lua/nvim_lsp/leanls.lua +++ b/lua/nvim_lsp/leanls.lua @@ -1,13 +1,11 @@ local configs = require 'nvim_lsp/configs' local util = require 'nvim_lsp/util' -local lsp = vim.lsp configs.leanls = { default_config = { cmd = {"lean-language-server", "--stdio"}; filetypes = {"lean"}; root_dir = util.root_pattern(".git"); - log_level = lsp.protocol.MessageType.Warning; }; -- on_new_config = function(new_config) end; -- on_attach = function(client, bufnr) end; diff --git a/lua/nvim_lsp/metals.lua b/lua/nvim_lsp/metals.lua index 1c3c7e2e..2c06f06a 100644 --- a/lua/nvim_lsp/metals.lua +++ b/lua/nvim_lsp/metals.lua @@ -1,6 +1,5 @@ local configs = require 'nvim_lsp/configs' local util = require 'nvim_lsp/util' -local lsp = vim.lsp local server_name = "metals" local bin_name = "metals" @@ -53,7 +52,6 @@ configs[server_name] = { cmd = {bin_name}; filetype = {"scala"}; root_dir = util.root_pattern("build.sbt", "build.sc", "build.gradle", "pom.xml"); - log_level = lsp.protocol.MessageType.Warning; }; on_new_config = function(config) installer.configure(config) diff --git a/lua/nvim_lsp/nimls.lua b/lua/nvim_lsp/nimls.lua index f4eb2e1e..2e10eb97 100644 --- a/lua/nvim_lsp/nimls.lua +++ b/lua/nvim_lsp/nimls.lua @@ -5,7 +5,6 @@ configs.nimls = { default_config = { cmd = {"nimlsp",}; filetypes = {'nim'}; - log_level = vim.lsp.protocol.MessageType.Warning; root_dir = function(fname) return util.find_git_ancestor(fname) or vim.loop.os_homedir() end; diff --git a/lua/nvim_lsp/ocamlls.lua b/lua/nvim_lsp/ocamlls.lua index 4477a68a..417529fa 100644 --- a/lua/nvim_lsp/ocamlls.lua +++ b/lua/nvim_lsp/ocamlls.lua @@ -1,6 +1,5 @@ local configs = require 'nvim_lsp/configs' local util = require 'nvim_lsp/util' -local lsp = vim.lsp local server_name = "ocamlls" local bin_name = "ocaml-language-server" @@ -16,7 +15,6 @@ configs[server_name] = { cmd = { bin_name, "--stdio" }; filetypes = { "ocaml", "reason" }; root_dir = util.root_pattern(".merlin", "package.json"); - log_level = lsp.protocol.MessageType.Warning; }; on_new_config = function(new_config) local install_info = installer.info() diff --git a/lua/nvim_lsp/pyls.lua b/lua/nvim_lsp/pyls.lua index 17f7978a..defce25b 100644 --- a/lua/nvim_lsp/pyls.lua +++ b/lua/nvim_lsp/pyls.lua @@ -1,12 +1,13 @@ local configs = require 'nvim_lsp/configs' -local lsp = vim.lsp +local util = require 'nvim_lsp/util' configs.pyls = { default_config = { cmd = {"pyls"}; filetypes = {"python"}; - root_dir = vim.loop.os_homedir; - log_level = lsp.protocol.MessageType.Warning; + root_dir = function(fname) + return util.path.dirname(fname) + end; }; -- on_new_config = function(new_config) end; -- on_attach = function(client, bufnr) end; diff --git a/lua/nvim_lsp/pyls_ms.lua b/lua/nvim_lsp/pyls_ms.lua index 16b7dd7e..55f3da06 100644 --- a/lua/nvim_lsp/pyls_ms.lua +++ b/lua/nvim_lsp/pyls_ms.lua @@ -1,6 +1,5 @@ local configs = require 'nvim_lsp/configs' local util = require 'nvim_lsp/util' -local lsp = vim.lsp local name = "pyls_ms" @@ -83,7 +82,6 @@ configs[name] = { root_dir = function(fname) return util.find_git_ancestor(fname) or vim.loop.os_homedir() end; - log_level = lsp.protocol.MessageType.Warning; settings = { python = { analysis = { diff --git a/lua/nvim_lsp/rls.lua b/lua/nvim_lsp/rls.lua index bd47db4c..472ea3d1 100644 --- a/lua/nvim_lsp/rls.lua +++ b/lua/nvim_lsp/rls.lua @@ -1,13 +1,11 @@ local configs = require 'nvim_lsp/configs' local util = require 'nvim_lsp/util' -local lsp = vim.lsp configs.rls = { default_config = { cmd = {"rls"}; filetypes = {"rust"}; root_dir = util.root_pattern("Cargo.toml"); - log_level = lsp.protocol.MessageType.Warning; }; docs = { vscode = "rust-lang.rust"; diff --git a/lua/nvim_lsp/rust_analyzer.lua b/lua/nvim_lsp/rust_analyzer.lua index 37ddbc02..234a3819 100644 --- a/lua/nvim_lsp/rust_analyzer.lua +++ b/lua/nvim_lsp/rust_analyzer.lua @@ -1,13 +1,11 @@ local configs = require 'nvim_lsp/configs' local util = require 'nvim_lsp/util' -local lsp = vim.lsp configs.rust_analyzer = { default_config = util.utf8_config { cmd = {"rust-analyzer"}; filetypes = {"rust"}; root_dir = util.root_pattern("Cargo.toml"); - log_level = lsp.protocol.MessageType.Warning; }; docs = { package_json = "https://github.com/rust-analyzer/rust-analyzer/raw/master/editors/code/package.json"; diff --git a/lua/nvim_lsp/solargraph.lua b/lua/nvim_lsp/solargraph.lua index d658102b..51de52ce 100644 --- a/lua/nvim_lsp/solargraph.lua +++ b/lua/nvim_lsp/solargraph.lua @@ -1,13 +1,11 @@ local configs = require 'nvim_lsp/configs' local util = require 'nvim_lsp/util' -local lsp = vim.lsp configs.solargraph = { default_config = { cmd = {"solargraph", "stdio"}; filetypes = {"ruby"}; root_dir = util.root_pattern("Gemfile", ".git"); - log_level = lsp.protocol.MessageType.Warning; }; docs = { vscode = "castwide.solargraph"; diff --git a/lua/nvim_lsp/sumneko_lua.lua b/lua/nvim_lsp/sumneko_lua.lua index e0610fb4..f88c61c8 100644 --- a/lua/nvim_lsp/sumneko_lua.lua +++ b/lua/nvim_lsp/sumneko_lua.lua @@ -1,6 +1,5 @@ local configs = require 'nvim_lsp/configs' local util = require 'nvim_lsp/util' -local vim = vim local name = "sumneko_lua" local bin_name = "lua-language-server" diff --git a/lua/nvim_lsp/terraformls.lua b/lua/nvim_lsp/terraformls.lua index cd918141..0a84fe2d 100644 --- a/lua/nvim_lsp/terraformls.lua +++ b/lua/nvim_lsp/terraformls.lua @@ -1,13 +1,11 @@ local configs = require 'nvim_lsp/configs' local util = require 'nvim_lsp/util' -local lsp = vim.lsp configs.terraformls = { default_config = { cmd = {"terraform-lsp"}; filetypes = {"terraform"}; root_dir = util.root_pattern(".git"); - log_level = lsp.protocol.MessageType.Warning; }; docs = { vscode = "mauve.terraform"; diff --git a/lua/nvim_lsp/texlab.lua b/lua/nvim_lsp/texlab.lua index 37021ee6..374666fc 100644 --- a/lua/nvim_lsp/texlab.lua +++ b/lua/nvim_lsp/texlab.lua @@ -36,7 +36,6 @@ configs.texlab = { cmd = {"texlab"}; filetypes = {"tex", "bib"}; root_dir = vim.loop.os_homedir; - log_level = lsp.protocol.MessageType.Warning; settings = { latex = { build = { diff --git a/lua/nvim_lsp/tsserver.lua b/lua/nvim_lsp/tsserver.lua index 8b8e0bcc..8bb79d79 100644 --- a/lua/nvim_lsp/tsserver.lua +++ b/lua/nvim_lsp/tsserver.lua @@ -1,6 +1,5 @@ local configs = require 'nvim_lsp/configs' local util = require 'nvim_lsp/util' -local lsp = vim.lsp local server_name = "tsserver" local bin_name = "typescript-language-server" @@ -16,7 +15,6 @@ configs[server_name] = { cmd = {bin_name, "--stdio"}; filetypes = {"javascript", "javascriptreact", "javascript.jsx", "typescript", "typescriptreact", "typescript.tsx"}; root_dir = util.root_pattern("package.json"); - log_level = lsp.protocol.MessageType.Warning; }; on_new_config = function(new_config) local install_info = installer.info() diff --git a/lua/nvim_lsp/vimls.lua b/lua/nvim_lsp/vimls.lua index 724588aa..88839699 100644 --- a/lua/nvim_lsp/vimls.lua +++ b/lua/nvim_lsp/vimls.lua @@ -1,6 +1,5 @@ local configs = require "nvim_lsp/configs" local util = require "nvim_lsp/util" -local lsp = vim.lsp local server_name = "vimls" local bin_name = "vim-language-server" @@ -18,7 +17,6 @@ configs[server_name] = { root_dir = function(fname) return util.find_git_ancestor(fname) or vim.loop.os_homedir() end, - log_level = lsp.protocol.MessageType.Warning, init_options = { iskeyword = "@,48-57,_,192-255,-#", vimruntime = "", diff --git a/lua/nvim_lsp/vuels.lua b/lua/nvim_lsp/vuels.lua index bd14d83d..3972bcbb 100644 --- a/lua/nvim_lsp/vuels.lua +++ b/lua/nvim_lsp/vuels.lua @@ -1,6 +1,5 @@ local configs = require 'nvim_lsp/configs' local util = require 'nvim_lsp/util' -local lsp = vim.lsp local server_name = "vuels" local bin_name = "vls" @@ -16,7 +15,6 @@ configs[server_name] = { cmd = {bin_name}; filetypes = {"vue"}; root_dir = util.root_pattern("package.json", "vue.config.js"); - log_level = lsp.protocol.MessageType.Warning; init_options = { config = { vetur = { diff --git a/lua/nvim_lsp/yamlls.lua b/lua/nvim_lsp/yamlls.lua index 3795a80b..5b1c9f82 100644 --- a/lua/nvim_lsp/yamlls.lua +++ b/lua/nvim_lsp/yamlls.lua @@ -1,6 +1,5 @@ local configs = require 'nvim_lsp/configs' local util = require 'nvim_lsp/util' -local lsp = vim.lsp local server_name = "yamlls" local bin_name = "yaml-language-server" @@ -16,7 +15,6 @@ configs[server_name] = { cmd = {bin_name, "--stdio"}; filetypes = {"yaml"}; root_dir = util.root_pattern(".git", vim.fn.getcwd()); - log_level = lsp.protocol.MessageType.Warning; }; on_new_config = function(new_config) local install_info = installer.info() |
