Merge pull request #1147 from elixir-lsp/1.18

1.18

Author: lukaszsamson

.github/workflows/ci.yml

@@ -67,6 +67,16 @@ jobs:
           - elixir: 1.17.x
             otp: 27.x
             tests_may_fail: false
+          # https://github.com/erlef/setup-beam/issues/314
+          # - elixir: 1.18.x
+          #   otp: 25.x
+          #   tests_may_fail: false
+          - elixir: 1.18.x
+            otp: 26.x
+            tests_may_fail: false
+          - elixir: 1.18.x
+            otp: 27.x
+            tests_may_fail: false
     env:
       MIX_ENV: test
     steps:
@@ -80,7 +90,8 @@ jobs:
           mix local.hex --force
           mix local.rebar --force
           mix deps.get --only test
-      - run: mix test || ${{ matrix.tests_may_fail }}
+      - run: mix test
+        continue-on-error: ${{ matrix.tests_may_fail }}
 
   mix_test_windows:
     name: mix test windows (Elixir ${{matrix.elixir}} | Erlang/OTP ${{matrix.otp}})
@@ -126,6 +137,16 @@ jobs:
           - elixir: 1.17.x
             otp: 27.x
             tests_may_fail: false
+          # https://github.com/erlef/setup-beam/issues/314
+          # - elixir: 1.18.x
+          #   otp: 25.x
+          #   tests_may_fail: false
+          - elixir: 1.18.x
+            otp: 26.x
+            tests_may_fail: false
+          - elixir: 1.18.x
+            otp: 27.x
+            tests_may_fail: false
     env:
       MIX_ENV: test
     steps:
@@ -143,14 +164,15 @@ jobs:
           mix local.rebar --force
           mix deps.get --only test
       - run: mix test
+        continue-on-error: ${{ matrix.tests_may_fail }}
 
   static_analysis:
     name: static analysis (Elixir ${{matrix.elixir}} | Erlang/OTP ${{matrix.otp}})
     runs-on: ubuntu-22.04
     strategy:
       matrix:
         include:
-          - elixir: 1.17.x
+          - elixir: 1.18.x
             otp: 27.x
     steps:
       - uses: actions/checkout@v4

.github/workflows/release-asset.yml

@@ -42,7 +42,7 @@ jobs:
       - name: Set up BEAM
         uses: erlef/setup-beam@v1
         with:
-          elixir-version: 1.17.x
+          elixir-version: 1.18.x
           otp-version: 27.x
 
       - name: Install dependencies

README.md

@@ -120,12 +120,12 @@ ElixirLS generally aims to support all supported versions of Elixir on all compa
 |      22         |       1.13      |        Yes        |         Erlang docs not working (requires EIP 48)          |
 |      23         |   1.13 - 1.14   |        Yes        |                            None                            |
 |      24         |   1.13 - 1.16   |        Yes        |                            None                            |
