Skip to content

fix(language-server): Can pass custom cmd option in setup #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mhanberg merged 1 commit into from
Nov 8, 2022
Merged

fix(language-server): Can pass custom cmd option in setup #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ elixir.setup({
tag = "v0.11.0", -- defaults to nil, mutually exclusive with the `branch` option

-- alternatively, point to an existing elixir-ls installation (optional)
-- not currently supported by elixirls, but can be a table if you wish to pass other args `{"path/to/elixirls", "--foo"}`
cmd = "/usr/local/bin/elixir-ls.sh",

-- default settings, use the `settings` function to override settings
Expand Down
26 changes: 18 additions & 8 deletions lua/elixir/language_server/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ local function install_elixir_ls(opts)
)
end

local function make_opts(opts)
local function repo_opts(opts)
local repo = opts.repo or "elixir-lsp/elixir-ls"
local ref
if opts.branch then
Expand All @@ -243,6 +243,14 @@ local function make_opts(opts)
}
end

local function wrap_in_table(maybe_string)
if type(maybe_string) == "string" then
return { maybe_string }
else
return maybe_string
end
end

function M.setup(opts)
if not elixir_nvim_output_bufnr then
elixir_nvim_output_bufnr = vim.api.nvim_create_buf(false, true)
Expand All @@ -255,27 +263,29 @@ function M.setup(opts)
local fname = Path.new(arg.file):absolute()

local root_dir = opts.root_dir and opts.root_dir(fname) or Utils.root_dir(fname)
local new_opts = make_opts(opts)
local repo_options = repo_opts(opts)

local cmd = M.command {
path = tostring(install_dir),
repo = new_opts.repo,
ref = new_opts.ref,
repo = repo_options.repo,
ref = repo_options.ref,
versions = Version.get(),
}

if not cmd:exists() then
if not opts.cmd and not cmd:exists() then
vim.ui.select({ "Yes", "No" }, { prompt = "Install ElixirLS" }, function(choice)
if choice == "Yes" then
install_elixir_ls(vim.tbl_extend("force", new_opts, { install_path = cmd:parent() }))
install_elixir_ls(vim.tbl_extend("force", repo_options, { install_path = cmd:parent() }))
end
end)

return
elseif root_dir then
end

if root_dir then
vim.lsp.start(vim.tbl_extend("keep", {
name = "ElixirLS",
cmd = { tostring(cmd) },
cmd = opts.cmd and wrap_in_table(opts.cmd) or { tostring(cmd) },
commands = {
["elixir.lens.test.run"] = test,
},
Expand Down