Skip to content

Commit 2cc30c8

Browse files
committed
reenable test on 1.12
add otp 26 to matrix
1 parent 30a0c7e commit 2cc30c8

File tree

8 files changed

+37
-8
lines changed

8 files changed

+37
-8
lines changed

.github/workflows/ci.yml

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,48 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
include:
19+
- elixir: 1.12.x
20+
otp: 22.x
21+
tests_may_fail: true
22+
- elixir: 1.12.x
23+
otp: 23.x
24+
tests_may_fail: true
25+
- elixir: 1.12.x
26+
otp: 24.x
27+
tests_may_fail: true
1928
- elixir: 1.13.x
2029
otp: 22.x
30+
tests_may_fail: false
2131
- elixir: 1.13.x
2232
otp: 23.x
33+
tests_may_fail: false
2334
- elixir: 1.13.x
2435
otp: 24.x
36+
tests_may_fail: false
2537
- elixir: 1.13.x
2638
otp: 25.x
39+
tests_may_fail: false
2740
- elixir: 1.14.x
2841
otp: 23.x
42+
tests_may_fail: false
2943
- elixir: 1.14.x
3044
otp: 24.x
45+
tests_may_fail: false
3146
- elixir: 1.14.x
3247
otp: 25.x
48+
tests_may_fail: false
49+
- elixir: 1.14.x
50+
otp: 26.x
51+
tests_may_fail: false
3352
- elixir: 1.15.x
3453
otp: 24.x
54+
tests_may_fail: false
3555
- elixir: 1.15.x
3656
otp: 25.x
57+
tests_may_fail: false
58+
- elixir: 1.15.x
59+
otp: 26.x
60+
tests_may_fail: false
3761
env:
3862
MIX_ENV: test
3963
steps:
@@ -47,7 +71,7 @@ jobs:
4771
mix local.hex --force
4872
mix local.rebar --force
4973
mix deps.get --only test
50-
- run: mix test
74+
- run: mix test || ${{ matrix.tests_may_fail }}
5175

5276
mix_test_windows:
5377
name: mix test windows (Elixir ${{matrix.elixir}} | Erlang/OTP ${{matrix.otp}})
@@ -70,10 +94,14 @@ jobs:
7094
otp: 24.x
7195
- elixir: 1.14.x
7296
otp: 25.x
97+
- elixir: 1.14.x
98+
otp: 26.x
7399
- elixir: 1.15.x
74100
otp: 24.x
75101
- elixir: 1.15.x
76102
otp: 25.x
103+
- elixir: 1.15.x
104+
otp: 26.x
77105
env:
78106
MIX_ENV: test
79107
steps:

apps/elixir_ls_debugger/mix.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ defmodule ElixirLS.Debugger.Mixfile do
1919
config_path: "../../config/config.exs",
2020
deps_path: "../../deps",
2121
lockfile: "../../mix.lock",
22-
elixir: ">= 1.13.0",
22+
elixir: ">= 1.12.0",
2323
build_embedded: false,
2424
start_permanent: true,
2525
build_per_environment: false,

apps/elixir_ls_utils/mix.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ defmodule ElixirLS.Utils.Mixfile do
2020
deps_path: "../../deps",
2121
elixirc_paths: elixirc_paths(Mix.env()),
2222
lockfile: "../../mix.lock",
23-
elixir: ">= 1.13.0",
23+
elixir: ">= 1.12.0",
2424
build_embedded: false,
2525
start_permanent: false,
2626
build_per_environment: false,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion do
1111
alias ElixirLS.LanguageServer.SourceFile
1212
import ElixirLS.LanguageServer.Protocol, only: [range: 4]
1313
alias ElixirSense.Providers.Suggestion.Matcher
14+
alias ElixirSense.Core.Normalized.Code, as: NormalizedCode
1415

1516
@enforce_keys [:label, :kind, :insert_text, :priority, :tags]
1617
defstruct [
@@ -149,7 +150,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion do
149150
text_before_cursor: text_before_cursor,
150151
text_after_cursor: text_after_cursor,
151152
prefix: prefix,
152-
remote_calls?: match?({:dot, _, _}, Code.Fragment.cursor_context(prefix)),
153+
remote_calls?: match?({:dot, _, _}, NormalizedCode.Fragment.cursor_context(prefix)),
153154
def_before: def_before,
154155
pipe_before?: Regex.match?(~r/\|>\s*#{Regex.escape(prefix)}$/u, text_before_cursor),
155156
capture_before?: Regex.match?(~r/&#{Regex.escape(prefix)}$/u, text_before_cursor),

apps/language_server/mix.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ defmodule ElixirLS.LanguageServer.Mixfile do
1515
[
1616
app: :language_server,
1717
version: @version,
18-
elixir: ">= 1.13.0",
18+
elixir: ">= 1.12.0",
1919
build_path: "../../_build",
2020
config_path: "../../config/config.exs",
2121
deps_path: "../../deps",

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: "993221f14673c5c43aee0866502ccee3986d67cd",
2+
elixir_sense: "aa1db70cc16d9c48462812cc14e2921ba137387f",
33
dialyxir_vendored: "d50dcd7101c6ebd37b57b7ee4a7888d8cb634782",
44
jason_v: "c81537e2a5e1acacb915cf339fe400357e3c2aaa",
55
erl2ex_vendored: "073ac6b9a44282e718b6050c7b27cedf9217a12a",

mix.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ defmodule ElixirLS.Mixfile do
99
start_permanent: Mix.env() == :prod,
1010
build_per_environment: false,
1111
deps: deps(),
12-
elixir: ">= 1.13.0",
12+
elixir: ">= 1.12.0",
1313
dialyzer: [
1414
plt_add_apps: [:dialyxir_vendored, :debugger, :dialyzer, :ex_unit, :hex, :mix],
1515
flags: [

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", "d50dcd7101c6ebd37b57b7ee4a7888d8cb634782", [ref: "d50dcd7101c6ebd37b57b7ee4a7888d8cb634782"]},
5-
"elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "993221f14673c5c43aee0866502ccee3986d67cd", [ref: "993221f14673c5c43aee0866502ccee3986d67cd"]},
5+
"elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "aa1db70cc16d9c48462812cc14e2921ba137387f", [ref: "aa1db70cc16d9c48462812cc14e2921ba137387f"]},
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)