Skip to content

Commit 5b6b459

Browse files
committed
bump elixir_sense
fix tests
1 parent 3089a02 commit 5b6b459

File tree

7 files changed

+15
-14
lines changed

7 files changed

+15
-14
lines changed

apps/language_server/lib/language_server/parser.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ defmodule ElixirLS.LanguageServer.Parser do
266266

267267
queue =
268268
Enum.reduce(state.queue, [], fn
269-
{{^uri, ^parsed_file_version, position}, from}, acc ->
269+
{{^uri, ^parsed_file_version, _position}, from}, acc ->
270270
GenServer.reply(from, updated_file)
271271
acc
272272

apps/language_server/lib/language_server/providers/execute_command/expand_macro.ex

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.ExpandMacro do
88
alias ElixirSense.Core.State
99
alias ElixirSense.Core.Parser
1010
alias ElixirSense.Core.Metadata
11+
alias ElixirSense.Core.MetadataBuilder
1112
alias ElixirSense.Core.Compiler
1213
alias ElixirLS.LanguageServer.SourceFile
1314

@@ -63,7 +64,7 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.ExpandMacro do
6364
try do
6465
expr = code |> Code.string_to_quoted!()
6566

66-
{ast, _state, _env} = Compiler.expand(expr, %State{}, env)
67+
{ast, _state, _env} = Compiler.expand(expr, MetadataBuilder.initial_state({line, 1}), env)
6768

6869
%{
6970
expand_once: expr |> Macro.expand_once(env) |> Macro.to_string(),

apps/language_server/test/providers/completion/suggestions_test.exs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
683683

684684
if System.otp_release() |> String.to_integer() >= 23 do
685685
if System.otp_release() |> String.to_integer() >= 27 do
686-
assert "This function is called" <> _ = summary
686+
assert "Update the [state]" <> _ = summary
687687
else
688688
assert "- OldVsn = Vsn" <> _ = summary
689689
end
@@ -1265,7 +1265,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
12651265
] = list
12661266

12671267
if System.otp_release() |> String.to_integer() >= 27 do
1268-
assert "Whenever" <> _ = documentation
1268+
assert "Initialize the state machine" <> _ = documentation
12691269
else
12701270
assert "- Args = " <> _ = documentation
12711271
end
@@ -1385,7 +1385,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
13851385
} = init_res
13861386

13871387
if System.otp_release() |> String.to_integer() >= 27 do
1388-
assert "Whenever a new event" <> _ = documentation
1388+
assert "Initialize the event handler" <> _ = documentation
13891389
else
13901390
assert "- InitArgs = Args" <> _ = documentation
13911391
end
@@ -1476,7 +1476,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
14761476
] = list
14771477

14781478
if System.otp_release() |> String.to_integer() >= 27 do
1479-
assert "Whenever" <> _ = documentation
1479+
assert "Initialize the state machine" <> _ = documentation
14801480
else
14811481
assert "- Args = " <> _ = documentation
14821482
end
@@ -1511,7 +1511,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
15111511
] = list
15121512

15131513
if System.otp_release() |> String.to_integer() >= 27 do
1514-
assert "Whenever" <> _ = documentation
1514+
assert "Initialize the server" <> _ = documentation
15151515
else
15161516
assert "- Args = " <> _ = documentation
15171517
end

apps/language_server/test/providers/hover/docs_test.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@ defmodule ElixirLS.LanguageServer.Providers.Hover.DocsTest do
725725

726726
if System.otp_release() |> String.to_integer() >= 23 do
727727
if System.otp_release() |> String.to_integer() >= 27 do
728-
assert "Whenever" <> _ = doc.docs
728+
assert "Initialize the state machine" <> _ = doc.docs
729729
else
730730
assert doc.docs =~
731731
"this function is called by"

apps/language_server/test/providers/signature_help/signature_test.exs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,7 +1023,7 @@ defmodule ElixirLS.LanguageServer.Providers.SignatureHelp.SignatureTest do
10231023

10241024
if System.otp_release() |> String.to_integer() >= 23 do
10251025
if System.otp_release() |> String.to_integer() >= 27 do
1026-
assert "Whenever" <> _ = summary
1026+
assert "Initialize the server" <> _ = summary
10271027
else
10281028
assert "- Args = " <> _ = summary
10291029
end
@@ -1070,7 +1070,7 @@ defmodule ElixirLS.LanguageServer.Providers.SignatureHelp.SignatureTest do
10701070
} = res
10711071

10721072
if System.otp_release() |> String.to_integer() >= 27 do
1073-
assert "Whenever" <> _ = documentation
1073+
assert "Initialize the state machine" <> _ = documentation
10741074
else
10751075
assert "- Args = " <> _ = documentation
10761076
end
@@ -1098,7 +1098,7 @@ defmodule ElixirLS.LanguageServer.Providers.SignatureHelp.SignatureTest do
10981098
} = res
10991099

11001100
if System.otp_release() |> String.to_integer() >= 27 do
1101-
assert "Whenever a" <> _ = summary
1101+
assert "Initialize the server" <> _ = summary
11021102
else
11031103
assert "- Args = " <> _ = summary
11041104
end
@@ -1285,7 +1285,7 @@ defmodule ElixirLS.LanguageServer.Providers.SignatureHelp.SignatureTest do
12851285
} = res
12861286

12871287
if System.otp_release() |> String.to_integer() >= 27 do
1288-
assert "Whenever a" <> _ = summary
1288+
assert "Initialize the state machine" <> _ = summary
12891289
else
12901290
assert "- Args = term" <> _ = summary
12911291
end

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: "749adcdbb4cd8b6b642d4e719feffddf312c5c69",
2+
elixir_sense: "4ef2bc0403b8d31f80c06cd6164b104d480f6c86",
33
dialyxir_vendored: "462e599aa7004a32cfa548cc715c9c59e95dacaf",
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", "462e599aa7004a32cfa548cc715c9c59e95dacaf", [ref: "462e599aa7004a32cfa548cc715c9c59e95dacaf"]},
5-
"elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "749adcdbb4cd8b6b642d4e719feffddf312c5c69", [ref: "749adcdbb4cd8b6b642d4e719feffddf312c5c69"]},
5+
"elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "4ef2bc0403b8d31f80c06cd6164b104d480f6c86", [ref: "4ef2bc0403b8d31f80c06cd6164b104d480f6c86"]},
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)