Skip to content

Commit 9aa3942

Browse files
committed
Partially revert dropping 1.12 support
This partially reverts commit bd3d3bb.
1 parent 486bf4c commit 9aa3942

File tree

5 files changed

+29
-10
lines changed

5 files changed

+29
-10
lines changed

apps/elixir_ls_debugger/lib/debugger/server.ex

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ defmodule ElixirLS.Debugger.Server do
206206
)
207207

208208
Output.debugger_important("Terminating #{__MODULE__}: #{message}")
209+
209210
unless Application.get_env(:elixir_ls_debugger, :test_mode) do
210211
System.stop(1)
211212
end

apps/language_server/lib/language_server/mix_shell.ex

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,12 @@ defmodule ElixirLS.LanguageServer.MixShell do
5555
true
5656
end
5757
else
58-
Mix.Shell.IO.yes?(message, options)
58+
# TODO convert to to normal call when we require elixir 1.13
59+
if Version.match?(System.version(), "< 1.13.0-dev") do
60+
apply(Mix.Shell.IO, :yes?, [message])
61+
else
62+
apply(Mix.Shell.IO, :yes?, [message, options])
63+
end
5964
end
6065
end
6166
end

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,19 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.GetExUnitTestsInFile
44

55
@impl ElixirLS.LanguageServer.Providers.ExecuteCommand
66
def execute([uri], _state) do
7-
path = SourceFile.Path.from_uri(uri)
7+
if Version.match?(System.version(), ">= 1.13.0-dev") do
8+
path = SourceFile.Path.from_uri(uri)
89

9-
case ExUnitTestTracer.get_tests(path) do
10-
{:ok, tests} ->
11-
{:ok, tests}
10+
case ExUnitTestTracer.get_tests(path) do
11+
{:ok, tests} ->
12+
{:ok, tests}
1213

13-
{:error, _reason} ->
14-
# TODO catch only Compile and Syntax errors?
15-
{:ok, []}
14+
{:error, _reason} ->
15+
# TODO catch only Compile and Syntax errors?
16+
{:ok, []}
17+
end
18+
else
19+
{:ok, []}
1620
end
1721
end
1822
end

apps/language_server/lib/language_server/providers/folding_range/token.ex

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ defmodule ElixirLS.LanguageServer.Providers.FoldingRange.Token do
3434
{:sigil, {b1, b2, b3}, _, _, _, _, delimiter} ->
3535
{:sigil, {b1 - 1, b2 - 1, b3}, delimiter}
3636

37+
# Older versions of Tokenizer.tokenize/1
38+
# TODO check which version
39+
{:sigil, {b1, b2, b3}, _, _, _, delimiter} ->
40+
{:sigil, {b1 - 1, b2 - 1, b3}, delimiter}
41+
3742
{:bin_heredoc, {b1, b2, b3}, _, _} ->
3843
{:bin_heredoc, {b1 - 1, b2 - 1, b3}, nil}
3944

apps/language_server/lib/language_server/tracer.ex

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,12 @@ defmodule ElixirLS.LanguageServer.Tracer do
268268
end
269269

270270
attributes =
271-
for name <- apply(Module, :attributes_in, [module]) do
272-
{name, Module.get_attribute(module, name)}
271+
if Version.match?(System.version(), ">= 1.13.0-dev") do
272+
for name <- apply(Module, :attributes_in, [module]) do
273+
{name, Module.get_attribute(module, name)}
274+
end
275+
else
276+
[]
273277
end
274278

275279
%{

0 commit comments

Comments
 (0)