diff options
| author | Michael Lingelbach <m.j.lbach@gmail.com> | 2021-02-27 12:17:09 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-27 12:17:09 -0800 |
| commit | 9c63c4c771c10cc3f42da69dae5d952297faa7a4 (patch) | |
| tree | ece5174cae09fe94562cf5a0d23370cd22f70574 /lua | |
| parent | Merge pull request #760 from teto/lspinfo (diff) | |
| parent | feat: add server specific LspInfo (diff) | |
| download | nvim-lspconfig-9c63c4c771c10cc3f42da69dae5d952297faa7a4.tar nvim-lspconfig-9c63c4c771c10cc3f42da69dae5d952297faa7a4.tar.gz nvim-lspconfig-9c63c4c771c10cc3f42da69dae5d952297faa7a4.tar.bz2 nvim-lspconfig-9c63c4c771c10cc3f42da69dae5d952297faa7a4.tar.lz nvim-lspconfig-9c63c4c771c10cc3f42da69dae5d952297faa7a4.tar.xz nvim-lspconfig-9c63c4c771c10cc3f42da69dae5d952297faa7a4.tar.zst nvim-lspconfig-9c63c4c771c10cc3f42da69dae5d952297faa7a4.zip | |
Merge pull request #762 from teto/add-hls-specific-lspinfo
Add hls specific lspinfo
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/lspconfig.lua | 4 | ||||
| -rw-r--r-- | lua/lspconfig/hls.lua | 7 | ||||
| -rw-r--r-- | lua/lspconfig/lspinfo.lua | 6 | ||||
| -rw-r--r-- | lua/nvim_lsp.lua | 2 |
4 files changed, 13 insertions, 6 deletions
diff --git a/lua/lspconfig.lua b/lua/lspconfig.lua index 77f47e63..462b4ddb 100644 --- a/lua/lspconfig.lua +++ b/lua/lspconfig.lua @@ -11,10 +11,6 @@ function M.available_servers() return vim.tbl_keys(configs) end -function M.installable_servers() - print("deprecated, see https://github.com/neovim/neovim/wiki/Following-HEAD") -end - -- Called from plugin/lspconfig.vim because it requires knowing that the last -- script in scriptnames to be executed is lspconfig. function M._root._setup() diff --git a/lua/lspconfig/hls.lua b/lua/lspconfig/hls.lua index 0daeeb03..27bdac26 100644 --- a/lua/lspconfig/hls.lua +++ b/lua/lspconfig/hls.lua @@ -11,6 +11,13 @@ configs.hls = { formattingProvider = "ormolu"; }; }; + lspinfo = function (cfg) + -- return "specific" + if cfg.settings.languageServerHaskell.logFile or false then + return "logfile: "..cfg.settings.languageServerHaskell.logFile + end + return "" + end; }; docs = { diff --git a/lua/lspconfig/lspinfo.lua b/lua/lspconfig/lspinfo.lua index f526cd13..75d4071e 100644 --- a/lua/lspconfig/lspinfo.lua +++ b/lua/lspconfig/lspinfo.lua @@ -46,12 +46,18 @@ return function () local indent = " " local function make_client_info(client) + local server_specific_info = "" + if client.config.lspinfo then + server_specific_info = client.config.lspinfo(client.config) + end return { "", indent.."Client: "..client.name.." (id "..tostring(client.id)..")", indent.."\troot: "..client.workspaceFolders[1].name, indent.."\tfiletypes: "..table.concat(client.config.filetypes or {}, ', '), indent.."\tcmd: "..remove_newlines(client.config.cmd), + indent.."\t"..server_specific_info, + "" } end diff --git a/lua/nvim_lsp.lua b/lua/nvim_lsp.lua deleted file mode 100644 index 39ef0b2e..00000000 --- a/lua/nvim_lsp.lua +++ /dev/null @@ -1,2 +0,0 @@ -local vim = vim -vim.api.nvim_command('echomsg "NOTICE: \\"nvim_lsp\\" module was renamed to \\"lspconfig\\". Update your config/plugins to require(\\"lspconfig\\") instead of require(\\"nvim_lsp\\")."') |