Skip to content

Commit 9c953d8

Browse files
lukaszsamsonlukaszsamson
committed
make sure tests pass on elixir master
1 parent 3200756 commit 9c953d8

File tree

6 files changed

+23
-28
lines changed

6 files changed

+23
-28
lines changed

‎apps/elixir_ls_utils/test/complete_test.exs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1949,10 +1949,6 @@ defmodule ElixirLS.Utils.CompletionEngineTest do
19491949
] = expand(~c"ArgumentError.exce")
19501950

19511951
assert [] = expand(~c"Elixir.bla")
1952-
1953-
assert [
1954-
%{name: "blame", type: :function, arity: 2}
1955-
] = expand(~c"ArgumentError.bla")
19561952
end
19571953

19581954
if System.otp_release() |> String.to_integer() >= 23 do

‎apps/language_server/lib/language_server/ast_utils.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ defmodule ElixirLS.LanguageServer.AstUtils do
130130
cond do
131131
form == :%{} ->
132132
column =
133-
if Version.match?(System.version(), "< 1.17.0") do
133+
if Version.match?(System.version(), "< 1.17.0-dev") do
134134
# workaround elixir bug
135135
# https://github.com/elixir-lang/elixir/commit/fd4e6b530c0e010712b06909c89820b08e49c238
136136
column - 1

‎apps/language_server/lib/language_server/providers/selection_ranges.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ defmodule ElixirLS.LanguageServer.Providers.SelectionRanges do
362362
range(start_line, start_character, end_line, end_character) ->
363363
start_character =
364364
if match?({:%{}, _, _}, ast) and match?({:%, _, _}, parent_ast_from_stack) and
365-
Version.match?(System.version(), "< 1.17.0") do
365+
Version.match?(System.version(), "< 1.17.0-dev") do
366366
# workaround elixir bug
367367
# https://github.com/elixir-lang/elixir/commit/fd4e6b530c0e010712b06909c89820b08e49c238
368368
# undo column offset for structs inner map node

