diff options
| author | steven_j <[email protected]> | 2022-03-28 08:59:33 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-03-28 08:59:33 +0200 |
| commit | 7807f147c192fdb6aec7659a3098b4bf31852fcd (patch) | |
| tree | 01545449515049f477d361da4209f7aefa426b03 | |
| parent | 5d08a337faa798b67611a1bba545ff5116579da4 (diff) | |
refactor(lsp): replace deprecated ocamllsp with ocamlls (#2402)
Co-authored-by: kylo252 <[email protected]>
| -rw-r--r-- | lua/lvim/lsp/config.lua | 2 | ||||
| -rw-r--r-- | tests/specs/lsp_spec.lua | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lua/lvim/lsp/config.lua b/lua/lvim/lsp/config.lua index ca6f66bb..3a345f15 100644 --- a/lua/lvim/lsp/config.lua +++ b/lua/lvim/lsp/config.lua @@ -78,7 +78,7 @@ return { "graphql", "jedi_language_server", "ltex", - "ocamllsp", + "ocamlls", "phpactor", "psalm", "pylsp", diff --git a/tests/specs/lsp_spec.lua b/tests/specs/lsp_spec.lua index 9031d98f..2518b237 100644 --- a/tests/specs/lsp_spec.lua +++ b/tests/specs/lsp_spec.lua @@ -31,7 +31,7 @@ a.describe("lsp workflow", function() lvim.log.level = "debug" local plugins = require "lvim.plugins" - require("lvim.plugin-loader"):load { plugins, lvim.plugins } + require("lvim.plugin-loader").load { plugins, lvim.plugins } if utils.is_file(logfile) then assert.equal(vim.fn.delete(logfile), 0) @@ -51,8 +51,9 @@ a.describe("lsp workflow", function() require("lvim.lsp").setup() for _, file in ipairs(vim.fn.glob(lvim.lsp.templates_dir .. "/*.lua", 1, 1)) do - for _, server in ipairs(lvim.lsp.override) do - assert.False(helpers.file_contains(file, server)) + for _, server_name in ipairs(lvim.lsp.override) do + local setup_cmd = string.format([[require("lvim.lsp.manager").setup(%q)]], server_name) + assert.False(helpers.file_contains(file, setup_cmd)) end end end) |