add support for table copilot node command

Author: timhugh

lua/copilot/config/init.lua

@@ -12,7 +12,7 @@ local logger = require("copilot.logger")
 ---@field copilot_model string|nil Model to use for Copilot, LSP server dictates the default
 ---@field root_dir RootDirFuncOrString Root directory for the project, defaults to the nearest .git directory
 ---@field should_attach ShouldAttachFunc Function to determine if Copilot should attach to the buffer
----@field copilot_node_command string Path to the Node.js executable, defaults to "node"
+---@field copilot_node_command string|string[] Path to the Node.js executable, defaults to "node"
 ---@field disable_limit_reached_message boolean Disable the limit reached message, defaults to false
 
 local initialized = false
@@ -68,7 +68,7 @@ function M.validate(config)
   vim.validate("copilot_model", config.copilot_model, { "string", "nil" })
   vim.validate("root_dir", config.root_dir, { "string", "function" })
   vim.validate("should_attach", config.should_attach, "function")
-  vim.validate("copilot_node_command", config.copilot_node_command, "string")
+  vim.validate("copilot_node_command", config.copilot_node_command, {"string", "table"})
 
   require("copilot.config.panel").validate(config.panel)
   require("copilot.config.suggestion").validate(config.suggestion)

lua/copilot/lsp/nodejs.lua

@@ -1,19 +1,21 @@
 local logger = require("copilot.logger")
+local util = require("copilot.util")
 
 local M = {
   ---@class copilot_nodejs_server_info
-  ---@type string
+  ---@type string|string[]
   node_command = nil,
   ---@type string
   server_path = nil,
   initialization_failed = false,
 }
 
+
 ---@return string node_version
 ---@return nil|string node_version_error
 function M.get_node_version()
   if not M.node_version then
-    local version_cmd = { M.node_command, "--version" }
+    local version_cmd = util.append_command(M.node_command, "--version")
 
     local node_version_major = 0
     local node_version = ""
@@ -95,14 +97,20 @@ end
 
 ---@return table
 function M.get_execute_command()
-  return {
-    M.node_command,
-    M.server_path or M.get_server_path(),
-    "--stdio",
-  }
+  if type(M.node_command) == "string" then
+    return {
+      M.node_command,
+      M.server_path or M.get_server_path(),
+      "--stdio",
+    }
+  elseif type(M.node_command) == "table" then
+    return util.append_command(M.node_command, { M.server_path or M.get_server_path(), "--stdio" })
+  else
+    error(string.format("failed to build node command from %s (type %s)", M.node_command, type(M.node_command)))
+  end
 end
 
----@param node_command? string
+---@param node_command? string|string[]
 ---@param custom_server_path? string
 ---@return boolean
 function M.setup(node_command, custom_server_path)

lua/copilot/util.lua

@@ -186,4 +186,31 @@ function M.get_buffer_previous_ft(bufnr)
   return (ok and result) or ""
 end
 
+---@param cmd string|string[]
+---@param append string|string[]
+---@return string[]
+M.append_command = function(cmd, append)
+  local full_cmd = {}
+
+  -- first append the base command
+  if type(cmd) == "string" then
+    table.insert(full_cmd, cmd)
+  elseif type(cmd) == "table" then
+    for _, part in ipairs(cmd) do
+      table.insert(full_cmd, part)
+    end
+  end
+
+  -- then append the additional parts
+  if type(append) == "string" then
+    table.insert(full_cmd, append)
+  elseif type(append) == "table" then
+    for _, part in ipairs(append) do
+      table.insert(full_cmd, part)
+    end
+  end
+
+  return full_cmd
+end
+
 return M

tests/test_nodejs.lua

@@ -73,6 +73,19 @@ T["get_node_version()"]["custom node command as string with spaces"] = function(
   eq(captured_args, { "/path to/node", "--version" })
 end
 
+T["get_node_version()"]["custom node command as table"] = function()
+  local captured_args = stub_process("v20.10.0", 0, false, function()
+    local nodejs = require("copilot.lsp.nodejs")
+    nodejs.setup({ "mise", "x", "node@lts", "--", "node" })
+
+    local version, error = nodejs.get_node_version()
+
+    eq(version, "20.10.0")
+    eq(error, nil)
+  end)
+  eq(captured_args, { "mise", "x", "node@lts", "--", "node", "--version" })
+end
+
 T["get_node_version()"]["handles vim.system failure"] = function()
   local captured_args = stub_process("", -1, true, function()
     local nodejs = require("copilot.lsp.nodejs")
@@ -144,4 +157,11 @@ T["get_execute_command()"]["custom node command as string with spaces"] = functi
   eq(cmd, { "/path to/node", nodejs.server_path, "--stdio" })
 end
 
+T["get_execute_command()"]["custom node command as table"] = function()
+  local nodejs = require("copilot.lsp.nodejs")
+  nodejs.setup({ "mise", "x", "node@lts", "--", "node" })
+  local cmd = nodejs.get_execute_command()
+  eq(cmd, { "mise", "x", "node@lts", "--", "node", nodejs.server_path, "--stdio" })
+end
+
 return T