‎apps/language_server/test/dialyzer_incremental_test.exs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
if System.otp_release() |> String.to_integer() >= 26 do
22
defmodule ElixirLS.LanguageServer.DialyzerIncrementalTest do
33
alias ElixirLS.LanguageServer.{
4-
Dialyzer,
54
Server,
65
Protocol,
76
SourceFile,

‎apps/language_server/test/providers/document_symbols_test.exs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,11 +1060,11 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do
10601060
kind: 7,
10611061
name: "prop",
10621062
range: %{
1063-
"end" => %{"character" => 2, "line" => 1},
1063+
"end" => %{"character" => _, "line" => 1},
10641064
"start" => %{"character" => 2, "line" => 1}
10651065
},
10661066
selectionRange: %{
1067-
"end" => %{"character" => 2, "line" => 1},
1067+
"end" => %{"character" => _, "line" => 1},
10681068
"start" => %{"character" => 2, "line" => 1}
10691069
}
10701070
},
@@ -1073,11 +1073,11 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do
10731073
kind: 7,
10741074
name: "prop_with_def",
10751075
range: %{
1076-
"end" => %{"character" => 2, "line" => 1},
1076+
"end" => %{"character" => _, "line" => 1},
10771077
"start" => %{"character" => 2, "line" => 1}
10781078
},
10791079
selectionRange: %{
1080-
"end" => %{"character" => 2, "line" => 1},
1080+
"end" => %{"character" => _, "line" => 1},
10811081
"start" => %{"character" => 2, "line" => 1}
10821082
}
10831083
}
@@ -1133,7 +1133,7 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do
11331133
kind: 7,
11341134
location: %{
11351135
range: %{
1136-
"end" => %{"character" => 2, "line" => 1},
1136+
"end" => %{"character" => _, "line" => 1},
11371137
"start" => %{"character" => 2, "line" => 1}
11381138
}
11391139
},
@@ -1144,7 +1144,7 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do
11441144
name: "prop_with_def",
11451145
location: %{
11461146
range: %{
1147-
"end" => %{"character" => 2, "line" => 1},
1147+
"end" => %{"character" => _, "line" => 1},
11481148
"start" => %{"character" => 2, "line" => 1}
11491149
}
11501150
},
@@ -1175,11 +1175,11 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do
11751175
kind: 7,
11761176
name: "message",
11771177
range: %{
1178-
"end" => %{"character" => 2, "line" => 1},
1178+
"end" => %{"character" => _, "line" => 1},
11791179
"start" => %{"character" => 2, "line" => 1}
11801180
},
11811181
selectionRange: %{
1182-
"end" => %{"character" => 2, "line" => 1},
1182+
"end" => %{"character" => _, "line" => 1},
11831183
"start" => %{"character" => 2, "line" => 1}
11841184
}
11851185
}
@@ -1235,7 +1235,7 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do
12351235
name: "message",
12361236
location: %{
12371237
range: %{
1238-
"end" => %{"character" => 2, "line" => 1},
1238+
"end" => %{"character" => _, "line" => 1},
12391239
"start" => %{"character" => 2, "line" => 1}
12401240
}
12411241
},
@@ -2096,11 +2096,11 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do
20962096
kind: 12,
20972097
name: "test \"does something\"",
20982098
range: %{
2099-
"end" => %{"character" => 10, "line" => 4},
2099+
"end" => %{"character" => _, "line" => 4},
21002100
"start" => %{"character" => 10, "line" => 4}
21012101
},
21022102
selectionRange: %{
2103-
"end" => %{"character" => 10, "line" => 4},
2103+
"end" => %{"character" => _, "line" => 4},
21042104
"start" => %{"character" => 10, "line" => 4}
21052105
}
21062106
}
@@ -2147,11 +2147,11 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do
21472147
kind: 12,
21482148
name: "test \"does\" <> \"something\"",
21492149
range: %{
2150-
"end" => %{"character" => 10, "line" => 4},
2150+
"end" => %{"character" => _, "line" => 4},
21512151
"start" => %{"character" => 10, "line" => 4}
21522152
},
21532153
selectionRange: %{
2154-
"end" => %{"character" => 10, "line" => 4},
2154+
"end" => %{"character" => _, "line" => 4},
21552155
"start" => %{"character" => 10, "line" => 4}
21562156
}
21572157
}
@@ -2217,7 +2217,7 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do
22172217
kind: 12,
22182218
location: %{
22192219
range: %{
2220-
"end" => %{"character" => 10, "line" => 4},
2220+
"end" => %{"character" => _, "line" => 4},
22212221
"start" => %{"character" => 10, "line" => 4}
22222222
}
22232223
},
@@ -2267,7 +2267,7 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do
22672267
kind: 12,
22682268
location: %{
22692269
range: %{
2270-
"end" => %{"character" => 10, "line" => 4},
2270+
"end" => %{"character" => _, "line" => 4},
22712271
"start" => %{"character" => 10, "line" => 4}
22722272
}
22732273
},
@@ -2477,11 +2477,11 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do
24772477
kind: 20,
24782478
name: "config :my_app MyApp.Repo",
24792479
range: %{
2480-
"end" => %{"character" => 0, "line" => 9},
2480+
"end" => %{"character" => _, "line" => _},
24812481
"start" => %{"character" => 0, "line" => 9}
24822482
},
24832483
selectionRange: %{
2484-
"end" => %{"character" => 0, "line" => 9},
2484+
"end" => %{"character" => _, "line" => _},
24852485
"start" => %{"character" => 0, "line" => 9}
24862486
}
24872487
}
@@ -2544,7 +2544,7 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do
25442544
kind: 20,
25452545
location: %{
25462546
range: %{
2547-
"end" => %{"character" => 0, "line" => 9},
2547+
"end" => %{"character" => _, "line" => _},
25482548
"start" => %{"character" => 0, "line" => 9}
25492549
}
25502550
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -465,19 +465,19 @@ defmodule ElixirLS.LanguageServer.Providers.SignatureHelp.SignatureTest do
465465
end
466466
"""
467467

468-
assert Signature.signature(code, 2, 21) == %{
468+
assert %{
469469
active_param: 0,
470470
signatures: [
471471
%{
472472
documentation:
473-
"Returns `true` if `list` starts with the given `prefix` list; otherwise returns `false`.",
473+
"Returns `true` if `list` starts with the given `prefix` list" <> _,
474474
name: "starts_with?",
475475
params: ["list", "prefix"],
476476
spec:
477477
"@spec starts_with?([...], [...]) :: boolean()\n@spec starts_with?(list(), []) :: true\n@spec starts_with?([], [...]) :: false"
478478
}
479479
]
480-
}
480+
} = Signature.signature(code, 2, 21)
481481
end
482482

483483
test "find signatures for function with @doc false" do

0 commit comments

Comments
 (0)