Explorar el Código

refactor(lsp): replace deprecated ocamllsp with ocamlls (#2402)

Co-authored-by: kylo252 <59826753+kylo252@users.noreply.github.com>
steven_j hace 3 años
padre
commit
7807f147c1
Se han modificado 2 ficheros con 5 adiciones y 4 borrados
  1. 1 1
      lua/lvim/lsp/config.lua
  2. 4 3
      tests/specs/lsp_spec.lua

+ 1 - 1
lua/lvim/lsp/config.lua

@@ -78,7 +78,7 @@ return {
     "graphql",
     "graphql",
     "jedi_language_server",
     "jedi_language_server",
     "ltex",
     "ltex",
-    "ocamllsp",
+    "ocamlls",
     "phpactor",
     "phpactor",
     "psalm",
     "psalm",
     "pylsp",
     "pylsp",

+ 4 - 3
tests/specs/lsp_spec.lua

@@ -31,7 +31,7 @@ a.describe("lsp workflow", function()
     lvim.log.level = "debug"
     lvim.log.level = "debug"
 
 
     local plugins = require "lvim.plugins"
     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
     if utils.is_file(logfile) then
       assert.equal(vim.fn.delete(logfile), 0)
       assert.equal(vim.fn.delete(logfile), 0)
@@ -51,8 +51,9 @@ a.describe("lsp workflow", function()
     require("lvim.lsp").setup()
     require("lvim.lsp").setup()
 
 
     for _, file in ipairs(vim.fn.glob(lvim.lsp.templates_dir .. "/*.lua", 1, 1)) do
     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
     end
   end)
   end)