diff options
| author | kylo252 <[email protected]> | 2021-12-13 17:35:21 +0100 |
|---|---|---|
| committer | kylo252 <[email protected]> | 2021-12-13 17:35:21 +0100 |
| commit | b327564d99b025a26a6dd8660fdc6990fd0d74e6 (patch) | |
| tree | 619009514cc34d6b6672f51d82a58f5e3c4fd093 | |
| parent | ab7a175bff611fc126ceb694d140233af7e40b33 (diff) | |
| parent | 683a89b543567ab2ddab1e8a2b1fe6c97f323e03 (diff) | |
Merge remote-tracking branch 'origin/rolling' into release-candidate
| -rw-r--r-- | lua/lvim/lsp/config.lua | 1 | ||||
| -rw-r--r-- | lua/lvim/lsp/templates.lua | 3 | ||||
| -rw-r--r-- | lua/lvim/plugins.lua | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lua/lvim/lsp/config.lua b/lua/lvim/lsp/config.lua index d4e2a741..1fbaf3a9 100644 --- a/lua/lvim/lsp/config.lua +++ b/lua/lvim/lsp/config.lua @@ -77,6 +77,7 @@ return { "sorbet", "sqlls", "sqls", + "solang", "spectral", "stylelint_lsp", "tailwindcss", diff --git a/lua/lvim/lsp/templates.lua b/lua/lvim/lsp/templates.lua index 33c75a6e..3478f4fb 100644 --- a/lua/lvim/lsp/templates.lua +++ b/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 diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index 39760397..8ef72bda 100644 --- a/lua/lvim/plugins.lua +++ b/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", |