瀏覽代碼

Merge remote-tracking branch 'origin/rolling' into release-candidate

kylo252 3 年之前
父節點
當前提交
b327564d99
共有 3 個文件被更改,包括 4 次插入4 次删除
  1. 1 0
      lua/lvim/lsp/config.lua
  2. 1 2
      lua/lvim/lsp/templates.lua
  3. 2 2
      lua/lvim/plugins.lua

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

@@ -77,6 +77,7 @@ return {
     "sorbet",
     "sqlls",
     "sqls",
+    "solang",
     "spectral",
     "stylelint_lsp",
     "tailwindcss",

+ 1 - 2
lua/lvim/lsp/templates.lua

@@ -19,8 +19,7 @@ end
 ---@param server_name string name of a valid language server, e.g. pyright, gopls, tsserver, etc.
 ---@param dir string the full path to the desired directory
 function M.generate_ftplugin(server_name, dir)
-  local has_custom_provider, _ = pcall(require, "lvim/lsp/providers/" .. server_name)
-  if vim.tbl_contains(lvim.lsp.override, server_name) and not has_custom_provider then
+  if vim.tbl_contains(lvim.lsp.override, server_name) then
     return
   end
 

+ 2 - 2
lua/lvim/plugins.lua

@@ -17,8 +17,8 @@ local commit = {
   nvim_autopairs = "04cd1779f81e9d50d5a116c5dccd054b275bd191",
   nvim_cmp = "af07ff9b7973e95eff9e0275e13fe0350281208b",
   nvim_dap = "3b3027e0ca98775000e1ba727d8f292e821f9f03",
-  nvim_lsp_installer = "fcd5d79a7f4966645e9d2f512b85b72f7de0dde2",
-  nvim_lspconfig = "e6d95863a336b7e52c92b38c62aa60b469254d14",
+  nvim_lsp_installer = "d7b10b13d72d4bf8f7b34779ddc3514bcc26b0f2",
+  nvim_lspconfig = "2293320aa824e25327c5a10675ae091d1ff83fbc",
   nvim_notify = "ef027e34b618eac42fb0111c1db670ba01793039",
   nvim_tree = "2e33b1654384921ec1cc9656a2018744f3f1ce81",
   nvim_treesitter = "1d66657e6d0f1f8f79ddc48ff1dac9788694cc2d",