Skip to content

Commit bdbfc5b

Browse files
authored
Elixir 1.14 (#716)
* bump elixir_sense * fix warnings * ensure Mix.Tasks.Format module is loaded * fix test * run formatter
1 parent 68fe3f7 commit bdbfc5b

File tree

5 files changed

+19
-12
lines changed

5 files changed

+19
-12
lines changed

apps/elixir_ls_debugger/lib/debugger/variables.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ defmodule ElixirLS.Debugger.Variables do
2121
def child_type(var) when is_pid(var) do
2222
case :erlang.process_info(var) do
2323
:undefined -> :indexed
24-
results -> :named
24+
_results -> :named
2525
end
2626
end
2727

2828
def child_type(var) when is_port(var) do
2929
case :erlang.port_info(var) do
3030
:undefined -> :indexed
31-
results -> :named
31+
_results -> :named
3232
end
3333
end
3434

apps/language_server/lib/language_server/providers/completion.ex

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -981,14 +981,15 @@ defmodule ElixirLS.LanguageServer.Providers.Completion do
981981
insert_text_format(:snippet)
982982
else
983983
insert_text_format(:plain_text)
984-
end,
984+
end
985985
}
986986

987-
json = if item.preselect do
988-
Map.put(json, "preselect", true)
989-
else
990-
json
991-
end
987+
json =
988+
if item.preselect do
989+
Map.put(json, "preselect", true)
990+
else
991+
json
992+
end
992993

993994
# deprecated as of Language Server Protocol Specification - 3.15
994995
json =

apps/language_server/lib/language_server/source_file.ex

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,8 @@ defmodule ElixirLS.LanguageServer.SourceFile do
339339
path = path_from_uri(uri)
340340

341341
try do
342+
true = Code.ensure_loaded?(Mix.Tasks.Format)
343+
342344
if function_exported?(Mix.Tasks.Format, :formatter_for_file, 1) do
343345
{:ok, Mix.Tasks.Format.formatter_for_file(path)}
344346
else

apps/language_server/test/providers/formatting_test.exs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,11 @@ defmodule ElixirLS.LanguageServer.Providers.FormattingTest do
500500
end
501501

502502
def assert_formatted(path, project_dir) do
503-
assert match?({:ok, [%{}]}, format(path, project_dir)), "expected '#{path}' to be formatted"
503+
assert match?(
504+
{:ok, [%ElixirLS.LanguageServer.Protocol.TextEdit{} | _]},
505+
format(path, project_dir)
506+
),
507+
"expected '#{path}' to be formatted"
504508
end
505509

506510
def refute_formatted(path, project_dir) do
@@ -512,12 +516,12 @@ defmodule ElixirLS.LanguageServer.Providers.FormattingTest do
512516
path = maybe_convert_path_separators("#{project_dir}/#{path}")
513517

514518
source_file = %SourceFile{
515-
text: "",
519+
text: " asd = 1",
516520
version: 1,
517521
dirty?: true
518522
}
519523

520-
File.write!(path, "")
524+
File.write!(path, " asd = 1")
521525
Formatting.format(source_file, SourceFile.path_to_uri(path), project_dir)
522526
end
523527
end

mix.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
%{
22
"dialyxir": {:hex, :dialyxir, "1.1.0", "c5aab0d6e71e5522e77beff7ba9e08f8e02bad90dfbeffae60eaf0cb47e29488", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "07ea8e49c45f15264ebe6d5b93799d4dd56a44036cf42d0ad9c960bc266c0b9a"},
33
"docsh": {:hex, :docsh, "0.7.2", "f893d5317a0e14269dd7fe79cf95fb6b9ba23513da0480ec6e77c73221cae4f2", [:rebar3], [{:providers, "1.8.1", [hex: :providers, repo: "hexpm", optional: false]}], "hexpm", "4e7db461bb07540d2bc3d366b8513f0197712d0495bb85744f367d3815076134"},
4-
"elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "192f5a18f18f2d86ff5731af143ea628c00c01c7", []},
4+
"elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "08bac2a5a0ad867908d77a7087eac756bf7cce43", []},
55
"erl2ex": {:git, "https://github.com/dazuma/erl2ex.git", "244c2d9ed5805ef4855a491d8616b8842fef7ca4", []},
66
"erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
77
"getopt": {:hex, :getopt, "1.0.1", "c73a9fa687b217f2ff79f68a3b637711bb1936e712b521d8ce466b29cbf7808a", [:rebar3], [], "hexpm", "53e1ab83b9ceb65c9672d3e7a35b8092e9bdc9b3ee80721471a161c10c59959c"},

0 commit comments

Comments
 (0)