fixup! feat: :Elixir command with subcommands and completions

Author: mhanberg

lua/elixir/init.lua

@@ -36,10 +36,7 @@ local define_user_command = function()
       local subcommand = args:next()
       if "uninstall" == subcommand then
         vim.fn.delete(nextls.default_bin)
-        vim.notify(
-          string.format("Uninstalled Next LS from %s", nextls.default_bin),
-          vim.lsp.log_levels.INFO
-        )
+        vim.notify(string.format("Uninstalled Next LS from %s", nextls.default_bin), vim.lsp.log_levels.INFO)
       else
         not_found = true
       end
@@ -80,14 +77,12 @@ function M.setup(opts)
     opts.credo.version = utils.latest_release("elixir-tools", "credo-language-server")
   end
 
+  local nextls_auto_update
   if not opts.nextls.cmd then
     opts.nextls.cmd = nextls.default_bin
+    nextls_auto_update = true
   end
 
-  -- if opts.nextls.enable and not opts.nextls.version then
-  --   opts.nextls.version = utils.latest_release("elixir-tools", "next-ls")
-  -- end
-
   mix.setup()
   projectionist.setup()
   if enabled(opts.elixirls.enable) then
@@ -99,7 +94,7 @@ function M.setup(opts)
   end
 
   if opts.nextls.enable == true then
-    nextls.setup(opts.nextls)
+    nextls.setup(vim.tbl_extend("force", opts.nextls, { auto_update = nextls_auto_update }))
   end
 end
 

lua/elixir/nextls/init.lua

@@ -15,14 +15,15 @@ function M.setup(opts)
     group = nextls_group,
     callback = function(event)
       local cmd = event.data.cmd
+      local auto_update = event.auto_update
       local options = event.data.opts
       local root_dir = event.data.root_dir
       vim.lsp.start({
         name = "NextLS",
         cmd = cmd,
         cmd_env = {
           NEXTLS_VERSION = options.version,
-          NEXTLS_AUTO_UPDATE = true,
+          NEXTLS_AUTO_UPDATE = auto_update,
         },
         settings = {},
         capabilities = options.capabilities or vim.lsp.protocol.make_client_capabilities(),
@@ -72,6 +73,7 @@ function M.setup(opts)
             data = {
               root_dir = root_dir,
               cmd = cmd,
+              auto_update = opts.auto_update,
               opts = opts,
             },
           })