Skip to content

Commit e54e2eb

Browse files
committed
update elixir_sense
1 parent a50c028 commit e54e2eb

File tree

6 files changed

+12
-5
lines changed

6 files changed

+12
-5
lines changed

apps/elixir_ls_debugger/lib/debugger/server.ex

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -681,10 +681,11 @@ defmodule ElixirLS.Debugger.Server do
681681
}
682682
end)
683683

684-
env = %ElixirSense.Providers.Suggestion.Complete.Env{vars: vars}
684+
env = %ElixirSense.Core.State.Env{vars: vars}
685+
metadata = %ElixirSense.Core.Metadata{}
685686

686687
results =
687-
ElixirSense.Providers.Suggestion.Complete.complete(prefix, env)
688+
ElixirSense.Providers.Suggestion.Complete.complete(prefix, env, metadata)
688689
|> Enum.map(&ElixirLS.Debugger.Completions.map/1)
689690

690691
{%{"targets" => results}, state}

apps/language_server/lib/language_server/experimental/provider/handlers/find_references.ex

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ defmodule ElixirLS.LanguageServer.Experimental.Provider.Handlers.FindReferences
3232
end
3333
end)
3434
|> Enum.reverse()
35+
# ElixirSense returns references from both compile tracer and current buffer
36+
# There may be duplicates
37+
|> Enum.uniq()
3538

3639
response = Responses.FindReferences.new(request.id, references)
3740
Logger.info("found #{length(references)} refs")

apps/language_server/lib/language_server/providers/hover.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ defmodule ElixirLS.LanguageServer.Providers.Hover do
4848
)
4949
end
5050

51-
defp contents(%{docs: markdown}, subject, project_dir) do
51+
defp contents(markdown, subject, project_dir) do
5252
%{
5353
kind: "markdown",
5454
value: add_hexdocs_link(markdown, subject, project_dir)

apps/language_server/lib/language_server/providers/references.ex

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ defmodule ElixirLS.LanguageServer.Providers.References do
2626
|> build_reference(uri, text)
2727
end)
2828
|> Enum.filter(&(not is_nil(&1)))
29+
# ElixirSense returns references from both compile tracer and current buffer
30+
# There may be duplicates
31+
|> Enum.uniq()
2932
end)
3033
end
3134

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: "3aea5e26d71d00c160033bd86451b11a69424b9d",
2+
elixir_sense: "a495a9bfed95de84ee49f0f4f3c5768ae24d43b2",
33
dialyxir_vendored: "7e908b4d760c7329046e0ee3076be9156cd784e1",
44
jason_v: "c81537e2a5e1acacb915cf339fe400357e3c2aaa"
55
]

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", "7e908b4d760c7329046e0ee3076be9156cd784e1", [ref: "7e908b4d760c7329046e0ee3076be9156cd784e1"]},
5-
"elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "3aea5e26d71d00c160033bd86451b11a69424b9d", [ref: "3aea5e26d71d00c160033bd86451b11a69424b9d"]},
5+
"elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "a495a9bfed95de84ee49f0f4f3c5768ae24d43b2", [ref: "a495a9bfed95de84ee49f0f4f3c5768ae24d43b2"]},
66
"erl2ex": {:git, "https://github.com/dazuma/erl2ex.git", "244c2d9ed5805ef4855a491d8616b8842fef7ca4", []},
77
"erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
88
"jason_v": {:git, "https://github.com/elixir-lsp/jason.git", "c81537e2a5e1acacb915cf339fe400357e3c2aaa", [ref: "c81537e2a5e1acacb915cf339fe400357e3c2aaa"]},

0 commit comments

Comments
 (0)