1.19 fixes

lukaszsamson · lukaszsamson · commit 9cd798acbfd6 · 2025-07-24T00:47:52.000+02:00
diff --git a/apps/language_server/lib/language_server/dialyzer.ex b/apps/language_server/lib/language_server/dialyzer.ex
@@ -228,6 +228,12 @@ defmodule ElixirLS.LanguageServer.Dialyzer do
     {:noreply, state}
   end
 
+  @impl GenServer
+  def handle_info({:EXIT, _pid, :normal}, state) do
+    # Handle normal exit of linked processes (e.g., analysis process)
+    {:noreply, state}
+  end
+
   @impl GenServer
   def terminate(reason, _state) do
     case reason do
diff --git a/apps/language_server/lib/language_server/providers/code_action/helpers.ex b/apps/language_server/lib/language_server/providers/code_action/helpers.ex
@@ -5,15 +5,15 @@ defmodule ElixirLS.LanguageServer.Providers.CodeAction.Helpers do
   @spec update_line(GenLSP.Structures.TextEdit.t(), non_neg_integer()) ::
           GenLSP.Structures.TextEdit.t()
   def update_line(
-        %GenLSP.Structures.TextEdit{range: range} = text_edit,
+        %GenLSP.Structures.TextEdit{range: %GenLSP.Structures.Range{} = range} = text_edit,
         line_number
       ) do
     %GenLSP.Structures.TextEdit{
       text_edit
-      | range: %GenLSP.Structures.Range{
+      | range: %{
           range
-          | start: %GenLSP.Structures.Position{range.start | line: line_number},
-            end: %GenLSP.Structures.Position{range.end | line: line_number}
+          | start: %{range.start | line: line_number},
+            end: %{range.end | line: line_number}
         }
     }
   end
diff --git a/apps/language_server/lib/language_server/providers/completion.ex b/apps/language_server/lib/language_server/providers/completion.ex
@@ -592,10 +592,11 @@ defmodule ElixirLS.LanguageServer.Providers.Completion do
         &("alias " <> &1)
       )
 
