nvim: add nushell language server and allow for lsps that don't have …

…a mason installer
chris468 · Jul 2, 2024 · 791a141 · 791a141
1 parent 26d4edf
commit 791a141
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/dotfiles/private_dot_config/nvim/lua/chris468/config/lang/init.lua b/dotfiles/private_dot_config/nvim/lua/chris468/config/lang/init.lua
@@ -9,6 +9,7 @@ local config = require("chris468.config")
 --- @field config? (table | fun():table?)
 --- @field register_server? table | fun():table?
 --- @field package_name? string
+--- @field install? boolean
 
 --- @class (exact) chris468.config.lang.Config
 --- @field lsp { [string]: false | chris468.config.lang.Lsp }
@@ -36,6 +37,12 @@ M.lsp = {
   lua_ls = {},
   mesonlsp = {},
   nil_ls = {}, -- nix
+  nushell = {
+    install = false,
+    config = {
+      filetypes = { "nu" },
+    },
+  },
   omnisharp = require("chris468.config.lang.omnisharp"),
   powershell_es = {},
   pyright = require("chris468.config.lang.pyright"),

diff --git a/dotfiles/private_dot_config/nvim/lua/chris468/plugins/nvim-lspconfig.lua b/dotfiles/private_dot_config/nvim/lua/chris468/plugins/nvim-lspconfig.lua
@@ -127,6 +127,7 @@ return {
       local mappings = require("mason-lspconfig.mappings.server").lspconfig_to_package
       local tool = {
         package_name = lsp.package_name or mappings[server] or server,
+        install = lsp.install,
         on_complete = register_lsp(opts.capabilities),
         data = {
           name = server,

diff --git a/dotfiles/private_dot_config/nvim/lua/chris468/util/mason.lua b/dotfiles/private_dot_config/nvim/lua/chris468/util/mason.lua
@@ -2,8 +2,9 @@ local M = {}
 
 --- @class (exact) chris468.util.mason.Tool
 --- @field package_name string
+--- @field install boolean?
 --- @field on_complete fun(tool: chris468.util.mason.Tool)?
---- @field data  any?
+--- @field data any?
 
 --- @alias chris468.util.mason.ToolsForFiletype { [string]: (string|chris468.util.mason.Tool)[] }
 
@@ -35,19 +36,17 @@ function M.install_tools(tools)
       tool = { package_name = tool }
     end
     local on_complete = tool.on_complete or noop
-    if registry.is_installed(tool.package_name) then
+    if tool.install == false or registry.is_installed(tool.package_name) then
       on_complete(tool)
-      return
-    end
-
-    local pkg = registry.get_package(tool.package_name)
-    if not pkg then
-      vim.notify("Package " .. tool .. " not found", vim.log.levels.ERROR)
-      on_complete(tool)
-      return
+    else
+      local pkg = registry.get_package(tool.package_name)
+      if pkg then
+        install_tool(pkg, on_complete, tool)
+      else
+        vim.notify("Package " .. tool .. " not found", vim.log.levels.ERROR)
+        on_complete(tool)
+      end
     end
-
-    install_tool(pkg, on_complete, tool)
   end
 end