Merge branch '1.19'

# Conflicts:
#	apps/language_server/lib/language_server/providers/code_action/helpers.ex
#	apps/language_server/lib/language_server/providers/completion.ex
#	apps/language_server/lib/language_server/providers/execute_command/expand_macro.ex

Author: lukaszsamson

apps/debug_adapter/lib/debug_adapter/server.ex

@@ -3272,10 +3272,10 @@ defmodule ElixirLS.DebugAdapter.Server do
     vars =
       for var_name <- Enum.uniq(env_var_names ++ binding_var_names) do
         case {Keyword.fetch(binding, var_name), Map.fetch(env_vars, var_name)} do
-          {{:ok, binding_value}, {:ok, env_var}} ->
+          {{:ok, binding_value}, {:ok, env_var = %ElixirSense.Core.State.VarInfo{}}} ->
             # var both in env and in binding - prefer type from binding
             type = ElixirSense.Core.Binding.from_var(binding_value)
-            %ElixirSense.Core.State.VarInfo{env_var | type: type}
+            %{env_var | type: type}
 
           {_, {:ok, env_var}} ->
             # var only in env - keep it, binding may not have everything

apps/debug_adapter/test/debugger_test.exs

@@ -3569,7 +3569,7 @@ defmodule ElixirLS.DebugAdapter.ServerTest do
             1,
             "evaluate",
             "evaluateError",
-            "** (MatchError) no match of right hand side value: 2" <> _,
+            "** (MatchError) no match of right hand side value:" <> _,
             %{},
             _,
             _

apps/language_server/lib/language_server/parser.ex

@@ -148,7 +148,7 @@ defmodule ElixirLS.LanguageServer.Parser do
         %Context{source_file: %SourceFile{version: old_version}} = old_file
         when current_version > old_version ->
           # replace updated file with new version
-          %Context{old_file | source_file: source_file}
+          %{old_file | source_file: source_file}
 
         %Context{} = old_file ->
           # ignore this request - this or newer version already in state
@@ -192,7 +192,7 @@ defmodule ElixirLS.LanguageServer.Parser do
 
             %Context{source_file: %SourceFile{version: old_version}} = old_file
             when old_version <= current_version ->
-              %Context{old_file | source_file: source_file}
+              %{old_file | source_file: source_file}
           end
 
         {pid, ref} =

apps/language_server/lib/language_server/providers/code_action/helpers.ex

@@ -8,13 +8,13 @@ defmodule ElixirLS.LanguageServer.Providers.CodeAction.Helpers do
         %GenLSP.Structures.TextEdit{range: %GenLSP.Structures.Range{} = range} = text_edit,
         line_number
       ) do
-    %GenLSP.Structures.TextEdit{
+    %GenLSP.Structures.Position{} = start_pos = range.start
+    %GenLSP.Structures.Position{} = end_pos = range.end
+    
+    %{
       text_edit
-      | range: %{
-          range
-          | start: %{range.start | line: line_number},
-            end: %{range.end | line: line_number}
-        }
+      | range: %{range | start: %{start_pos | line: line_number},
+                        end: %{end_pos | line: line_number}}
     }
   end
 

apps/language_server/lib/language_server/providers/code_mod/diff.ex

@@ -43,7 +43,7 @@ defmodule ElixirLS.LanguageServer.Providers.CodeMod.Diff do
          ]
        )
        when byte_size(insert_text) > 0 do
-    collapsed_edit = %TextEdit{delete_edit | new_text: insert_text}
+    collapsed_edit = %{delete_edit | new_text: insert_text}
     [collapsed_edit | rest]
   end
 

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

@@ -593,11 +593,10 @@ defmodule ElixirLS.LanguageServer.Providers.Completion do
       )
 
     %CompletionItem{} = completion_item = completion_without_additional_text_edit.completion_item