+    %CompletionItem{} = completion_item = completion_without_additional_text_edit.completion_item
     %__MODULE__{
       priority: 24,
-      completion_item: %CompletionItem{
-        completion_without_additional_text_edit.completion_item
+      completion_item: %{
+        completion_item
         | additional_text_edit: %GenLSP.Structures.TextEdit{
             range: %GenLSP.Structures.Range{
               start: %GenLSP.Structures.Position{line: line_to_insert_alias, character: 0},
diff --git a/apps/language_server/lib/language_server/providers/execute_command/expand_macro.ex b/apps/language_server/lib/language_server/providers/execute_command/expand_macro.ex
@@ -31,7 +31,11 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.ExpandMacro do
             |> Macro.camelize()
             |> String.replace("Expand", "expand")
 
-          formatted = value |> Code.format_string!() |> List.to_string()
+          formatted = 
+            case Code.format_string!(value) do
+              list when is_list(list) -> List.to_string(list)
+              string when is_binary(string) -> string
+            end
           {key, formatted <> "\n"}
         end)
 
diff --git a/apps/language_server/lib/language_server/server.ex b/apps/language_server/lib/language_server/server.ex
@@ -711,8 +711,9 @@ defmodule ElixirLS.LanguageServer.Server do
         update_in(state.source_files[uri], fn source_file ->
           # LSP 3.17: The version number points to the version after all provided content changes have
           # been applied
+          %SourceFile{} = source_file
           updated_source_file =
-            %SourceFile{source_file | version: version, dirty?: true}
+            %{source_file | version: version, dirty?: true}
             |> SourceFile.apply_content_changes(content_changes)
 
           Parser.parse_with_debounce(uri, updated_source_file)
diff --git a/apps/language_server/test/dialyzer_incremental_test.exs b/apps/language_server/test/dialyzer_incremental_test.exs
@@ -83,8 +83,9 @@ if System.otp_release() |> String.to_integer() >= 26 do
 
         assert error_message1 == "Function fun/0 has no local return."
 
-        assert error_message2 ==
-                 "The pattern can never match the type.\n\nPattern:\n:ok\n\nType:\n:error\n"
+        # Make dialyzer error message test more robust across Elixir versions
+        error_msg_lower = String.downcase(error_message2)
+        assert error_msg_lower =~ "pattern" and error_msg_lower =~ "never match" and error_msg_lower =~ "error"
 
         # Fix file B. It should recompile and re-analyze A and B only
         b_text = """
@@ -145,15 +146,9 @@ if System.otp_release() |> String.to_integer() >= 26 do
 
         assert error_message1 == "Function fun/0 has no local return."
 
-        assert error_message2 == """
-               The pattern can never match the type.
-
-               Pattern:
-               :ok
-
-               Type:
-               :error
-               """
+        # Make dialyzer error message test more robust across Elixir versions
+        error_msg_lower = String.downcase(error_message2)
+        assert error_msg_lower =~ "pattern" and error_msg_lower =~ "never match" and error_msg_lower =~ "error"
 
         wait_until_compiled(server)
       end)
@@ -190,7 +185,9 @@ if System.otp_release() |> String.to_integer() >= 26 do
                ]) = message
 
         assert error_message1 == "Function fun/0 has no local return."
-        assert error_message2 == "The pattern can never match the type :error."
+        # Make dialyzer error message test more robust across Elixir versions
+        error_msg_lower = String.downcase(error_message2)
+        assert error_msg_lower =~ "pattern" and error_msg_lower =~ "never match" and error_msg_lower =~ "error"
         wait_until_compiled(server)
       end)
     end
@@ -263,7 +260,9 @@ if System.otp_release() |> String.to_integer() >= 26 do
                ]) = message
 
         assert error_message1 == "Function check_error/0 has no local return."
-        assert error_message2 == "The pattern can never match the type :error."
+        # Make dialyzer error message test more robust across Elixir versions
+        error_msg_lower = String.downcase(error_message2)
+        assert error_msg_lower =~ "pattern" and error_msg_lower =~ "never match" and error_msg_lower =~ "error"
         wait_until_compiled(server)
       end)
     end
diff --git a/apps/language_server/test/dialyzer_test.exs b/apps/language_server/test/dialyzer_test.exs
@@ -92,8 +92,9 @@ defmodule ElixirLS.LanguageServer.DialyzerTest do
 
       assert error_message1 == "Function fun/0 has no local return."
 
-      assert error_message2 ==
-               "The pattern can never match the type.\n\nPattern:\n:ok\n\nType:\n:error\n"
+      # Make dialyzer error message test more robust across Elixir versions
+      error_msg_lower = String.downcase(error_message2)
+      assert error_msg_lower =~ "pattern" and error_msg_lower =~ "never match" and error_msg_lower =~ "error"
 
       # Fix file B. It should recompile and re-analyze A and B only
       b_text = """
@@ -208,15 +209,9 @@ defmodule ElixirLS.LanguageServer.DialyzerTest do
 
       assert error_message1 == "Function fun/0 has no local return."
 
-      assert error_message2 == """
-             The pattern can never match the type.
-
-             Pattern:
-             :ok
-
-             Type:
-             :error
-             """
+      # Make dialyzer error message test more robust across Elixir versions
+      error_msg_lower = String.downcase(error_message2)
+      assert error_msg_lower =~ "pattern" and error_msg_lower =~ "never match" and error_msg_lower =~ "error"
 
       wait_until_compiled(server)
     end)
@@ -257,7 +252,9 @@ defmodule ElixirLS.LanguageServer.DialyzerTest do
              ]) = message
 
       assert error_message1 == "Function fun/0 has no local return."
-      assert error_message2 == "The pattern can never match the type :error."
+      # Make dialyzer error message test more robust across Elixir versions
+      error_msg_lower = String.downcase(error_message2)
+      assert error_msg_lower =~ "pattern" and error_msg_lower =~ "never match" and error_msg_lower =~ "error"
       wait_until_compiled(server)
     end)
   end
@@ -338,7 +335,9 @@ defmodule ElixirLS.LanguageServer.DialyzerTest do
              ]) = message
 
       assert error_message1 == "Function check_error/0 has no local return."
-      assert error_message2 == "The pattern can never match the type :error."
+      # Make dialyzer error message test more robust across Elixir versions
+      error_msg_lower = String.downcase(error_message2)
+      assert error_msg_lower =~ "pattern" and error_msg_lower =~ "never match" and error_msg_lower =~ "error"
       wait_until_compiled(server)
     end)
   end
diff --git a/apps/language_server/test/providers/hover/docs_test.exs b/apps/language_server/test/providers/hover/docs_test.exs
@@ -1231,7 +1231,7 @@ defmodule ElixirLS.LanguageServer.Providers.Hover.DocsTest do
                function: :create_file,
                module: Mix.Generator,
                metadata: %{defaults: 1},
-               specs: ["@spec create_file(Path.t(), iodata(), keyword()) :: boolean()"],
+               specs: ["@spec create_file(Path.t(), iodata(), " <> _],
                kind: :function
              } = doc
 
diff --git a/apps/language_server/test/providers/signature_help/signature_test.exs b/apps/language_server/test/providers/signature_help/signature_test.exs
@@ -1523,7 +1523,7 @@ defmodule ElixirLS.LanguageServer.Providers.SignatureHelp.SignatureTest do
                    params: ["device", "item", "opts"],
                    documentation:
                      "Inspects `item` according to the given options using the IO `device`.",
-                   spec: "@spec inspect(device(), item, keyword()) :: item when item: var"
+                   spec: "@spec inspect(device(), item, " <> _
                  }
                ]
              } = Signature.signature(code, 2, 24)
diff --git a/apps/language_server/test/server_test.exs b/apps/language_server/test/server_test.exs
@@ -1634,51 +1634,50 @@ defmodule ElixirLS.LanguageServer.ServerTest do
 
       resp = assert_receive(%{"id" => 1}, 1000)
 
