Skip to content

Commit 1e9a1dc

Browse files
committed
handle activeParameter override on signature
Completes fix for #994
1 parent 3fe374e commit 1e9a1dc

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

apps/language_server/lib/language_server/providers/signature_help.ex

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,23 @@ defmodule ElixirLS.LanguageServer.Providers.SignatureHelp do
2222
{:ok, response}
2323
end
2424

25-
defp signature_response(%{documentation: documentation, name: name, params: params, spec: spec}) do
25+
defp signature_response(
26+
%{documentation: documentation, name: name, params: params, spec: spec} = signature
27+
) do
2628
params_info = for param <- params, do: %{"label" => param}
2729

2830
label = "#{name}(#{Enum.join(params, ", ")})"
2931
response = %{"label" => label, "parameters" => params_info}
3032

33+
response =
34+
case signature do
35+
%{active_param: active_param} ->
36+
Map.put(response, "activeParameter", active_param)
37+
38+
_ ->
39+
response
40+
end
41+
3142
case {spec, documentation} do
3243
{"", ""} ->
3344
response

dep_versions.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[
2-
elixir_sense: "a9ae8bc1bd4b99957b68512eb364513898826a30",
2+
elixir_sense: "d2e39a51542dec75932a20cdf430acff24896087",
33
dialyxir_vendored: "d50dcd7101c6ebd37b57b7ee4a7888d8cb634782",
44
jason_v: "c81537e2a5e1acacb915cf339fe400357e3c2aaa",
55
erl2ex_vendored: "073ac6b9a44282e718b6050c7b27cedf9217a12a",

mix.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"benchee": {:hex, :benchee, "1.1.0", "f3a43817209a92a1fade36ef36b86e1052627fd8934a8b937ac9ab3a76c43062", [:mix], [{:deep_merge, "~> 1.0", [hex: :deep_merge, repo: "hexpm", optional: false]}, {:statistex, "~> 1.0", [hex: :statistex, repo: "hexpm", optional: false]}], "hexpm", "7da57d545003165a012b587077f6ba90b89210fd88074ce3c60ce239eb5e6d93"},
33
"deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm", "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"},
44
"dialyxir_vendored": {:git, "https://github.com/elixir-lsp/dialyxir.git", "d50dcd7101c6ebd37b57b7ee4a7888d8cb634782", [ref: "d50dcd7101c6ebd37b57b7ee4a7888d8cb634782"]},
5-
"elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "a9ae8bc1bd4b99957b68512eb364513898826a30", [ref: "a9ae8bc1bd4b99957b68512eb364513898826a30"]},
5+
"elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "d2e39a51542dec75932a20cdf430acff24896087", [ref: "d2e39a51542dec75932a20cdf430acff24896087"]},
66
"erl2ex_vendored": {:git, "https://github.com/elixir-lsp/erl2ex.git", "073ac6b9a44282e718b6050c7b27cedf9217a12a", [ref: "073ac6b9a44282e718b6050c7b27cedf9217a12a"]},
77
"erlex_vendored": {:git, "https://github.com/elixir-lsp/erlex.git", "82db0e82ee4896491bc26dec99f5d795f03ab9f4", [ref: "82db0e82ee4896491bc26dec99f5d795f03ab9f4"]},
88
"jason_v": {:git, "https://github.com/elixir-lsp/jason.git", "c81537e2a5e1acacb915cf339fe400357e3c2aaa", [ref: "c81537e2a5e1acacb915cf339fe400357e3c2aaa"]},

0 commit comments

Comments
 (0)