-|      25         |  1.13.4 - 1.17  |        Yes        |                            None                            |
+|      25         |  1.13.4 - 1.18  |        Yes        |                            None                            |
 | 26.0.0 - 26.0.1 |       any       |        No         | [#886](https://github.com/elixir-lsp/elixir-ls/issues/886) |
-| 26.0.2 - 26.1.2 |  1.14.5 - 1.17  |    *nix only      | [#927](https://github.com/elixir-lsp/elixir-ls/issues/927), [#1023](https://github.com/elixir-lsp/elixir-ls/issues/1023) |
-|   >= 26.2.0     |  1.14.5 - 1.17  |        Yes        |                            None                            |
+| 26.0.2 - 26.1.2 |  1.14.5 - 1.18  |    *nix only      | [#927](https://github.com/elixir-lsp/elixir-ls/issues/927), [#1023](https://github.com/elixir-lsp/elixir-ls/issues/1023) |
+|   >= 26.2.0     |  1.14.5 - 1.18  |        Yes        |                            None                            |
 |      any        |     1.15.5      |        Yes        |  Broken formatter [#975](https://github.com/elixir-lsp/elixir-ls/issues/975) |
-|      27         |      1.17       |        Yes        |                            None                            |
+|      27         |    1.17 - 1.18  |        Yes        |                            None                            |
 
 ### Version management
 

apps/debug_adapter/lib/debug_adapter/server.ex

@@ -1187,7 +1187,7 @@ defmodule ElixirLS.DebugAdapter.Server do
         {state, frame_ids} = ensure_frame_ids(state, pid, stack_frames)
 
         stack_frames_json =
-          for {%Frame{} = stack_frame, frame_id} <- List.zip([stack_frames, frame_ids]) do
+          for {%Frame{} = stack_frame, frame_id} <- Enum.zip([stack_frames, frame_ids]) do
             %{
               "id" => frame_id,
               "name" => Stacktrace.Frame.name(stack_frame),

apps/debug_adapter/lib/debug_adapter/stacktrace.ex

@@ -65,7 +65,7 @@ defmodule ElixirLS.DebugAdapter.Stacktrace do
                   []
 
                 _ ->
-                  frames = List.zip([backtrace_rest, stack_frames(meta_pid, level)])
+                  frames = Enum.zip([backtrace_rest, stack_frames(meta_pid, level)])
 
                   for {{level, {mod, function, args}}, {level, {mod, line}, bindings}} <- frames do
                     %Frame{

apps/debug_adapter/test/binding_test.exs

@@ -28,7 +28,11 @@ defmodule ElixirLS.DebugAdapter.BindingTest do
 
     test "multiple versions" do
       assert [{:asd, "b"}] ==
-               Binding.to_elixir_variable_names([{:_asd@1, "a"}, {:_asd@12, "b"}, {:_asd@11, "c"}])
+               Binding.to_elixir_variable_names([
+                 {:_asd@1, "a"},
+                 {:_asd@12, "b"},
+                 {:_asd@11, "c"}
+               ])
     end
 
     test "filter _" do

apps/elixir_ls_utils/lib/launch.ex

@@ -28,7 +28,7 @@ defmodule ElixirLS.Utils.Launch do
 
     load_dot_config()
 
-    # as of 1.15 mix supports two environment variables MIX_QUIET and MIX_DEBUG
+    # as of 1.18 mix supports environment variables MIX_QUIET, MIX_DEBUG, MIX_PROFILE
     # that are not important for our use cases
 
     :ok

apps/elixir_ls_utils/test/complete_test.exs

@@ -1029,7 +1029,7 @@ defmodule ElixirLS.Utils.CompletionEngineTest do
 
     # local call on var
 
-    if Version.match?(System.version(), "< 1.16.0-dev") do
+    if Version.match?(System.version(), "< 1.16.0") do
       assert [] == expand(~c"asd.(")
       assert [] == expand(~c"@asd.(")
     else

apps/elixir_ls_utils/test/support/mix_test.case.ex

@@ -89,7 +89,13 @@ defmodule ElixirLS.Utils.MixTest.Case do
 
   defmacro in_fixture(dir, which, block) do
     module = inspect(__CALLER__.module)
-    function = Atom.to_string(elem(__CALLER__.function, 0))
+
+    function =
+      case __CALLER__.function do
+        {f, _a} -> Atom.to_string(f)
+        nil -> nil
+      end
+
     tmp = Path.join(module, function)
 
     quote do

apps/language_server/lib/language_server/ast_utils.ex

@@ -1,9 +1,5 @@
 # This code has originally been a part of https://github.com/elixir-lsp/elixir_sense
 
-# Copyright (c) 2017 Marlus Saraiva
-# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
 defmodule ElixirLS.LanguageServer.AstUtils do
   import ElixirLS.LanguageServer.Protocol
   alias ElixirLS.LanguageServer.SourceFile
@@ -14,24 +10,40 @@ defmodule ElixirLS.LanguageServer.AstUtils do
   def node_range(node, options \\ [])
   def node_range(atom, _options) when is_atom(atom), do: nil
 
-  def node_range([{{:__block__, _, [_]} = first, _} | _] = list, _options) do
-    case List.last(list) do
-      {_, last} ->
-        case {node_range(first), node_range(last)} do
-          {range(start_line, start_character, _, _), range(_, _, end_line, end_character)} ->
-            range(start_line, start_character, end_line, end_character)
+  def node_range([{{:__block__, meta, [_]} = first, _} | _] = list, _options) do
+    if Keyword.get(meta, :format) == :keyword or Keyword.has_key?(meta, :assoc) or
+         Version.match?(System.version(), "< 1.18.0-dev") do
+      case List.last(list) do
+        {_, last} ->
+          case {node_range(first), node_range(last)} do
+            {range(start_line, start_character, _, _), range(_, _, end_line, end_character)} ->
+              range(start_line, start_character, end_line, end_character)
 
-          _ ->
-            nil
-        end
+            _ ->
+              nil
+          end
 
-      _ ->
-        nil
+        _ ->
+          nil
+      end
     end
   end
 
   def node_range(list, _options) when is_list(list), do: nil
 
+  def node_range({{:__block__, meta, [_]} = first, last}, _options) do
+    if Keyword.get(meta, :format) == :keyword or Keyword.has_key?(meta, :assoc) or
+         Version.match?(System.version(), "< 1.18.0-dev") do
+      case {node_range(first), node_range(last)} do
+        {range(start_line, start_character, _, _), range(_, _, end_line, end_character)} ->
+          range(start_line, start_character, end_line, end_character)
+
+        _ ->
+          nil
+      end
+    end
+  end
+
   def node_range({:__block__, meta, args} = _ast, _options) do
     line = Keyword.get(meta, :line)
     column = Keyword.get(meta, :column)
@@ -62,6 +74,18 @@ defmodule ElixirLS.LanguageServer.AstUtils do
             # 2 element tuple
             {end_location[:line] - 1, end_location[:column] - 1 + 1}
 
+          match?(kind when kind in [:atom, :keyword], Keyword.get(meta, :format)) ->
+            [literal] = args
+
+            modifier =
+              if literal in [true, false, nil] do
+                1
+              else
+                0
+              end
+
+            get_literal_end(literal, {line, column + modifier}, nil)
+
           match?([_], args) ->
             [literal] = args
             delimiter = meta[:delimiter]
@@ -96,10 +120,12 @@ defmodule ElixirLS.LanguageServer.AstUtils do
     line = Keyword.get(meta, :line) - 1
     column = Keyword.get(meta, :column) - 1
     {end_line, end_column} = get_eoe_by_formatting(ast, {line, column}, options)
-    # on elixir 1.15+ formatter changes charlist '' to ~c"" sigil so we need to correct columns
+
+    # on elixir 1.15-1.17 formatter changes charlist '' to ~c"" sigil so we need to correct columns
     # if charlist is single line
     correction =
-      if end_line == line and Version.match?(System.version(), ">= 1.15.0-dev") do
+      if end_line == line and Version.match?(System.version(), ">= 1.15.0-dev") and
+           Version.match?(System.version(), "< 1.18.0-dev") do
         2
       else
         0
@@ -165,18 +191,24 @@ defmodule ElixirLS.LanguageServer.AstUtils do
                 nil
             end
 
-          match?({:., _, [Kernel, :to_string]}, form) ->
-            {line, column}
+          match?({:., _meta, [Kernel, :to_string]}, form) ->
+            if Keyword.get(meta, :from_interpolation) ||
+                 Version.match?(System.version(), "< 1.16.0-dev") do
+              {line, column}
+            end
 
-          match?({:., _, [Access, :get]}, form) and match?([_ | _], args) ->
-            [arg | _] = args
+          match?({:., _meta, [Access, :get]}, form) and match?([_ | _], args) ->
+            if Keyword.get(meta, :from_brackets) ||
+                 Version.match?(System.version(), "< 1.16.0-dev") do
+              [arg | _] = args
 
-            case node_range(arg) do
-              range(line, column, _, _) ->
-                {line, column}
+              case node_range(arg) do
+                range(line, column, _, _) ->
+                  {line, column}
 
-              nil ->
-                nil
+                nil ->
+                  nil
+              end
             end
 
           match?({:., _, [_ | _]}, form) ->

apps/language_server/lib/language_server/diagnostics.ex

@@ -472,8 +472,14 @@ defmodule ElixirLS.LanguageServer.Diagnostics do
         for typing_trace <- typing_traces, trace <- typing_trace.traces do
           case typing_trace.type do
             :variable ->
-              line = trace.meta |> Keyword.get(:line, 1)
-              column = trace.meta |> Keyword.get(:column, 1)
+              {line, column} =
+                case trace do
+                  %{meta: meta} ->
+                    {Keyword.get(meta, :line, 1), Keyword.get(meta, :column, 1)}
+
+                  _ ->
+                    {Keyword.get(trace, :line, 1), Keyword.get(trace, :column, 1)}
+                end
 
               message = "given type: #{trace.formatted_type}"
 

apps/language_server/lib/language_server/dialyzer/manifest.ex

@@ -167,7 +167,10 @@ defmodule ElixirLS.LanguageServer.Dialyzer.Manifest do
     modules_to_paths =
       for app <- @erlang_apps ++ @elixir_apps,
           path <-
-            Path.join([SourceFile.Path.escape_for_wildcard(Application.app_dir(app)), "**/*.beam"])
+            Path.join([
+              SourceFile.Path.escape_for_wildcard(Application.app_dir(app)),
+              "**/*.beam"
+            ])
             |> Path.wildcard(),
           into: %{},
           do: {pathname_to_module(path), path |> String.to_charlist()}

apps/language_server/lib/language_server/markdown_utils.ex

@@ -142,6 +142,17 @@ defmodule ElixirLS.LanguageServer.MarkdownUtils do
     "**Delegates to** #{inspect(m)}.#{f}/#{a}"
   end
 
+  defp get_metadata_entry_md({:behaviours, []}), do: nil
+
+  defp get_metadata_entry_md({:behaviours, list})
+       when is_list(list) do
+    "**Implements** #{Enum.map_join(list, ", ", &inspect/1)}"
+  end
+
+  defp get_metadata_entry_md({:source_annos, _}), do: nil
+
+  defp get_metadata_entry_md({:source_path, _}), do: nil
+
   defp get_metadata_entry_md({:spark_opts, _}), do: nil
 
   defp get_metadata_entry_md({key, value}) do
@@ -404,7 +415,7 @@ defmodule ElixirLS.LanguageServer.MarkdownUtils do
   @kernel_special_forms_exports Kernel.SpecialForms.__info__(:macros)
   @kernel_exports Kernel.__info__(:macros) ++ Kernel.__info__(:functions)
 
-  defp get_module_fun_arity("..///3"), do: {Kernel, :"..//", 3}
+  defp get_module_fun_arity("..///3"), do: {Kernel, :..//, 3}
   defp get_module_fun_arity("../2"), do: {Kernel, :.., 2}
   defp get_module_fun_arity("../0"), do: {Kernel, :.., 0}
   defp get_module_fun_arity("./2"), do: {Kernel.SpecialForms, :., 2}