reenable test on 1.12

add otp 26 to matrix
elixir-lsp · Nov 2, 2023 · 2cc30c8 · 2cc30c8
1 parent 30a0c7e
commit 2cc30c8
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,24 +16,48 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          - elixir: 1.12.x
+            otp: 22.x
+            tests_may_fail: true
+          - elixir: 1.12.x
+            otp: 23.x
+            tests_may_fail: true
+          - elixir: 1.12.x
+            otp: 24.x
+            tests_may_fail: true
           - elixir: 1.13.x
             otp: 22.x
+            tests_may_fail: false
           - elixir: 1.13.x
             otp: 23.x
+            tests_may_fail: false
           - elixir: 1.13.x
             otp: 24.x
+            tests_may_fail: false
           - elixir: 1.13.x
             otp: 25.x
+            tests_may_fail: false
           - elixir: 1.14.x
             otp: 23.x
+            tests_may_fail: false
           - elixir: 1.14.x
             otp: 24.x
+            tests_may_fail: false
           - elixir: 1.14.x
             otp: 25.x
+            tests_may_fail: false
+          - elixir: 1.14.x
+            otp: 26.x
+            tests_may_fail: false
           - elixir: 1.15.x
             otp: 24.x
+            tests_may_fail: false
           - elixir: 1.15.x
             otp: 25.x
+            tests_may_fail: false
+           - elixir: 1.15.x
+            otp: 26.x
+            tests_may_fail: false
     env:
       MIX_ENV: test
     steps:
@@ -47,7 +71,7 @@ jobs:
           mix local.hex --force
           mix local.rebar --force
           mix deps.get --only test
-      - run: mix test
+      - run: mix test || ${{ matrix.tests_may_fail }}
 
   mix_test_windows:
     name: mix test windows (Elixir ${{matrix.elixir}} | Erlang/OTP ${{matrix.otp}})
@@ -70,10 +94,14 @@ jobs:
             otp: 24.x
           - elixir: 1.14.x
             otp: 25.x
+          - elixir: 1.14.x
+            otp: 26.x
           - elixir: 1.15.x
             otp: 24.x
           - elixir: 1.15.x
             otp: 25.x
+          - elixir: 1.15.x
+            otp: 26.x
     env:
       MIX_ENV: test
     steps:

diff --git a/apps/elixir_ls_debugger/mix.exs b/apps/elixir_ls_debugger/mix.exs
@@ -19,7 +19,7 @@ defmodule ElixirLS.Debugger.Mixfile do
       config_path: "../../config/config.exs",
       deps_path: "../../deps",
       lockfile: "../../mix.lock",
-      elixir: ">= 1.13.0",
+      elixir: ">= 1.12.0",
       build_embedded: false,
       start_permanent: true,
       build_per_environment: false,

diff --git a/apps/elixir_ls_utils/mix.exs b/apps/elixir_ls_utils/mix.exs
@@ -20,7 +20,7 @@ defmodule ElixirLS.Utils.Mixfile do
       deps_path: "../../deps",
       elixirc_paths: elixirc_paths(Mix.env()),
       lockfile: "../../mix.lock",
-      elixir: ">= 1.13.0",
+      elixir: ">= 1.12.0",
       build_embedded: false,
       start_permanent: false,
       build_per_environment: false,

diff --git a/apps/language_server/lib/language_server/providers/completion.ex b/apps/language_server/lib/language_server/providers/completion.ex
@@ -11,6 +11,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion do
   alias ElixirLS.LanguageServer.SourceFile
   import ElixirLS.LanguageServer.Protocol, only: [range: 4]
   alias ElixirSense.Providers.Suggestion.Matcher
+  alias ElixirSense.Core.Normalized.Code, as: NormalizedCode
 
   @enforce_keys [:label, :kind, :insert_text, :priority, :tags]
   defstruct [
@@ -149,7 +150,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion do
       text_before_cursor: text_before_cursor,
       text_after_cursor: text_after_cursor,
       prefix: prefix,
-      remote_calls?: match?({:dot, _, _}, Code.Fragment.cursor_context(prefix)),
+      remote_calls?: match?({:dot, _, _}, NormalizedCode.Fragment.cursor_context(prefix)),
       def_before: def_before,
       pipe_before?: Regex.match?(~r/\|>\s*#{Regex.escape(prefix)}$/u, text_before_cursor),
       capture_before?: Regex.match?(~r/&#{Regex.escape(prefix)}$/u, text_before_cursor),

diff --git a/apps/language_server/mix.exs b/apps/language_server/mix.exs
@@ -15,7 +15,7 @@ defmodule ElixirLS.LanguageServer.Mixfile do
     [
       app: :language_server,
       version: @version,
-      elixir: ">= 1.13.0",
+      elixir: ">= 1.12.0",
       build_path: "../../_build",
       config_path: "../../config/config.exs",
       deps_path: "../../deps",

diff --git a/dep_versions.exs b/dep_versions.exs
@@ -1,5 +1,5 @@
 [
-  elixir_sense: "993221f14673c5c43aee0866502ccee3986d67cd",
+  elixir_sense: "aa1db70cc16d9c48462812cc14e2921ba137387f",
   dialyxir_vendored: "d50dcd7101c6ebd37b57b7ee4a7888d8cb634782",
   jason_v: "c81537e2a5e1acacb915cf339fe400357e3c2aaa",
   erl2ex_vendored: "073ac6b9a44282e718b6050c7b27cedf9217a12a",

diff --git a/mix.exs b/mix.exs
@@ -9,7 +9,7 @@ defmodule ElixirLS.Mixfile do
       start_permanent: Mix.env() == :prod,
       build_per_environment: false,
       deps: deps(),
-      elixir: ">= 1.13.0",
+      elixir: ">= 1.12.0",
       dialyzer: [
         plt_add_apps: [:dialyxir_vendored, :debugger, :dialyzer, :ex_unit, :hex, :mix],
         flags: [

diff --git a/mix.lock b/mix.lock
@@ -2,7 +2,7 @@
   "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"},
   "deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm", "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"},
   "dialyxir_vendored": {:git, "https://github.com/elixir-lsp/dialyxir.git", "d50dcd7101c6ebd37b57b7ee4a7888d8cb634782", [ref: "d50dcd7101c6ebd37b57b7ee4a7888d8cb634782"]},
-  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "993221f14673c5c43aee0866502ccee3986d67cd", [ref: "993221f14673c5c43aee0866502ccee3986d67cd"]},
+  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "aa1db70cc16d9c48462812cc14e2921ba137387f", [ref: "aa1db70cc16d9c48462812cc14e2921ba137387f"]},
   "erl2ex_vendored": {:git, "https://github.com/elixir-lsp/erl2ex.git", "073ac6b9a44282e718b6050c7b27cedf9217a12a", [ref: "073ac6b9a44282e718b6050c7b27cedf9217a12a"]},
   "erlex_vendored": {:git, "https://github.com/elixir-lsp/erlex.git", "82db0e82ee4896491bc26dec99f5d795f03ab9f4", [ref: "82db0e82ee4896491bc26dec99f5d795f03ab9f4"]},
   "jason_v": {:git, "https://github.com/elixir-lsp/jason.git", "c81537e2a5e1acacb915cf339fe400357e3c2aaa", [ref: "c81537e2a5e1acacb915cf339fe400357e3c2aaa"]},