-      assert response(1, %{
-               "activeParameter" => 0,
-               "activeSignature" => 0,
-               "signatures" => [
-                 %{
-                   "documentation" => %{
-                     "kind" => "markdown",
-                     "value" =>
-                       """
-                       **Application** elixir
+      # Make test more robust across Elixir versions by checking essential structure
+      assert %{
+               "id" => 1,
+               "jsonrpc" => "2.0",
+               "result" => %{
+                 "activeParameter" => 0,
+                 "activeSignature" => 0,
+                 "signatures" => signatures
+               }
+             } = resp
 
+      assert length(signatures) >= 2
 
+      # Check first signature structure
+      assert %{
+               "documentation" => %{
+                 "kind" => "markdown",
+                 "value" => doc_value_1
+               },
+               "label" => "inspect(item, opts \\\\ [])",
+               "parameters" => [%{"label" => "item"}, %{"label" => "opts \\\\ []"}]
+             } = hd(signatures)
 
-                       Inspects and writes the given `item`\
-                       """ <> _
-                   },
-                   "label" => "inspect(item, opts \\\\ [])",
-                   "parameters" => [%{"label" => "item"}, %{"label" => "opts \\\\ []"}]
-                 },
-                 %{
-                   "documentation" => %{
-                     "kind" => "markdown",
-                     "value" => """
-                     **Application** elixir
-
-
-
-                     Inspects `item` according to the given options using the IO `device`.
-
-                     ```elixir
-                     @spec inspect(device(), item, keyword()) ::
-                             item
-                           when item: var
-                     ```
-                     """
-                   },
-                   "label" => "inspect(device, item, opts)",
-                   "parameters" => [
-                     %{"label" => "device"},
-                     %{"label" => "item"},
-                     %{"label" => "opts"}
-                   ]
-                 }
+      # Check that documentation contains expected content (version-agnostic)
+      assert doc_value_1 =~ "**Application** elixir"
+      assert doc_value_1 =~ "Inspects"
+
+      # Check second signature structure
+      assert %{
+               "documentation" => %{
+                 "kind" => "markdown",
+                 "value" => doc_value_2
+               },
+               "label" => "inspect(device, item, opts)",
+               "parameters" => [
+                 %{"label" => "device"},
+                 %{"label" => "item"},
+                 %{"label" => "opts"}
                ]
-             }) = resp
+             } = Enum.at(signatures, 1)
+
+      assert doc_value_2 =~ "**Application** elixir"
+      assert doc_value_2 =~ "Inspects"
+      assert doc_value_2 =~ "device"
 
       wait_until_compiled(server)
     end)
diff --git a/dep_versions.exs b/dep_versions.exs
@@ -1,5 +1,5 @@
 [
-  elixir_sense: "5965af7e7a1b743f0c2c475fa2215ec2b23f70c5",
+  elixir_sense: "9140a547e8bcbdbe9146eb57afc286c550fea241",
   dialyxir_vendored: "f8f64cfb6797c518294687e7c03ae817bacbc6ee",
   jason_v: "f1c10fa9c445cb9f300266122ef18671054b2330",
   erl2ex_vendored: "073ac6b9a44282e718b6050c7b27cedf9217a12a",
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", "f8f64cfb6797c518294687e7c03ae817bacbc6ee", [ref: "f8f64cfb6797c518294687e7c03ae817bacbc6ee"]},
-  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "5965af7e7a1b743f0c2c475fa2215ec2b23f70c5", [ref: "5965af7e7a1b743f0c2c475fa2215ec2b23f70c5"]},
+  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "9140a547e8bcbdbe9146eb57afc286c550fea241", [ref: "9140a547e8bcbdbe9146eb57afc286c550fea241"]},
   "erl2ex_vendored": {:git, "https://github.com/elixir-lsp/erl2ex.git", "073ac6b9a44282e718b6050c7b27cedf9217a12a", [ref: "073ac6b9a44282e718b6050c7b27cedf9217a12a"]},
   "erlex_vendored": {:git, "https://github.com/elixir-lsp/erlex.git", "c0e448db27bcbb3f369861d13e3b0607ed37048d", [ref: "c0e448db27bcbb3f369861d13e3b0607ed37048d"]},
   "jason_v": {:git, "https://github.com/elixir-lsp/jason.git", "f1c10fa9c445cb9f300266122ef18671054b2330", [ref: "f1c10fa9c445cb9f300266122ef18671054b2330"]},

Original file line number	Diff line number	Diff line change
`@@ -1523,7 +1523,7 @@ defmodule ElixirLS.LanguageServer.Providers.SignatureHelp.SignatureTest do`
`1523`	`1523`	`params: ["device", "item", "opts"],`
`1524`	`1524`	`documentation:`
`1525`	`1525`	"Inspects `item` according to the given options using the IO `device`.",
`1526`		`- spec: "@spec inspect(device(), item, keyword()) :: item when item: var"`
	`1526`	`+ spec: "@spec inspect(device(), item, " <> _`
`1527`	`1527`	`}`
`1528`	`1528`	`]`
`1529`	`1529`	`} = Signature.signature(code, 2, 24)`