+    
     %__MODULE__{
       priority: 24,
-      completion_item: %{
-        completion_item
-        | additional_text_edit: %GenLSP.Structures.TextEdit{
+      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},
               end: %GenLSP.Structures.Position{line: line_to_insert_alias, character: 0}
@@ -1024,9 +1023,10 @@ defmodule ElixirLS.LanguageServer.Providers.Completion do
     if completion do
       completion =
         if name in @operators do
+          %CompletionItem{} = completion_item = completion.completion_item
           %__MODULE__{
             completion
-            | completion_item: %CompletionItem{completion.completion_item | kind: :operator}
+            | completion_item: %{completion_item | kind: :operator}
           }
         else
           completion
@@ -1050,11 +1050,10 @@ defmodule ElixirLS.LanguageServer.Providers.Completion do
               &("require " <> &1)
             )
 
+          %CompletionItem{} = completion_item = completion.completion_item
           %__MODULE__{
             completion
-            | completion_item: %CompletionItem{
-                completion.completion_item
-                | additional_text_edit: %GenLSP.Structures.TextEdit{
+            | completion_item: %{completion_item | additional_text_edit: %GenLSP.Structures.TextEdit{
                     range: %GenLSP.Structures.Range{
                       start: %GenLSP.Structures.Position{
                         line: line_to_insert_require,
@@ -1074,13 +1073,10 @@ defmodule ElixirLS.LanguageServer.Providers.Completion do
       file_path = Keyword.get(options, :file_path)
 
       if snippet = snippet_for({origin, name}, Map.put(context, :file_path, file_path)) do
+        %CompletionItem{} = completion_item = completion.completion_item
         %__MODULE__{
           completion
-          | completion_item: %CompletionItem{
-              completion.completion_item
-              | insert_text: snippet,
-                label: name
-            }
+          | completion_item: %{completion_item | insert_text: snippet, label: name}
         }
       else
         completion

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

@@ -31,11 +31,7 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.ExpandMacro do
             |> Macro.camelize()
             |> String.replace("Expand", "expand")
 
-          formatted = 
-            case Code.format_string!(value) do
-              list when is_list(list) -> List.to_string(list)
-              string when is_binary(string) -> string
-            end
+          formatted = value |> Code.format_string!() |> IO.iodata_to_binary()
           {key, formatted <> "\n"}
         end)
 

apps/language_server/lib/language_server/providers/hover.ex

@@ -280,7 +280,7 @@ defmodule ElixirLS.LanguageServer.Providers.Hover do
   defp format_header(text) do
     text
     |> Code.format_string!(line_length: 40)
-    |> to_string
+    |> IO.iodata_to_binary()
   rescue
     _ ->
       # Code.format_string! can raise SyntaxError e.g.

apps/language_server/lib/language_server/server.ex

@@ -708,7 +708,7 @@ defmodule ElixirLS.LanguageServer.Server do
       state
     else
       state =
-        update_in(state.source_files[uri], fn source_file ->
+        update_in(state.source_files[uri], fn %SourceFile{} = source_file ->
           # LSP 3.17: The version number points to the version after all provided content changes have
           # been applied
           %SourceFile{} = source_file
@@ -819,7 +819,7 @@ defmodule ElixirLS.LanguageServer.Server do
             %SourceFile{text: source_file_text, dirty?: true} = source_file ->
               case File.read(SourceFile.Path.from_uri(uri)) do
                 {:ok, ^source_file_text} ->
-                  Map.put(acc, uri, %SourceFile{source_file | dirty?: false})
+                  Map.put(acc, uri, %{source_file | dirty?: false})
 
                 {:ok, _} ->
                   acc
@@ -2139,7 +2139,7 @@ defmodule ElixirLS.LanguageServer.Server do
           # diagnostics without file are meaningless in LSP, try to point to mixfile instead
           if project_dir != nil and mix_project? do
             file = Path.join(project_dir, MixfileHelpers.mix_exs())
-            %Diagnostics{diagnostic | file: file, source: file, position: 0}
+            %{diagnostic | file: file, source: file, position: 0}
           end
         end
       end)

apps/language_server/lib/language_server/source_file.ex

@@ -222,7 +222,6 @@ defmodule ElixirLS.LanguageServer.SourceFile do
       case format_code(spec, line_length: line_length) do
         {:ok, code} ->
           code
-          |> to_string()
 
         {:error, _} ->
           spec
@@ -327,7 +326,7 @@ defmodule ElixirLS.LanguageServer.SourceFile do
 
   defp format_code(code, opts) do
     try do
-      {:ok, Code.format_string!(code, opts)}
+      {:ok, Code.format_string!(code, opts) |> IO.iodata_to_binary()}
     rescue
       e ->
         {:error, e}