From f41d6059842402ca526354df8a1ffd13809f75f0 Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Sat, 20 Jul 2024 23:02:27 +0200
Subject: [PATCH 01/36] remove non existing prop

---
 .../test/providers/plugins/phoenix/scope_test.exs                | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/language_server/test/providers/plugins/phoenix/scope_test.exs b/apps/language_server/test/providers/plugins/phoenix/scope_test.exs
index 223ed95d6..0b5ad93f1 100644
--- a/apps/language_server/test/providers/plugins/phoenix/scope_test.exs
+++ b/apps/language_server/test/providers/plugins/phoenix/scope_test.exs
@@ -91,7 +91,6 @@ defmodule ElixirLS.LanguageServer.Plugins.Phoenix.ScopeTest do
               name: :web_prefix,
               positions: [{5, 5}],
               scope_id: 2,
-              is_definition: true,
               type: {:atom, ExampleWeb}
             }
           ],

From 217a57c307d179d9eeb18c41c92bdf55103a76b4 Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Fri, 2 Aug 2024 07:04:37 +0200
Subject: [PATCH 02/36] fix signatures

---
 .../test/providers/signature_help/signature_test.exs        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/language_server/test/providers/signature_help/signature_test.exs b/apps/language_server/test/providers/signature_help/signature_test.exs
index 42617666a..ea45a18c3 100644
--- a/apps/language_server/test/providers/signature_help/signature_test.exs
+++ b/apps/language_server/test/providers/signature_help/signature_test.exs
@@ -892,7 +892,7 @@ defmodule ElixirLS.LanguageServer.Providers.SignatureHelp.SignatureTest do
                    name: "sum",
                    params: ["a", "b \\\\ 0"],
                    documentation: "",
-                   spec: "@spec sum(integer, integer) :: integer"
+                   spec: "@spec sum(integer(), integer()) :: integer()"
                  }
                ]
              }
@@ -927,7 +927,7 @@ defmodule ElixirLS.LanguageServer.Providers.SignatureHelp.SignatureTest do
                    ],
                    documentation: "",
                    spec:
-                     "@spec sum(integer, integer, integer, integer, integer, integer) :: integer",
+                     "@spec sum(integer(), integer(), integer(), integer(), integer(), integer()) :: integer()",
                    active_param: 2
                  }
                ]
@@ -1173,7 +1173,7 @@ defmodule ElixirLS.LanguageServer.Providers.SignatureHelp.SignatureTest do
                    documentation: "asdf",
                    name: "go",
                    params: ["t"],
-                   spec: "@callback go(t) :: integer()"
+                   spec: "@callback go(t()) :: integer()"
                  }
                ]
              } = res

From 42c40c25c1dc57b4b3f5793521ea450bad56b25a Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Fri, 2 Aug 2024 07:32:55 +0200
Subject: [PATCH 03/36] handle versioned vars

---
 apps/elixir_ls_utils/lib/completion_engine.ex |  2 +-
 apps/elixir_ls_utils/test/complete_test.exs   | 33 ++++++++---
 .../language_server/providers/hover/docs.ex   |  9 +--
 .../providers/implementation/locator.ex       | 58 +++++++++++--------
 .../providers/plugins/phoenix/scope.ex        |  6 +-
 .../providers/references/locator.ex           |  9 ++-
 .../providers/completion/suggestions_test.exs | 16 +++--
 .../test/providers/hover/docs_test.exs        |  2 +-
 8 files changed, 83 insertions(+), 52 deletions(-)

diff --git a/apps/elixir_ls_utils/lib/completion_engine.ex b/apps/elixir_ls_utils/lib/completion_engine.ex
index b38d68832..07e305726 100644
--- a/apps/elixir_ls_utils/lib/completion_engine.ex
+++ b/apps/elixir_ls_utils/lib/completion_engine.ex
@@ -312,7 +312,7 @@ defmodule ElixirLS.Utils.CompletionEngine do
   end
 
   defp expand_dot_path({:var, var}, %State.Env{} = env, %Metadata{} = metadata) do
-    value_from_binding({:variable, List.to_atom(var)}, env, metadata)
+    value_from_binding({:variable, List.to_atom(var), :any}, env, metadata)
   end
 
   defp expand_dot_path({:module_attribute, attribute}, %State.Env{} = env, %Metadata{} = metadata) do
diff --git a/apps/elixir_ls_utils/test/complete_test.exs b/apps/elixir_ls_utils/test/complete_test.exs
index cded356a2..e41d466fc 100644
--- a/apps/elixir_ls_utils/test/complete_test.exs
+++ b/apps/elixir_ls_utils/test/complete_test.exs
@@ -475,6 +475,7 @@ defmodule ElixirLS.Utils.CompletionEngineTest do
       vars: [
         %VarInfo{
           name: :mod,
+          version: 1,
           type: {:atom, String}
         }
       ]
@@ -489,6 +490,7 @@ defmodule ElixirLS.Utils.CompletionEngineTest do
       vars: [
         %VarInfo{
           name: :map,
+          version: 1,
           type: {:map, [foo: 1, bar_1: 23, bar_2: 14], nil}
         }
       ]
@@ -575,27 +577,33 @@ defmodule ElixirLS.Utils.CompletionEngineTest do
       vars: [
         %VarInfo{
           name: :struct,
+          version: 1,
           type: {:struct, [], {:atom, DateTime}, nil}
         },
         %VarInfo{
           name: :other,
+          version: 1,
           type: {:call, {:atom, DateTime}, :utc_now, []}
         },
         %VarInfo{
           name: :from_metadata,
+          version: 1,
           type: {:struct, [], {:atom, MyStruct}, nil}
         },
         %VarInfo{
           name: :var,
-          type: {:variable, :struct}
+          version: 1,
+          type: {:variable, :struct, 1}
         },
         %VarInfo{
           name: :yyyy,
+          version: 1,
           type: {:map, [date: {:struct, [], {:atom, DateTime}, nil}], []}
         },
         %VarInfo{
           name: :xxxx,
-          type: {:call, {:atom, Map}, :fetch!, [{:variable, :yyyy}, {:atom, :date}]}
+          version: 1,
+          type: {:call, {:atom, Map}, :fetch!, [{:variable, :yyyy, 1}, {:atom, :date}]}
         }
       ]
     }
@@ -766,6 +774,7 @@ defmodule ElixirLS.Utils.CompletionEngineTest do
       vars: [
         %VarInfo{
           name: :map,
+          version: 1,
           type:
             {:map,
              [
@@ -911,6 +920,7 @@ defmodule ElixirLS.Utils.CompletionEngineTest do
       vars: [
         %VarInfo{
           name: :map,
+          version: 1,
           type: {:map, [{"foo", 124}], nil}
         }
       ]
@@ -924,6 +934,7 @@ defmodule ElixirLS.Utils.CompletionEngineTest do
       vars: [
         %VarInfo{
           name: :map,
+          version: 1,
           type: {:map, [nested: {:map, [num: 23], nil}], nil}
         }
       ]
@@ -939,11 +950,13 @@ defmodule ElixirLS.Utils.CompletionEngineTest do
       vars: [
         %VarInfo{
           name: :map,
+          version: 1,
           type: {:map, [{:foo, {:atom, String}}], nil}
         },
         %VarInfo{
           name: :call,
-          type: {:call, {:variable, :map}, :foo, []}
+          version: 1,
+          type: {:call, {:variable, :map, 1}, :foo, []}
         }
       ]
     }
@@ -956,6 +969,7 @@ defmodule ElixirLS.Utils.CompletionEngineTest do
       vars: [
         %VarInfo{
           name: :call,
+          version: 1,
           type: {:call, {:atom, DateTime}, :utc_now, []}
         }
       ]
@@ -1059,13 +1073,16 @@ defmodule ElixirLS.Utils.CompletionEngineTest do
     env = %Env{
       vars: [
         %VarInfo{
-          name: :numeral
+          name: :numeral,
+          version: 1
         },
         %VarInfo{
-          name: :number
+          name: :number,
+          version: 1
         },
         %VarInfo{
-          name: :nothing
+          name: :nothing,
+          version: 1
         }
       ]
     }
@@ -1082,7 +1099,8 @@ defmodule ElixirLS.Utils.CompletionEngineTest do
     env = %Env{
       vars: [
         %VarInfo{
-          name: :number
+          name: :number,
+          version: 1
         }
       ]
     }
@@ -1605,6 +1623,7 @@ defmodule ElixirLS.Utils.CompletionEngineTest do
       vars: [
         %VarInfo{
           name: :struct,
+          version: 1,
           type:
             {:struct,
              [
diff --git a/apps/language_server/lib/language_server/providers/hover/docs.ex b/apps/language_server/lib/language_server/providers/hover/docs.ex
index 99b1aa41b..0c65633a6 100644
--- a/apps/language_server/lib/language_server/providers/hover/docs.ex
+++ b/apps/language_server/lib/language_server/providers/hover/docs.ex
@@ -133,14 +133,15 @@ defmodule ElixirLS.LanguageServer.Providers.Hover.Docs do
           docs: docs
         }
 
-      {:variable, variable} ->
+      {:variable, variable, version} ->
         {line, column} = context.begin
 
         var_info =
           vars
           |> Enum.find(fn
-            %VarInfo{name: name, positions: positions} ->
-              name == variable and {line, column} in positions
+            %VarInfo{} = info ->
+              info.name == variable and (info.version == version or version == :any) and
+                {line, column} in info.positions
           end)
 
         if var_info != nil do
@@ -150,7 +151,7 @@ defmodule ElixirLS.LanguageServer.Providers.Hover.Docs do
           }
         else
           mod_fun_docs(
-            type,
+            {nil, variable},
             context,
             binding_env,
             env,
diff --git a/apps/language_server/lib/language_server/providers/implementation/locator.ex b/apps/language_server/lib/language_server/providers/implementation/locator.ex
index 78b28f8bc..89bcbe567 100644
--- a/apps/language_server/lib/language_server/providers/implementation/locator.ex
+++ b/apps/language_server/lib/language_server/providers/implementation/locator.ex
@@ -69,6 +69,10 @@ defmodule ElixirLS.LanguageServer.Providers.Implementation.Locator do
       {kind, _} when kind in [:attribute, :keyword] ->
         []
 
+      {:variable, name, _} ->
+        # treat variable name as local function call
+        do_find(nil, name, context, env, metadata, binding_env)
+
       {module_type, function} ->
         module =
           case Binding.expand(binding_env, module_type) do
@@ -79,32 +83,36 @@ defmodule ElixirLS.LanguageServer.Providers.Implementation.Locator do
               env.module
           end
 
-        {line, column} = context.end
-        call_arity = Metadata.get_call_arity(metadata, module, function, line, column) || :any
-
-        behaviour_implementations =
-          find_behaviour_implementations(
-            module,
-            function,
-            call_arity,
-            module,
-            env,
-            metadata,
-            binding_env
-          )
+        do_find(module, function, context, env, metadata, binding_env)
+    end
+  end
 
-        if behaviour_implementations == [] do
-          find_delegatee(
-            {module, function},
-            call_arity,
-            env,
-            metadata,
-            binding_env
-          )
-          |> List.wrap()
-        else
-          behaviour_implementations
-        end
+  defp do_find(module, function, context, env, metadata, binding_env) do
+    {line, column} = context.end
+    call_arity = Metadata.get_call_arity(metadata, module, function, line, column) || :any
+
+    behaviour_implementations =
+      find_behaviour_implementations(
+        module,
+        function,
+        call_arity,
+        module,
+        env,
+        metadata,
+        binding_env
+      )
+
+    if behaviour_implementations == [] do
+      find_delegatee(
+        {module, function},
+        call_arity,
+        env,
+        metadata,
+        binding_env
+      )
+      |> List.wrap()
+    else
+      behaviour_implementations
     end
   end
 
diff --git a/apps/language_server/lib/language_server/providers/plugins/phoenix/scope.ex b/apps/language_server/lib/language_server/providers/plugins/phoenix/scope.ex
index 97abe5ec1..074e14f48 100644
--- a/apps/language_server/lib/language_server/providers/plugins/phoenix/scope.ex
+++ b/apps/language_server/lib/language_server/providers/plugins/phoenix/scope.ex
@@ -98,8 +98,10 @@ defmodule ElixirLS.LanguageServer.Plugins.Phoenix.Scope do
     get_mod(scope_alias, binding_env)
   end
 
-  defp get_mod({name, _, nil}, binding_env) when is_atom(name) do
-    case Binding.expand(binding_env, {:variable, name}) do
+  defp get_mod({name, meta, context}, binding_env)
+       when is_atom(name) and is_atom(context) and
+              name not in [:__MODULE__, :__DIR__, :__ENV__, :__CALLER__, :__STACKTRACE__, :_] do
+    case Binding.expand(binding_env, {:variable, name, Keyword.get(meta, :version, :any)}) do
       {:atom, atom} ->
         atom
 
diff --git a/apps/language_server/lib/language_server/providers/references/locator.ex b/apps/language_server/lib/language_server/providers/references/locator.ex
index 5e96a6724..c196bee3c 100644
--- a/apps/language_server/lib/language_server/providers/references/locator.ex
+++ b/apps/language_server/lib/language_server/providers/references/locator.ex
@@ -192,12 +192,15 @@ defmodule ElixirLS.LanguageServer.Providers.References.Locator do
       {:keyword, _} ->
         []
 
-      {:variable, variable} ->
+      {:variable, variable, version} ->
         {line, column} = context.begin
 
         var_info =
-          Enum.find(vars, fn %VarInfo{name: name, positions: positions} ->
-            name == variable and {line, column} in positions
+          Enum.find_value(vars, fn {{_name, _version}, %VarInfo{} = info} ->
+            if info.name == variable and (info.version == version or version == :any) and
+                 {line, column} in info.positions do
+              info
+            end
           end)
 
         if var_info != nil do
diff --git a/apps/language_server/test/providers/completion/suggestions_test.exs b/apps/language_server/test/providers/completion/suggestions_test.exs
index 4c0c6cae3..10b859ce3 100644
--- a/apps/language_server/test/providers/completion/suggestions_test.exs
+++ b/apps/language_server/test/providers/completion/suggestions_test.exs
@@ -503,13 +503,13 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
 
     assert [
              %{
-               args: "t",
-               args_list: ["t"],
+               args: "t()",
+               args_list: ["t()"],
                arity: 1,
                metadata: %{since: "1.2.3"},
                name: "my_fun",
                origin: "MyProto",
-               spec: "@callback my_fun(t) :: term",
+               spec: "@callback my_fun(t()) :: term",
                summary: "Some callback",
                type: :protocol_function
              },
@@ -773,7 +773,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
                metadata: %{since: "1.2.3", overridable: true},
                name: "test",
                origin: "ElixirSenseExample.OverridableFunctions",
-               spec: "@spec test(number, number) :: number",
+               spec: "@spec test(number(), number()) :: number()",
                summary: "Some overridable",
                type: :callback,
                subtype: :callback
@@ -1135,14 +1135,12 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
                metadata: %{implementing: BB},
                name: "go",
                origin: "BB.String",
-               spec: "@callback go(t) :: integer()",
+               spec: "@callback go(t()) :: integer()",
                summary: "asdf",
                type: :function,
                visibility: :public
              }
            ] = list
-
-    #  TODO docs and metadata
   end
 
   test "list metadata macro - fallback to macrocallback in metadata" do
@@ -4300,7 +4298,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
                signature: "my_local_t()",
                args_list: [],
                doc: "",
-               spec: "@typep my_local_t :: integer",
+               spec: "@typep my_local_t() :: integer()",
                metadata: %{}
              } == suggestion2
 
@@ -4377,7 +4375,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
                signature: "my_local_t()",
                args_list: [],
                doc: "",
-               spec: "@type my_local_t :: integer",
+               spec: "@type my_local_t() :: integer()",
                metadata: %{}
              } == suggestion1
     end
diff --git a/apps/language_server/test/providers/hover/docs_test.exs b/apps/language_server/test/providers/hover/docs_test.exs
index a649c825e..dae8d3dc0 100644
--- a/apps/language_server/test/providers/hover/docs_test.exs
+++ b/apps/language_server/test/providers/hover/docs_test.exs
@@ -510,7 +510,7 @@ defmodule ElixirLS.LanguageServer.Providers.Hover.DocsTest do
                kind: :function,
                metadata: %{implementing: BB, since: "1.2.3"},
                module: BB.String,
-               specs: ["@callback go(t) :: integer()"],
+               specs: ["@callback go(t()) :: integer()"],
                docs: "asdf"
              }
     end

From 7e294e63da145b1127ea4eb3fc200f35a163f47a Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Fri, 2 Aug 2024 07:33:30 +0200
Subject: [PATCH 04/36] remove not needed

---
 .../test/providers/completion/suggestions_test.exs               | 1 -
 .../test/providers/signature_help/signature_test.exs             | 1 -
 2 files changed, 2 deletions(-)

diff --git a/apps/language_server/test/providers/completion/suggestions_test.exs b/apps/language_server/test/providers/completion/suggestions_test.exs
index 10b859ce3..32ecee3a5 100644
--- a/apps/language_server/test/providers/completion/suggestions_test.exs
+++ b/apps/language_server/test/providers/completion/suggestions_test.exs
@@ -3299,7 +3299,6 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
            ]
   end
 
-  @tag :type_inference
   test "suggestion for fields in struct when struct type is attribute" do
     buffer = """
     defmodule MyServer do
diff --git a/apps/language_server/test/providers/signature_help/signature_test.exs b/apps/language_server/test/providers/signature_help/signature_test.exs
index ea45a18c3..c414f01f1 100644
--- a/apps/language_server/test/providers/signature_help/signature_test.exs
+++ b/apps/language_server/test/providers/signature_help/signature_test.exs
@@ -629,7 +629,6 @@ defmodule ElixirLS.LanguageServer.Providers.SignatureHelp.SignatureTest do
              }
     end
 
-    @tag :type_inference
     test "find signatures from variable" do
       code = """
       defmodule MyMod do

From c094dea2606975e4103af8d670594146ae63dbea Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Fri, 9 Aug 2024 23:19:35 +0200
Subject: [PATCH 05/36] wip

---
 apps/debug_adapter/mix.exs                    |  2 +-
 apps/elixir_ls_utils/mix.exs                  |  3 +-
 .../providers/definition/locator.ex           | 17 +++++----
 .../language_server/providers/hover/docs.ex   |  2 +-
 .../providers/references/locator.ex           |  2 +-
 apps/language_server/mix.exs                  |  2 +-
 .../providers/definition/locator_test.exs     | 36 ++++++++++++-------
 7 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/apps/debug_adapter/mix.exs b/apps/debug_adapter/mix.exs
index 3b274f969..ce21e74a5 100644
--- a/apps/debug_adapter/mix.exs
+++ b/apps/debug_adapter/mix.exs
@@ -37,7 +37,7 @@ defmodule ElixirLS.DebugAdapter.MixProject do
 
   defp deps do
     [
-      {:elixir_sense, github: "elixir-lsp/elixir_sense", ref: @dep_versions[:elixir_sense]},
+      {:elixir_sense, path: "~/elixir_sense"},
       {:elixir_ls_utils, in_umbrella: true},
       {:jason_v, github: "elixir-lsp/jason", ref: @dep_versions[:jason_v]},
       {:dialyxir_vendored,
diff --git a/apps/elixir_ls_utils/mix.exs b/apps/elixir_ls_utils/mix.exs
index 517f56f45..8982c73cf 100644
--- a/apps/elixir_ls_utils/mix.exs
+++ b/apps/elixir_ls_utils/mix.exs
@@ -37,7 +37,8 @@ defmodule ElixirLS.Utils.MixProject do
 
   defp deps do
     [
-      {:elixir_sense, github: "elixir-lsp/elixir_sense", ref: @dep_versions[:elixir_sense]},
+      # {:elixir_sense, github: "elixir-lsp/elixir_sense", ref: @dep_versions[:elixir_sense]},
+      {:elixir_sense, path: "~/elixir_sense"},
       {:jason_v, github: "elixir-lsp/jason", ref: @dep_versions[:jason_v]},
       {:mix_task_archive_deps, github: "elixir-lsp/mix_task_archive_deps"},
       {:dialyxir_vendored,
diff --git a/apps/language_server/lib/language_server/providers/definition/locator.ex b/apps/language_server/lib/language_server/providers/definition/locator.ex
index 60cc0e3ce..2641dcc3f 100644
--- a/apps/language_server/lib/language_server/providers/definition/locator.ex
+++ b/apps/language_server/lib/language_server/providers/definition/locator.ex
@@ -38,13 +38,12 @@ defmodule ElixirLS.LanguageServer.Providers.Definition.Locator do
             Parser.parse_string(code, true, true, {line, column})
           end)
 
-        env =
-          Metadata.get_env(metadata, {line, column})
-          |> Metadata.add_scope_vars(metadata, {line, column})
+        env = Metadata.get_cursor_env(metadata, {line, column}, {context.begin, context.end})
 
         find(
           context,
-          env,
+          env
+          |> Metadata.add_scope_vars(metadata, {line, column}),
           metadata
         )
     end
@@ -78,13 +77,17 @@ defmodule ElixirLS.LanguageServer.Providers.Definition.Locator do
       {:keyword, _} ->
         nil
 
-      {:variable, variable} ->
+      {:variable, variable, version} ->
+        dbg(context)
+
         var_info =
           vars
           |> Enum.find(fn
-            %VarInfo{name: name, positions: positions} ->
-              name == variable and context.begin in positions
+            %VarInfo{} = info ->
+              info.name == variable and (info.version == version or version == :any) and
+                context.begin in info.positions
           end)
+          |> dbg
 
         if var_info != nil do
           {definition_line, definition_column} = Enum.min(var_info.positions)
diff --git a/apps/language_server/lib/language_server/providers/hover/docs.ex b/apps/language_server/lib/language_server/providers/hover/docs.ex
index 0c65633a6..a8345d3cf 100644
--- a/apps/language_server/lib/language_server/providers/hover/docs.ex
+++ b/apps/language_server/lib/language_server/providers/hover/docs.ex
@@ -81,7 +81,7 @@ defmodule ElixirLS.LanguageServer.Providers.Hover.Docs do
             Parser.parse_string(code, true, true, {line, column})
           end)
 
-        env = Metadata.get_env(metadata, {line, column})
+        env = Metadata.get_cursor_env(metadata, {line, column}, {begin_pos, end_pos})
 
         case all(context, env, metadata) do
           [] ->
diff --git a/apps/language_server/lib/language_server/providers/references/locator.ex b/apps/language_server/lib/language_server/providers/references/locator.ex
index c196bee3c..105172503 100644
--- a/apps/language_server/lib/language_server/providers/references/locator.ex
+++ b/apps/language_server/lib/language_server/providers/references/locator.ex
@@ -36,7 +36,7 @@ defmodule ElixirLS.LanguageServer.Providers.References.Locator do
           %State.Env{
             module: module
           } =
-          Metadata.get_env(metadata, {line, column})
+          Metadata.get_cursor_env(metadata, {line, column}, {context.begin, context.end})
           |> Metadata.add_scope_vars(metadata, {line, column})
 
         # find last env of current module
diff --git a/apps/language_server/mix.exs b/apps/language_server/mix.exs
index 6d8642ef9..f5318d0b3 100644
--- a/apps/language_server/mix.exs
+++ b/apps/language_server/mix.exs
@@ -37,8 +37,8 @@ defmodule ElixirLS.LanguageServer.MixProject do
   defp deps do
     [
       {:elixir_ls_utils, in_umbrella: true},
-      {:elixir_sense, github: "elixir-lsp/elixir_sense", ref: @dep_versions[:elixir_sense]},
       {:erl2ex_vendored, github: "elixir-lsp/erl2ex", ref: @dep_versions[:erl2ex_vendored]},
+      {:elixir_sense, path: "~/elixir_sense"},
       {:dialyxir_vendored,
        github: "elixir-lsp/dialyxir", ref: @dep_versions[:dialyxir_vendored], runtime: false},
       {:jason_v, github: "elixir-lsp/jason", ref: @dep_versions[:jason_v]},
diff --git a/apps/language_server/test/providers/definition/locator_test.exs b/apps/language_server/test/providers/definition/locator_test.exs
index 0dc7b85bd..40330f3ec 100644
--- a/apps/language_server/test/providers/definition/locator_test.exs
+++ b/apps/language_server/test/providers/definition/locator_test.exs
@@ -921,19 +921,19 @@ defmodule ElixirLS.LanguageServer.Providers.Definition.LocatorTest do
     end
     """
 
-    assert Locator.definition(buffer, 2, 32) == %Location{
-             type: :variable,
-             file: nil,
-             line: 2,
-             column: 14
-           }
-
-    assert Locator.definition(buffer, 4, 16) == %Location{
-             type: :variable,
-             file: nil,
-             line: 4,
-             column: 7
-           }
+    # assert Locator.definition(buffer, 2, 32) == %Location{
+    #          type: :variable,
+    #          file: nil,
+    #          line: 2,
+    #          column: 14
+    #        }
+
+    # assert Locator.definition(buffer, 4, 16) == %Location{
+    #          type: :variable,
+    #          file: nil,
+    #          line: 4,
+    #          column: 7
+    #        }
 
     assert Locator.definition(buffer, 7, 32) == %Location{
              type: :variable,
@@ -1102,6 +1102,16 @@ defmodule ElixirLS.LanguageServer.Providers.Definition.LocatorTest do
            }
 
     # `a` redefined in a case clause
+    # TODO cursor lands in the wrong clause
+    # defmodule MyModule do
+    #   def my_fun(a, b) do
+    #     case a do
+    #       ^b ->
+    #         b
+    #         %{b: ^b} = __cursor__()
+    #     end
+    #   end
+    # end
     assert Locator.definition(buffer, 5, 18) == %Location{
              type: :variable,
              file: nil,

From f5ba4377b77267dcc6c67c0b14bbbb43c0c088ca Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Sun, 18 Aug 2024 18:41:42 +0200
Subject: [PATCH 06/36] definition, references, haver, implementation,
 signature_help working

---
 .../completion/reducers/type_specs.ex         | 10 ++++-
 .../providers/definition/locator.ex           | 31 ++++++++++++---
 .../language_server/providers/hover/docs.ex   |  1 +
 .../providers/implementation/locator.ex       | 38 +++++++++++++++++--
 .../providers/references/locator.ex           |  3 ++
 .../providers/definition/locator_test.exs     |  4 +-
 .../providers/references/locator_test.exs     |  4 +-
 7 files changed, 77 insertions(+), 14 deletions(-)

diff --git a/apps/language_server/lib/language_server/providers/completion/reducers/type_specs.ex b/apps/language_server/lib/language_server/providers/completion/reducers/type_specs.ex
index 89b2ba4bf..ade1f0c79 100644
--- a/apps/language_server/lib/language_server/providers/completion/reducers/type_specs.ex
+++ b/apps/language_server/lib/language_server/providers/completion/reducers/type_specs.ex
@@ -67,7 +67,15 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.Reducers.TypeSpecs do
     {:cont, acc}
   end
 
-  defp expand({{kind, _} = type, hint}, env, aliases) when kind in [:attribute, :variable] do
+  defp expand({{:attribute, _} = type, hint}, env, aliases) do
+    # TODO Binding should return expanded aliases
+    case Binding.expand(env, type) do
+      {:atom, module} -> {Introspection.expand_alias(module, aliases), hint}
+      _ -> {nil, ""}
+    end
+  end
+
+  defp expand({{:variable, _, _} = type, hint}, env, aliases) do
     # TODO Binding should return expanded aliases
     case Binding.expand(env, type) do
       {:atom, module} -> {Introspection.expand_alias(module, aliases), hint}
diff --git a/apps/language_server/lib/language_server/providers/definition/locator.ex b/apps/language_server/lib/language_server/providers/definition/locator.ex
index 2641dcc3f..8dd8f79e7 100644
--- a/apps/language_server/lib/language_server/providers/definition/locator.ex
+++ b/apps/language_server/lib/language_server/providers/definition/locator.ex
@@ -78,7 +78,6 @@ defmodule ElixirLS.LanguageServer.Providers.Definition.Locator do
         nil
 
       {:variable, variable, version} ->
-        dbg(context)
 
         var_info =
           vars
@@ -87,7 +86,6 @@ defmodule ElixirLS.LanguageServer.Providers.Definition.Locator do
               info.name == variable and (info.version == version or version == :any) and
                 context.begin in info.positions
           end)
-          |> dbg
 
         if var_info != nil do
           {definition_line, definition_column} = Enum.min(var_info.positions)
@@ -146,14 +144,37 @@ defmodule ElixirLS.LanguageServer.Providers.Definition.Locator do
   end
 
   defp do_find_function_or_module(
-         {{kind, _} = type, function},
+         {{:variable, _, _} = type, function},
          context,
          env,
          metadata,
          binding_env,
          visited
-       )
-       when kind in [:attribute, :variable] do
+       ) do
+    case Binding.expand(binding_env, type) do
+      {:atom, module} ->
+        do_find_function_or_module(
+          {{:atom, module}, function},
+          context,
+          env,
+          metadata,
+          binding_env,
+          visited
+        )
+
+      _ ->
+        nil
+    end
+  end
+
+  defp do_find_function_or_module(
+         {{:attribute, _} = type, function},
+         context,
+         env,
+         metadata,
+         binding_env,
+         visited
+       ) do
     case Binding.expand(binding_env, type) do
       {:atom, module} ->
         do_find_function_or_module(
diff --git a/apps/language_server/lib/language_server/providers/hover/docs.ex b/apps/language_server/lib/language_server/providers/hover/docs.ex
index a8345d3cf..569a49fdf 100644
--- a/apps/language_server/lib/language_server/providers/hover/docs.ex
+++ b/apps/language_server/lib/language_server/providers/hover/docs.ex
@@ -82,6 +82,7 @@ defmodule ElixirLS.LanguageServer.Providers.Hover.Docs do
           end)
 
         env = Metadata.get_cursor_env(metadata, {line, column}, {begin_pos, end_pos})
+        |> Metadata.add_scope_vars(metadata, {line, column})
 
         case all(context, env, metadata) do
           [] ->
diff --git a/apps/language_server/lib/language_server/providers/implementation/locator.ex b/apps/language_server/lib/language_server/providers/implementation/locator.ex
index 89bcbe567..fd4b24817 100644
--- a/apps/language_server/lib/language_server/providers/implementation/locator.ex
+++ b/apps/language_server/lib/language_server/providers/implementation/locator.ex
@@ -154,7 +154,14 @@ defmodule ElixirLS.LanguageServer.Providers.Implementation.Locator do
     |> Enum.reject(&is_nil/1)
   end
 
-  defp expand({kind, _attr} = type, binding_env) when kind in [:attribute, :variable] do
+  defp expand({:attribute, _attr} = type, binding_env) do
+    case Binding.expand(binding_env, type) do
+      {:atom, atom} -> atom
+      _ -> nil
+    end
+  end
+
+  defp expand({:variable, _, _} = type, binding_env) do
     case Binding.expand(binding_env, type) do
       {:atom, atom} -> atom
       _ -> nil
@@ -226,14 +233,37 @@ defmodule ElixirLS.LanguageServer.Providers.Implementation.Locator do
   end
 
   defp do_find_delegatee(
-         {{kind, _} = type, function},
+         {{:attribute, _} = type, function},
+         arity,
+         env,
+         metadata,
+         binding_env,
+         visited
+       ) do
+    case Binding.expand(binding_env, type) do
+      {:atom, module} ->
+        do_find_delegatee(
+          {module, function},
+          arity,
+          env,
+          metadata,
+          binding_env,
+          visited
+        )
+
+      _ ->
+        nil
+    end
+  end
+
+  defp do_find_delegatee(
+         {{:variable, _, _} = type, function},
          arity,
          env,
          metadata,
          binding_env,
          visited
-       )
-       when kind in [:attribute, :variable] do
+       ) do
     case Binding.expand(binding_env, type) do
       {:atom, module} ->
         do_find_delegatee(
diff --git a/apps/language_server/lib/language_server/providers/references/locator.ex b/apps/language_server/lib/language_server/providers/references/locator.ex
index 105172503..4fd6d124c 100644
--- a/apps/language_server/lib/language_server/providers/references/locator.ex
+++ b/apps/language_server/lib/language_server/providers/references/locator.ex
@@ -32,6 +32,9 @@ defmodule ElixirLS.LanguageServer.Providers.References.Locator do
             Parser.parse_string(code, true, true, {line, column})
           end)
 
+        # if context is var try to find env by scope_id
+        # find scopes that contain this variable
+
         env =
           %State.Env{
             module: module
diff --git a/apps/language_server/test/providers/definition/locator_test.exs b/apps/language_server/test/providers/definition/locator_test.exs
index 40330f3ec..63551d114 100644
--- a/apps/language_server/test/providers/definition/locator_test.exs
+++ b/apps/language_server/test/providers/definition/locator_test.exs
@@ -820,7 +820,7 @@ defmodule ElixirLS.LanguageServer.Providers.Definition.LocatorTest do
            }
   end
 
-  test "find definition of functions when name same as variable - parens preferes function" do
+  test "find definition of functions when name same as variable - parens prefers function" do
     buffer = """
     defmodule MyModule do
       def my_fun(), do: :ok
@@ -840,7 +840,7 @@ defmodule ElixirLS.LanguageServer.Providers.Definition.LocatorTest do
            }
   end
 
-  test "find definition of variables when name same as function - no parens preferes variable" do
+  test "find definition of variables when name same as function - no parens prefers variable" do
     buffer = """
     defmodule MyModule do
       def my_fun(), do: :ok
diff --git a/apps/language_server/test/providers/references/locator_test.exs b/apps/language_server/test/providers/references/locator_test.exs
index a6fa457f1..e89805be1 100644
--- a/apps/language_server/test/providers/references/locator_test.exs
+++ b/apps/language_server/test/providers/references/locator_test.exs
@@ -1439,8 +1439,8 @@ defmodule ElixirLS.LanguageServer.Providers.References.LocatorTest do
     expected_references = [
       %{uri: nil, range: %{start: %{line: 3, column: 5}, end: %{line: 3, column: 8}}},
       %{uri: nil, range: %{start: %{line: 5, column: 12}, end: %{line: 5, column: 15}}},
-      %{uri: nil, range: %{start: %{line: 6, column: 11}, end: %{line: 6, column: 14}}},
-      %{uri: nil, range: %{start: %{line: 8, column: 23}, end: %{line: 8, column: 26}}}
+      %{uri: nil, range: %{start: %{line: 8, column: 23}, end: %{line: 8, column: 26}}},
+      %{uri: nil, range: %{start: %{line: 6, column: 11}, end: %{line: 6, column: 14}}}
     ]
 
     Enum.each([{3, 5}, {5, 12}, {6, 11}, {8, 23}], fn {line, column} ->

From 4d190cd0fe6c882a4588691c1e350a298bd53312 Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Tue, 20 Aug 2024 07:59:57 +0200
Subject: [PATCH 07/36] fix tests

---
 .../providers/completion/suggestion.ex        | 20 ++++++++++++--
 .../providers/completion/suggestions_test.exs | 26 +++++++++----------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/apps/language_server/lib/language_server/providers/completion/suggestion.ex b/apps/language_server/lib/language_server/providers/completion/suggestion.ex
index ef265ef4e..79eb6151f 100644
--- a/apps/language_server/lib/language_server/providers/completion/suggestion.ex
+++ b/apps/language_server/lib/language_server/providers/completion/suggestion.ex
@@ -53,6 +53,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.Suggestion do
   alias ElixirSense.Core.Parser
   alias ElixirSense.Core.Source
   alias ElixirLS.LanguageServer.Providers.Completion.Reducers
+  alias ElixirSense.Core.Normalized.Code, as: NormalizedCode
 
   @type generic :: %{
           type: :generic,
@@ -109,7 +110,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.Suggestion do
 
   @spec suggestions(String.t(), pos_integer, pos_integer, keyword()) :: [Suggestion.suggestion()]
   def suggestions(code, line, column, options \\ []) do
-    hint = Source.prefix(code, line, column)
+    {prefix = hint, suffix} = Source.prefix_suffix(code, line, column)
 
     metadata =
       Keyword.get_lazy(options, :metadata, fn ->
@@ -126,8 +127,23 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.Suggestion do
         {line, column}
       )
 
+    # TODO test surround_context
+    # surround = case NormalizedCode.Fragment.surround_context(code, {line, column}) do
+    #   :none ->
+    #     nil
+
+    #   context ->
+    #     {context.begin, context.end}
+    #   end
+
+    surround = case {prefix, suffix} do
+      {"", ""} -> nil
+      _ ->
+        {{line, column - String.length(prefix)}, {line, column + String.length(suffix)}}
+    end
+
     env =
-      Metadata.get_env(metadata, {line, column})
+      Metadata.get_cursor_env(metadata, {line, column}, surround)
       |> Metadata.add_scope_vars(
         metadata,
         {line, column},
diff --git a/apps/language_server/test/providers/completion/suggestions_test.exs b/apps/language_server/test/providers/completion/suggestions_test.exs
index 32ecee3a5..fa61f59d8 100644
--- a/apps/language_server/test/providers/completion/suggestions_test.exs
+++ b/apps/language_server/test/providers/completion/suggestions_test.exs
@@ -498,7 +498,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
     """
 
     list =
-      Suggestion.suggestions(buffer, 11, 3)
+      Suggestion.suggestions(buffer, 12, 3)
       |> Enum.filter(fn s -> s.type == :protocol_function end)
 
     assert [
@@ -509,7 +509,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
                metadata: %{since: "1.2.3"},
                name: "my_fun",
                origin: "MyProto",
-               spec: "@callback my_fun(t()) :: term",
+               spec: "@callback my_fun(t()) :: term()",
                summary: "Some callback",
                type: :protocol_function
              },
@@ -969,7 +969,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
     assert list == [
              %{
                description: "{:ok, term()}",
-               snippet: "{:ok, term()}",
+               snippet: "{:ok, \"${1:term()}$\"}",
                spec: "{:ok, term()}",
                type: :return
              },
@@ -993,13 +993,13 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
     assert [
              %{
                description: "{:ok, non_neg_integer()}",
-               snippet: "{:ok, non_neg_integer()}",
+               snippet: "{:ok, \"${1:non_neg_integer()}$\"}",
                spec: "{:ok, non_neg_integer()}",
                type: :return
              },
              %{
                description: "{:error, module()}",
-               snippet: "{:error, module()}",
+               snippet: "{:error, \"${1:module()}$\"}",
                spec: "{:error, module()}",
                type: :return
              }
@@ -1027,7 +1027,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
     assert [
              %{
                description: "{:ok, term()}",
-               snippet: "{:ok, term()}",
+               snippet: "{:ok, \"${1:term()}$\"}",
                spec: "{:ok, term()}",
                type: :return
              },
@@ -1052,9 +1052,9 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
     assert [
              %{description: ":ok", snippet: ":ok", spec: ":ok", type: :return},
              %{
-               description: "{:error, any}",
-               snippet: "{:error, \"${1:any}$\"}",
-               spec: "{:error, any}",
+               description: "{:error, any()}",
+               snippet: "{:error, \"${1:any()}$\"}",
+               spec: "{:error, any()}",
                type: :return
              }
            ] == list
@@ -1851,9 +1851,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
     assert_received {:result, list}
 
     assert list == [
-             %{name: "arg", type: :variable},
-             # FIXME my is not defined, should not be in the list
-             %{name: "my", type: :variable}
+             %{name: "arg", type: :variable}
            ]
   end
 
@@ -2097,7 +2095,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
       """
 
       list =
-        Suggestion.suggestions(buffer, 2, 5)
+        Suggestion.suggestions(buffer, 3, 5)
         |> Enum.filter(fn s -> s.type == :attribute end)
         |> Enum.map(fn %{name: name} -> name end)
 
@@ -2498,7 +2496,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
                type: :function,
                args: "a",
                args_list: ["a"],
-               spec: "@spec test_fun_pub(integer) :: atom",
+               spec: "@spec test_fun_pub(integer()) :: atom()",
                summary: "",
                metadata: %{},
                snippet: nil,

From 216f9df5b276815dc56ef0c918d7fce0779e2ca9 Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Tue, 20 Aug 2024 08:04:34 +0200
Subject: [PATCH 08/36] Revert local elixir_sense

---
 apps/debug_adapter/mix.exs   | 2 +-
 apps/elixir_ls_utils/mix.exs | 3 +--
 apps/language_server/mix.exs | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/debug_adapter/mix.exs b/apps/debug_adapter/mix.exs
index ce21e74a5..3b274f969 100644
--- a/apps/debug_adapter/mix.exs
+++ b/apps/debug_adapter/mix.exs
@@ -37,7 +37,7 @@ defmodule ElixirLS.DebugAdapter.MixProject do
 
   defp deps do
     [
-      {:elixir_sense, path: "~/elixir_sense"},
+      {:elixir_sense, github: "elixir-lsp/elixir_sense", ref: @dep_versions[:elixir_sense]},
       {:elixir_ls_utils, in_umbrella: true},
       {:jason_v, github: "elixir-lsp/jason", ref: @dep_versions[:jason_v]},
       {:dialyxir_vendored,
diff --git a/apps/elixir_ls_utils/mix.exs b/apps/elixir_ls_utils/mix.exs
index 8982c73cf..517f56f45 100644
--- a/apps/elixir_ls_utils/mix.exs
+++ b/apps/elixir_ls_utils/mix.exs
@@ -37,8 +37,7 @@ defmodule ElixirLS.Utils.MixProject do
 
   defp deps do
     [
-      # {:elixir_sense, github: "elixir-lsp/elixir_sense", ref: @dep_versions[:elixir_sense]},
-      {:elixir_sense, path: "~/elixir_sense"},
+      {:elixir_sense, github: "elixir-lsp/elixir_sense", ref: @dep_versions[:elixir_sense]},
       {:jason_v, github: "elixir-lsp/jason", ref: @dep_versions[:jason_v]},
       {:mix_task_archive_deps, github: "elixir-lsp/mix_task_archive_deps"},
       {:dialyxir_vendored,
diff --git a/apps/language_server/mix.exs b/apps/language_server/mix.exs
index f5318d0b3..6d8642ef9 100644
--- a/apps/language_server/mix.exs
+++ b/apps/language_server/mix.exs
@@ -37,8 +37,8 @@ defmodule ElixirLS.LanguageServer.MixProject do
   defp deps do
     [
       {:elixir_ls_utils, in_umbrella: true},
+      {:elixir_sense, github: "elixir-lsp/elixir_sense", ref: @dep_versions[:elixir_sense]},
       {:erl2ex_vendored, github: "elixir-lsp/erl2ex", ref: @dep_versions[:erl2ex_vendored]},
-      {:elixir_sense, path: "~/elixir_sense"},
       {:dialyxir_vendored,
        github: "elixir-lsp/dialyxir", ref: @dep_versions[:dialyxir_vendored], runtime: false},
       {:jason_v, github: "elixir-lsp/jason", ref: @dep_versions[:jason_v]},

From 98c428958fd5f7dabf632c056cfa2ccef33b7027 Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Tue, 20 Aug 2024 08:06:40 +0200
Subject: [PATCH 09/36] switch to elixir_sense expand branch

---
 dep_versions.exs | 2 +-
 mix.lock         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dep_versions.exs b/dep_versions.exs
index 4b3f8c87f..246caa330 100644
--- a/dep_versions.exs
+++ b/dep_versions.exs
@@ -1,5 +1,5 @@
 [
-  elixir_sense: "4adfc55dc6902f56e6d070e14fba768a0ff05bd3",
+  elixir_sense: "88e3e432f8891687bfe7ad21a2d6e2ddd0e5cef2",
   dialyxir_vendored: "462e599aa7004a32cfa548cc715c9c59e95dacaf",
   jason_v: "c81537e2a5e1acacb915cf339fe400357e3c2aaa",
   erl2ex_vendored: "073ac6b9a44282e718b6050c7b27cedf9217a12a",
diff --git a/mix.lock b/mix.lock
index 48565beea..4306d0c3e 100644
--- 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", "462e599aa7004a32cfa548cc715c9c59e95dacaf", [ref: "462e599aa7004a32cfa548cc715c9c59e95dacaf"]},
-  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "4adfc55dc6902f56e6d070e14fba768a0ff05bd3", [ref: "4adfc55dc6902f56e6d070e14fba768a0ff05bd3"]},
+  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "88e3e432f8891687bfe7ad21a2d6e2ddd0e5cef2", [ref: "88e3e432f8891687bfe7ad21a2d6e2ddd0e5cef2"]},
   "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"]},

From 29f82731435360d5d43fd1cad40b5e4705125687 Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Tue, 20 Aug 2024 10:15:12 +0200
Subject: [PATCH 10/36] bump elixir_sense

---
 dep_versions.exs | 2 +-
 mix.lock         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dep_versions.exs b/dep_versions.exs
index 246caa330..5ea763e26 100644
--- a/dep_versions.exs
+++ b/dep_versions.exs
@@ -1,5 +1,5 @@
 [
-  elixir_sense: "88e3e432f8891687bfe7ad21a2d6e2ddd0e5cef2",
+  elixir_sense: "aa2bea7fde70df5c663e9428053f3848a7f769ed",
   dialyxir_vendored: "462e599aa7004a32cfa548cc715c9c59e95dacaf",
   jason_v: "c81537e2a5e1acacb915cf339fe400357e3c2aaa",
   erl2ex_vendored: "073ac6b9a44282e718b6050c7b27cedf9217a12a",
diff --git a/mix.lock b/mix.lock
index 4306d0c3e..6af34dd4b 100644
--- 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", "462e599aa7004a32cfa548cc715c9c59e95dacaf", [ref: "462e599aa7004a32cfa548cc715c9c59e95dacaf"]},
-  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "88e3e432f8891687bfe7ad21a2d6e2ddd0e5cef2", [ref: "88e3e432f8891687bfe7ad21a2d6e2ddd0e5cef2"]},
+  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "aa2bea7fde70df5c663e9428053f3848a7f769ed", [ref: "aa2bea7fde70df5c663e9428053f3848a7f769ed"]},
   "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"]},

From 690a5f9dbd01c07cfe9cad35fbf2f0902ee3c033 Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Fri, 23 Aug 2024 00:01:11 +0200
Subject: [PATCH 11/36] fix tests on 1.16

---
 .../providers/completion/suggestions_test.exs | 21 ++++---------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/apps/language_server/test/providers/completion/suggestions_test.exs b/apps/language_server/test/providers/completion/suggestions_test.exs
index fa61f59d8..bc4cece72 100644
--- a/apps/language_server/test/providers/completion/suggestions_test.exs
+++ b/apps/language_server/test/providers/completion/suggestions_test.exs
@@ -1637,23 +1637,6 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
            ]
   end
 
-  test "lists vars in unfinished fn" do
-    buffer = """
-    defmodule MyServer do
-      []
-      |> Enum.min_by(fn x -> 
-    end
-    """
-
-    list =
-      Suggestion.suggestions(buffer, 3, 26)
-      |> Enum.filter(fn s -> s.type == :variable end)
-
-    assert list == [
-             %{name: "x", type: :variable}
-           ]
-  end
-
   test "lists vars in string interpolation" do
     buffer = """
     defmodule MyServer do
@@ -1812,6 +1795,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
            ]
   end
 
+  if Version.match?(System.version(), ">= 1.17.0") do
   test "lists params in fn's not finished multiline" do
     buffer = """
     defmodule MyServer do
@@ -1832,7 +1816,9 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
 
     assert list == [%{name: "arg", type: :variable}]
   end
+  end
 
+  if Version.match?(System.version(), ">= 1.17.0") do
   test "lists params in fn's not finished" do
     buffer = """
     defmodule MyServer do
@@ -1854,6 +1840,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
              %{name: "arg", type: :variable}
            ]
   end
+  end
 
   test "lists params in defs not finished" do
     buffer = """

From fe1a056142f3341711d25b1dd7a91025b216e270 Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Fri, 23 Aug 2024 00:32:35 +0200
Subject: [PATCH 12/36] bump elixir_sense

---
 dep_versions.exs | 2 +-
 mix.lock         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dep_versions.exs b/dep_versions.exs
index 5ea763e26..18fbc913f 100644
--- a/dep_versions.exs
+++ b/dep_versions.exs
@@ -1,5 +1,5 @@
 [
-  elixir_sense: "aa2bea7fde70df5c663e9428053f3848a7f769ed",
+  elixir_sense: "b2064c655ecb254f7d3647fe1c60108eb4d0952a",
   dialyxir_vendored: "462e599aa7004a32cfa548cc715c9c59e95dacaf",
   jason_v: "c81537e2a5e1acacb915cf339fe400357e3c2aaa",
   erl2ex_vendored: "073ac6b9a44282e718b6050c7b27cedf9217a12a",
diff --git a/mix.lock b/mix.lock
index 6af34dd4b..05f463c3f 100644
--- 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", "462e599aa7004a32cfa548cc715c9c59e95dacaf", [ref: "462e599aa7004a32cfa548cc715c9c59e95dacaf"]},
-  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "aa2bea7fde70df5c663e9428053f3848a7f769ed", [ref: "aa2bea7fde70df5c663e9428053f3848a7f769ed"]},
+  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "b2064c655ecb254f7d3647fe1c60108eb4d0952a", [ref: "b2064c655ecb254f7d3647fe1c60108eb4d0952a"]},
   "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"]},

From 43f6fe45e344ac5bde9fa7df2ce41764ee9a35c3 Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Fri, 23 Aug 2024 00:44:47 +0200
Subject: [PATCH 13/36] drop 1.12 support

---
 .github/workflows/ci.yml                          | 15 ---------------
 apps/debug_adapter/mix.exs                        |  2 +-
 apps/elixir_ls_utils/lib/minimum_version.ex       |  4 ++--
 apps/elixir_ls_utils/mix.exs                      |  2 +-
 .../lib/language_server/ast_utils.ex              |  4 ++--
 apps/language_server/mix.exs                      |  2 +-
 mix.exs                                           |  2 +-
 7 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a9bd106ed..0c87eaaf3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,15 +16,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - elixir: 1.12.x
-            otp: 22.x
-            tests_may_fail: false
-          - elixir: 1.12.x
-            otp: 23.x
-            tests_may_fail: false
-          - elixir: 1.12.x
-            otp: 24.x
-            tests_may_fail: false
           - elixir: 1.13.x
             otp: 22.x
             tests_may_fail: false
@@ -98,12 +89,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - elixir: 1.12.x
-            otp: 22.x
-          - elixir: 1.12.x
-            otp: 23.x
-          - elixir: 1.12.x
-            otp: 24.x
           - elixir: 1.13.x
             otp: 22.x
           - elixir: 1.13.x
diff --git a/apps/debug_adapter/mix.exs b/apps/debug_adapter/mix.exs
index 3b274f969..18e806d1f 100644
--- a/apps/debug_adapter/mix.exs
+++ b/apps/debug_adapter/mix.exs
@@ -19,7 +19,7 @@ defmodule ElixirLS.DebugAdapter.MixProject do
       config_path: "../../config/config.exs",
       deps_path: "../../deps",
       lockfile: "../../mix.lock",
-      elixir: ">= 1.12.0",
+      elixir: ">= 1.13.0",
       build_embedded: false,
       start_permanent: true,
       build_per_environment: false,
diff --git a/apps/elixir_ls_utils/lib/minimum_version.ex b/apps/elixir_ls_utils/lib/minimum_version.ex
index 0012783e1..d73d9a5d0 100644
--- a/apps/elixir_ls_utils/lib/minimum_version.ex
+++ b/apps/elixir_ls_utils/lib/minimum_version.ex
@@ -16,7 +16,7 @@ defmodule ElixirLS.Utils.MinimumVersion do
   end
 
   def check_elixir_version do
-    if Version.match?(System.version(), ">= 1.12.0") do
+    if Version.match?(System.version(), ">= 1.13.0") do
       if Regex.match?(~r/-/, System.version()) do
         {:error,
          "Only official elixir releases are supported. (Currently running v#{System.version()})"}
@@ -25,7 +25,7 @@ defmodule ElixirLS.Utils.MinimumVersion do
       end
     else
       {:error,
-       "Elixir versions below 1.12.0 are not supported. (Currently running v#{System.version()})"}
+       "Elixir versions below 1.13.0 are not supported. (Currently running v#{System.version()})"}
     end
   end
 
diff --git a/apps/elixir_ls_utils/mix.exs b/apps/elixir_ls_utils/mix.exs
index 517f56f45..c77e10653 100644
--- a/apps/elixir_ls_utils/mix.exs
+++ b/apps/elixir_ls_utils/mix.exs
@@ -20,7 +20,7 @@ defmodule ElixirLS.Utils.MixProject do
       deps_path: "../../deps",
       elixirc_paths: elixirc_paths(Mix.env()),
       lockfile: "../../mix.lock",
-      elixir: ">= 1.12.0",
+      elixir: ">= 1.13.0",
       build_embedded: false,
       start_permanent: false,
       build_per_environment: false,
diff --git a/apps/language_server/lib/language_server/ast_utils.ex b/apps/language_server/lib/language_server/ast_utils.ex
index c1a9113cc..5aa6006d1 100644
--- a/apps/language_server/lib/language_server/ast_utils.ex
+++ b/apps/language_server/lib/language_server/ast_utils.ex
@@ -75,7 +75,7 @@ defmodule ElixirLS.LanguageServer.AstUtils do
                 end
 
               lines = SourceFile.lines(literal)
-              # meta[:indentation] is nil on 1.12
+              # meta[:indentation] is nil on 1.12, not sure this is needed in 1.13+
               indentation = Keyword.get(meta, :indentation, 0)
 
               {line + length(lines), indentation + get_delimiter_length(delimiter)}
@@ -224,7 +224,7 @@ defmodule ElixirLS.LanguageServer.AstUtils do
 
               {last[:line] - 1, last[:column] - 1 + last_length}
             else
-              # last is nil on 1.12
+              # last is nil on 1.12, not sure this is needed in 1.13+
               get_eoe_by_formatting(ast, {line, column}, options)
             end
 
diff --git a/apps/language_server/mix.exs b/apps/language_server/mix.exs
index 6d8642ef9..f463e2752 100644
--- a/apps/language_server/mix.exs
+++ b/apps/language_server/mix.exs
@@ -15,7 +15,7 @@ defmodule ElixirLS.LanguageServer.MixProject do
     [
       app: :language_server,
       version: @version,
-      elixir: ">= 1.12.0",
+      elixir: ">= 1.13.0",
       build_path: "../../_build",
       config_path: "../../config/config.exs",
       deps_path: "../../deps",
diff --git a/mix.exs b/mix.exs
index ee1b6cdbc..5950499c8 100644
--- 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.12.0",
+      elixir: ">= 1.13.0",
       dialyzer: [
         plt_add_apps: [:dialyxir_vendored, :debugger, :dialyzer, :ex_unit, :hex, :mix],
         flags: [

From 2f03c360bc1ffa8c43db9b0d390cac0786b0ad57 Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Fri, 23 Aug 2024 09:53:49 +0200
Subject: [PATCH 14/36] remove 1.12 code

---
 .github/workflows/ci.yml                      |   4 +-
 .../lib/language_server/ast_utils.ex          |  22 +-
 .../lib/language_server/mix_shell.ex          |   7 +-
 .../providers/completion/suggestion.ex        |  13 +-
 .../providers/definition/locator.ex           |   1 -
 .../get_ex_unit_tests_in_file.ex              |  18 +-
 .../language_server/providers/hover/docs.ex   |   5 +-
 .../lib/language_server/tracer.ex             |  16 +-
 apps/language_server/test/ast_utils_test.exs  |  88 +++----
 .../replace_remote_function_test.exs          |  18 +-
 .../type_spec/contract_translator_test.exs    |   7 +-
 .../providers/completion/suggestions_test.exs |  64 ++---
 .../test/providers/document_symbols_test.exs  | 172 +++++++------
 .../execute_command/expand_macro_test.exs     | 226 +++++++-----------
 .../get_ex_unit_tests_in_file_test.exs        |  84 ++++---
 .../providers/references/locator_test.exs     |  75 +++---
 .../test/providers/references_test.exs        |  20 +-
 17 files changed, 358 insertions(+), 482 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0c87eaaf3..80abe187c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -150,8 +150,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - elixir: 1.15.x
-            otp: 25.x
+          - elixir: 1.17.x
+            otp: 27.x
     steps:
       - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
diff --git a/apps/language_server/lib/language_server/ast_utils.ex b/apps/language_server/lib/language_server/ast_utils.ex
index 5aa6006d1..5b9eb1c77 100644
--- a/apps/language_server/lib/language_server/ast_utils.ex
+++ b/apps/language_server/lib/language_server/ast_utils.ex
@@ -75,7 +75,7 @@ defmodule ElixirLS.LanguageServer.AstUtils do
                 end
 
               lines = SourceFile.lines(literal)
-              # meta[:indentation] is nil on 1.12, not sure this is needed in 1.13+
+              # TODO meta[:indentation] is nil on 1.12, not sure this is needed in 1.13+
               indentation = Keyword.get(meta, :indentation, 0)
 
               {line + length(lines), indentation + get_delimiter_length(delimiter)}
@@ -224,7 +224,7 @@ defmodule ElixirLS.LanguageServer.AstUtils do
 
               {last[:line] - 1, last[:column] - 1 + last_length}
             else
-              # last is nil on 1.12, not sure this is needed in 1.13+
+              # TODO last is nil on 1.12, not sure this is needed in 1.13+
               get_eoe_by_formatting(ast, {line, column}, options)
             end
 
@@ -389,17 +389,13 @@ defmodule ElixirLS.LanguageServer.AstUtils do
     line_length = Keyword.get(formatter_opts, :line_length, 98)
 
     code =
-      if Version.match?(System.version(), ">= 1.13.0-dev") do
-        ast
-        |> Code.quoted_to_algebra(
-          escape: false,
-          locals_without_parens: locals_without_parens
-        )
-        |> Inspect.Algebra.format(line_length)
-        |> IO.iodata_to_binary()
-      else
-        Macro.to_string(ast)
-      end
+      ast
+      |> Code.quoted_to_algebra(
+        escape: false,
+        locals_without_parens: locals_without_parens
+      )
+      |> Inspect.Algebra.format(line_length)
+      |> IO.iodata_to_binary()
 
     lines = code |> SourceFile.lines()
 
diff --git a/apps/language_server/lib/language_server/mix_shell.ex b/apps/language_server/lib/language_server/mix_shell.ex
index 78fdbeb07..22ff07a72 100644
--- a/apps/language_server/lib/language_server/mix_shell.ex
+++ b/apps/language_server/lib/language_server/mix_shell.ex
@@ -55,12 +55,7 @@ defmodule ElixirLS.LanguageServer.MixShell do
           true
       end
     else
-      # TODO convert to to normal call when we require elixir 1.13
-      if Version.match?(System.version(), "< 1.13.0-dev") do
-        apply(Mix.Shell.IO, :yes?, [message])
-      else
-        apply(Mix.Shell.IO, :yes?, [message, options])
-      end
+      Mix.Shell.IO.yes?(message, options)
     end
   end
 end
diff --git a/apps/language_server/lib/language_server/providers/completion/suggestion.ex b/apps/language_server/lib/language_server/providers/completion/suggestion.ex
index 79eb6151f..fd9302376 100644
--- a/apps/language_server/lib/language_server/providers/completion/suggestion.ex
+++ b/apps/language_server/lib/language_server/providers/completion/suggestion.ex
@@ -136,11 +136,14 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.Suggestion do
     #     {context.begin, context.end}
     #   end
 
-    surround = case {prefix, suffix} do
-      {"", ""} -> nil
-      _ ->
-        {{line, column - String.length(prefix)}, {line, column + String.length(suffix)}}
-    end
+    surround =
+      case {prefix, suffix} do
+        {"", ""} ->
+          nil
+
+        _ ->
+          {{line, column - String.length(prefix)}, {line, column + String.length(suffix)}}
+      end
 
     env =
       Metadata.get_cursor_env(metadata, {line, column}, surround)
diff --git a/apps/language_server/lib/language_server/providers/definition/locator.ex b/apps/language_server/lib/language_server/providers/definition/locator.ex
index 8dd8f79e7..9959f3c96 100644
--- a/apps/language_server/lib/language_server/providers/definition/locator.ex
+++ b/apps/language_server/lib/language_server/providers/definition/locator.ex
@@ -78,7 +78,6 @@ defmodule ElixirLS.LanguageServer.Providers.Definition.Locator do
         nil
 
       {:variable, variable, version} ->
-
         var_info =
           vars
           |> Enum.find(fn
diff --git a/apps/language_server/lib/language_server/providers/execute_command/get_ex_unit_tests_in_file.ex b/apps/language_server/lib/language_server/providers/execute_command/get_ex_unit_tests_in_file.ex
index 0b4e1c963..836053341 100644
--- a/apps/language_server/lib/language_server/providers/execute_command/get_ex_unit_tests_in_file.ex
+++ b/apps/language_server/lib/language_server/providers/execute_command/get_ex_unit_tests_in_file.ex
@@ -4,19 +4,15 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.GetExUnitTestsInFile
 
   @impl ElixirLS.LanguageServer.Providers.ExecuteCommand
   def execute([uri], _state) do
-    if Version.match?(System.version(), ">= 1.13.0-dev") do
-      path = SourceFile.Path.from_uri(uri)
+    path = SourceFile.Path.from_uri(uri)
 
-      case ExUnitTestTracer.get_tests(path) do
-        {:ok, tests} ->
-          {:ok, tests}
+    case ExUnitTestTracer.get_tests(path) do
+      {:ok, tests} ->
+        {:ok, tests}
 
-        {:error, _reason} ->
-          # TODO catch only Compile and Syntax errors?
-          {:ok, []}
-      end
-    else
-      {:ok, []}
+      {:error, _reason} ->
+        # TODO catch only Compile and Syntax errors?
+        {:ok, []}
     end
   end
 end
diff --git a/apps/language_server/lib/language_server/providers/hover/docs.ex b/apps/language_server/lib/language_server/providers/hover/docs.ex
index 569a49fdf..028d96bb2 100644
--- a/apps/language_server/lib/language_server/providers/hover/docs.ex
+++ b/apps/language_server/lib/language_server/providers/hover/docs.ex
@@ -81,8 +81,9 @@ defmodule ElixirLS.LanguageServer.Providers.Hover.Docs do
             Parser.parse_string(code, true, true, {line, column})
           end)
 
-        env = Metadata.get_cursor_env(metadata, {line, column}, {begin_pos, end_pos})
-        |> Metadata.add_scope_vars(metadata, {line, column})
+        env =
+          Metadata.get_cursor_env(metadata, {line, column}, {begin_pos, end_pos})
+          |> Metadata.add_scope_vars(metadata, {line, column})
 
         case all(context, env, metadata) do
           [] ->
diff --git a/apps/language_server/lib/language_server/tracer.ex b/apps/language_server/lib/language_server/tracer.ex
index ed4afbb42..dbc8602b4 100644
--- a/apps/language_server/lib/language_server/tracer.ex
+++ b/apps/language_server/lib/language_server/tracer.ex
@@ -358,20 +358,16 @@ defmodule ElixirLS.LanguageServer.Tracer do
   defp build_module_info(module, file, line) do
     defs =
       for {name, arity} <- Module.definitions_in(module) do
-        def_info = apply(Module, :get_definition, [module, {name, arity}])
+        def_info = Module.get_definition(module, {name, arity})
         {{name, arity}, build_def_info(def_info)}
       end
 
     attributes =
-      if Version.match?(System.version(), ">= 1.13.0-dev") do
-        for name <- apply(Module, :attributes_in, [module]) do
-          # reading attribute value here breaks unused attributes warnings
-          # https://github.com/elixir-lang/elixir/issues/13168
-          # {name, Module.get_attribute(module, name)}
-          {name, nil}
-        end
-      else
-        []
+      for name <- Module.attributes_in(module) do
+        # reading attribute value here breaks unused attributes warnings
+        # https://github.com/elixir-lang/elixir/issues/13168
+        # {name, Module.get_attribute(module, name)}
+        {name, nil}
       end
 
     %{
diff --git a/apps/language_server/test/ast_utils_test.exs b/apps/language_server/test/ast_utils_test.exs
index 0b8eb086c..c317ca594 100644
--- a/apps/language_server/test/ast_utils_test.exs
+++ b/apps/language_server/test/ast_utils_test.exs
@@ -44,28 +44,20 @@ defmodule ElixirLS.LanguageServer.AstUtilsTest do
       assert get_range(":abc") == range(0, 0, 0, 4)
     end
 
-    if Version.match?(System.version(), ">= 1.13.0-dev") do
-      test "quoted atom string" do
-        assert get_range(":\"abc\"") == range(0, 0, 0, 6)
-      end
+    test "quoted atom string" do
+      assert get_range(":\"abc\"") == range(0, 0, 0, 6)
     end
 
-    if Version.match?(System.version(), ">= 1.13.0-dev") do
-      test "quoted atom charlist" do
-        assert get_range(":'abc'") == range(0, 0, 0, 6)
-      end
+    test "quoted atom charlist" do
+      assert get_range(":'abc'") == range(0, 0, 0, 6)
     end
 
-    if Version.match?(System.version(), ">= 1.13.0-dev") do
-      test "quoted atom string interpolated" do
-        assert get_range(":\"ab\#{inspect(self())}c\"") == range(0, 0, 0, 24)
-      end
+    test "quoted atom string interpolated" do
+      assert get_range(":\"ab\#{inspect(self())}c\"") == range(0, 0, 0, 24)
     end
 
-    if Version.match?(System.version(), ">= 1.13.0-dev") do
-      test "quoted atom charlist interpolated" do
-        assert get_range(":'ab\#{inspect(self())}c'") == range(0, 0, 0, 24)
-      end
+    test "quoted atom charlist interpolated" do
+      assert get_range(":'ab\#{inspect(self())}c'") == range(0, 0, 0, 24)
     end
 
     test "string" do
@@ -88,42 +80,32 @@ defmodule ElixirLS.LanguageServer.AstUtilsTest do
       assert get_range("\"\"\"\nabc\n\"\"\"") == range(0, 0, 2, 3)
     end
 
-    if Version.match?(System.version(), ">= 1.13.0-dev") do
-      test "string heredoc with indentation" do
-        assert get_range("\"\"\"\n  abc\n  \"\"\"") == range(0, 0, 2, 5)
-      end
+    test "string heredoc with indentation" do
+      assert get_range("\"\"\"\n  abc\n  \"\"\"") == range(0, 0, 2, 5)
     end
 
     test "charlist heredoc" do
       assert get_range("'''\nabc\n'''") == range(0, 0, 2, 3)
     end
 
-    if Version.match?(System.version(), ">= 1.13.0-dev") do
-      test "charlist heredoc with indentation" do
-        assert get_range("'''\n  abc\n  '''") == range(0, 0, 2, 5)
-      end
+    test "charlist heredoc with indentation" do
+      assert get_range("'''\n  abc\n  '''") == range(0, 0, 2, 5)
     end
 
     test "string interpolated" do
       assert get_range("\"abc \#{inspect(a)} sd\"") == range(0, 0, 0, 22)
     end
 
-    if Version.match?(System.version(), ">= 1.13.0-dev") do
-      test "charlist interpolated" do
-        assert get_range("'abc \#{inspect(a)} sd'") == range(0, 0, 0, 22)
-      end
+    test "charlist interpolated" do
+      assert get_range("'abc \#{inspect(a)} sd'") == range(0, 0, 0, 22)
     end
 
-    if Version.match?(System.version(), ">= 1.13.0-dev") do
-      test "string heredoc interpolated" do
-        assert get_range("\"\"\"\nab\#{inspect(a)}c\n\"\"\"") == range(0, 0, 2, 3)
-      end
+    test "string heredoc interpolated" do
+      assert get_range("\"\"\"\nab\#{inspect(a)}c\n\"\"\"") == range(0, 0, 2, 3)
     end
 
-    if Version.match?(System.version(), ">= 1.13.0-dev") do
-      test "charlist heredoc interpolated" do
-        assert get_range("'''\nab\#{inspect(a)}c\n'''") == range(0, 0, 2, 3)
-      end
+    test "charlist heredoc interpolated" do
+      assert get_range("'''\nab\#{inspect(a)}c\n'''") == range(0, 0, 2, 3)
     end
 
     test "sigil" do
@@ -336,10 +318,8 @@ defmodule ElixirLS.LanguageServer.AstUtilsTest do
       assert get_range("local.(123)") == range(0, 0, 0, 11)
     end
 
-    if Version.match?(System.version(), ">= 1.13.0-dev") do
-      test "nested call" do
-        assert get_range("local.prop.foo") == range(0, 0, 0, 14)
-      end
+    test "nested call" do
+      assert get_range("local.prop.foo") == range(0, 0, 0, 14)
     end
 
     test "access" do
@@ -375,15 +355,13 @@ defmodule ElixirLS.LanguageServer.AstUtilsTest do
       assert get_range(text) == range(0, 0, 1, 14)
     end
 
-    if Version.match?(System.version(), ">= 1.13.0-dev") do
-      test "remote call pipe no parens" do
-        text = """
-        123
-        |> Some.fun1
-        """
+    test "remote call pipe no parens" do
+      text = """
+      123
+      |> Some.fun1
+      """
 
-        assert get_range(text) == range(0, 0, 1, 12)
-      end
+      assert get_range(text) == range(0, 0, 1, 12)
     end
 
     test "local call pipe" do
@@ -483,15 +461,13 @@ defmodule ElixirLS.LanguageServer.AstUtilsTest do
       assert get_range(text) == range(0, 0, 2, 3)
     end
 
-    if Version.match?(System.version(), ">= 1.13.0-dev") do
-      test "def short notation" do
-        test = ~S"""
-        defp name(%Config{} = config),
-          do: :"#{__MODULE__}_#{config.node_id}_#{config.channel_unique_id}"
-        """
+    test "def short notation" do
+      test = ~S"""
+      defp name(%Config{} = config),
+        do: :"#{__MODULE__}_#{config.node_id}_#{config.channel_unique_id}"
+      """
 
-        assert get_range(test) == range(0, 0, 1, 68)
-      end
+      assert get_range(test) == range(0, 0, 1, 68)
     end
   end
 end
diff --git a/apps/language_server/test/providers/code_action/replace_remote_function_test.exs b/apps/language_server/test/providers/code_action/replace_remote_function_test.exs
index 6a0f95a87..cbc6d27b7 100644
--- a/apps/language_server/test/providers/code_action/replace_remote_function_test.exs
+++ b/apps/language_server/test/providers/code_action/replace_remote_function_test.exs
@@ -125,10 +125,8 @@ defmodule ElixirLS.LanguageServer.Providers.CodeAction.ReplaceRemoteFunctionTest
       }
         |> modify(suggestion: "Enum.concat")
 
-      if Version.match?(System.version(), ">= 1.13.0") do
-        assert result ==
-                 "for x <- Enum.concat([[1], [2], [3]]), do: Enum.concat([[1], [2], [3], [x]])"
-      end
+      assert result ==
+               "for x <- Enum.concat([[1], [2], [3]]), do: Enum.concat([[1], [2], [3], [x]])"
     end
 
     test "applied in a with block" do
@@ -138,9 +136,7 @@ defmodule ElixirLS.LanguageServer.Providers.CodeAction.ReplaceRemoteFunctionTest
       }
         |> modify()
 
-      if Version.match?(System.version(), ">= 1.13.0") do
-        assert result == "with x <- Enum.count([1, 2, 3]), do: x"
-      end
+      assert result == "with x <- Enum.count([1, 2, 3]), do: x"
     end
 
     test "applied in a with block, preserves comment" do
@@ -150,9 +146,7 @@ defmodule ElixirLS.LanguageServer.Providers.CodeAction.ReplaceRemoteFunctionTest
       }
         |> modify()
 
-      if Version.match?(System.version(), ">= 1.13.0") do
-        assert result == "with x <- Enum.count([1, 2, 3]), do: x # TODO: Fix this"
-      end
+      assert result == "with x <- Enum.count([1, 2, 3]), do: x # TODO: Fix this"
     end
 
     test "applied in a with block with started do end" do
@@ -162,9 +156,7 @@ defmodule ElixirLS.LanguageServer.Providers.CodeAction.ReplaceRemoteFunctionTest
       }
         |> modify()
 
-      if Version.match?(System.version(), ">= 1.13.0") do
-        assert result == "with x <- Enum.count([1, 2, 3]) do"
-      end
+      assert result == "with x <- Enum.count([1, 2, 3]) do"
     end
 
     test "preserving the leading indent" do
diff --git a/apps/language_server/test/providers/code_lens/type_spec/contract_translator_test.exs b/apps/language_server/test/providers/code_lens/type_spec/contract_translator_test.exs
index a52396db5..bb75fca37 100644
--- a/apps/language_server/test/providers/code_lens/type_spec/contract_translator_test.exs
+++ b/apps/language_server/test/providers/code_lens/type_spec/contract_translator_test.exs
@@ -158,12 +158,7 @@ defmodule ElixirLS.LanguageServer.Providers.CodeLens.TypeSpec.ContractTranslator
   test "map with fields" do
     contract = ~c"(any()) -> \#{integer()=>any(), 1:=atom(), abc:=4}"
 
-    expected =
-      if Version.match?(System.version(), "< 1.13.0") do
-        "foo(any()) :: %{optional(integer()) => any(), 1 => atom(), :abc => 4}"
-      else
-        "foo(any()) :: %{optional(integer()) => any(), 1 => atom(), abc: 4}"
-      end
+    expected = "foo(any()) :: %{optional(integer()) => any(), 1 => atom(), abc: 4}"
 
     assert expected ==
              ContractTranslator.translate_contract(:foo, contract, false, Atom)
diff --git a/apps/language_server/test/providers/completion/suggestions_test.exs b/apps/language_server/test/providers/completion/suggestions_test.exs
index bc4cece72..1f6bc5868 100644
--- a/apps/language_server/test/providers/completion/suggestions_test.exs
+++ b/apps/language_server/test/providers/completion/suggestions_test.exs
@@ -1796,50 +1796,50 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
   end
 
   if Version.match?(System.version(), ">= 1.17.0") do
-  test "lists params in fn's not finished multiline" do
-    buffer = """
-    defmodule MyServer do
-      my = fn arg ->
+    test "lists params in fn's not finished multiline" do
+      buffer = """
+      defmodule MyServer do
+        my = fn arg ->
 
-    end
-    """
+      end
+      """
 
-    assert capture_io(:stderr, fn ->
-             list =
-               Suggestion.suggestions(buffer, 3, 5)
-               |> Enum.filter(fn s -> s.type == :variable end)
+      assert capture_io(:stderr, fn ->
+               list =
+                 Suggestion.suggestions(buffer, 3, 5)
+                 |> Enum.filter(fn s -> s.type == :variable end)
 
-             send(self(), {:result, list})
-           end) =~ "an expression is always required on the right side of ->"
+               send(self(), {:result, list})
+             end) =~ "an expression is always required on the right side of ->"
 
-    assert_received {:result, list}
+      assert_received {:result, list}
 
-    assert list == [%{name: "arg", type: :variable}]
-  end
+      assert list == [%{name: "arg", type: :variable}]
+    end
   end
 
   if Version.match?(System.version(), ">= 1.17.0") do
-  test "lists params in fn's not finished" do
-    buffer = """
-    defmodule MyServer do
-      my = fn arg ->
-    end
-    """
+    test "lists params in fn's not finished" do
+      buffer = """
+      defmodule MyServer do
+        my = fn arg ->
+      end
+      """
 
-    assert capture_io(:stderr, fn ->
-             list =
-               Suggestion.suggestions(buffer, 2, 19)
-               |> Enum.filter(fn s -> s.type == :variable end)
+      assert capture_io(:stderr, fn ->
+               list =
+                 Suggestion.suggestions(buffer, 2, 19)
+                 |> Enum.filter(fn s -> s.type == :variable end)
 
-             send(self(), {:result, list})
-           end) =~ "an expression is always required on the right side of ->"
+               send(self(), {:result, list})
+             end) =~ "an expression is always required on the right side of ->"
 
-    assert_received {:result, list}
+      assert_received {:result, list}
 
-    assert list == [
-             %{name: "arg", type: :variable}
-           ]
-  end
+      assert list == [
+               %{name: "arg", type: :variable}
+             ]
+    end
   end
 
   test "lists params in defs not finished" do
diff --git a/apps/language_server/test/providers/document_symbols_test.exs b/apps/language_server/test/providers/document_symbols_test.exs
index cdd7d9a6e..5a42fe2e9 100644
--- a/apps/language_server/test/providers/document_symbols_test.exs
+++ b/apps/language_server/test/providers/document_symbols_test.exs
@@ -1627,59 +1627,56 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do
 
     result = DocumentSymbols.symbols(uri, parser_context, true)
 
-    # earlier elixir versions return different ranges
-    if Version.match?(System.version(), ">= 1.13.0") do
-      assert {:ok,
-              [
-                %Protocol.DocumentSymbol{
-                  children: [
-                    %Protocol.DocumentSymbol{
-                      children: [
-                        %Protocol.DocumentSymbol{
-                          children: [],
-                          kind: 7,
-                          name: "name",
-                          range: %{
-                            "end" => %{"character" => 55, "line" => 3},
-                            "start" => %{"character" => 15, "line" => 3}
-                          },
-                          selectionRange: %{
-                            "end" => %{"character" => 55, "line" => 3},
-                            "start" => %{"character" => 15, "line" => 3}
-                          }
+    assert {:ok,
+            [
+              %Protocol.DocumentSymbol{
+                children: [
+                  %Protocol.DocumentSymbol{
+                    children: [
+                      %Protocol.DocumentSymbol{
+                        children: [],
+                        kind: 7,
+                        name: "name",
+                        range: %{
+                          "end" => %{"character" => 55, "line" => 3},
+                          "start" => %{"character" => 15, "line" => 3}
                         },
-                        %Protocol.DocumentSymbol{
-                          children: [],
-                          kind: 7,
-                          name: "age",
-                          range: %{
-                            "end" => %{"character" => 55, "line" => 3},
-                            "start" => %{"character" => 15, "line" => 3}
-                          },
-                          selectionRange: %{
-                            "end" => %{"character" => 55, "line" => 3},
-                            "start" => %{"character" => 15, "line" => 3}
-                          }
+                        selectionRange: %{
+                          "end" => %{"character" => 55, "line" => 3},
+                          "start" => %{"character" => 15, "line" => 3}
                         }
-                      ],
-                      kind: 5,
-                      name: ":user",
-                      detail: :defrecord,
-                      range: %{
-                        "end" => %{"character" => 55, "line" => 3},
-                        "start" => %{"character" => 8, "line" => 3}
                       },
-                      selectionRange: %{
-                        "end" => %{"character" => 55, "line" => 3},
-                        "start" => %{"character" => 8, "line" => 3}
+                      %Protocol.DocumentSymbol{
+                        children: [],
+                        kind: 7,
+                        name: "age",
+                        range: %{
+                          "end" => %{"character" => 55, "line" => 3},
+                          "start" => %{"character" => 15, "line" => 3}
+                        },
+                        selectionRange: %{
+                          "end" => %{"character" => 55, "line" => 3},
+                          "start" => %{"character" => 15, "line" => 3}
+                        }
                       }
+                    ],
+                    kind: 5,
+                    name: ":user",
+                    detail: :defrecord,
+                    range: %{
+                      "end" => %{"character" => 55, "line" => 3},
+                      "start" => %{"character" => 8, "line" => 3}
+                    },
+                    selectionRange: %{
+                      "end" => %{"character" => 55, "line" => 3},
+                      "start" => %{"character" => 8, "line" => 3}
                     }
-                  ],
-                  kind: 2,
-                  name: "MyModule"
-                }
-              ]} = result
-    end
+                  }
+                ],
+                kind: 2,
+                name: "MyModule"
+              }
+            ]} = result
   end
 
   test "[flat] handles records" do
@@ -1695,51 +1692,48 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbolsTest do
 
     result = DocumentSymbols.symbols(uri, parser_context, false)
 
-    # earlier elixir versions return different ranges
-    if Version.match?(System.version(), ">= 1.13.0") do
-      assert {:ok,
-              [
-                %Protocol.SymbolInformation{
-                  name: "MyModule",
-                  kind: 2,
-                  location: %{
-                    range: %{
-                      "end" => %{"character" => 9, "line" => 4},
-                      "start" => %{"character" => 6, "line" => 1}
-                    }
+    assert {:ok,
+            [
+              %Protocol.SymbolInformation{
+                name: "MyModule",
+                kind: 2,
+                location: %{
+                  range: %{
+                    "end" => %{"character" => 9, "line" => 4},
+                    "start" => %{"character" => 6, "line" => 1}
                   }
-                },
-                %Protocol.SymbolInformation{
-                  name: ":user",
-                  kind: 5,
-                  containerName: "MyModule"
-                },
-                %Protocol.SymbolInformation{
-                  containerName: ":user",
-                  kind: 7,
-                  location: %{
-                    range: %{
-                      "end" => %{"character" => 55, "line" => 3},
-                      "start" => %{"character" => 15, "line" => 3}
-                    },
-                    uri: "file:///project/file.ex"
+                }
+              },
+              %Protocol.SymbolInformation{
+                name: ":user",
+                kind: 5,
+                containerName: "MyModule"
+              },
+              %Protocol.SymbolInformation{
+                containerName: ":user",
+                kind: 7,
+                location: %{
+                  range: %{
+                    "end" => %{"character" => 55, "line" => 3},
+                    "start" => %{"character" => 15, "line" => 3}
                   },
-                  name: "name"
+                  uri: "file:///project/file.ex"
                 },
-                %Protocol.SymbolInformation{
-                  containerName: ":user",
-                  kind: 7,
-                  location: %{
-                    range: %{
-                      "end" => %{"character" => 55, "line" => 3},
-                      "start" => %{"character" => 15, "line" => 3}
-                    },
-                    uri: "file:///project/file.ex"
+                name: "name"
+              },
+              %Protocol.SymbolInformation{
+                containerName: ":user",
+                kind: 7,
+                location: %{
+                  range: %{
+                    "end" => %{"character" => 55, "line" => 3},
+                    "start" => %{"character" => 15, "line" => 3}
                   },
-                  name: "age"
-                }
-              ]} = result
-    end
+                  uri: "file:///project/file.ex"
+                },
+                name: "age"
+              }
+            ]} = result
   end
 
   test "[nested] skips docs attributes" do
diff --git a/apps/language_server/test/providers/execute_command/expand_macro_test.exs b/apps/language_server/test/providers/execute_command/expand_macro_test.exs
index 44f5013eb..f5eaf6969 100644
--- a/apps/language_server/test/providers/execute_command/expand_macro_test.exs
+++ b/apps/language_server/test/providers/execute_command/expand_macro_test.exs
@@ -64,73 +64,38 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.ExpandMacroTest do
                }
              })
 
-    if Version.match?(System.version(), "< 1.13.0") do
-      assert res == %{
-               "expand" => """
-               require(ElixirLS.Test.MacroA)
-               ElixirLS.Test.MacroA.__using__([])
-               """,
-               "expandAll" => """
-               require(ElixirLS.Test.MacroA)
-
-               (
-                 import(ElixirLS.Test.MacroA)
-
-                 def(macro_a_func) do
-                   :ok
-                 end
-               )
-               """,
-               "expandOnce" => """
-               require(ElixirLS.Test.MacroA)
-               ElixirLS.Test.MacroA.__using__([])
-               """,
-               "expandPartial" => """
-               require(ElixirLS.Test.MacroA)
-
-               (
-                 import(ElixirLS.Test.MacroA)
-
-                 def(macro_a_func) do
-                   :ok
-                 end
-               )
-               """
-             }
-    else
-      assert res == %{
-               "expand" => """
-               require ElixirLS.Test.MacroA
-               ElixirLS.Test.MacroA.__using__([])
-               """,
-               "expandAll" => """
-               require ElixirLS.Test.MacroA
-
-               (
-                 import ElixirLS.Test.MacroA
-
-                 def macro_a_func do
-                   :ok
-                 end
-               )
-               """,
-               "expandOnce" => """
-               require ElixirLS.Test.MacroA
-               ElixirLS.Test.MacroA.__using__([])
-               """,
-               "expandPartial" => """
-               require ElixirLS.Test.MacroA
-
-               (
-                 import ElixirLS.Test.MacroA
-
-                 def macro_a_func do
-                   :ok
-                 end
-               )
-               """
-             }
-    end
+    assert res == %{
+             "expand" => """
+             require ElixirLS.Test.MacroA
+             ElixirLS.Test.MacroA.__using__([])
+             """,
+             "expandAll" => """
+             require ElixirLS.Test.MacroA
+
+             (
+               import ElixirLS.Test.MacroA
+
+               def macro_a_func do
+                 :ok
+               end
+             )
+             """,
+             "expandOnce" => """
+             require ElixirLS.Test.MacroA
+             ElixirLS.Test.MacroA.__using__([])
+             """,
+             "expandPartial" => """
+             require ElixirLS.Test.MacroA
+
+             (
+               import ElixirLS.Test.MacroA
+
+               def macro_a_func do
+                 :ok
+               end
+             )
+             """
+           }
   end
 
   describe "expand full" do
@@ -144,86 +109,75 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.ExpandMacroTest do
       code = "use Application"
       result = ExpandMacro.expand_full(buffer, code, 2)
 
-      if Version.match?(System.version(), ">= 1.13.0") do
-        assert result.expand_once =~
-                 """
-                 (
-                   require Application
-                   Application.__using__([])
-                 )
-                 """
-                 |> String.trim()
+      assert result.expand_once =~
+               """
+               (
+                 require Application
+                 Application.__using__([])
+               )
+               """
+               |> String.trim()
 
-        assert result.expand =~
-                 """
-                 (
-                   require Application
-                   Application.__using__([])
-                 )
-                 """
-                 |> String.trim()
+      assert result.expand =~
+               """
+               (
+                 require Application
+                 Application.__using__([])
+               )
+               """
+               |> String.trim()
 
-        assert result.expand_partial =~
-                 """
-                 (
-                   require Application
+      assert result.expand_partial =~
+               """
+               (
+                 require Application
 
-                   (
-                     @behaviour Application
-                     @doc false
-                     def stop(_state) do
-                       :ok
-                     end
+                 (
+                   @behaviour Application
+                   @doc false
+                   def stop(_state) do
+                     :ok
+                   end
 
-                     defoverridable Application
-                   )
+                   defoverridable Application
                  )
-                 """
-                 |> String.trim()
+               )
+               """
+               |> String.trim()
+
+      assert result.expand_all =~
+               (if Version.match?(System.version(), ">= 1.14.0") do
+                  """
+                  (
+                    require Application
 
-        assert result.expand_all =~
-                 (if Version.match?(System.version(), ">= 1.14.0") do
-                    """
                     (
-                      require Application
+                      Module.__put_attribute__(MyModule, :behaviour, Application, nil, [])
+                      Module.__put_attribute__(MyModule, :doc, {0, false}, nil, [])
 
-                      (
-                        Module.__put_attribute__(MyModule, :behaviour, Application, nil, [])
-                        Module.__put_attribute__(MyModule, :doc, {0, false}, nil, [])
+                      def stop(_state) do
+                        :ok
+                      end
 
-                        def stop(_state) do
-                          :ok
-                        end
+                      Module.make_overridable(MyModule, Application)
+                  """
+                else
+                  """
+                  (
+                    require Application
 
-                        Module.make_overridable(MyModule, Application)
-                    """
-                  else
-                    """
                     (
-                      require Application
-
-                      (
-                        Module.__put_attribute__(MyModule, :behaviour, Application, nil)
-                        Module.__put_attribute__(MyModule, :doc, {0, false}, nil)
-
-                        def stop(_state) do
-                          :ok
-                        end
-
-                        Module.make_overridable(MyModule, Application)
-                    """
-                  end)
-                 |> String.trim()
-      else
-        assert result.expand_once =~
-                 """
-                 (
-                   require(Application)
-                   Application.__using__([])
-                 )
-                 """
-                 |> String.trim()
-      end
+                      Module.__put_attribute__(MyModule, :behaviour, Application, nil)
+                      Module.__put_attribute__(MyModule, :doc, {0, false}, nil)
+
+                      def stop(_state) do
+                        :ok
+                      end
+
+                      Module.make_overridable(MyModule, Application)
+                  """
+                end)
+               |> String.trim()
     end
 
     test "with errors" do
diff --git a/apps/language_server/test/providers/execute_command/get_ex_unit_tests_in_file_test.exs b/apps/language_server/test/providers/execute_command/get_ex_unit_tests_in_file_test.exs
index 7a5ce50c6..7ca1d4f7d 100644
--- a/apps/language_server/test/providers/execute_command/get_ex_unit_tests_in_file_test.exs
+++ b/apps/language_server/test/providers/execute_command/get_ex_unit_tests_in_file_test.exs
@@ -9,51 +9,49 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.GetExUnitTestsInFileT
     {:ok, %{}}
   end
 
-  if Version.match?(System.version(), ">= 1.13.0") do
-    @tag fixture: true
-    test "return tests" do
-      in_fixture(Path.join(__DIR__, "../../../test_fixtures"), "project_with_tests", fn ->
-        uri = SourceFile.Path.to_uri(Path.join(File.cwd!(), "test/fixture_test.exs"))
+  @tag fixture: true
+  test "return tests" do
+    in_fixture(Path.join(__DIR__, "../../../test_fixtures"), "project_with_tests", fn ->
+      uri = SourceFile.Path.to_uri(Path.join(File.cwd!(), "test/fixture_test.exs"))
 
-        assert {:ok,
-                [
-                  %{
-                    describes: [
-                      %{
-                        describe: nil,
-                        line: nil,
-                        tests: [
-                          %{
-                            line: 19,
-                            name: "this will be a test in future",
-                            type: :test
-                          },
-                          %{line: 6, name: "fixture test", type: :test}
-                        ]
-                      },
-                      %{
-                        describe: "describe with test",
-                        line: 10,
-                        tests: [
-                          %{line: 11, name: "fixture test", type: :test}
-                        ]
-                      }
-                    ],
-                    line: 0,
-                    module: "FixtureTest"
-                  }
-                ]} = GetExUnitTestsInFile.execute([uri], nil)
-      end)
-    end
+      assert {:ok,
+              [
+                %{
+                  describes: [
+                    %{
+                      describe: nil,
+                      line: nil,
+                      tests: [
+                        %{
+                          line: 19,
+                          name: "this will be a test in future",
+                          type: :test
+                        },
+                        %{line: 6, name: "fixture test", type: :test}
+                      ]
+                    },
+                    %{
+                      describe: "describe with test",
+                      line: 10,
+                      tests: [
+                        %{line: 11, name: "fixture test", type: :test}
+                      ]
+                    }
+                  ],
+                  line: 0,
+                  module: "FixtureTest"
+                }
+              ]} = GetExUnitTestsInFile.execute([uri], nil)
+    end)
+  end
 
-    @tag fixture: true
-    test "return empty when file fails to compile" do
-      in_fixture(Path.join(__DIR__, "../../../test_fixtures"), "project_with_tests", fn ->
-        uri = SourceFile.Path.to_uri(Path.join(File.cwd!(), "test/error_test.exs"))
+  @tag fixture: true
+  test "return empty when file fails to compile" do
+    in_fixture(Path.join(__DIR__, "../../../test_fixtures"), "project_with_tests", fn ->
+      uri = SourceFile.Path.to_uri(Path.join(File.cwd!(), "test/error_test.exs"))
 
-        assert {:ok, []} =
-                 GetExUnitTestsInFile.execute([uri], nil)
-      end)
-    end
+      assert {:ok, []} =
+               GetExUnitTestsInFile.execute([uri], nil)
+    end)
   end
 end
diff --git a/apps/language_server/test/providers/references/locator_test.exs b/apps/language_server/test/providers/references/locator_test.exs
index e89805be1..85ee60eae 100644
--- a/apps/language_server/test/providers/references/locator_test.exs
+++ b/apps/language_server/test/providers/references/locator_test.exs
@@ -1094,22 +1094,20 @@ defmodule ElixirLS.LanguageServer.Providers.References.LocatorTest do
 
     references = Locator.references(buffer, 3, 59, trace)
 
-    if Version.match?(System.version(), ">= 1.13.0") do
-      assert references == [
-               %{
-                 range: %{end: %{column: 62, line: 3}, start: %{column: 58, line: 3}},
-                 uri: nil
-               },
-               %{
-                 uri: "test/support/modules_with_references.ex",
-                 range: %{start: %{line: 65, column: 47}, end: %{line: 65, column: 51}}
-               },
-               %{
-                 range: %{end: %{column: 13, line: 70}, start: %{column: 9, line: 70}},
-                 uri: "test/support/modules_with_references.ex"
-               }
-             ]
-    end
+    assert references == [
+             %{
+               range: %{end: %{column: 62, line: 3}, start: %{column: 58, line: 3}},
+               uri: nil
+             },
+             %{
+               uri: "test/support/modules_with_references.ex",
+               range: %{start: %{line: 65, column: 47}, end: %{line: 65, column: 51}}
+             },
+             %{
+               range: %{end: %{column: 13, line: 70}, start: %{column: 9, line: 70}},
+               uri: "test/support/modules_with_references.ex"
+             }
+           ]
   end
 
   test "find references from remote calls with the function in the next line", %{trace: trace} do
@@ -1124,22 +1122,20 @@ defmodule ElixirLS.LanguageServer.Providers.References.LocatorTest do
 
     references = Locator.references(buffer, 3, 59, trace)
 
-    if Version.match?(System.version(), ">= 1.13.0") do
-      assert [
-               %{
-                 range: %{end: %{column: 62, line: 3}, start: %{column: 58, line: 3}},
-                 uri: nil
-               },
-               %{
-                 range: %{end: %{column: 51, line: 65}, start: %{column: 47, line: 65}},
-                 uri: "test/support/modules_with_references.ex"
-               },
-               %{
-                 range: %{end: %{column: 13, line: 70}, start: %{column: 9, line: 70}},
-                 uri: "test/support/modules_with_references.ex"
-               }
-             ] = references
-    end
+    assert [
+             %{
+               range: %{end: %{column: 62, line: 3}, start: %{column: 58, line: 3}},
+               uri: nil
+             },
+             %{
+               range: %{end: %{column: 51, line: 65}, start: %{column: 47, line: 65}},
+               uri: "test/support/modules_with_references.ex"
+             },
+             %{
+               range: %{end: %{column: 13, line: 70}, start: %{column: 9, line: 70}},
+               uri: "test/support/modules_with_references.ex"
+             }
+           ] = references
   end
 
   if Version.match?(System.version(), ">= 1.14.0") do
@@ -1897,16 +1893,9 @@ defmodule ElixirLS.LanguageServer.Providers.References.LocatorTest do
          start: %{column: column_start, line: line_start},
          end: %{column: column_end, line: line_end}
        }) do
-    if Version.match?(System.version(), ">= 1.13.0") do
-      %{
-        start: %{column: column_start, line: line_start},
-        end: %{column: column_end, line: line_end}
-      }
-    else
-      %{
-        start: %{column: column_start - 1, line: line_start},
-        end: %{column: column_end - 1, line: line_end}
-      }
-    end
+    %{
+      start: %{column: column_start, line: line_start},
+      end: %{column: column_end, line: line_end}
+    }
   end
 end
diff --git a/apps/language_server/test/providers/references_test.exs b/apps/language_server/test/providers/references_test.exs
index bf778faa0..398d6a131 100644
--- a/apps/language_server/test/providers/references_test.exs
+++ b/apps/language_server/test/providers/references_test.exs
@@ -217,13 +217,9 @@ defmodule ElixirLS.LanguageServer.Providers.ReferencesTest do
 
     list = References.references(parser_context, uri, line, char, true, File.cwd!())
 
-    if Version.match?(System.version(), ">= 1.13.0-dev") do
-      assert length(list) == 2
-      assert Enum.any?(list, &(&1["uri"] |> String.ends_with?("references_erlang.ex")))
-      assert Enum.any?(list, &(&1["uri"] |> String.ends_with?("references_referenced.ex")))
-    else
-      assert length(list) == 3
-    end
+    assert length(list) == 2
+    assert Enum.any?(list, &(&1["uri"] |> String.ends_with?("references_erlang.ex")))
+    assert Enum.any?(list, &(&1["uri"] |> String.ends_with?("references_referenced.ex")))
   end
 
   test "finds remote references to erlang module" do
@@ -243,13 +239,9 @@ defmodule ElixirLS.LanguageServer.Providers.ReferencesTest do
 
     list = References.references(parser_context, uri, line, char, true, File.cwd!())
 
-    if Version.match?(System.version(), ">= 1.13.0-dev") do
-      assert length(list) == 2
-      assert Enum.any?(list, &(&1["uri"] |> String.ends_with?("references_erlang.ex")))
-      assert Enum.any?(list, &(&1["uri"] |> String.ends_with?("references_referenced.ex")))
-    else
-      assert length(list) == 3
-    end
+    assert length(list) == 2
+    assert Enum.any?(list, &(&1["uri"] |> String.ends_with?("references_erlang.ex")))
+    assert Enum.any?(list, &(&1["uri"] |> String.ends_with?("references_referenced.ex")))
   end
 
   test "finds alias references" do

From 79bc1371ce3763174de9c765c35f72b6341bde28 Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Sun, 1 Sep 2024 12:45:24 +0200
Subject: [PATCH 15/36] remove references to AST and MacroExpander

---
 .../providers/execute_command/expand_macro.ex | 44 +++++------
 .../execute_command/expand_macro_test.exs     | 74 ++++---------------
 2 files changed, 37 insertions(+), 81 deletions(-)

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
index 88fd67d3a..01d9f0295 100644
--- 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
@@ -6,10 +6,11 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.ExpandMacro do
 
   alias ElixirLS.LanguageServer.Server
   alias ElixirSense.Core.Ast
-  alias ElixirSense.Core.MacroExpander
   alias ElixirSense.Core.State
   alias ElixirSense.Core.Parser
   alias ElixirSense.Core.Metadata
+  alias ElixirSense.Core.Compiler
+  alias ElixirLS.LanguageServer.SourceFile
 
   @behaviour ElixirLS.LanguageServer.Providers.ExecuteCommand
 
@@ -17,12 +18,13 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.ExpandMacro do
   def execute([uri, text, line], state)
       when is_binary(text) and is_integer(line) do
     source_file = Server.get_source_file(state, uri)
+    path = get_path(uri)
     cur_text = source_file.text
 
     # TODO change/move this
     if String.trim(text) != "" do
       formatted =
-        expand_full(cur_text, text, line + 1)
+        expand_full(cur_text, text, path, line + 1)
         |> Map.new(fn {key, value} ->
           key =
             key
@@ -45,42 +47,31 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.ExpandMacro do
        %{
          "expand" => "\n",
          "expandAll" => "\n",
-         "expandOnce" => "\n",
-         "expandPartial" => "\n"
+         "expandOnce" => "\n"
        }}
     end
   end
 
-  def expand_full(buffer, code, line) do
+  def expand_full(buffer, code, file, line) do
     buffer_file_metadata = Parser.parse_string(buffer, true, true, {line, 1})
 
     env = Metadata.get_env(buffer_file_metadata, {line, 1})
 
-    do_expand_full(code, env)
+    do_expand_full(code, env, file, line)
   end
 
-  def do_expand_full(code, %State.Env{} = env) do
-    # TODO function and other
-    env =
-      %Macro.Env{
-        macros: env.macros,
-        functions: env.functions,
-        module: env.module,
-        requires: env.requires,
-        aliases: env.aliases
-      }
+  def do_expand_full(code, %State.Env{} = env, file, line) do
+    env = State.Env.to_macro_env(env, file, line)
 
     try do
-      {:ok, expr} = code |> Code.string_to_quoted()
+      expr = code |> Code.string_to_quoted!()
 
-      # Elixir require some meta to expand ast
-      expr = MacroExpander.add_default_meta(expr)
+      {ast, _state, _env} = Compiler.expand(expr, %State{}, env)
 
       %{
         expand_once: expr |> Macro.expand_once(env) |> Macro.to_string(),
         expand: expr |> Macro.expand(env) |> Macro.to_string(),
-        expand_partial: expr |> Ast.expand_partial(env) |> Macro.to_string(),
-        expand_all: expr |> Ast.expand_all(env) |> Macro.to_string()
+        expand_all: ast |> Macro.to_string()
       }
     rescue
       e ->
@@ -89,9 +80,18 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.ExpandMacro do
         %{
           expand_once: message,
           expand: message,
-          expand_partial: message,
           expand_all: message
         }
     end
   end
+
+  defp get_path(uri) do
+    case uri do
+      "file:" <> _ ->
+        SourceFile.Path.from_uri(uri)
+
+      _ ->
+        "nofile"
+    end
+  end
 end
diff --git a/apps/language_server/test/providers/execute_command/expand_macro_test.exs b/apps/language_server/test/providers/execute_command/expand_macro_test.exs
index f5eaf6969..1bace7beb 100644
--- a/apps/language_server/test/providers/execute_command/expand_macro_test.exs
+++ b/apps/language_server/test/providers/execute_command/expand_macro_test.exs
@@ -25,8 +25,7 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.ExpandMacroTest do
     assert res == %{
              "expand" => "\n",
              "expandAll" => "\n",
-             "expandOnce" => "\n",
-             "expandPartial" => "\n"
+             "expandOnce" => "\n"
            }
 
     assert {:ok, res} =
@@ -41,8 +40,7 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.ExpandMacroTest do
     assert res == %{
              "expand" => "abc\n",
              "expandAll" => "abc\n",
-             "expandOnce" => "abc\n",
-             "expandPartial" => "abc\n"
+             "expandOnce" => "abc\n"
            }
   end
 
@@ -70,30 +68,16 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.ExpandMacroTest do
              ElixirLS.Test.MacroA.__using__([])
              """,
              "expandAll" => """
-             require ElixirLS.Test.MacroA
+             ElixirLS.Test.MacroA
 
              (
-               import ElixirLS.Test.MacroA
-
-               def macro_a_func do
-                 :ok
-               end
+               ElixirLS.Test.MacroA
+               {:macro_a_func, 0}
              )
              """,
              "expandOnce" => """
              require ElixirLS.Test.MacroA
              ElixirLS.Test.MacroA.__using__([])
-             """,
-             "expandPartial" => """
-             require ElixirLS.Test.MacroA
-
-             (
-               import ElixirLS.Test.MacroA
-
-               def macro_a_func do
-                 :ok
-               end
-             )
              """
            }
   end
@@ -107,7 +91,7 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.ExpandMacroTest do
       """
 
       code = "use Application"
-      result = ExpandMacro.expand_full(buffer, code, 2)
+      result = ExpandMacro.expand_full(buffer, code, "nofile", 2)
 
       assert result.expand_once =~
                """
@@ -127,39 +111,17 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.ExpandMacroTest do
                """
                |> String.trim()
 
-      assert result.expand_partial =~
-               """
-               (
-                 require Application
-
-                 (
-                   @behaviour Application
-                   @doc false
-                   def stop(_state) do
-                     :ok
-                   end
-
-                   defoverridable Application
-                 )
-               )
-               """
-               |> String.trim()
-
       assert result.expand_all =~
                (if Version.match?(System.version(), ">= 1.14.0") do
                   """
-                  (
-                    require Application
-
-                    (
-                      Module.__put_attribute__(MyModule, :behaviour, Application, nil, [])
-                      Module.__put_attribute__(MyModule, :doc, {0, false}, nil, [])
-
-                      def stop(_state) do
-                        :ok
-                      end
+                  Application
 
-                      Module.make_overridable(MyModule, Application)
+                  (
+                    Application
+                    @doc false
+                    {:stop, 1}
+                    nil
+                  )
                   """
                 else
                   """
@@ -168,7 +130,7 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.ExpandMacroTest do
 
                     (
                       Module.__put_attribute__(MyModule, :behaviour, Application, nil)
-                      Module.__put_attribute__(MyModule, :doc, {0, false}, nil)
+                      Module.__put_attribute__(MyModule, :doc, {2, false}, nil)
 
                       def stop(_state) do
                         :ok
@@ -188,7 +150,7 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.ExpandMacroTest do
       """
 
       code = "{"
-      result = ExpandMacro.expand_full(buffer, code, 2)
+      result = ExpandMacro.expand_full(buffer, code, "nofile", 2)
 
       assert result.expand_once =~
                """
@@ -202,12 +164,6 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.ExpandMacroTest do
                """
                |> String.trim()
 
-      assert result.expand_partial =~
-               """
-               "missing terminator: }\
-               """
-               |> String.trim()
-
       assert result.expand_all =~
                """
                "missing terminator: }\

From f0c4a811c21b361c1ac9168392d23bbf7df2c820 Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Thu, 5 Sep 2024 14:49:56 +0200
Subject: [PATCH 16/36] use env from metadata builder for eval and completions

---
 apps/debug_adapter/lib/debug_adapter/code.ex  | 137 ++++++++++++++
 .../debug_adapter/lib/debug_adapter/server.ex | 176 +++++++++++++-----
 2 files changed, 265 insertions(+), 48 deletions(-)
 create mode 100644 apps/debug_adapter/lib/debug_adapter/code.ex

diff --git a/apps/debug_adapter/lib/debug_adapter/code.ex b/apps/debug_adapter/lib/debug_adapter/code.ex
new file mode 100644
index 000000000..15cf6452e
--- /dev/null
+++ b/apps/debug_adapter/lib/debug_adapter/code.ex
@@ -0,0 +1,137 @@
+defmodule ElixirLS.DebugAdapter.Code do
+  if Version.match?(System.version(), ">= 1.14.0-dev") do
+    defdelegate env_for_eval(env), to: Code
+  else
+    def env_for_eval(%{lexical_tracker: pid} = env) do
+      new_env = %{
+        env
+        | context: nil,
+          context_modules: [],
+          macro_aliases: [],
+          versioned_vars: %{}
+      }
+
+      if is_pid(pid) do
+        if Process.alive?(pid) do
+          new_env
+        else
+          IO.warn("""
+          an __ENV__ with outdated compilation information was given to eval, \
+          call Macro.Env.prune_compile_info/1 to prune it
+          """)
+
+          %{new_env | lexical_tracker: nil, tracers: []}
+        end
+      else
+        %{new_env | tracers: []}
+      end
+    end
+
+    def env_for_eval(opts) when is_list(opts) do
+      env = elixir_env.new()
+
+      line =
+        case Keyword.get(opts, :line) do
+          line_opt when is_integer(line_opt) -> line_opt
+          nil -> Map.get(env, :line)
+        end
+
+      file =
+        case Keyword.get(opts, :file) do
+          file_opt when is_binary(file_opt) -> file_opt
+          nil -> Map.get(env, :file)
+        end
+
+      module =
+        case Keyword.get(opts, :module) do
+          module_opt when is_atom(module_opt) -> module_opt
+          nil -> nil
+        end
+
+      fa =
+        case Keyword.get(opts, :function) do
+          {function, arity} when is_atom(function) and is_integer(arity) -> {function, arity}
+          nil -> nil
+        end
+
+      temp_tracers =
+        case Keyword.get(opts, :tracers) do
+          tracers_opt when is_list(tracers_opt) -> tracers_opt
+          nil -> []
+        end
+
+      aliases =
+        case Keyword.get(opts, :aliases) do
+          aliases_opt when is_list(aliases_opt) ->
+            IO.warn(":aliases option in eval is deprecated")
+            aliases_opt
+
+          nil ->
+            Map.get(env, :aliases)
+        end
+
+      requires =
+        case Keyword.get(opts, :requires) do
+          requires_opt when is_list(requires_opt) ->
+            IO.warn(":requires option in eval is deprecated")
+            MapSet.new(requires_opt)
+
+          nil ->
+            Map.get(env, :requires)
+        end
+
+      functions =
+        case Keyword.get(opts, :functions) do
+          functions_opt when is_list(functions_opt) ->
+            IO.warn(":functions option in eval is deprecated")
+            functions_opt
+
+          nil ->
+            Map.get(env, :functions)
+        end
+
+      macros =
+        case Keyword.get(opts, :macros) do
+          macros_opt when is_list(macros_opt) ->
+            IO.warn(":macros option in eval is deprecated")
+            macros_opt
+
+          nil ->
+            Map.get(env, :macros)
+        end
+
+      {lexical_tracker, tracers} =
+        case Keyword.get(opts, :lexical_tracker) do
+          pid when is_pid(pid) ->
+            IO.warn(":lexical_tracker option in eval is deprecated")
+
+            if Process.alive?(pid) do
+              {pid, temp_tracers}
+            else
+              {nil, []}
+            end
+
+          nil ->
+            IO.warn(":lexical_tracker option in eval is deprecated")
+            {nil, []}
+
+          _ ->
+            {nil, temp_tracers}
+        end
+
+      %{
+        env
+        | file: file,
+          module: module,
+          function: fa,
+          tracers: tracers,
+          macros: macros,
+          functions: functions,
+          lexical_tracker: lexical_tracker,
+          requires: requires,
+          aliases: aliases,
+          line: line
+      }
+    end
+  end
+end
diff --git a/apps/debug_adapter/lib/debug_adapter/server.ex b/apps/debug_adapter/lib/debug_adapter/server.ex
index 5498c9026..a5786d428 100644
--- a/apps/debug_adapter/lib/debug_adapter/server.ex
+++ b/apps/debug_adapter/lib/debug_adapter/server.ex
@@ -249,7 +249,7 @@ defmodule ElixirLS.DebugAdapter.Server do
             first_frame
             | bindings: Map.new(binding),
               dbg_frame?: true,
-              dbg_env: Code.env_for_eval(env),
+              dbg_env: env,
               module: env.module,
               function: env.function,
               file: env.file,
@@ -276,7 +276,7 @@ defmodule ElixirLS.DebugAdapter.Server do
             messages: [],
             bindings: Map.new(binding),
             dbg_frame?: true,
-            dbg_env: Code.env_for_eval(env),
+            dbg_env: env,
             line: env.line || 1
           }
 
@@ -294,11 +294,7 @@ defmodule ElixirLS.DebugAdapter.Server do
                 messages: [],
                 bindings: %{},
                 dbg_frame?: true,
-                dbg_env:
-                  Code.env_for_eval(
-                    file: file,
-                    line: line
-                  ),
+                dbg_env: nil,
                 line: line
               }
             end
@@ -1335,7 +1331,8 @@ defmodule ElixirLS.DebugAdapter.Server do
       end
 
     async_fn = fn ->
-      {binding, env_for_eval} = binding_and_env(state.paused_processes, args["frameId"])
+      frame = frame_for_eval(state.paused_processes, args["frameId"])
+      {_metadata, _env, binding, env_for_eval} = binding_and_env(state.paused_processes, frame)
       value = evaluate_code_expression(expr, binding, env_for_eval)
 
       child_type = Variables.child_type(value)
@@ -1449,23 +1446,18 @@ defmodule ElixirLS.DebugAdapter.Server do
       column = Utils.dap_character_to_elixir(line, column)
       prefix = String.slice(line, 0, column)
 
-      {binding, _env_for_eval} =
-        binding_and_env(state.paused_processes, args["arguments"]["frameId"])
+      frame = frame_for_eval(state.paused_processes, args["arguments"]["frameId"])
 
-      vars =
-        binding
-        |> Enum.map(fn {name, value} ->
-          %ElixirSense.Core.State.VarInfo{
-            name: name,
-            type: ElixirSense.Core.Binding.from_var(value)
-          }
-        end)
+      {metadata, env, _binding, _env_for_eval} = binding_and_env(state.paused_processes, frame)
 
-      env = %ElixirSense.Core.State.Env{vars: vars}
-      metadata = %ElixirSense.Core.Metadata{}
+      cursor_position =
+        case frame do
+          nil -> {1, 1}
+          frame -> {frame.line, 1}
+        end
 
       results =
-        ElixirLS.Utils.CompletionEngine.complete(prefix, env, metadata, {1, 1})
+        ElixirLS.Utils.CompletionEngine.complete(prefix, env, metadata, cursor_position)
         |> Enum.map(&ElixirLS.DebugAdapter.Completions.map/1)
 
       %{"targets" => results}
@@ -1609,7 +1601,9 @@ defmodule ElixirLS.DebugAdapter.Server do
 
   defp evaluate_code_expression(expr, binding, env_or_opts) do
     try do
-      {term, _bindings} = Code.eval_string(expr, binding, env_or_opts)
+      # TODO use Code.env_for_eval when we require elixir 1.14
+      env = ElixirLS.DebugAdapter.Code.env_for_eval(env_or_opts)
+      {term, _bindings} = Code.eval_string(expr, binding, env)
       term
     catch
       kind, error ->
@@ -1628,6 +1622,22 @@ defmodule ElixirLS.DebugAdapter.Server do
     end
   end
 
+  defp frame_for_eval(_paused_processes, nil), do: nil
+
+  defp frame_for_eval(paused_processes, frame_id) do
+    case find_frame(paused_processes, frame_id) do
+      {_pid, %Frame{} = frame} ->
+        frame
+
+      _ ->
+        raise ServerError,
+          message: "argumentError",
+          format: "Unable to find frame {frameId}",
+          variables: %{"frameId" => frame_id},
+          send_telemetry: false
+    end
+  end
+
   # for null frameId DAP spec suggest to return variables in the global scope
   # there is no global scope in erlang/elixir so instead we flat map all variables
   # from all paused processes and evaluator
@@ -1647,35 +1657,38 @@ defmodule ElixirLS.DebugAdapter.Server do
         Binding.to_elixir_variable_names(bindings)
       end)
 
-    {binding, []}
+    {%ElixirSense.Core.Metadata{},
+     update_env_vars_from_binding(%ElixirSense.Core.State.Env{}, binding), binding, []}
   end
 
-  defp binding_and_env(paused_processes, frame_id) do
-    case find_frame(paused_processes, frame_id) do
-      {_pid, %Frame{bindings: bindings, dbg_frame?: dbg_frame?} = frame} when is_map(bindings) ->
-        if dbg_frame? do
-          {bindings |> Enum.to_list(), frame.dbg_env}
-        else
-          {Binding.to_elixir_variable_names(bindings),
-           [
-             file: frame.file,
-             line: frame.line
-           ]}
-        end
+  defp binding_and_env(
+         _paused_processes,
+         %Frame{bindings: bindings, dbg_frame?: dbg_frame?} = frame
+       )
+       when is_map(bindings) do
+    {metadata, env, macro_env} = parse_file(frame.file, frame.line)
 
-      {_pid, %Frame{} = frame} ->
-        {[],
-         [
-           file: frame.file,
-           line: frame.line
-         ]}
-
-      _ ->
-        raise ServerError,
-          message: "argumentError",
-          format: "Unable to find frame {frameId}",
-          variables: %{"frameId" => frame_id},
-          send_telemetry: false
+    if dbg_frame? do
+      if frame.dbg_env do
+        # we are evaluating an expression in dbg breakpoint - take dbg macro env as env for eval
+        # we have exact elixir bindings here
+        env = ElixirSense.Core.State.Env.update_from_macro_env(env, frame.dbg_env)
+        binding = bindings |> Enum.to_list()
+        {metadata, update_env_vars_from_binding(env, binding), binding, frame.dbg_env}
+      else
+        # we are evaluating an expression in dbg breakpoint but frame is upper in the stacktrace
+        # we don't have any bindings here
+        # take env from metadata builder as env for eval
+        {metadata, env, [], macro_env}
+      end
+    else
+      # we are evaluating an expression in OTP debugger breakpoint
+      # take env from metadata builder as env for eval
+      # bindings come from OTP debugger
+      # unfortunately there is no way to select right versions of variables in binding
+      # translation in :elixir_erl_var.translate is one way
+      binding = Binding.to_elixir_variable_names(bindings)
+      {metadata, update_env_vars_from_binding(env, binding), binding, macro_env}
     end
   end
 
@@ -2597,6 +2610,16 @@ defmodule ElixirLS.DebugAdapter.Server do
         status not in [:exit, :no_conn],
         into: %{},
         do: {pid, {function, status, info}}
+  rescue
+    e in MatchError ->
+      if Exception.message(e) =~ ":already_started" do
+        # workaround for a crash in tests (probably caused by race conditions)
+        # ** (MatchError) no match of right hand side value: {:error, {:already_started, #PID<0.385.0>}}
+        # (debugger 5.3.4) dbg_iserver.erl:75: :dbg_iserver.safe_call/1
+        %{}
+      else
+        reraise(e, __STACKTRACE__)
+      end
   end
 
   defp update_threads(state = %__MODULE__{}, snapshot_by_pid \\ get_snapshot_by_pid()) do
@@ -2889,4 +2912,61 @@ defmodule ElixirLS.DebugAdapter.Server do
       GenServer.call(parent, {:request_finished, packet, start_time, result}, :infinity)
     end)
   end
+
+  defp parse_file(file, line) do
+    try do
+      if String.ends_with?(file, ".ex") or String.ends_with?(file, ".exs") do
+        code = File.read!(file)
+        buffer_file_metadata = ElixirSense.Core.Parser.parse_string(code, false, true, {line, 1})
+
+        env = ElixirSense.Core.Metadata.get_env(buffer_file_metadata, {line, 1})
+        # TODO env_for_eval?
+        # should we clear versioned_vars?
+        {buffer_file_metadata, env, ElixirSense.Core.State.Env.to_macro_env(env, file, line)}
+      else
+        # do not try to parse non elixir files
+        {%ElixirSense.Core.Metadata{}, %ElixirSense.Core.State.Env{}, [file: file, line: line]}
+      end
+    rescue
+      error ->
+        {payload, stacktrace} = Exception.blame(:error, error, __STACKTRACE__)
+        message = Exception.format(:error, payload, stacktrace)
+
+        Output.debugger_console(
+          "Unable to parse file #{file}: #{message}; Using stub evaluator environment."
+        )
+
+        {%ElixirSense.Core.Metadata{}, %ElixirSense.Core.State.Env{}, [file: file, line: line]}
+    end
+  end
+
+  defp update_env_vars_from_binding(env, binding) do
+    env_vars = env.vars |> Map.new(&{&1.name, &1})
+    env_var_names = env_vars |> Map.keys()
+    binding_var_names = binding |> Keyword.keys()
+
+    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}} ->
+            # 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}
+
+          {_, {:ok, env_var}} ->
+            # var only in env - keep it, binding may not have everything
+            env_var
+
+          {{:ok, binding_value}, _} ->
+            # var only in binding - add var to env
+            %ElixirSense.Core.State.VarInfo{
+              name: var_name,
+              type: ElixirSense.Core.Binding.from_var(binding_value)
+            }
+        end
+        |> IO.inspect()
+      end
+
+    %{env | vars: vars}
+  end
 end

From ed2d2ca07436289ad4ab62ef71b74e0740b3ec05 Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Thu, 5 Sep 2024 23:44:01 +0200
Subject: [PATCH 17/36] evaluate conditional breakpoints, hit counts and log
 points in Macro.Env obtained from metadata

---
 .../lib/debug_adapter/breakpoint_condition.ex | 101 ++++++---
 .../debug_adapter/lib/debug_adapter/server.ex |  98 +++++----
 .../test/breakpoint_condition_test.exs        | 205 ++++++++++++++----
 apps/debug_adapter/test/debugger_test.exs     |  41 ++--
 4 files changed, 296 insertions(+), 149 deletions(-)

diff --git a/apps/debug_adapter/lib/debug_adapter/breakpoint_condition.ex b/apps/debug_adapter/lib/debug_adapter/breakpoint_condition.ex
index cd514238c..ca7d0cc51 100644
--- a/apps/debug_adapter/lib/debug_adapter/breakpoint_condition.ex
+++ b/apps/debug_adapter/lib/debug_adapter/breakpoint_condition.ex
@@ -16,27 +16,27 @@ defmodule ElixirLS.DebugAdapter.BreakpointCondition do
   @spec register_condition(
           module,
           module,
-          [non_neg_integer],
+          non_neg_integer,
           String.t(),
           String.t() | nil,
-          non_neg_integer
+          String.t()
         ) ::
           {:ok, {module, atom}} | {:error, :limit_reached}
-  def register_condition(name \\ __MODULE__, module, lines, condition, log_message, hit_count) do
+  def register_condition(name \\ __MODULE__, module, line, env, condition, log_message, hit_count) do
     GenServer.call(
       name,
-      {:register_condition, {module, lines}, condition, log_message, hit_count}
+      {:register_condition, {module, line}, env, condition, log_message, hit_count}
     )
   end
 
-  @spec unregister_condition(module, module, [non_neg_integer]) :: :ok
-  def unregister_condition(name \\ __MODULE__, module, lines) do
-    GenServer.cast(name, {:unregister_condition, {module, lines}})
+  @spec unregister_condition(module, module, non_neg_integer) :: :ok
+  def unregister_condition(name \\ __MODULE__, module, line) do
+    GenServer.cast(name, {:unregister_condition, {module, line}})
   end
 
-  @spec has_condition?(module, module, [non_neg_integer]) :: boolean
-  def has_condition?(name \\ __MODULE__, module, lines) do
-    GenServer.call(name, {:has_condition?, {module, lines}})
+  @spec has_condition?(module, module, non_neg_integer) :: boolean
+  def has_condition?(name \\ __MODULE__, module, line) do
+    GenServer.call(name, {:has_condition?, {module, line}})
   end
 
   @spec get_condition(module, non_neg_integer) ::
@@ -96,7 +96,7 @@ defmodule ElixirLS.DebugAdapter.BreakpointCondition do
 
   @impl GenServer
   def handle_call(
-        {:register_condition, key, condition, log_message, hit_count},
+        {:register_condition, key, env, condition, log_message, hit_count},
         _from,
         %{free: free, conditions: conditions} = state
       ) do
@@ -111,7 +111,7 @@ defmodule ElixirLS.DebugAdapter.BreakpointCondition do
               state
               | free: rest,
                 conditions:
-                  conditions |> Map.put(key, {number, {condition, log_message, hit_count}})
+                  conditions |> Map.put(key, {number, {env, condition, log_message, hit_count}})
             }
 
             {:reply, {:ok, {__MODULE__, :"check_#{number}"}}, state}
@@ -120,7 +120,8 @@ defmodule ElixirLS.DebugAdapter.BreakpointCondition do
       {number, _old_condition} ->
         state = %{
           state
-          | conditions: conditions |> Map.put(key, {number, {condition, log_message, hit_count}})
+          | conditions:
+              conditions |> Map.put(key, {number, {env, condition, log_message, hit_count}})
         }
 
         {:reply, {:ok, {__MODULE__, :"check_#{number}"}}, state}
@@ -132,11 +133,11 @@ defmodule ElixirLS.DebugAdapter.BreakpointCondition do
   end
 
   def handle_call({:get_condition, number}, _from, %{conditions: conditions, hits: hits} = state) do
-    {condition, log_message, hit_count} =
+    {env, condition, log_message, hit_count} =
       conditions |> Map.values() |> Enum.find(fn {n, _c} -> n == number end) |> elem(1)
 
     hits = hits |> Map.get(number, 0)
-    {:reply, {condition, log_message, hit_count, hits}, state}
+    {:reply, {env, condition, log_message, hit_count, hits}, state}
   end
 
   def handle_call(:clear, _from, _state) do
@@ -177,14 +178,20 @@ defmodule ElixirLS.DebugAdapter.BreakpointCondition do
   for i <- @range do
     @spec unquote(:"check_#{i}")(term) :: boolean
     def unquote(:"check_#{i}")(binding) do
-      {condition, log_message, hit_count, hits} = get_condition(unquote(i))
+      {env, condition, log_message, hit_count_condition, hits} = get_condition(unquote(i))
       elixir_binding = binding |> ElixirLS.DebugAdapter.Binding.to_elixir_variable_names()
-      result = eval_condition(condition, elixir_binding)
+      result = eval_condition(condition, elixir_binding, env)
 
       result =
         if result do
           register_hit(unquote(i))
           # do not break if hit count not reached
+          # the spec requires:
+          # If both this property and `condition` are specified, `hitCondition` should
+          # be evaluated only if the `condition` is met, and the debug adapter should
+          # stop only if both conditions are met.
+
+          hit_count = eval_hit_condition(hit_count_condition, elixir_binding, env)
           hits + 1 > hit_count
         else
           result
@@ -194,7 +201,9 @@ defmodule ElixirLS.DebugAdapter.BreakpointCondition do
         # Debug Adapter Protocol:
         # If this attribute exists and is non-empty, the backend must not 'break' (stop)
         # but log the message instead. Expressions within {} are interpolated.
-        Output.debugger_console(interpolate(log_message, elixir_binding))
+        # If either `hitCondition` or `condition` is specified, then the message
+        # should only be logged if those conditions are met.
+        Output.debugger_console(interpolate(log_message, elixir_binding, env))
         false
       else
         result
@@ -202,12 +211,12 @@ defmodule ElixirLS.DebugAdapter.BreakpointCondition do
     end
   end
 
-  @spec eval_condition(String.t(), keyword) :: boolean
-  def eval_condition("true", _binding), do: true
+  @spec eval_condition(String.t(), keyword, Macro.Env.t()) :: boolean
+  def eval_condition("true", _binding, _env), do: true
 
-  def eval_condition(condition, elixir_binding) do
+  def eval_condition(condition, elixir_binding, env) do
     try do
-      {term, _bindings} = Code.eval_string(condition, elixir_binding)
+      {term, _bindings} = Code.eval_string(condition, elixir_binding, env)
       if term, do: true, else: false
     catch
       kind, error ->
@@ -219,9 +228,29 @@ defmodule ElixirLS.DebugAdapter.BreakpointCondition do
     end
   end
 
-  def eval_string(expression, elixir_binding) do
+  @spec eval_hit_condition(String.t(), keyword, Macro.Env.t()) :: number
+  def eval_hit_condition("0", _binding, _env), do: 0
+
+  def eval_hit_condition(condition, elixir_binding, env) do
+    try do
+      {term, _bindings} = Code.eval_string(condition, elixir_binding, env)
+
+      if is_number(term) do
+        term
+      else
+        raise "Hit count evaluated to non number #{inspect(term)}"
+      end
+    catch
+      kind, error ->
+        Output.debugger_important("Error in hit count: " <> Exception.format_banner(kind, error))
+
+        0
+    end
+  end
+
+  def eval_string(expression, elixir_binding, env) do
     try do
-      {term, _bindings} = Code.eval_string(expression, elixir_binding)
+      {term, _bindings} = Code.eval_string(expression, elixir_binding, env)
       to_string(term)
     catch
       kind, error ->
@@ -233,21 +262,21 @@ defmodule ElixirLS.DebugAdapter.BreakpointCondition do
     end
   end
 
-  def interpolate(format_string, elixir_binding) do
-    interpolate(format_string, [], elixir_binding)
+  def interpolate(format_string, elixir_binding, env) do
+    interpolate(format_string, [], elixir_binding, env)
     |> Enum.reverse()
     |> IO.iodata_to_binary()
   end
 
-  def interpolate(<<>>, acc, _elixir_binding), do: acc
+  def interpolate(<<>>, acc, _elixir_binding, _env), do: acc
 
-  def interpolate(<<"\\{", rest::binary>>, acc, elixir_binding),
-    do: interpolate(rest, ["{" | acc], elixir_binding)
+  def interpolate(<<"\\{", rest::binary>>, acc, elixir_binding, env),
+    do: interpolate(rest, ["{" | acc], elixir_binding, env)
 
-  def interpolate(<<"\\}", rest::binary>>, acc, elixir_binding),
-    do: interpolate(rest, ["}" | acc], elixir_binding)
+  def interpolate(<<"\\}", rest::binary>>, acc, elixir_binding, env),
+    do: interpolate(rest, ["}" | acc], elixir_binding, env)
 
-  def interpolate(<<"{", rest::binary>>, acc, elixir_binding) do
+  def interpolate(<<"{", rest::binary>>, acc, elixir_binding, env) do
     case parse_expression(rest, []) do
       {:ok, expression_iolist, expression_rest} ->
         expression =
@@ -255,8 +284,8 @@ defmodule ElixirLS.DebugAdapter.BreakpointCondition do
           |> Enum.reverse()
           |> IO.iodata_to_binary()
 
-        eval_result = eval_string(expression, elixir_binding)
-        interpolate(expression_rest, [eval_result | acc], elixir_binding)
+        eval_result = eval_string(expression, elixir_binding, env)
+        interpolate(expression_rest, [eval_result | acc], elixir_binding, env)
 
       :error ->
         Output.debugger_important("Log message has unpaired or nested `{}`")
@@ -264,8 +293,8 @@ defmodule ElixirLS.DebugAdapter.BreakpointCondition do
     end
   end
 
-  def interpolate(<<char::binary-size(1), rest::binary>>, acc, elixir_binding),
-    do: interpolate(rest, [char | acc], elixir_binding)
+  def interpolate(<<char::binary-size(1), rest::binary>>, acc, elixir_binding, env),
+    do: interpolate(rest, [char | acc], elixir_binding, env)
 
   def parse_expression(<<>>, _acc), do: :error
   def parse_expression(<<"\\{", rest::binary>>, acc), do: parse_expression(rest, ["{" | acc])
diff --git a/apps/debug_adapter/lib/debug_adapter/server.ex b/apps/debug_adapter/lib/debug_adapter/server.ex
index a5786d428..e373a04ea 100644
--- a/apps/debug_adapter/lib/debug_adapter/server.ex
+++ b/apps/debug_adapter/lib/debug_adapter/server.ex
@@ -973,7 +973,9 @@ defmodule ElixirLS.DebugAdapter.Server do
 
     for {{m, f, a}, lines} <- state.function_breakpoints,
         not Map.has_key?(parsed_mfas_conditions, {m, f, a}) do
-      BreakpointCondition.unregister_condition(m, lines)
+      for line <- lines do
+        BreakpointCondition.unregister_condition(m, line)
+      end
 
       case :int.del_break_in(m, f, a) do
         :ok ->
@@ -993,6 +995,14 @@ defmodule ElixirLS.DebugAdapter.Server do
           into: %{},
           do:
             (
+              path =
+                try do
+                  module_info = ModuleInfoCache.get(m) || m.module_info()
+                  Path.expand(to_string(module_info[:compile][:source]))
+                rescue
+                  _ -> "nofile"
+                end
+
               result =
                 case current[{m, f, a}] do
                   nil ->
@@ -1011,6 +1021,7 @@ defmodule ElixirLS.DebugAdapter.Server do
 
                             # pass nil as log_message - not supported on function breakpoints as of DAP 1.63
                             update_break_condition(
+                              path,
                               m,
                               lines,
                               condition,
@@ -1038,7 +1049,15 @@ defmodule ElixirLS.DebugAdapter.Server do
 
                   lines ->
                     # pass nil as log_message - not supported on function breakpoints as of DAP 1.51
-                    update_break_condition(m, lines, condition, nil, hit_count, state.config)
+                    update_break_condition(
+                      path,
+                      m,
+                      lines,
+                      condition,
+                      nil,
+                      hit_count,
+                      state.config
+                    )
 
                     {:ok, lines}
                 end
@@ -2461,7 +2480,7 @@ defmodule ElixirLS.DebugAdapter.Server do
             Output.debugger_console("Setting breakpoint in #{inspect(module)} #{path}:#{line}")
             # no need to handle errors here, it can fail only with {:error, :break_exists}
             :int.break(module, line)
-            update_break_condition(module, line, condition, log_message, hit_count, config)
+            update_break_condition(path, module, line, condition, log_message, hit_count, config)
 
             [module | added]
 
@@ -2524,38 +2543,49 @@ defmodule ElixirLS.DebugAdapter.Server do
     end
   end
 
-  def update_break_condition(module, lines, condition, log_message, hit_count, config) do
+  def update_break_condition(path, module, lines, condition, log_message, hit_count, config) do
     lines = List.wrap(lines)
 
-    condition = parse_condition(condition)
+    condition = parse_condition(condition, "true")
 
-    hit_count = eval_hit_count(hit_count)
+    hit_count = parse_condition(hit_count, "0")
 
     log_message = if log_message not in ["", nil], do: log_message
 
-    register_break_condition(module, lines, condition, log_message, hit_count, config)
+    register_break_condition(path, module, lines, condition, log_message, hit_count, config)
   end
 
-  defp register_break_condition(module, lines, condition, log_message, hit_count, %{
+  defp register_break_condition(file, module, lines, condition, log_message, hit_count, %{
          "request" => "launch"
        }) do
-    case BreakpointCondition.register_condition(module, lines, condition, log_message, hit_count) do
-      {:ok, mf} ->
-        for line <- lines do
+    for line <- lines do
+      {_metadata, _env, macro_env_or_opts} = parse_file(file, line)
+      # TODO use Code.env_for_eval when we require elixir 1.14
+      env = ElixirLS.DebugAdapter.Code.env_for_eval(macro_env_or_opts)
+
+      case BreakpointCondition.register_condition(
+             module,
+             line,
+             env,
+             condition,
+             log_message,
+             hit_count
+           ) do
+        {:ok, mf} ->
           :int.test_at_break(module, line, mf)
-        end
 
-      {:error, reason} ->
-        Output.debugger_important(
-          "Unable to set condition on a breakpoint in #{module}:#{inspect(lines)}: #{inspect(reason)}"
-        )
+        {:error, reason} ->
+          Output.debugger_important(
+            "Unable to set condition on a breakpoint in #{module}:#{inspect(line)}: #{inspect(reason)}"
+          )
+      end
     end
   end
 
-  defp register_break_condition(_module, _lines, condition, log_message, hit_count, %{
+  defp register_break_condition(_file, _module, _lines, condition, log_message, hit_count, %{
          "request" => "attach"
        }) do
-    if condition != "true" || log_message || hit_count != 0 do
+    if condition != "true" || log_message || hit_count != "0" do
       # Module passed to :int.test_at_break has to be available on remote nodes. Otherwise break condition will
       # always evaluate to false. We cannot easily distribute BreakpointCondition to remote nodes.
       Output.debugger_important(
@@ -2564,39 +2594,16 @@ defmodule ElixirLS.DebugAdapter.Server do
     end
   end
 
-  defp parse_condition(condition) when condition in [nil, ""], do: "true"
+  defp parse_condition(condition, default) when condition in [nil, ""], do: default
 
-  defp parse_condition(condition) do
+  defp parse_condition(condition, default) do
     case Code.string_to_quoted(condition) do
       {:ok, _} ->
         condition
 
       {:error, reason} ->
         Output.debugger_important("Cannot parse breakpoint condition: #{inspect(reason)}")
-        "true"
-    end
-  end
-
-  defp eval_hit_count(hit_count) when hit_count in [nil, ""], do: 0
-
-  defp eval_hit_count(hit_count) do
-    try do
-      # TODO binding?
-      {term, _bindings} = Code.eval_string(hit_count, [])
-
-      if is_integer(term) do
-        term
-      else
-        Output.debugger_important("Hit condition must evaluate to integer")
-        0
-      end
-    catch
-      kind, error ->
-        Output.debugger_important(
-          "Error while evaluating hit condition: " <> Exception.format_banner(kind, error)
-        )
-
-        0
+        default
     end
   end
 
@@ -2920,8 +2927,7 @@ defmodule ElixirLS.DebugAdapter.Server do
         buffer_file_metadata = ElixirSense.Core.Parser.parse_string(code, false, true, {line, 1})
 
         env = ElixirSense.Core.Metadata.get_env(buffer_file_metadata, {line, 1})
-        # TODO env_for_eval?
-        # should we clear versioned_vars?
+
         {buffer_file_metadata, env, ElixirSense.Core.State.Env.to_macro_env(env, file, line)}
       else
         # do not try to parse non elixir files
diff --git a/apps/debug_adapter/test/breakpoint_condition_test.exs b/apps/debug_adapter/test/breakpoint_condition_test.exs
index 8523e30f4..c8638c4f8 100644
--- a/apps/debug_adapter/test/breakpoint_condition_test.exs
+++ b/apps/debug_adapter/test/breakpoint_condition_test.exs
@@ -22,44 +22,93 @@ defmodule ElixirLS.DebugAdapter.BreakpointConditionTest do
   describe "register" do
     test "basic" do
       assert {:ok, {BreakpointCondition, :check_0}} ==
-               BreakpointCondition.register_condition(@name, Some, [123], "a == b", nil, 0)
+               BreakpointCondition.register_condition(
+                 @name,
+                 Some,
+                 123,
+                 __ENV__,
+                 "a == b",
+                 nil,
+                 "0"
+               )
 
       assert {:ok, {BreakpointCondition, :check_1}} ==
-               BreakpointCondition.register_condition(@name, Some, [124], "c == d", "asd", 1)
+               BreakpointCondition.register_condition(
+                 @name,
+                 Some,
+                 124,
+                 __ENV__,
+                 "c == d",
+                 "asd",
+                 "1"
+               )
 
       assert {:ok, {BreakpointCondition, :check_2}} ==
-               BreakpointCondition.register_condition(@name, Other, [124], "c == d", nil, 2)
+               BreakpointCondition.register_condition(
+                 @name,
+                 Other,
+                 124,
+                 __ENV__,
+                 "c == d",
+                 nil,
+                 "2"
+               )
 
       state = :sys.get_state(Process.whereis(@name))
 
-      assert state.conditions == %{
-               {Other, [124]} => {2, {"c == d", nil, 2}},
-               {Some, [123]} => {0, {"a == b", nil, 0}},
-               {Some, [124]} => {1, {"c == d", "asd", 1}}
-             }
+      assert %{
+               {Other, 124} => {2, {_, "c == d", nil, "2"}},
+               {Some, 123} => {0, {_, "a == b", nil, "0"}},
+               {Some, 124} => {1, {_, "c == d", "asd", "1"}}
+             } = state.conditions
 
       assert state.free == 3..99 |> Enum.to_list()
     end
 
     test "limit" do
       for i <- 0..99 do
-        {:ok, _} = BreakpointCondition.register_condition(@name, Some, [i], "c == d", nil, 1)
+        {:ok, _} =
+          BreakpointCondition.register_condition(@name, Some, i, __ENV__, "c == d", nil, "1")
       end
 
       assert {:error, :limit_reached} ==
-               BreakpointCondition.register_condition(@name, Some, [100], "c == d", nil, 1)
+               BreakpointCondition.register_condition(
+                 @name,
+                 Some,
+                 100,
+                 __ENV__,
+                 "c == d",
+                 nil,
+                 "1"
+               )
     end
 
     test "update" do
       assert {:ok, {BreakpointCondition, :check_0}} ==
-               BreakpointCondition.register_condition(@name, Some, [123], "a == b", nil, 2)
+               BreakpointCondition.register_condition(
+                 @name,
+                 Some,
+                 123,
+                 __ENV__,
+                 "a == b",
+                 nil,
+                 "2"
+               )
 
       assert {:ok, {BreakpointCondition, :check_0}} ==
-               BreakpointCondition.register_condition(@name, Some, [123], "c == b", "xxx", 3)
+               BreakpointCondition.register_condition(
+                 @name,
+                 Some,
+                 123,
+                 __ENV__,
+                 "c == b",
+                 "xxx",
+                 "3"
+               )
 
       state = :sys.get_state(Process.whereis(@name))
 
-      assert state.conditions == %{{Some, [123]} => {0, {"c == b", "xxx", 3}}}
+      assert %{{Some, 123} => {0, {_, "c == b", "xxx", "3"}}} = state.conditions
       assert state.free == 1..99 |> Enum.to_list()
     end
   end
@@ -67,11 +116,19 @@ defmodule ElixirLS.DebugAdapter.BreakpointConditionTest do
   describe "unregister" do
     test "basic" do
       assert {:ok, {BreakpointCondition, :check_0}} ==
-               BreakpointCondition.register_condition(@name, Some, [123], "a == b", nil, 0)
+               BreakpointCondition.register_condition(
+                 @name,
+                 Some,
+                 123,
+                 __ENV__,
+                 "a == b",
+                 nil,
+                 "0"
+               )
 
       BreakpointCondition.register_hit(@name, 0)
 
-      assert :ok == BreakpointCondition.unregister_condition(@name, Some, [123])
+      assert :ok == BreakpointCondition.unregister_condition(@name, Some, 123)
 
       state = :sys.get_state(Process.whereis(@name))
 
@@ -82,10 +139,18 @@ defmodule ElixirLS.DebugAdapter.BreakpointConditionTest do
 
     test "idempotency" do
       assert {:ok, {BreakpointCondition, :check_0}} ==
-               BreakpointCondition.register_condition(@name, Some, [123], "a == b", nil, 1)
-
-      assert :ok == BreakpointCondition.unregister_condition(@name, Some, [123])
-      assert :ok == BreakpointCondition.unregister_condition(@name, Some, [123])
+               BreakpointCondition.register_condition(
+                 @name,
+                 Some,
+                 123,
+                 __ENV__,
+                 "a == b",
+                 nil,
+                 "1"
+               )
+
+      assert :ok == BreakpointCondition.unregister_condition(@name, Some, 123)
+      assert :ok == BreakpointCondition.unregister_condition(@name, Some, 123)
 
       state = :sys.get_state(Process.whereis(@name))
 
@@ -96,30 +161,38 @@ defmodule ElixirLS.DebugAdapter.BreakpointConditionTest do
 
   test "has_condition?" do
     assert {:ok, {BreakpointCondition, :check_0}} ==
-             BreakpointCondition.register_condition(@name, Some, [123], "a == b", nil, 1)
+             BreakpointCondition.register_condition(@name, Some, 123, __ENV__, "a == b", nil, "1")
 
-    assert BreakpointCondition.has_condition?(@name, Some, [123])
+    assert BreakpointCondition.has_condition?(@name, Some, 123)
 
-    refute BreakpointCondition.has_condition?(@name, Some, [124])
-    refute BreakpointCondition.has_condition?(@name, Other, [123])
+    refute BreakpointCondition.has_condition?(@name, Some, 124)
+    refute BreakpointCondition.has_condition?(@name, Other, 123)
   end
 
   test "get_condition" do
     assert {:ok, {BreakpointCondition, :check_0}} ==
-             BreakpointCondition.register_condition(@name, Some, [123], "a == b", nil, 1)
+             BreakpointCondition.register_condition(@name, Some, 123, __ENV__, "a == b", nil, "1")
 
     assert {:ok, {BreakpointCondition, :check_1}} ==
-             BreakpointCondition.register_condition(@name, Some, [124], "c == d", "xxx", 2)
+             BreakpointCondition.register_condition(
+               @name,
+               Some,
+               124,
+               __ENV__,
+               "c == d",
+               "xxx",
+               "2"
+             )
 
     BreakpointCondition.register_hit(@name, 1)
 
-    assert {"a == b", nil, 1, 0} == BreakpointCondition.get_condition(@name, 0)
-    assert {"c == d", "xxx", 2, 1} == BreakpointCondition.get_condition(@name, 1)
+    assert {_, "a == b", nil, "1", 0} = BreakpointCondition.get_condition(@name, 0)
+    assert {_, "c == d", "xxx", "2", 1} = BreakpointCondition.get_condition(@name, 1)
   end
 
   test "register_hit" do
     assert {:ok, {BreakpointCondition, :check_0}} ==
-             BreakpointCondition.register_condition(@name, Some, [123], "a == b", nil, 1)
+             BreakpointCondition.register_condition(@name, Some, 123, __ENV__, "a == b", nil, "1")
 
     BreakpointCondition.register_hit(@name, 0)
     assert :sys.get_state(Process.whereis(@name)).hits == %{0 => 1}
@@ -130,75 +203,113 @@ defmodule ElixirLS.DebugAdapter.BreakpointConditionTest do
   describe "evel_condition" do
     test "evals to true" do
       binding = [{:a, 1}, {:b, 1}]
-      assert BreakpointCondition.eval_condition("a == b", binding) == true
+      assert BreakpointCondition.eval_condition("a == b", binding, __ENV__) == true
     end
 
     test "evals to truthy" do
       binding = [{:a, 1}]
-      assert BreakpointCondition.eval_condition("a", binding) == true
+      assert BreakpointCondition.eval_condition("a", binding, __ENV__) == true
     end
 
     test "evals to false" do
       binding = [{:a, 1}, {:b, 2}]
-      assert BreakpointCondition.eval_condition("a == b", binding) == false
+      assert BreakpointCondition.eval_condition("a == b", binding, __ENV__) == false
     end
 
     test "evals to falsy" do
       binding = [{:a, nil}]
-      assert BreakpointCondition.eval_condition("a", binding) == false
+      assert BreakpointCondition.eval_condition("a", binding, __ENV__) == false
+    end
+
+    test "handles raise" do
+      capture_io(:standard_error, fn ->
+        assert BreakpointCondition.eval_condition("raise ArgumentError", [], __ENV__) == false
+      end)
+    end
+
+    test "handles throw" do
+      capture_io(:standard_error, fn ->
+        assert BreakpointCondition.eval_condition("throw :asd", [], __ENV__) == false
+      end)
+    end
+
+    test "handles exit" do
+      capture_io(:standard_error, fn ->
+        assert BreakpointCondition.eval_condition("exit(:normal)", [], __ENV__) == false
+      end)
+    end
+  end
+
+  describe "eval_hit_condition" do
+    test "evals to number" do
+      binding = [{:a, 1}]
+      assert BreakpointCondition.eval_hit_condition("1 + 2.5", binding, __ENV__) == 3.5
+    end
+
+    test "defaults to 0" do
+      binding = [{:a, 1}, {:b, 2}]
+      assert BreakpointCondition.eval_hit_condition("false", binding, __ENV__) == 0
     end
 
     test "handles raise" do
       capture_io(:standard_error, fn ->
-        assert BreakpointCondition.eval_condition("raise ArgumentError", []) == false
+        assert BreakpointCondition.eval_hit_condition("raise ArgumentError", [], __ENV__) == 0
       end)
     end
 
     test "handles throw" do
       capture_io(:standard_error, fn ->
-        assert BreakpointCondition.eval_condition("throw :asd", []) == false
+        assert BreakpointCondition.eval_hit_condition("throw :asd", [], __ENV__) == 0
       end)
     end
 
     test "handles exit" do
       capture_io(:standard_error, fn ->
-        assert BreakpointCondition.eval_condition("exit(:normal)", []) == false
+        assert BreakpointCondition.eval_hit_condition("exit(:normal)", [], __ENV__) == 0
       end)
     end
   end
 
   describe "interpolate" do
     test "basic" do
-      assert BreakpointCondition.interpolate("", []) == ""
-      assert BreakpointCondition.interpolate("abc", []) == "abc"
+      assert BreakpointCondition.interpolate("", [], __ENV__) == ""
+      assert BreakpointCondition.interpolate("abc", [], __ENV__) == "abc"
     end
 
     test "escape sequences" do
-      assert BreakpointCondition.interpolate("\\{", []) == "{"
-      assert BreakpointCondition.interpolate("\\}", []) == "}"
+      assert BreakpointCondition.interpolate("\\{", [], __ENV__) == "{"
+      assert BreakpointCondition.interpolate("\\}", [], __ENV__) == "}"
     end
 
     test "substitute variable" do
-      assert BreakpointCondition.interpolate("abc{myvar}cde", myvar: "123") == "abc123cde"
-      assert BreakpointCondition.interpolate("abc{myvar}cde", myvar: 123) == "abc123cde"
+      assert BreakpointCondition.interpolate("abc{myvar}cde", [myvar: "123"], __ENV__) ==
+               "abc123cde"
+
+      assert BreakpointCondition.interpolate("abc{myvar}cde", [myvar: 123], __ENV__) ==
+               "abc123cde"
     end
 
     test "escape sequence within substitution" do
-      assert BreakpointCondition.interpolate("abc{inspect(%\\{\\})}cde", []) == "abc%{}cde"
+      assert BreakpointCondition.interpolate("abc{inspect(%\\{\\})}cde", [], __ENV__) ==
+               "abc%{}cde"
     end
 
     test "invalid" do
       capture_io(:standard_error, fn ->
-        assert BreakpointCondition.interpolate("abc{myvar{cde", []) == "abc"
-        assert BreakpointCondition.interpolate("abc{myvarcde", myvar: 123) == "abc"
+        assert BreakpointCondition.interpolate("abc{myvar{cde", [], __ENV__) == "abc"
+        assert BreakpointCondition.interpolate("abc{myvarcde", [myvar: 123], __ENV__) == "abc"
       end)
     end
 
     test "error in substitution" do
       capture_io(:standard_error, fn ->
-        assert BreakpointCondition.interpolate("abc{myvar}cde", []) == "abccde"
-        assert BreakpointCondition.interpolate("abc{self()}cde", myvar: 123) == "abccde"
-        assert BreakpointCondition.interpolate("abc{throw :error}cde", myvar: 123) == "abccde"
+        assert BreakpointCondition.interpolate("abc{myvar}cde", [], __ENV__) == "abccde"
+
+        assert BreakpointCondition.interpolate("abc{self()}cde", [myvar: 123], __ENV__) ==
+                 "abccde"
+
+        assert BreakpointCondition.interpolate("abc{throw :error}cde", [myvar: 123], __ENV__) ==
+                 "abccde"
       end)
     end
   end
diff --git a/apps/debug_adapter/test/debugger_test.exs b/apps/debug_adapter/test/debugger_test.exs
index cd8db5b3d..563a0a89a 100644
--- a/apps/debug_adapter/test/debugger_test.exs
+++ b/apps/debug_adapter/test/debugger_test.exs
@@ -1579,9 +1579,9 @@ defmodule ElixirLS.DebugAdapter.ServerTest do
 
         assert %{^abs_path => [{[MixProject], 3}]} = :sys.get_state(server).breakpoints
 
-        assert BreakpointCondition.has_condition?(MixProject, [3])
+        assert BreakpointCondition.has_condition?(MixProject, 3)
 
-        assert BreakpointCondition.get_condition(0) == {"a == b", nil, 0, 0}
+        assert {%Macro.Env{}, "a == b", nil, "0", 0} = BreakpointCondition.get_condition(0)
 
         # modify
 
@@ -1604,9 +1604,9 @@ defmodule ElixirLS.DebugAdapter.ServerTest do
 
         assert %{^abs_path => [{[MixProject], 3}]} = :sys.get_state(server).breakpoints
 
-        assert BreakpointCondition.has_condition?(MixProject, [3])
+        assert BreakpointCondition.has_condition?(MixProject, 3)
 
-        assert BreakpointCondition.get_condition(0) == {"x == y", nil, 0, 0}
+        assert {%Macro.Env{}, "x == y", nil, "0", 0} = BreakpointCondition.get_condition(0)
 
         # unset
 
@@ -1674,9 +1674,9 @@ defmodule ElixirLS.DebugAdapter.ServerTest do
 
         assert %{^abs_path => [{[MixProject], 3}]} = :sys.get_state(server).breakpoints
 
-        assert BreakpointCondition.has_condition?(MixProject, [3])
+        assert BreakpointCondition.has_condition?(MixProject, 3)
 
-        assert BreakpointCondition.get_condition(0) == {"true", nil, 25, 0}
+        assert {%Macro.Env{}, "true", nil, "25", 0} = BreakpointCondition.get_condition(0)
 
         # modify
 
@@ -1699,9 +1699,9 @@ defmodule ElixirLS.DebugAdapter.ServerTest do
 
         assert %{^abs_path => [{[MixProject], 3}]} = :sys.get_state(server).breakpoints
 
-        assert BreakpointCondition.has_condition?(MixProject, [3])
+        assert BreakpointCondition.has_condition?(MixProject, 3)
 
-        assert BreakpointCondition.get_condition(0) == {"true", nil, 55, 0}
+        assert {%Macro.Env{}, "true", nil, "55", 0} = BreakpointCondition.get_condition(0)
 
         # unset
 
@@ -1769,9 +1769,10 @@ defmodule ElixirLS.DebugAdapter.ServerTest do
 
         assert %{^abs_path => [{[MixProject], 3}]} = :sys.get_state(server).breakpoints
 
-        assert BreakpointCondition.has_condition?(MixProject, [3])
+        assert BreakpointCondition.has_condition?(MixProject, 3)
 
-        assert BreakpointCondition.get_condition(0) == {"true", "breakpoint hit", 0, 0}
+        assert {%Macro.Env{}, "true", "breakpoint hit", "0", 0} =
+                 BreakpointCondition.get_condition(0)
 
         # modify
 
@@ -1794,9 +1795,9 @@ defmodule ElixirLS.DebugAdapter.ServerTest do
 
         assert %{^abs_path => [{[MixProject], 3}]} = :sys.get_state(server).breakpoints
 
-        assert BreakpointCondition.has_condition?(MixProject, [3])
+        assert BreakpointCondition.has_condition?(MixProject, 3)
 
-        assert BreakpointCondition.get_condition(0) == {"true", "abc", 0, 0}
+        assert {%Macro.Env{}, "true", "abc", "0", 0} = BreakpointCondition.get_condition(0)
 
         # unset
 
@@ -2207,9 +2208,9 @@ defmodule ElixirLS.DebugAdapter.ServerTest do
 
         assert %{{:hello, :hello_world, 0} => [5]} = :sys.get_state(server).function_breakpoints
 
-        assert BreakpointCondition.has_condition?(:hello, [5])
+        assert BreakpointCondition.has_condition?(:hello, 5)
 
-        assert BreakpointCondition.get_condition(0) == {"a == b", nil, 0, 0}
+        assert {%Macro.Env{}, "a == b", nil, "0", 0} = BreakpointCondition.get_condition(0)
 
         # update
 
@@ -2233,9 +2234,9 @@ defmodule ElixirLS.DebugAdapter.ServerTest do
 
         assert %{{:hello, :hello_world, 0} => [5]} = :sys.get_state(server).function_breakpoints
 
-        assert BreakpointCondition.has_condition?(:hello, [5])
+        assert BreakpointCondition.has_condition?(:hello, 5)
 
-        assert BreakpointCondition.get_condition(0) == {"x == y", nil, 0, 0}
+        assert {%Macro.Env{}, "x == y", nil, "0", 0} = BreakpointCondition.get_condition(0)
 
         # unset
 
@@ -2300,9 +2301,9 @@ defmodule ElixirLS.DebugAdapter.ServerTest do
 
         assert %{{:hello, :hello_world, 0} => [5]} = :sys.get_state(server).function_breakpoints
 
-        assert BreakpointCondition.has_condition?(:hello, [5])
+        assert BreakpointCondition.has_condition?(:hello, 5)
 
-        assert BreakpointCondition.get_condition(0) == {"true", nil, 25, 0}
+        assert {%Macro.Env{}, "true", nil, "25", 0} = BreakpointCondition.get_condition(0)
 
         # update
 
@@ -2326,9 +2327,9 @@ defmodule ElixirLS.DebugAdapter.ServerTest do
 
         assert %{{:hello, :hello_world, 0} => [5]} = :sys.get_state(server).function_breakpoints
 
-        assert BreakpointCondition.has_condition?(:hello, [5])
+        assert BreakpointCondition.has_condition?(:hello, 5)
 
-        assert BreakpointCondition.get_condition(0) == {"true", nil, 55, 0}
+        assert {%Macro.Env{}, "true", nil, "55", 0} = BreakpointCondition.get_condition(0)
 
         # unset
 

From b1df4471aed8094639d3edc6b9cab7980f319d21 Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Wed, 11 Sep 2024 14:32:59 +0200
Subject: [PATCH 18/36] add tests for read and write variables

remove no longer needed hacks in completions
---
 .../providers/completion/suggestion.ex        |  27 +---
 .../providers/definition/locator.ex           |   1 +
 .../providers/completion/suggestions_test.exs |  39 ++++++
 .../providers/definition/locator_test.exs     | 126 ++++++++++++++++--
 .../test/providers/hover/docs_test.exs        |  64 +++++++++
 .../providers/references/locator_test.exs     |  78 +++++++++++
 6 files changed, 296 insertions(+), 39 deletions(-)

diff --git a/apps/language_server/lib/language_server/providers/completion/suggestion.ex b/apps/language_server/lib/language_server/providers/completion/suggestion.ex
index fd9302376..b09260d92 100644
--- a/apps/language_server/lib/language_server/providers/completion/suggestion.ex
+++ b/apps/language_server/lib/language_server/providers/completion/suggestion.ex
@@ -145,32 +145,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.Suggestion do
           {{line, column - String.length(prefix)}, {line, column + String.length(suffix)}}
       end
 
-    env =
-      Metadata.get_cursor_env(metadata, {line, column}, surround)
-      |> Metadata.add_scope_vars(
-        metadata,
-        {line, column},
-        &(to_string(&1.name) != hint)
-      )
-
-    # if variable is rebound then in env there are many variables with the same name
-    # find the one defined closest to cursor
-    vars =
-      env.vars
-      |> Enum.group_by(fn %State.VarInfo{name: name} -> name end)
-      |> Enum.map(fn {_name, list} ->
-        list
-        |> Enum.max_by(fn
-          %State.VarInfo{positions: [_position]} ->
-            # variable is being defined - it's not a good candidate
-            {0, 0}
-
-          %State.VarInfo{positions: positions} ->
-            Enum.min(positions)
-        end)
-      end)
-
-    env = %{env | vars: vars}
+    env = Metadata.get_cursor_env(metadata, {line, column}, surround)
 
     module_store = ModuleStore.build()
 
diff --git a/apps/language_server/lib/language_server/providers/definition/locator.ex b/apps/language_server/lib/language_server/providers/definition/locator.ex
index 9959f3c96..9f0c7dcb1 100644
--- a/apps/language_server/lib/language_server/providers/definition/locator.ex
+++ b/apps/language_server/lib/language_server/providers/definition/locator.ex
@@ -91,6 +91,7 @@ defmodule ElixirLS.LanguageServer.Providers.Definition.Locator do
 
           %Location{type: :variable, file: nil, line: definition_line, column: definition_column}
         else
+          # find local call
           find_function_or_module(
             {nil, variable},
             context,
diff --git a/apps/language_server/test/providers/completion/suggestions_test.exs b/apps/language_server/test/providers/completion/suggestions_test.exs
index 1f6bc5868..224e430f5 100644
--- a/apps/language_server/test/providers/completion/suggestions_test.exs
+++ b/apps/language_server/test/providers/completion/suggestions_test.exs
@@ -1908,6 +1908,45 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
            ]
   end
 
+  test "lists write vars in match context" do
+    buffer = """
+    defmodule MyServer do
+      def my(arg = 1, a), do: :ok
+    end
+    """
+
+    list =
+      Suggestion.suggestions(buffer, 2, 20)
+      |> Enum.filter(fn s -> s.type == :variable end)
+
+    assert list == [
+             %{name: "arg", type: :variable}
+           ]
+  end
+
+  test "does not list write vars" do
+    buffer = """
+    defmodule MyServer do
+      [arg = 1, a]
+      a
+    end
+    """
+
+    list =
+      Suggestion.suggestions(buffer, 2, 14)
+      |> Enum.filter(fn s -> s.type == :variable end)
+
+    # arg is a write var and is not available for read in the cursor context
+    assert list == []
+
+    list =
+      Suggestion.suggestions(buffer, 3, 4)
+      |> Enum.filter(fn s -> s.type == :variable end)
+
+    # arg is a read var here
+    assert list == [%{name: "arg", type: :variable}]
+  end
+
   test "lists params and vars in cond clauses" do
     buffer = """
     defmodule MyServer do
diff --git a/apps/language_server/test/providers/definition/locator_test.exs b/apps/language_server/test/providers/definition/locator_test.exs
index 63551d114..e08c5b9ce 100644
--- a/apps/language_server/test/providers/definition/locator_test.exs
+++ b/apps/language_server/test/providers/definition/locator_test.exs
@@ -921,19 +921,19 @@ defmodule ElixirLS.LanguageServer.Providers.Definition.LocatorTest do
     end
     """
 
-    # assert Locator.definition(buffer, 2, 32) == %Location{
-    #          type: :variable,
-    #          file: nil,
-    #          line: 2,
-    #          column: 14
-    #        }
-
-    # assert Locator.definition(buffer, 4, 16) == %Location{
-    #          type: :variable,
-    #          file: nil,
-    #          line: 4,
-    #          column: 7
-    #        }
+    assert Locator.definition(buffer, 2, 32) == %Location{
+             type: :variable,
+             file: nil,
+             line: 2,
+             column: 14
+           }
+
+    assert Locator.definition(buffer, 4, 16) == %Location{
+             type: :variable,
+             file: nil,
+             line: 4,
+             column: 7
+           }
 
     assert Locator.definition(buffer, 7, 32) == %Location{
              type: :variable,
@@ -1060,6 +1060,106 @@ defmodule ElixirLS.LanguageServer.Providers.Definition.LocatorTest do
            }
   end
 
+  # TODO not supported in Code.Fragment.surround_context
+  # test "find definition of &1 capture variable" do
+  #   buffer = """
+  #   defmodule MyModule do
+  #     def go() do
+  #       abc = 5
+  #       & [
+  #         &1,
+  #         abc,
+  #         cde = 1,
+  #         record_env()  
+  #       ]
+  #     end
+  #   end
+  #   """
+
+  #   assert Locator.definition(buffer, 4, 8) == %Location{
+  #            type: :variable,
+  #            file: nil,
+  #            line: 4,
+  #            column: 7
+  #          }
+  # end
+
+  test "find definition of write variable on definition" do
+    buffer = """
+    defmodule MyModule do
+      def go() do
+        abc = 5
+        & [
+          &1,
+          abc,
+          cde = 1,
+          record_env()  
+        ]
+      end
+    end
+    """
+
+    assert Locator.definition(buffer, 7, 8) == %Location{
+             type: :variable,
+             file: nil,
+             line: 7,
+             column: 7
+           }
+  end
+
+  test "does not find definition of write variable on read" do
+    buffer = """
+    defmodule MyModule do
+      def go() do
+        abc = 5
+        & [
+          &1,
+          abc,
+          cde = 1,
+          record_env(cde)  
+        ]
+      end
+    end
+    """
+
+    assert Locator.definition(buffer, 8, 19) == nil
+  end
+
+  test "find definition of write variable in match context" do
+    buffer = """
+    defmodule MyModule do
+      def go(asd = 3, asd) do
+        :ok
+      end
+
+      def go(asd = 3, [2, asd]) do
+        :ok
+      end
+    end
+    """
+
+    assert Locator.definition(buffer, 2, 11) == %Location{
+             type: :variable,
+             file: nil,
+             line: 2,
+             column: 10
+           }
+
+    assert Locator.definition(buffer, 2, 20) == %Location{
+             type: :variable,
+             file: nil,
+             line: 2,
+             column: 10
+           }
+
+    assert Locator.definition(buffer, 6, 24) == %Location{
+             type: :variable,
+             file: nil,
+             line: 6,
+             column: 10
+           }
+  end
+
   test "find definition of a variable when using pin operator" do
     buffer = """
     defmodule MyModule do
diff --git a/apps/language_server/test/providers/hover/docs_test.exs b/apps/language_server/test/providers/hover/docs_test.exs
index dae8d3dc0..bd8c360b5 100644
--- a/apps/language_server/test/providers/hover/docs_test.exs
+++ b/apps/language_server/test/providers/hover/docs_test.exs
@@ -1846,6 +1846,70 @@ defmodule ElixirLS.LanguageServer.Providers.Hover.DocsTest do
                docs: [%{kind: :variable}]
              } = Docs.docs(buffer, 8, 21)
     end
+
+    test "find docs for write variable on definition" do
+      buffer = """
+      defmodule MyModule do
+        def go() do
+          abc = 5
+          & [
+            &1,
+            abc,
+            cde = 1,
+            record_env()  
+          ]
+        end
+      end
+      """
+
+      assert %{
+               docs: [%{kind: :variable}]
+             } = Docs.docs(buffer, 7, 8)
+    end
+
+    test "does not find docs for write variable on read" do
+      buffer = """
+      defmodule MyModule do
+        def go() do
+          abc = 5
+          & [
+            &1,
+            abc,
+            cde = 1,
+            record_env(cde)  
+          ]
+        end
+      end
+      """
+
+      assert Docs.docs(buffer, 8, 19) == nil
+    end
+
+    test "finds docs for write variable in match context" do
+      buffer = """
+      defmodule MyModule do
+        def go(asd = 3, asd) do
+          :ok
+        end
+
+        def go(asd = 3, [2, asd]) do
+          :ok
+        end
+      end
+      """
+
+      assert %{
+               docs: [%{kind: :variable}]
+             } = Docs.docs(buffer, 2, 11)
+
+      assert %{
+               docs: [%{kind: :variable}]
+             } = Docs.docs(buffer, 2, 20)
+
+      assert %{
+               docs: [%{kind: :variable}]
+             } = Docs.docs(buffer, 6, 24)
+    end
   end
 
   test "find local type in typespec local def elsewhere" do
diff --git a/apps/language_server/test/providers/references/locator_test.exs b/apps/language_server/test/providers/references/locator_test.exs
index 85ee60eae..2538e51ce 100644
--- a/apps/language_server/test/providers/references/locator_test.exs
+++ b/apps/language_server/test/providers/references/locator_test.exs
@@ -1574,6 +1574,84 @@ defmodule ElixirLS.LanguageServer.Providers.References.LocatorTest do
     assert Locator.references(buffer, 8, 21, trace) == expected_references
   end
 
+  test "find references of write variable on definition", %{trace: trace} do
+    buffer = """
+    defmodule MyModule do
+      def go() do
+        abc = 5
+        & [
+          &1,
+          abc,
+          cde = 1,
+          record_env()  
+        ]
+      end
+    end
+    """
+
+    expected_references = [
+      %{uri: nil, range: %{start: %{line: 7, column: 7}, end: %{line: 7, column: 10}}}
+    ]
+
+    assert Locator.references(buffer, 7, 8, trace) == expected_references
+  end
+
+  test "does not find references of write variable on read", %{trace: trace} do
+    buffer = """
+    defmodule MyModule do
+      def go() do
+        abc = 5
+        & [
+          &1,
+          abc,
+          cde = 1,
+          record_env(cde)  
+        ]
+      end
+    end
+    """
+
+    expected_references = [
+      %{uri: nil, range: %{start: %{line: 7, column: 7}, end: %{line: 7, column: 10}}}
+    ]
+
+    # cde in cde = 1 is defined
+    assert Locator.references(buffer, 7, 8, trace) == expected_references
+
+    # cde in record_env(cde) is undefined
+    assert Locator.references(buffer, 8, 19, trace) == []
+  end
+
+  test "find definition of write variable in match context", %{trace: trace} do
+    buffer = """
+    defmodule MyModule do
+      def go(asd = 3, asd) do
+        :ok
+      end
+
+      def go(asd = 3, [2, asd]) do
+        :ok
+      end
+    end
+    """
+
+    expected_references = [
+      %{uri: nil, range: %{start: %{line: 2, column: 10}, end: %{line: 2, column: 13}}},
+      %{uri: nil, range: %{start: %{line: 2, column: 19}, end: %{line: 2, column: 22}}}
+    ]
+
+    assert Locator.references(buffer, 2, 11, trace) == expected_references
+
+    assert Locator.references(buffer, 2, 20, trace) == expected_references
+
+    expected_references = [
+      %{uri: nil, range: %{start: %{line: 6, column: 10}, end: %{line: 6, column: 13}}},
+      %{uri: nil, range: %{start: %{line: 6, column: 23}, end: %{line: 6, column: 26}}}
+    ]
+
+    assert Locator.references(buffer, 6, 24, trace) == expected_references
+  end
+
   test "find references of attributes", %{trace: trace} do
     buffer = """
     defmodule MyModule do

From dd572f4df55d3563055d6d3dabeb100492b0fda2 Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Wed, 18 Sep 2024 23:10:49 +0200
Subject: [PATCH 19/36] simplify var location

---
 .../providers/completion/suggestion.ex        |  1 -
 .../providers/definition/locator.ex           | 13 ++-----
 .../providers/document_symbols.ex             | 25 +++----------
 .../providers/execute_command/expand_macro.ex |  1 -
 .../language_server/providers/hover/docs.ex   | 15 ++------
 .../providers/references/locator.ex           | 36 ++-----------------
 6 files changed, 11 insertions(+), 80 deletions(-)

diff --git a/apps/language_server/lib/language_server/providers/completion/suggestion.ex b/apps/language_server/lib/language_server/providers/completion/suggestion.ex
index b09260d92..5199afeba 100644
--- a/apps/language_server/lib/language_server/providers/completion/suggestion.ex
+++ b/apps/language_server/lib/language_server/providers/completion/suggestion.ex
@@ -53,7 +53,6 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.Suggestion do
   alias ElixirSense.Core.Parser
   alias ElixirSense.Core.Source
   alias ElixirLS.LanguageServer.Providers.Completion.Reducers
-  alias ElixirSense.Core.Normalized.Code, as: NormalizedCode
 
   @type generic :: %{
           type: :generic,
diff --git a/apps/language_server/lib/language_server/providers/definition/locator.ex b/apps/language_server/lib/language_server/providers/definition/locator.ex
index 9f0c7dcb1..1a7fa1c48 100644
--- a/apps/language_server/lib/language_server/providers/definition/locator.ex
+++ b/apps/language_server/lib/language_server/providers/definition/locator.ex
@@ -18,7 +18,6 @@ defmodule ElixirLS.LanguageServer.Providers.Definition.Locator do
   alias ElixirSense.Core.State
   alias ElixirSense.Core.State.ModFunInfo
   alias ElixirSense.Core.State.TypeInfo
-  alias ElixirSense.Core.State.VarInfo
   alias ElixirSense.Core.Source
   alias ElixirSense.Core.SurroundContext
   alias ElixirLS.LanguageServer.Location
@@ -42,8 +41,7 @@ defmodule ElixirLS.LanguageServer.Providers.Definition.Locator do
 
         find(
           context,
-          env
-          |> Metadata.add_scope_vars(metadata, {line, column}),
+          env,
           metadata
         )
     end
@@ -61,7 +59,6 @@ defmodule ElixirLS.LanguageServer.Providers.Definition.Locator do
         context,
         %State.Env{
           module: module,
-          vars: vars,
           attributes: attributes
         } = env,
         metadata
@@ -78,13 +75,7 @@ defmodule ElixirLS.LanguageServer.Providers.Definition.Locator do
         nil
 
       {:variable, variable, version} ->
-        var_info =
-          vars
-          |> Enum.find(fn
-            %VarInfo{} = info ->
-              info.name == variable and (info.version == version or version == :any) and
-                context.begin in info.positions
-          end)
+        var_info = Metadata.find_var(metadata, variable, version, context.begin)
 
         if var_info != nil do
           {definition_line, definition_column} = Enum.min(var_info.positions)
diff --git a/apps/language_server/lib/language_server/providers/document_symbols.ex b/apps/language_server/lib/language_server/providers/document_symbols.ex
index cfde20b36..bb6f58a82 100644
--- a/apps/language_server/lib/language_server/providers/document_symbols.ex
+++ b/apps/language_server/lib/language_server/providers/document_symbols.ex
@@ -8,7 +8,6 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbols do
   alias ElixirLS.LanguageServer.Providers.SymbolUtils
   alias ElixirLS.LanguageServer.{SourceFile, Parser}
   require ElixirLS.LanguageServer.Protocol, as: Protocol
-  alias ElixirSense.Core.Normalized.Module, as: NormalizedModule
 
   defmodule Info do
     defstruct [:type, :name, :detail, :location, :children, :selection_location, :symbol]
@@ -173,13 +172,13 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbols do
               not is_nil(type_expression) do
     type_name_location =
       case type_expression do
-        [{:"::", _, [{name, type_head_location, args} = type_head | _]}] ->
+        [{:"::", _, [{name, type_head_location, args} = _type_head | _]}] ->
           {{name, args}, type_head_location}
 
-        [{:when, _, [{:"::", _, [{name, type_head_location, args} = type_head, _]}, _]}] ->
+        [{:when, _, [{:"::", _, [{name, type_head_location, args} = _type_head, _]}, _]}] ->
           {{name, args}, type_head_location}
 
-        [{name, type_head_location, args} = type_head | _] ->
+        [{name, type_head_location, args} = _type_head | _] ->
           {{name, args}, type_head_location}
 
         _ ->
@@ -218,16 +217,9 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbols do
   # Function, macro, guard with when
   defp extract_symbol(
          _current_module,
-         {defname, location, [{:when, _, [{name, head_location, args} = fn_head, _]} | _]}
+         {defname, location, [{:when, _, [{name, head_location, args} = _fn_head, _]} | _]}
        )
        when defname in @defs do
-    head =
-      Macro.to_string(fn_head)
-      |> String.replace(~r/,*\n\s*/u, fn
-        "," <> _ -> ", "
-        _ -> ""
-      end)
-
     %Info{
       type: if(defname in @macro_defs, do: :constant, else: :function),
       symbol: to_string(name),
@@ -242,16 +234,9 @@ defmodule ElixirLS.LanguageServer.Providers.DocumentSymbols do
   # Function, macro, delegate
   defp extract_symbol(
          _current_module,
-         {defname, location, [{name, head_location, args} = fn_head | _]}
+         {defname, location, [{name, head_location, args} = _fn_head | _]}
        )
        when defname in @defs do
-    head =
-      Macro.to_string(fn_head)
-      |> String.replace(~r/,*\n\s*/u, fn
-        "," <> _ -> ", "
-        _ -> ""
-      end)
-
     %Info{
       type: if(defname in @macro_defs, do: :constant, else: :function),
       symbol: to_string(name),
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
index 01d9f0295..c9302bbbe 100644
--- 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
@@ -5,7 +5,6 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.ExpandMacro do
   """
 
   alias ElixirLS.LanguageServer.Server
-  alias ElixirSense.Core.Ast
   alias ElixirSense.Core.State
   alias ElixirSense.Core.Parser
   alias ElixirSense.Core.Metadata
diff --git a/apps/language_server/lib/language_server/providers/hover/docs.ex b/apps/language_server/lib/language_server/providers/hover/docs.ex
index 028d96bb2..d418a87bf 100644
--- a/apps/language_server/lib/language_server/providers/hover/docs.ex
+++ b/apps/language_server/lib/language_server/providers/hover/docs.ex
@@ -17,7 +17,6 @@ defmodule ElixirLS.LanguageServer.Providers.Hover.Docs do
   alias ElixirSense.Core.State
   alias ElixirSense.Core.SurroundContext
   alias ElixirSense.Core.State.ModFunInfo
-  alias ElixirSense.Core.State.VarInfo
   alias ElixirSense.Core.TypeInfo
   alias ElixirSense.Core.Parser
 
@@ -83,7 +82,6 @@ defmodule ElixirLS.LanguageServer.Providers.Hover.Docs do
 
         env =
           Metadata.get_cursor_env(metadata, {line, column}, {begin_pos, end_pos})
-          |> Metadata.add_scope_vars(metadata, {line, column})
 
         case all(context, env, metadata) do
           [] ->
@@ -104,8 +102,7 @@ defmodule ElixirLS.LanguageServer.Providers.Hover.Docs do
   defp all(
          context,
          %State.Env{
-           module: module,
-           vars: vars
+           module: module
          } = env,
          metadata
        ) do
@@ -136,15 +133,7 @@ defmodule ElixirLS.LanguageServer.Providers.Hover.Docs do
         }
 
       {:variable, variable, version} ->
-        {line, column} = context.begin
-
-        var_info =
-          vars
-          |> Enum.find(fn
-            %VarInfo{} = info ->
-              info.name == variable and (info.version == version or version == :any) and
-                {line, column} in info.positions
-          end)
+        var_info = Metadata.find_var(metadata, variable, version, context.begin)
 
         if var_info != nil do
           %{
diff --git a/apps/language_server/lib/language_server/providers/references/locator.ex b/apps/language_server/lib/language_server/providers/references/locator.ex
index 4fd6d124c..810dc4e07 100644
--- a/apps/language_server/lib/language_server/providers/references/locator.ex
+++ b/apps/language_server/lib/language_server/providers/references/locator.ex
@@ -24,9 +24,7 @@ defmodule ElixirLS.LanguageServer.Providers.References.Locator do
       :none ->
         []
 
-      %{
-        begin: {begin_line, begin_col}
-      } = context ->
+      context ->
         metadata =
           Keyword.get_lazy(options, :metadata, fn ->
             Parser.parse_string(code, true, true, {line, column})
@@ -40,34 +38,13 @@ defmodule ElixirLS.LanguageServer.Providers.References.Locator do
             module: module
           } =
           Metadata.get_cursor_env(metadata, {line, column}, {context.begin, context.end})
-          |> Metadata.add_scope_vars(metadata, {line, column})
 
         # find last env of current module
         attributes = get_attributes(metadata, module)
 
-        # one line can contain variables from many scopes
-        # if the cursor is over variable take variables from the scope as it will
-        # be more correct than the env scope
-        vars =
-          case Enum.find(env.vars, fn %VarInfo{positions: positions} ->
-                 {begin_line, begin_col} in positions
-               end) do
-            %VarInfo{scope_id: scope_id} ->
-              # in (h|l)?eex templates vars_info_per_scope_id[scope_id] is nil
-              if metadata.vars_info_per_scope_id[scope_id] do
-                metadata.vars_info_per_scope_id[scope_id]
-              else
-                []
-              end
-
-            nil ->
-              []
-          end
-
         find(
           context,
           env,
-          vars,
           attributes,
           metadata,
           trace
@@ -101,7 +78,6 @@ defmodule ElixirLS.LanguageServer.Providers.References.Locator do
           aliases: aliases,
           module: module
         } = env,
-        vars,
         attributes,
         %Metadata{
           mods_funs_to_positions: mods_funs,
@@ -196,15 +172,7 @@ defmodule ElixirLS.LanguageServer.Providers.References.Locator do
         []
 
       {:variable, variable, version} ->
-        {line, column} = context.begin
-
-        var_info =
-          Enum.find_value(vars, fn {{_name, _version}, %VarInfo{} = info} ->
-            if info.name == variable and (info.version == version or version == :any) and
-                 {line, column} in info.positions do
-              info
-            end
-          end)
+        var_info = Metadata.find_var(metadata, variable, version, context.begin)
 
         if var_info != nil do
           %VarInfo{positions: positions} = var_info

From 38bd07dd0a95f97dae2c328db5c001c671564d17 Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Thu, 19 Sep 2024 00:00:04 +0200
Subject: [PATCH 20/36] cursor and parsing improvements

---
 apps/debug_adapter/lib/debug_adapter/server.ex      |  3 +--
 .../code_action/replace_remote_function.ex          | 10 ++++------
 .../providers/completion/suggestion.ex              | 13 +++++++------
 .../language_server/providers/definition/locator.ex |  2 +-
 .../providers/execute_command/expand_macro.ex       |  5 ++---
 .../lib/language_server/providers/hover/docs.ex     |  2 +-
 .../providers/implementation/locator.ex             |  4 ++--
 .../language_server/providers/references/locator.ex |  2 +-
 .../providers/signature_help/signature.ex           |  4 ++--
 9 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/apps/debug_adapter/lib/debug_adapter/server.ex b/apps/debug_adapter/lib/debug_adapter/server.ex
index e373a04ea..92619ae84 100644
--- a/apps/debug_adapter/lib/debug_adapter/server.ex
+++ b/apps/debug_adapter/lib/debug_adapter/server.ex
@@ -2925,8 +2925,7 @@ defmodule ElixirLS.DebugAdapter.Server do
       if String.ends_with?(file, ".ex") or String.ends_with?(file, ".exs") do
         code = File.read!(file)
         buffer_file_metadata = ElixirSense.Core.Parser.parse_string(code, false, true, {line, 1})
-
-        env = ElixirSense.Core.Metadata.get_env(buffer_file_metadata, {line, 1})
+        env = Metadata.get_cursor_env(buffer_file_metadata, {line, 1})
 
         {buffer_file_metadata, env, ElixirSense.Core.State.Env.to_macro_env(env, file, line)}
       else
diff --git a/apps/language_server/lib/language_server/providers/code_action/replace_remote_function.ex b/apps/language_server/lib/language_server/providers/code_action/replace_remote_function.ex
index 52031c4b2..4e9c3168f 100644
--- a/apps/language_server/lib/language_server/providers/code_action/replace_remote_function.ex
+++ b/apps/language_server/lib/language_server/providers/code_action/replace_remote_function.ex
@@ -12,6 +12,7 @@ defmodule ElixirLS.LanguageServer.Providers.CodeAction.ReplaceRemoteFunction do
   alias ElixirLS.LanguageServer.Providers.CodeMod.Text
   alias ElixirLS.LanguageServer.SourceFile
   alias ElixirSense.Core.Parser
+  alias ElixirSense.Core.Metadata
 
   import ElixirLS.LanguageServer.Providers.CodeAction.Helpers
 
@@ -180,12 +181,9 @@ defmodule ElixirLS.LanguageServer.Providers.CodeAction.ReplaceRemoteFunction do
   defp aliases_at(source_file, line_number) do
     one_based_line = line_number + 1
 
-    metadata = Parser.parse_string(source_file.text, true, true, {one_based_line, 1})
-
-    case metadata.lines_to_env[one_based_line] do
-      %ElixirSense.Core.State.Env{aliases: aliases} -> {:ok, aliases}
-      _ -> :error
-    end
+    metadata = Parser.parse_string(source_file.text, true, false, {one_based_line, 1})
+    env = Metadata.get_cursor_env(metadata, {one_based_line, 1})
+    {:ok, env.aliases}
   end
 
   defp module_to_alias(module) do
diff --git a/apps/language_server/lib/language_server/providers/completion/suggestion.ex b/apps/language_server/lib/language_server/providers/completion/suggestion.ex
index 5199afeba..adb407d29 100644
--- a/apps/language_server/lib/language_server/providers/completion/suggestion.ex
+++ b/apps/language_server/lib/language_server/providers/completion/suggestion.ex
@@ -113,7 +113,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.Suggestion do
 
     metadata =
       Keyword.get_lazy(options, :metadata, fn ->
-        Parser.parse_string(code, true, true, {line, column})
+        Parser.parse_string(code, true, false, {line, column})
       end)
 
     {text_before, text_after} = Source.split_at(code, line, column)
@@ -192,17 +192,18 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.Suggestion do
 
     # TODO this may no longer be needed
     # only fix_incomplete_call has some tests depending on it
+    # on 1.17 no tests depend on those hacks
     fixers = [
-      fix_incomplete_call,
-      fix_incomplete_kw,
-      fix_incomplete_kw_key
+      # fix_incomplete_call,
+      # fix_incomplete_kw,
+      # fix_incomplete_kw_key
     ]
 
-    Enum.reduce_while(fixers, nil, fn fun, _ ->
+    Enum.reduce_while(fixers, metadata, fn fun, metadata ->
       new_buffer = fun.(text_before, text_after)
 
       with true <- new_buffer != nil,
-           meta <- Parser.parse_string(new_buffer, false, true, {line, column}),
+           meta <- Parser.parse_string(new_buffer, false, false, {line, column}),
            %Metadata{error: error} <- meta,
            true <- error == nil do
         {:halt, meta}
diff --git a/apps/language_server/lib/language_server/providers/definition/locator.ex b/apps/language_server/lib/language_server/providers/definition/locator.ex
index 1a7fa1c48..0a7d19015 100644
--- a/apps/language_server/lib/language_server/providers/definition/locator.ex
+++ b/apps/language_server/lib/language_server/providers/definition/locator.ex
@@ -34,7 +34,7 @@ defmodule ElixirLS.LanguageServer.Providers.Definition.Locator do
       context ->
         metadata =
           Keyword.get_lazy(options, :metadata, fn ->
-            Parser.parse_string(code, true, true, {line, column})
+            Parser.parse_string(code, true, false, {line, column})
           end)
 
         env = Metadata.get_cursor_env(metadata, {line, column}, {context.begin, context.end})
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
index c9302bbbe..e07ae4b6c 100644
--- 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
@@ -52,9 +52,8 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.ExpandMacro do
   end
 
   def expand_full(buffer, code, file, line) do
-    buffer_file_metadata = Parser.parse_string(buffer, true, true, {line, 1})
-
-    env = Metadata.get_env(buffer_file_metadata, {line, 1})
+    buffer_file_metadata = Parser.parse_string(buffer, true, false, {line, 1})
+    env = Metadata.get_cursor_env(buffer_file_metadata, {line, 1})
 
     do_expand_full(code, env, file, line)
   end
diff --git a/apps/language_server/lib/language_server/providers/hover/docs.ex b/apps/language_server/lib/language_server/providers/hover/docs.ex
index d418a87bf..4ff12eeef 100644
--- a/apps/language_server/lib/language_server/providers/hover/docs.ex
+++ b/apps/language_server/lib/language_server/providers/hover/docs.ex
@@ -77,7 +77,7 @@ defmodule ElixirLS.LanguageServer.Providers.Hover.Docs do
       %{begin: begin_pos, end: end_pos} = context ->
         metadata =
           Keyword.get_lazy(options, :metadata, fn ->
-            Parser.parse_string(code, true, true, {line, column})
+            Parser.parse_string(code, true, false, {line, column})
           end)
 
         env =
diff --git a/apps/language_server/lib/language_server/providers/implementation/locator.ex b/apps/language_server/lib/language_server/providers/implementation/locator.ex
index fd4b24817..73dec8c81 100644
--- a/apps/language_server/lib/language_server/providers/implementation/locator.ex
+++ b/apps/language_server/lib/language_server/providers/implementation/locator.ex
@@ -30,10 +30,10 @@ defmodule ElixirLS.LanguageServer.Providers.Implementation.Locator do
       context ->
         metadata =
           Keyword.get_lazy(options, :metadata, fn ->
-            Parser.parse_string(code, true, true, {line, column})
+            Parser.parse_string(code, true, false, {line, column})
           end)
 
-        env = Metadata.get_env(metadata, {line, column})
+        env = Metadata.get_cursor_env(metadata, {line, column}, {context.begin, context.end})
 
         find(
           context,
diff --git a/apps/language_server/lib/language_server/providers/references/locator.ex b/apps/language_server/lib/language_server/providers/references/locator.ex
index 810dc4e07..0fc7e0b88 100644
--- a/apps/language_server/lib/language_server/providers/references/locator.ex
+++ b/apps/language_server/lib/language_server/providers/references/locator.ex
@@ -27,7 +27,7 @@ defmodule ElixirLS.LanguageServer.Providers.References.Locator do
       context ->
         metadata =
           Keyword.get_lazy(options, :metadata, fn ->
-            Parser.parse_string(code, true, true, {line, column})
+            Parser.parse_string(code, true, false, {line, column})
           end)
 
         # if context is var try to find env by scope_id
diff --git a/apps/language_server/lib/language_server/providers/signature_help/signature.ex b/apps/language_server/lib/language_server/providers/signature_help/signature.ex
index d38b141e2..4c4d74aa2 100644
--- a/apps/language_server/lib/language_server/providers/signature_help/signature.ex
+++ b/apps/language_server/lib/language_server/providers/signature_help/signature.ex
@@ -21,10 +21,10 @@ defmodule ElixirLS.LanguageServer.Providers.SignatureHelp.Signature do
 
     metadata =
       Keyword.get_lazy(options, :metadata, fn ->
-        Parser.parse_string(code, true, true, {line, column})
+        Parser.parse_string(code, true, false, {line, column})
       end)
 
-    env = Metadata.get_env(metadata, {line, column})
+    env = Metadata.get_cursor_env(metadata, {line, column})
 
     find(prefix, {line, column}, env, metadata)
   end

From 068927031c8ef82165343e5084de58a383e52b1f Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Thu, 19 Sep 2024 18:58:30 +0200
Subject: [PATCH 21/36] remove env handling from parser

---
 .../lib/language_server/parser.ex             | 80 ++-----------------
 1 file changed, 5 insertions(+), 75 deletions(-)

diff --git a/apps/language_server/lib/language_server/parser.ex b/apps/language_server/lib/language_server/parser.ex
index 268ae1554..525957a22 100644
--- a/apps/language_server/lib/language_server/parser.ex
+++ b/apps/language_server/lib/language_server/parser.ex
@@ -163,8 +163,6 @@ defmodule ElixirLS.LanguageServer.Parser do
 
     case {files[uri], Map.has_key?(state.parse_pids, {uri, current_version})} do
       {%Context{parsed_version: ^current_version} = file, _} ->
-        file = maybe_fix_missing_env(file, position)
-
         {:reply, file, state}
 
       {_, true} ->
@@ -269,8 +267,7 @@ defmodule ElixirLS.LanguageServer.Parser do
     queue =
       Enum.reduce(state.queue, [], fn
         {{^uri, ^parsed_file_version, position}, from}, acc ->
-          file = maybe_fix_missing_env(updated_file, position)
-          GenServer.reply(from, file)
+          GenServer.reply(from, updated_file)
           acc
 
         {request, from}, acc ->
@@ -311,49 +308,6 @@ defmodule ElixirLS.LanguageServer.Parser do
       source_file.language_id in ["elixir", "eex", "html-eex", "phoenix-heex"]
   end
 
-  defp maybe_fix_missing_env(%Context{} = file, nil), do: file
-
-  defp maybe_fix_missing_env(
-         %Context{metadata: metadata, flag: flag, source_file: source_file = %SourceFile{}} =
-           file,
-         {line, _character} = cursor_position
-       ) do
-    if Map.has_key?(metadata.lines_to_env, line) do
-      file
-    else
-      case flag do
-        {_, ^cursor_position} ->
-          # give up - we already tried
-          file
-
-        {:exact, _} ->
-          # file does not have parse errors, try to parse again with marker
-          metadata =
-            case ElixirSense.Core.Parser.try_fix_line_not_found_by_inserting_marker(
-                   source_file.text,
-                   cursor_position
-                 ) do
-              {:ok, acc} ->
-                ElixirSense.Core.Metadata.fill(source_file.text, acc)
-
-              _ ->
-                metadata
-            end
-
-          %Context{file | metadata: metadata, flag: {:exact, cursor_position}}
-
-        :not_parsable ->
-          # give up - no support in fault tolerant parser
-          file
-
-        {f, _cursor_position} when f in [:not_parsable, :fixed] ->
-          # reparse with cursor position
-          {flag, ast, metadata} = fault_tolerant_parse(source_file, cursor_position)
-          %Context{file | ast: ast, metadata: metadata, flag: flag}
-      end
-    end
-  end
-
   def do_parse(
         %Context{source_file: source_file = %SourceFile{}, path: path} = file,
         cursor_position \\ nil
@@ -363,9 +317,8 @@ defmodule ElixirLS.LanguageServer.Parser do
     {flag, ast, metadata} =
       if ast do
         # no syntax errors
-        metadata =
-          MetadataBuilder.build(ast)
-          |> fix_missing_env(source_file.text, cursor_position)
+        acc = MetadataBuilder.build(ast)
+        metadata = ElixirSense.Core.Metadata.fill(source_file.text, acc)
 
         {{:exact, cursor_position}, ast, metadata}
       else
@@ -397,9 +350,8 @@ defmodule ElixirLS.LanguageServer.Parser do
 
     case ElixirSense.Core.Parser.string_to_ast(source_file.text, options) do
       {:ok, ast, modified_source, _error} ->
-        metadata =
-          MetadataBuilder.build(ast)
-          |> fix_missing_env(modified_source, cursor_position)
+        acc = MetadataBuilder.build(ast)
+        metadata = ElixirSense.Core.Metadata.fill(modified_source, acc)
 
         {{:fixed, cursor_position}, ast, metadata}
 
@@ -427,28 +379,6 @@ defmodule ElixirLS.LanguageServer.Parser do
       {{:not_parsable, cursor_position}, @dummy_ast, @dummy_metadata}
   end
 
-  defp fix_missing_env(acc, source, nil), do: ElixirSense.Core.Metadata.fill(source, acc)
-
-  defp fix_missing_env(acc, source, {line, _} = cursor_position) do
-    acc =
-      if Map.has_key?(acc.lines_to_env, line) do
-        acc
-      else
-        case ElixirSense.Core.Parser.try_fix_line_not_found_by_inserting_marker(
-               source,
-               cursor_position
-             ) do
-          {:ok, acc} ->
-            acc
-
-          _ ->
-            acc
-        end
-      end
-
-    ElixirSense.Core.Metadata.fill(source, acc)
-  end
-
   defp get_path(uri) do
     case uri do
       "file:" <> _ ->

From bf9ba8462a946ce97de0aea50a86cb2e3b948e88 Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Thu, 19 Sep 2024 19:00:10 +0200
Subject: [PATCH 22/36] bump elixir_sense

---
 dep_versions.exs | 2 +-
 mix.lock         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dep_versions.exs b/dep_versions.exs
index 18fbc913f..a6a61e1c5 100644
--- a/dep_versions.exs
+++ b/dep_versions.exs
@@ -1,5 +1,5 @@
 [
-  elixir_sense: "b2064c655ecb254f7d3647fe1c60108eb4d0952a",
+  elixir_sense: "b802c3db057d64bc84ad17740ea2723b440be41c",
   dialyxir_vendored: "462e599aa7004a32cfa548cc715c9c59e95dacaf",
   jason_v: "c81537e2a5e1acacb915cf339fe400357e3c2aaa",
   erl2ex_vendored: "073ac6b9a44282e718b6050c7b27cedf9217a12a",
diff --git a/mix.lock b/mix.lock
index 05f463c3f..ccb229955 100644
--- 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", "462e599aa7004a32cfa548cc715c9c59e95dacaf", [ref: "462e599aa7004a32cfa548cc715c9c59e95dacaf"]},
-  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "b2064c655ecb254f7d3647fe1c60108eb4d0952a", [ref: "b2064c655ecb254f7d3647fe1c60108eb4d0952a"]},
+  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "b802c3db057d64bc84ad17740ea2723b440be41c", [ref: "b802c3db057d64bc84ad17740ea2723b440be41c"]},
   "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"]},

From 44eb3172fa72503155c0e104e71ec0c7d029aa63 Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Sat, 28 Sep 2024 13:38:14 +0200
Subject: [PATCH 23/36] bump elixir_sense

---
 apps/debug_adapter/test/variables_test.exs | 2 --
 dep_versions.exs                           | 2 +-
 mix.lock                                   | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/debug_adapter/test/variables_test.exs b/apps/debug_adapter/test/variables_test.exs
index 1ed553b0d..6e112a9e4 100644
--- a/apps/debug_adapter/test/variables_test.exs
+++ b/apps/debug_adapter/test/variables_test.exs
@@ -49,8 +49,6 @@ defmodule ElixirLS.DebugAdapter.VariablesTest do
 
     assert Variables.type(%Date{year: 2022, month: 1, day: 1}) == "%Date{}"
     assert Variables.type(%ArgumentError{}) == "%ArgumentError{}"
-    # TODO MapSet
-    # TODO :array
   end
 
   test "num_children" do
diff --git a/dep_versions.exs b/dep_versions.exs
index a6a61e1c5..598a2205f 100644
--- a/dep_versions.exs
+++ b/dep_versions.exs
@@ -1,5 +1,5 @@
 [
-  elixir_sense: "b802c3db057d64bc84ad17740ea2723b440be41c",
+  elixir_sense: "26d4e87cf462a1116a839706da9633461c207c12",
   dialyxir_vendored: "462e599aa7004a32cfa548cc715c9c59e95dacaf",
   jason_v: "c81537e2a5e1acacb915cf339fe400357e3c2aaa",
   erl2ex_vendored: "073ac6b9a44282e718b6050c7b27cedf9217a12a",
diff --git a/mix.lock b/mix.lock
index ccb229955..ed61d684a 100644
--- 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", "462e599aa7004a32cfa548cc715c9c59e95dacaf", [ref: "462e599aa7004a32cfa548cc715c9c59e95dacaf"]},
-  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "b802c3db057d64bc84ad17740ea2723b440be41c", [ref: "b802c3db057d64bc84ad17740ea2723b440be41c"]},
+  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "26d4e87cf462a1116a839706da9633461c207c12", [ref: "26d4e87cf462a1116a839706da9633461c207c12"]},
   "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"]},

From bbce81c19a33073b826504a4652f34fcb51b9118 Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Mon, 30 Sep 2024 23:03:21 +0200
Subject: [PATCH 24/36] exclude more tests

---
 apps/language_server/test/markdown_utils_test.exs  |  1 -
 .../test/providers/completion/suggestions_test.exs | 14 ++++++++++++++
 .../test/providers/definition/locator_test.exs     |  4 ++++
 .../test/providers/hover/docs_test.exs             |  2 ++
 .../test/providers/implementation/locator_test.exs |  2 ++
 5 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/apps/language_server/test/markdown_utils_test.exs b/apps/language_server/test/markdown_utils_test.exs
index d6abd838d..ed6d67535 100644
--- a/apps/language_server/test/markdown_utils_test.exs
+++ b/apps/language_server/test/markdown_utils_test.exs
@@ -105,7 +105,6 @@ defmodule ElixirLS.LanguageServer.MarkdownUtilsTest do
   describe "ex_doc links" do
     # The test cases here base on autolink documentation from https://hexdocs.pm/ex_doc/readme.html#auto-linking
     # and test cases from https://github.com/elixir-lang/ex_doc/blob/v0.31.1/test/ex_doc/language/elixir_test.exs
-    # TODO add support for OTP 27
 
     @version System.version()
     test "elixir module link with prefix" do
diff --git a/apps/language_server/test/providers/completion/suggestions_test.exs b/apps/language_server/test/providers/completion/suggestions_test.exs
index 224e430f5..ee36e2839 100644
--- a/apps/language_server/test/providers/completion/suggestions_test.exs
+++ b/apps/language_server/test/providers/completion/suggestions_test.exs
@@ -2003,6 +2003,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
     assert list == [%{name: "my_var", type: :variable}]
   end
 
+  if Version.match?(System.version(), ">= 1.15.0") do
   test "list vars in multiline struct" do
     buffer = """
     defmodule MyServer do
@@ -2021,6 +2022,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
 
     assert list == [%{name: "my_var", type: :variable}]
   end
+  end
 
   test "tuple destructuring" do
     buffer = """
@@ -4012,6 +4014,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
   end
 
   describe "suggestions for typespecs" do
+    if Version.match?(System.version(), ">= 1.15.0") do
     test "remote types - filter list of typespecs" do
       buffer = """
       defmodule My do
@@ -4021,7 +4024,9 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
       list = suggestions_by_type(:type_spec, buffer)
       assert length(list) == 4
     end
+    end
 
+    if Version.match?(System.version(), ">= 1.15.0") do
     test "remote types - retrieve info from typespecs" do
       buffer = """
       defmodule My do
@@ -4041,14 +4046,17 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
       assert suggestion.doc == "Remote list type"
       assert suggestion.origin == "ElixirSenseExample.ModuleWithTypespecs.Remote"
     end
+    end
 
     test "on specs" do
+      if Version.match?(System.version(), ">= 1.15.0") do
       buffer = """
       defmodule My do
         @spec a() :: Remote.\
       """
 
       assert %{name: "remote_list_t"} = suggestion_by_name("remote_list_t", buffer)
+      end
 
       buffer = """
       defmodule My do
@@ -4093,6 +4101,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
       assert [_, _] = suggestions_by_name("nonempty_list", buffer, 2, 19)
     end
 
+    if Version.match?(System.version(), ">= 1.15.0") do
     test "remote types - by attribute" do
       buffer = """
       defmodule My do
@@ -4105,7 +4114,9 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
 
       assert suggestion_1.signature == "my_type()"
     end
+    end
 
+    if Version.match?(System.version(), ">= 1.15.0") do
     test "remote types - by __MODULE__" do
       buffer = """
       defmodule My do
@@ -4117,7 +4128,9 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
 
       assert suggestion_1.signature == "my_type()"
     end
+    end
 
+    if Version.match?(System.version(), ">= 1.15.0") do
     test "remote types - retrieve info from typespecs with params" do
       buffer = """
       defmodule My do
@@ -4138,6 +4151,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
       assert suggestion_2.doc == "Remote type with params"
       assert suggestion_2.origin == "ElixirSenseExample.ModuleWithTypespecs.Remote"
     end
+    end
 
     test "local types - filter list of typespecs" do
       buffer = """
diff --git a/apps/language_server/test/providers/definition/locator_test.exs b/apps/language_server/test/providers/definition/locator_test.exs
index e08c5b9ce..ea1b4533f 100644
--- a/apps/language_server/test/providers/definition/locator_test.exs
+++ b/apps/language_server/test/providers/definition/locator_test.exs
@@ -1779,6 +1779,7 @@ defmodule ElixirLS.LanguageServer.Providers.Definition.LocatorTest do
     assert read_line(file, {line, column}) =~ "my_type(a)"
   end
 
+  if Version.match?(System.version(), ">= 1.15.0") do
   test "find remote type for lowest matching arity in incomplete code" do
     buffer = """
     defmodule MyModule do
@@ -1830,6 +1831,7 @@ defmodule ElixirLS.LanguageServer.Providers.Definition.LocatorTest do
 
     assert nil == Locator.definition(buffer, 3, 20)
   end
+  end
 
   @tag capture_log: true
   test "find remote type for the correct arity - fallback to docs" do
@@ -1847,6 +1849,7 @@ defmodule ElixirLS.LanguageServer.Providers.Definition.LocatorTest do
     assert read_line(file, {line, column}) =~ "@typedoc \"one param version\""
   end
 
+  if Version.match?(System.version(), ">= 1.15.0") do
   @tag capture_log: true
   test "find remote type for lowest matching arity in incomplete code - fallback to docs" do
     buffer = """
@@ -1899,6 +1902,7 @@ defmodule ElixirLS.LanguageServer.Providers.Definition.LocatorTest do
 
     assert nil == Locator.definition(buffer, 3, 20)
   end
+  end
 
   test "find super inside overridable function" do
     buffer = """
diff --git a/apps/language_server/test/providers/hover/docs_test.exs b/apps/language_server/test/providers/hover/docs_test.exs
index bd8c360b5..748d8f46b 100644
--- a/apps/language_server/test/providers/hover/docs_test.exs
+++ b/apps/language_server/test/providers/hover/docs_test.exs
@@ -2088,6 +2088,7 @@ defmodule ElixirLS.LanguageServer.Providers.Hover.DocsTest do
       assert nil == Docs.docs(buffer, 3, 68)
     end
 
+    if Version.match?(System.version(), ">= 1.15.0") do
     test "retrieves documentation for all matching type arities with incomplete code" do
       buffer = """
       defmodule MyModule do
@@ -2141,5 +2142,6 @@ defmodule ElixirLS.LanguageServer.Providers.Hover.DocsTest do
       # too many arguments
       assert nil == Docs.docs(buffer, 3, 20)
     end
+    end
   end
 end
diff --git a/apps/language_server/test/providers/implementation/locator_test.exs b/apps/language_server/test/providers/implementation/locator_test.exs
index 5a863cd4f..abc802e94 100644
--- a/apps/language_server/test/providers/implementation/locator_test.exs
+++ b/apps/language_server/test/providers/implementation/locator_test.exs
@@ -562,6 +562,7 @@ defmodule ElixirLS.LanguageServer.Providers.Implementation.LocatorTest do
     assert read_line(file, {line, column}) =~ "delegated_function do"
   end
 
+  if Version.match?(System.version(), ">= 1.15.0") do
   test "find implementation of delegated functions in incomplete code" do
     buffer = """
     defmodule MyModule do
@@ -617,6 +618,7 @@ defmodule ElixirLS.LanguageServer.Providers.Implementation.LocatorTest do
 
     assert [] = Locator.implementations(buffer, 3, 11)
   end
+  end
 
   test "find implementation of delegated functions via @attr" do
     buffer = """

From bfd14c832752d07ea0e7f258bb91c91dca522d30 Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Mon, 30 Sep 2024 23:06:49 +0200
Subject: [PATCH 25/36] bump elixir_sense

---
 dep_versions.exs | 2 +-
 mix.lock         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dep_versions.exs b/dep_versions.exs
index 598a2205f..93f96d72e 100644
--- a/dep_versions.exs
+++ b/dep_versions.exs
@@ -1,5 +1,5 @@
 [
-  elixir_sense: "26d4e87cf462a1116a839706da9633461c207c12",
+  elixir_sense: "67b22e2ad349124aa7e44f733e82a3ecbd5d4dfb",
   dialyxir_vendored: "462e599aa7004a32cfa548cc715c9c59e95dacaf",
   jason_v: "c81537e2a5e1acacb915cf339fe400357e3c2aaa",
   erl2ex_vendored: "073ac6b9a44282e718b6050c7b27cedf9217a12a",
diff --git a/mix.lock b/mix.lock
index ed61d684a..6a2369259 100644
--- 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", "462e599aa7004a32cfa548cc715c9c59e95dacaf", [ref: "462e599aa7004a32cfa548cc715c9c59e95dacaf"]},
-  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "26d4e87cf462a1116a839706da9633461c207c12", [ref: "26d4e87cf462a1116a839706da9633461c207c12"]},
+  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "67b22e2ad349124aa7e44f733e82a3ecbd5d4dfb", [ref: "67b22e2ad349124aa7e44f733e82a3ecbd5d4dfb"]},
   "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"]},

From 8cc75931465478c1df647bf489545074b46825ac Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Mon, 30 Sep 2024 23:21:02 +0200
Subject: [PATCH 26/36] fix build on 1.13

---
 apps/debug_adapter/lib/debug_adapter/code.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/debug_adapter/lib/debug_adapter/code.ex b/apps/debug_adapter/lib/debug_adapter/code.ex
index 15cf6452e..1ce6dbe29 100644
--- a/apps/debug_adapter/lib/debug_adapter/code.ex
+++ b/apps/debug_adapter/lib/debug_adapter/code.ex
@@ -28,7 +28,7 @@ defmodule ElixirLS.DebugAdapter.Code do
     end
 
     def env_for_eval(opts) when is_list(opts) do
-      env = elixir_env.new()
+      env = :elixir_env.new()
 
       line =
         case Keyword.get(opts, :line) do

From 3fd40ce4687aea897eaa70342fcdcace4ebbcbc9 Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Mon, 30 Sep 2024 23:21:31 +0200
Subject: [PATCH 27/36] format

---
 .../providers/completion/suggestions_test.exs | 168 +++++++++---------
 .../providers/definition/locator_test.exs     | 162 ++++++++---------
 .../test/providers/hover/docs_test.exs        |  86 ++++-----
 .../providers/implementation/locator_test.exs |  88 ++++-----
 4 files changed, 252 insertions(+), 252 deletions(-)

diff --git a/apps/language_server/test/providers/completion/suggestions_test.exs b/apps/language_server/test/providers/completion/suggestions_test.exs
index ee36e2839..79b19ffe7 100644
--- a/apps/language_server/test/providers/completion/suggestions_test.exs
+++ b/apps/language_server/test/providers/completion/suggestions_test.exs
@@ -2004,24 +2004,24 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
   end
 
   if Version.match?(System.version(), ">= 1.15.0") do
-  test "list vars in multiline struct" do
-    buffer = """
-    defmodule MyServer do
-      def go do
-        %Some{
-          filed: my_var,
-          other: my
-        } = abc()
+    test "list vars in multiline struct" do
+      buffer = """
+      defmodule MyServer do
+        def go do
+          %Some{
+            filed: my_var,
+            other: my
+          } = abc()
+        end
       end
-    end
-    """
+      """
 
-    list =
-      Suggestion.suggestions(buffer, 5, 16)
-      |> Enum.filter(fn s -> s.type in [:variable] end)
+      list =
+        Suggestion.suggestions(buffer, 5, 16)
+        |> Enum.filter(fn s -> s.type in [:variable] end)
 
-    assert list == [%{name: "my_var", type: :variable}]
-  end
+      assert list == [%{name: "my_var", type: :variable}]
+    end
   end
 
   test "tuple destructuring" do
@@ -4015,47 +4015,47 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
 
   describe "suggestions for typespecs" do
     if Version.match?(System.version(), ">= 1.15.0") do
-    test "remote types - filter list of typespecs" do
-      buffer = """
-      defmodule My do
-        @type a :: Remote.remote_t\
-      """
-
-      list = suggestions_by_type(:type_spec, buffer)
-      assert length(list) == 4
-    end
+      test "remote types - filter list of typespecs" do
+        buffer = """
+        defmodule My do
+          @type a :: Remote.remote_t\
+        """
+
+        list = suggestions_by_type(:type_spec, buffer)
+        assert length(list) == 4
+      end
     end
 
     if Version.match?(System.version(), ">= 1.15.0") do
-    test "remote types - retrieve info from typespecs" do
-      buffer = """
-      defmodule My do
-        @type a :: Remote.\
-      """
+      test "remote types - retrieve info from typespecs" do
+        buffer = """
+        defmodule My do
+          @type a :: Remote.\
+        """
 
-      suggestion = suggestion_by_name("remote_list_t", buffer)
+        suggestion = suggestion_by_name("remote_list_t", buffer)
 
-      assert suggestion.spec == """
-             @type remote_list_t() :: [
-               remote_t()
-             ]\
-             """
+        assert suggestion.spec == """
+               @type remote_list_t() :: [
+                 remote_t()
+               ]\
+               """
 
-      assert suggestion.signature == "remote_list_t()"
-      assert suggestion.arity == 0
-      assert suggestion.doc == "Remote list type"
-      assert suggestion.origin == "ElixirSenseExample.ModuleWithTypespecs.Remote"
-    end
+        assert suggestion.signature == "remote_list_t()"
+        assert suggestion.arity == 0
+        assert suggestion.doc == "Remote list type"
+        assert suggestion.origin == "ElixirSenseExample.ModuleWithTypespecs.Remote"
+      end
     end
 
     test "on specs" do
       if Version.match?(System.version(), ">= 1.15.0") do
-      buffer = """
-      defmodule My do
-        @spec a() :: Remote.\
-      """
+        buffer = """
+        defmodule My do
+          @spec a() :: Remote.\
+        """
 
-      assert %{name: "remote_list_t"} = suggestion_by_name("remote_list_t", buffer)
+        assert %{name: "remote_list_t"} = suggestion_by_name("remote_list_t", buffer)
       end
 
       buffer = """
@@ -4102,55 +4102,55 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
     end
 
     if Version.match?(System.version(), ">= 1.15.0") do
-    test "remote types - by attribute" do
-      buffer = """
-      defmodule My do
-        @type my_type :: integer
-        @attr My
-        @type some :: @attr.my\
-      """
+      test "remote types - by attribute" do
+        buffer = """
+        defmodule My do
+          @type my_type :: integer
+          @attr My
+          @type some :: @attr.my\
+        """
 
-      [suggestion_1] = suggestions_by_name("my_type", buffer)
+        [suggestion_1] = suggestions_by_name("my_type", buffer)
 
-      assert suggestion_1.signature == "my_type()"
-    end
+        assert suggestion_1.signature == "my_type()"
+      end
     end
 
     if Version.match?(System.version(), ">= 1.15.0") do
-    test "remote types - by __MODULE__" do
-      buffer = """
-      defmodule My do
-        @type my_type :: integer
-        @type some :: __MODULE__.my\
-      """
+      test "remote types - by __MODULE__" do
+        buffer = """
+        defmodule My do
+          @type my_type :: integer
+          @type some :: __MODULE__.my\
+        """
 
-      [suggestion_1] = suggestions_by_name("my_type", buffer)
+        [suggestion_1] = suggestions_by_name("my_type", buffer)
 
-      assert suggestion_1.signature == "my_type()"
-    end
+        assert suggestion_1.signature == "my_type()"
+      end
     end
 
     if Version.match?(System.version(), ">= 1.15.0") do
-    test "remote types - retrieve info from typespecs with params" do
-      buffer = """
-      defmodule My do
-        @type a :: Remote.\
-      """
-
-      [suggestion_1, suggestion_2] = suggestions_by_name("remote_t", buffer)
-
-      assert suggestion_1.spec == "@type remote_t() :: atom()"
-      assert suggestion_1.signature == "remote_t()"
-      assert suggestion_1.arity == 0
-      assert suggestion_1.doc == "Remote type"
-      assert suggestion_1.origin == "ElixirSenseExample.ModuleWithTypespecs.Remote"
-
-      assert suggestion_2.spec =~ "@type remote_t(a, b) ::"
-      assert suggestion_2.signature == "remote_t(a, b)"
-      assert suggestion_2.arity == 2
-      assert suggestion_2.doc == "Remote type with params"
-      assert suggestion_2.origin == "ElixirSenseExample.ModuleWithTypespecs.Remote"
-    end
+      test "remote types - retrieve info from typespecs with params" do
+        buffer = """
+        defmodule My do
+          @type a :: Remote.\
+        """
+
+        [suggestion_1, suggestion_2] = suggestions_by_name("remote_t", buffer)
+
+        assert suggestion_1.spec == "@type remote_t() :: atom()"
+        assert suggestion_1.signature == "remote_t()"
+        assert suggestion_1.arity == 0
+        assert suggestion_1.doc == "Remote type"
+        assert suggestion_1.origin == "ElixirSenseExample.ModuleWithTypespecs.Remote"
+
+        assert suggestion_2.spec =~ "@type remote_t(a, b) ::"
+        assert suggestion_2.signature == "remote_t(a, b)"
+        assert suggestion_2.arity == 2
+        assert suggestion_2.doc == "Remote type with params"
+        assert suggestion_2.origin == "ElixirSenseExample.ModuleWithTypespecs.Remote"
+      end
     end
 
     test "local types - filter list of typespecs" do
diff --git a/apps/language_server/test/providers/definition/locator_test.exs b/apps/language_server/test/providers/definition/locator_test.exs
index ea1b4533f..d4f36248e 100644
--- a/apps/language_server/test/providers/definition/locator_test.exs
+++ b/apps/language_server/test/providers/definition/locator_test.exs
@@ -1780,57 +1780,57 @@ defmodule ElixirLS.LanguageServer.Providers.Definition.LocatorTest do
   end
 
   if Version.match?(System.version(), ">= 1.15.0") do
-  test "find remote type for lowest matching arity in incomplete code" do
-    buffer = """
-    defmodule MyModule do
-      alias ElixirSenseExample.TypesWithMultipleArity, as: T
-      @type some :: T.my_type(
-    end
-    """
+    test "find remote type for lowest matching arity in incomplete code" do
+      buffer = """
+      defmodule MyModule do
+        alias ElixirSenseExample.TypesWithMultipleArity, as: T
+        @type some :: T.my_type(
+      end
+      """
 
-    assert %Location{type: :typespec, file: file, line: line, column: column} =
-             Locator.definition(buffer, 3, 20)
+      assert %Location{type: :typespec, file: file, line: line, column: column} =
+               Locator.definition(buffer, 3, 20)
 
-    assert file =~ "language_server/test/support/types_with_multiple_arity.ex"
-    assert read_line(file, {line, column}) =~ "@type my_type :: integer"
+      assert file =~ "language_server/test/support/types_with_multiple_arity.ex"
+      assert read_line(file, {line, column}) =~ "@type my_type :: integer"
 
-    buffer = """
-    defmodule MyModule do
-      alias ElixirSenseExample.TypesWithMultipleArity, as: T
-      @type some :: T.my_type(integer
-    end
-    """
+      buffer = """
+      defmodule MyModule do
+        alias ElixirSenseExample.TypesWithMultipleArity, as: T
+        @type some :: T.my_type(integer
+      end
+      """
 
-    assert %Location{type: :typespec, file: file, line: line, column: column} =
-             Locator.definition(buffer, 3, 20)
+      assert %Location{type: :typespec, file: file, line: line, column: column} =
+               Locator.definition(buffer, 3, 20)
 
-    assert file =~ "language_server/test/support/types_with_multiple_arity.ex"
-    assert read_line(file, {line, column}) =~ "@type my_type(a) :: {integer, a}"
+      assert file =~ "language_server/test/support/types_with_multiple_arity.ex"
+      assert read_line(file, {line, column}) =~ "@type my_type(a) :: {integer, a}"
 
-    buffer = """
-    defmodule MyModule do
-      alias ElixirSenseExample.TypesWithMultipleArity, as: T
-      @type some :: T.my_type(integer,
-    end
-    """
+      buffer = """
+      defmodule MyModule do
+        alias ElixirSenseExample.TypesWithMultipleArity, as: T
+        @type some :: T.my_type(integer,
+      end
+      """
 
-    assert %Location{type: :typespec, file: file, line: line, column: column} =
-             Locator.definition(buffer, 3, 20)
+      assert %Location{type: :typespec, file: file, line: line, column: column} =
+               Locator.definition(buffer, 3, 20)
 
-    assert file =~ "language_server/test/support/types_with_multiple_arity.ex"
-    assert read_line(file, {line, column}) =~ "@type my_type(a, b) :: {integer, a, b}"
+      assert file =~ "language_server/test/support/types_with_multiple_arity.ex"
+      assert read_line(file, {line, column}) =~ "@type my_type(a, b) :: {integer, a, b}"
 
-    buffer = """
-    defmodule MyModule do
-      alias ElixirSenseExample.TypesWithMultipleArity, as: T
-      @type some :: T.my_type(integer, integer,
-    end
-    """
+      buffer = """
+      defmodule MyModule do
+        alias ElixirSenseExample.TypesWithMultipleArity, as: T
+        @type some :: T.my_type(integer, integer,
+      end
+      """
 
-    # too many arguments
+      # too many arguments
 
-    assert nil == Locator.definition(buffer, 3, 20)
-  end
+      assert nil == Locator.definition(buffer, 3, 20)
+    end
   end
 
   @tag capture_log: true
@@ -1850,58 +1850,58 @@ defmodule ElixirLS.LanguageServer.Providers.Definition.LocatorTest do
   end
 
   if Version.match?(System.version(), ">= 1.15.0") do
-  @tag capture_log: true
-  test "find remote type for lowest matching arity in incomplete code - fallback to docs" do
-    buffer = """
-    defmodule MyModule do
-      alias ElixirSenseExample.TypesWithMultipleArity1, as: T
-      @type some :: T.my_type(
-    end
-    """
+    @tag capture_log: true
+    test "find remote type for lowest matching arity in incomplete code - fallback to docs" do
+      buffer = """
+      defmodule MyModule do
+        alias ElixirSenseExample.TypesWithMultipleArity1, as: T
+        @type some :: T.my_type(
+      end
+      """
 
-    assert %Location{type: :typespec, file: file, line: line, column: column} =
-             Locator.definition(buffer, 3, 20)
+      assert %Location{type: :typespec, file: file, line: line, column: column} =
+               Locator.definition(buffer, 3, 20)
 
-    assert file =~ "language_server/test/support/types_with_multiple_arity.ex"
-    assert read_line(file, {line, column}) =~ "@typedoc \"no params version\""
+      assert file =~ "language_server/test/support/types_with_multiple_arity.ex"
+      assert read_line(file, {line, column}) =~ "@typedoc \"no params version\""
 
-    buffer = """
-    defmodule MyModule do
-      alias ElixirSenseExample.TypesWithMultipleArity1, as: T
-      @type some :: T.my_type(integer
-    end
-    """
+      buffer = """
+      defmodule MyModule do
+        alias ElixirSenseExample.TypesWithMultipleArity1, as: T
+        @type some :: T.my_type(integer
+      end
+      """
 
-    assert %Location{type: :typespec, file: file, line: line, column: column} =
-             Locator.definition(buffer, 3, 20)
+      assert %Location{type: :typespec, file: file, line: line, column: column} =
+               Locator.definition(buffer, 3, 20)
 
-    assert file =~ "language_server/test/support/types_with_multiple_arity.ex"
-    assert read_line(file, {line, column}) =~ "@typedoc \"one param version\""
+      assert file =~ "language_server/test/support/types_with_multiple_arity.ex"
+      assert read_line(file, {line, column}) =~ "@typedoc \"one param version\""
 
-    buffer = """
-    defmodule MyModule do
-      alias ElixirSenseExample.TypesWithMultipleArity1, as: T
-      @type some :: T.my_type(integer,
-    end
-    """
+      buffer = """
+      defmodule MyModule do
+        alias ElixirSenseExample.TypesWithMultipleArity1, as: T
+        @type some :: T.my_type(integer,
+      end
+      """
 
-    assert %Location{type: :typespec, file: file, line: line, column: column} =
-             Locator.definition(buffer, 3, 20)
+      assert %Location{type: :typespec, file: file, line: line, column: column} =
+               Locator.definition(buffer, 3, 20)
 
-    assert file =~ "language_server/test/support/types_with_multiple_arity.ex"
-    assert read_line(file, {line, column}) =~ "@typedoc \"two params version\""
+      assert file =~ "language_server/test/support/types_with_multiple_arity.ex"
+      assert read_line(file, {line, column}) =~ "@typedoc \"two params version\""
 
-    buffer = """
-    defmodule MyModule do
-      alias ElixirSenseExample.TypesWithMultipleArity1, as: T
-      @type some :: T.my_type(integer, integer,
-    end
-    """
+      buffer = """
+      defmodule MyModule do
+        alias ElixirSenseExample.TypesWithMultipleArity1, as: T
+        @type some :: T.my_type(integer, integer,
+      end
+      """
 
-    # too many arguments
+      # too many arguments
 
-    assert nil == Locator.definition(buffer, 3, 20)
-  end
+      assert nil == Locator.definition(buffer, 3, 20)
+    end
   end
 
   test "find super inside overridable function" do
diff --git a/apps/language_server/test/providers/hover/docs_test.exs b/apps/language_server/test/providers/hover/docs_test.exs
index 748d8f46b..086972071 100644
--- a/apps/language_server/test/providers/hover/docs_test.exs
+++ b/apps/language_server/test/providers/hover/docs_test.exs
@@ -2089,59 +2089,59 @@ defmodule ElixirLS.LanguageServer.Providers.Hover.DocsTest do
     end
 
     if Version.match?(System.version(), ">= 1.15.0") do
-    test "retrieves documentation for all matching type arities with incomplete code" do
-      buffer = """
-      defmodule MyModule do
-        alias ElixirSenseExample.TypesWithMultipleArity, as: T
-        @type some :: T.my_type(
-      end
-      """
+      test "retrieves documentation for all matching type arities with incomplete code" do
+        buffer = """
+        defmodule MyModule do
+          alias ElixirSenseExample.TypesWithMultipleArity, as: T
+          @type some :: T.my_type(
+        end
+        """
 
-      assert %{docs: docs} =
-               Docs.docs(buffer, 3, 20)
+        assert %{docs: docs} =
+                 Docs.docs(buffer, 3, 20)
 
-      assert length(docs) == 3
-      assert Enum.at(docs, 0).docs =~ "no params version"
-      assert Enum.at(docs, 1).docs =~ "one param version"
-      assert Enum.at(docs, 2).docs =~ "two params version"
+        assert length(docs) == 3
+        assert Enum.at(docs, 0).docs =~ "no params version"
+        assert Enum.at(docs, 1).docs =~ "one param version"
+        assert Enum.at(docs, 2).docs =~ "two params version"
 
-      buffer = """
-      defmodule MyModule do
-        alias ElixirSenseExample.TypesWithMultipleArity, as: T
-        @type some :: T.my_type(integer
-      end
-      """
+        buffer = """
+        defmodule MyModule do
+          alias ElixirSenseExample.TypesWithMultipleArity, as: T
+          @type some :: T.my_type(integer
+        end
+        """
 
-      assert %{docs: docs} =
-               Docs.docs(buffer, 3, 20)
+        assert %{docs: docs} =
+                 Docs.docs(buffer, 3, 20)
 
-      assert length(docs) == 2
-      assert Enum.at(docs, 0).docs =~ "one param version"
-      assert Enum.at(docs, 1).docs =~ "two params version"
+        assert length(docs) == 2
+        assert Enum.at(docs, 0).docs =~ "one param version"
+        assert Enum.at(docs, 1).docs =~ "two params version"
 
-      buffer = """
-      defmodule MyModule do
-        alias ElixirSenseExample.TypesWithMultipleArity, as: T
-        @type some :: T.my_type(integer, integer
-      end
-      """
+        buffer = """
+        defmodule MyModule do
+          alias ElixirSenseExample.TypesWithMultipleArity, as: T
+          @type some :: T.my_type(integer, integer
+        end
+        """
 
-      assert %{docs: docs} =
-               Docs.docs(buffer, 3, 20)
+        assert %{docs: docs} =
+                 Docs.docs(buffer, 3, 20)
 
-      assert length(docs) == 1
-      assert Enum.at(docs, 0).docs =~ "two params version"
+        assert length(docs) == 1
+        assert Enum.at(docs, 0).docs =~ "two params version"
 
-      buffer = """
-      defmodule MyModule do
-        alias ElixirSenseExample.TypesWithMultipleArity, as: T
-        @type some :: T.my_type(integer, integer,
-      end
-      """
+        buffer = """
+        defmodule MyModule do
+          alias ElixirSenseExample.TypesWithMultipleArity, as: T
+          @type some :: T.my_type(integer, integer,
+        end
+        """
 
-      # too many arguments
-      assert nil == Docs.docs(buffer, 3, 20)
-    end
+        # too many arguments
+        assert nil == Docs.docs(buffer, 3, 20)
+      end
     end
   end
 end
diff --git a/apps/language_server/test/providers/implementation/locator_test.exs b/apps/language_server/test/providers/implementation/locator_test.exs
index abc802e94..2bd6b2da7 100644
--- a/apps/language_server/test/providers/implementation/locator_test.exs
+++ b/apps/language_server/test/providers/implementation/locator_test.exs
@@ -563,61 +563,61 @@ defmodule ElixirLS.LanguageServer.Providers.Implementation.LocatorTest do
   end
 
   if Version.match?(System.version(), ">= 1.15.0") do
-  test "find implementation of delegated functions in incomplete code" do
-    buffer = """
-    defmodule MyModule do
-      alias ElixirSenseExample.ModuleWithFunctions, as: MyMod
-      MyMod.delegated_function(
-      #        ^
-    end
-    """
+    test "find implementation of delegated functions in incomplete code" do
+      buffer = """
+      defmodule MyModule do
+        alias ElixirSenseExample.ModuleWithFunctions, as: MyMod
+        MyMod.delegated_function(
+        #        ^
+      end
+      """
 
-    [%Location{type: :function, file: file, line: line, column: column}] =
-      Locator.implementations(buffer, 3, 11)
+      [%Location{type: :function, file: file, line: line, column: column}] =
+        Locator.implementations(buffer, 3, 11)
 
-    assert file =~ "language_server/test/support/module_with_functions.ex"
-    assert read_line(file, {line, column}) =~ "delegated_function do"
+      assert file =~ "language_server/test/support/module_with_functions.ex"
+      assert read_line(file, {line, column}) =~ "delegated_function do"
 
-    buffer = """
-    defmodule MyModule do
-      alias ElixirSenseExample.ModuleWithFunctions, as: MyMod
-      MyMod.delegated_function(1
-      #        ^
-    end
-    """
+      buffer = """
+      defmodule MyModule do
+        alias ElixirSenseExample.ModuleWithFunctions, as: MyMod
+        MyMod.delegated_function(1
+        #        ^
+      end
+      """
 
-    [%Location{type: :function, file: file, line: line, column: column}] =
-      Locator.implementations(buffer, 3, 11)
+      [%Location{type: :function, file: file, line: line, column: column}] =
+        Locator.implementations(buffer, 3, 11)
 
-    assert file =~ "language_server/test/support/module_with_functions.ex"
-    assert read_line(file, {line, column}) =~ "delegated_function(a) do"
+      assert file =~ "language_server/test/support/module_with_functions.ex"
+      assert read_line(file, {line, column}) =~ "delegated_function(a) do"
 
-    buffer = """
-    defmodule MyModule do
-      alias ElixirSenseExample.ModuleWithFunctions, as: MyMod
-      MyMod.delegated_function(1,
-      #        ^
-    end
-    """
+      buffer = """
+      defmodule MyModule do
+        alias ElixirSenseExample.ModuleWithFunctions, as: MyMod
+        MyMod.delegated_function(1,
+        #        ^
+      end
+      """
 
-    [%Location{type: :function, file: file, line: line, column: column}] =
-      Locator.implementations(buffer, 3, 11)
+      [%Location{type: :function, file: file, line: line, column: column}] =
+        Locator.implementations(buffer, 3, 11)
 
-    assert file =~ "language_server/test/support/module_with_functions.ex"
-    assert read_line(file, {line, column}) =~ "delegated_function(a, b) do"
+      assert file =~ "language_server/test/support/module_with_functions.ex"
+      assert read_line(file, {line, column}) =~ "delegated_function(a, b) do"
 
-    buffer = """
-    defmodule MyModule do
-      alias ElixirSenseExample.ModuleWithFunctions, as: MyMod
-      MyMod.delegated_function(1, 2,
-      #        ^
-    end
-    """
+      buffer = """
+      defmodule MyModule do
+        alias ElixirSenseExample.ModuleWithFunctions, as: MyMod
+        MyMod.delegated_function(1, 2,
+        #        ^
+      end
+      """
 
-    # too many arguments
+      # too many arguments
 
-    assert [] = Locator.implementations(buffer, 3, 11)
-  end
+      assert [] = Locator.implementations(buffer, 3, 11)
+    end
   end
 
   test "find implementation of delegated functions via @attr" do

From f38fb87d058df4cb7e84d1bff21e1fac5a40d5db Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Mon, 30 Sep 2024 23:38:32 +0200
Subject: [PATCH 28/36] bump elixir_sense

---
 dep_versions.exs | 2 +-
 mix.lock         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dep_versions.exs b/dep_versions.exs
index 93f96d72e..91339923e 100644
--- a/dep_versions.exs
+++ b/dep_versions.exs
@@ -1,5 +1,5 @@
 [
-  elixir_sense: "67b22e2ad349124aa7e44f733e82a3ecbd5d4dfb",
+  elixir_sense: "d64014597757d962dc15a4a63851d6c5f4f82898",
   dialyxir_vendored: "462e599aa7004a32cfa548cc715c9c59e95dacaf",
   jason_v: "c81537e2a5e1acacb915cf339fe400357e3c2aaa",
   erl2ex_vendored: "073ac6b9a44282e718b6050c7b27cedf9217a12a",
diff --git a/mix.lock b/mix.lock
index 6a2369259..62601211c 100644
--- 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", "462e599aa7004a32cfa548cc715c9c59e95dacaf", [ref: "462e599aa7004a32cfa548cc715c9c59e95dacaf"]},
-  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "67b22e2ad349124aa7e44f733e82a3ecbd5d4dfb", [ref: "67b22e2ad349124aa7e44f733e82a3ecbd5d4dfb"]},
+  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "d64014597757d962dc15a4a63851d6c5f4f82898", [ref: "d64014597757d962dc15a4a63851d6c5f4f82898"]},
   "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"]},

From 7c96d44ae1681de5a407b96bf2d73dd6cb3f4fe8 Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Tue, 1 Oct 2024 22:28:08 +0200
Subject: [PATCH 29/36] use cursor_env

---
 apps/debug_adapter/lib/debug_adapter/server.ex                | 4 ++--
 .../lib/language_server/providers/completion.ex               | 2 +-
 .../lib/language_server/providers/references/locator.ex       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/debug_adapter/lib/debug_adapter/server.ex b/apps/debug_adapter/lib/debug_adapter/server.ex
index 92619ae84..59271f3f0 100644
--- a/apps/debug_adapter/lib/debug_adapter/server.ex
+++ b/apps/debug_adapter/lib/debug_adapter/server.ex
@@ -2437,7 +2437,7 @@ defmodule ElixirLS.DebugAdapter.Server do
       metadata = ElixirSense.Core.Parser.parse_file(path, false, false, nil)
 
       for line <- lines do
-        env = ElixirSense.Core.Metadata.get_env(metadata, {line |> elem(0), 1})
+        env = ElixirSense.Core.Metadata.get_cursor_env(metadata, {line |> elem(0), 1})
         metadata_module = env.module
 
         modules_to_break =
@@ -2925,7 +2925,7 @@ defmodule ElixirLS.DebugAdapter.Server do
       if String.ends_with?(file, ".ex") or String.ends_with?(file, ".exs") do
         code = File.read!(file)
         buffer_file_metadata = ElixirSense.Core.Parser.parse_string(code, false, true, {line, 1})
-        env = Metadata.get_cursor_env(buffer_file_metadata, {line, 1})
+        env = ElixirSense.Core.Metadata.get_cursor_env(buffer_file_metadata, {line, 1})
 
         {buffer_file_metadata, env, ElixirSense.Core.State.Env.to_macro_env(env, file, line)}
       else
diff --git a/apps/language_server/lib/language_server/providers/completion.ex b/apps/language_server/lib/language_server/providers/completion.ex
index 76f5b42d4..19e03045e 100644
--- a/apps/language_server/lib/language_server/providers/completion.ex
+++ b/apps/language_server/lib/language_server/providers/completion.ex
@@ -142,7 +142,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion do
 
     prefix = get_prefix(text_before_cursor)
 
-    env = ElixirSense.Core.Metadata.get_env(metadata, {line, character})
+    env = ElixirSense.Core.Metadata.get_cursor_env(metadata, {line, character})
 
     scope =
       case env do
diff --git a/apps/language_server/lib/language_server/providers/references/locator.ex b/apps/language_server/lib/language_server/providers/references/locator.ex
index 0fc7e0b88..e8e4af8ff 100644
--- a/apps/language_server/lib/language_server/providers/references/locator.ex
+++ b/apps/language_server/lib/language_server/providers/references/locator.ex
@@ -113,7 +113,7 @@ defmodule ElixirLS.LanguageServer.Providers.References.Locator do
             |> List.flatten()
             |> Enum.filter(fn call -> function == nil or call.func == function end)
             |> Enum.map(fn call ->
-              env = Metadata.get_env(metadata, call.position)
+              env = Metadata.get_cursor_env(metadata, call.position)
 
               binding_env = Binding.from_env(env, metadata)
 

From e3cb7a8b3e4648357931931777732f593f76965f Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Tue, 1 Oct 2024 22:32:06 +0200
Subject: [PATCH 30/36] bump elixir_sense

---
 dep_versions.exs | 2 +-
 mix.lock         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dep_versions.exs b/dep_versions.exs
index 91339923e..de7228c82 100644
--- a/dep_versions.exs
+++ b/dep_versions.exs
@@ -1,5 +1,5 @@
 [
-  elixir_sense: "d64014597757d962dc15a4a63851d6c5f4f82898",
+  elixir_sense: "749adcdbb4cd8b6b642d4e719feffddf312c5c69",
   dialyxir_vendored: "462e599aa7004a32cfa548cc715c9c59e95dacaf",
   jason_v: "c81537e2a5e1acacb915cf339fe400357e3c2aaa",
   erl2ex_vendored: "073ac6b9a44282e718b6050c7b27cedf9217a12a",
diff --git a/mix.lock b/mix.lock
index 62601211c..d6706a1fe 100644
--- 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", "462e599aa7004a32cfa548cc715c9c59e95dacaf", [ref: "462e599aa7004a32cfa548cc715c9c59e95dacaf"]},
-  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "d64014597757d962dc15a4a63851d6c5f4f82898", [ref: "d64014597757d962dc15a4a63851d6c5f4f82898"]},
+  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "749adcdbb4cd8b6b642d4e719feffddf312c5c69", [ref: "749adcdbb4cd8b6b642d4e719feffddf312c5c69"]},
   "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"]},

From 3089a02f0d198f4d9f366937ae91e0b8c5a0cf63 Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Fri, 4 Oct 2024 22:41:07 +0200
Subject: [PATCH 31/36] resolve some TODOs

---
 .../lib/language_server/markdown_utils.ex     |  1 -
 .../lib/language_server/mix_tasks/format.ex   |  1 -
 .../providers/completion/suggestion.ex        | 10 +----
 .../providers/execute_command/expand_macro.ex |  1 -
 .../test/providers/completion_test.exs        | 44 ++++++++++---------
 .../providers/definition/locator_test.exs     |  5 +--
 .../providers/references/locator_test.exs     |  2 +-
 7 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/apps/language_server/lib/language_server/markdown_utils.ex b/apps/language_server/lib/language_server/markdown_utils.ex
index 429121650..22a86fe1a 100644
--- a/apps/language_server/lib/language_server/markdown_utils.ex
+++ b/apps/language_server/lib/language_server/markdown_utils.ex
@@ -151,7 +151,6 @@ defmodule ElixirLS.LanguageServer.MarkdownUtils do
   of ExDoc autolinker https://hexdocs.pm/ex_doc/readme.html#auto-linking
   """
   def transform_ex_doc_links(string, current_module \\ nil) do
-    # TODO add support for OTP 27
     string
     |> String.split(~r/(`.*?`)|(\[.*?\]\(.*?\))/u, include_captures: true)
     |> Enum.map(fn segment ->
diff --git a/apps/language_server/lib/language_server/mix_tasks/format.ex b/apps/language_server/lib/language_server/mix_tasks/format.ex
index c269336c2..197808cfe 100644
--- a/apps/language_server/lib/language_server/mix_tasks/format.ex
+++ b/apps/language_server/lib/language_server/mix_tasks/format.ex
@@ -371,7 +371,6 @@ defmodule Mix.Tasks.ElixirLSFormat do
   @doc """
   Returns formatter options to be used for the given file.
   """
-  # TODO: Deprecate on Elixir v1.17
   @doc deprecated: "Use formatter_for_file/2 instead"
   def formatter_opts_for_file(file, opts \\ []) do
     {_, formatter_opts} = formatter_for_file(file, opts)
diff --git a/apps/language_server/lib/language_server/providers/completion/suggestion.ex b/apps/language_server/lib/language_server/providers/completion/suggestion.ex
index adb407d29..193d8cd3c 100644
--- a/apps/language_server/lib/language_server/providers/completion/suggestion.ex
+++ b/apps/language_server/lib/language_server/providers/completion/suggestion.ex
@@ -126,15 +126,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.Suggestion do
         {line, column}
       )
 
-    # TODO test surround_context
-    # surround = case NormalizedCode.Fragment.surround_context(code, {line, column}) do
-    #   :none ->
-    #     nil
-
-    #   context ->
-    #     {context.begin, context.end}
-    #   end
-
+    # This works better than Code.Fragment.surround_context
     surround =
       case {prefix, suffix} do
         {"", ""} ->
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
index e07ae4b6c..1f71f42d0 100644
--- 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
@@ -20,7 +20,6 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.ExpandMacro do
     path = get_path(uri)
     cur_text = source_file.text
 
-    # TODO change/move this
     if String.trim(text) != "" do
       formatted =
         expand_full(cur_text, text, path, line + 1)
diff --git a/apps/language_server/test/providers/completion_test.exs b/apps/language_server/test/providers/completion_test.exs
index ad4be0f25..c99df434d 100644
--- a/apps/language_server/test/providers/completion_test.exs
+++ b/apps/language_server/test/providers/completion_test.exs
@@ -1448,32 +1448,34 @@ defmodule ElixirLS.LanguageServer.Providers.CompletionTest do
              } = first
     end
 
-    test "will suggest remote quoted calls" do
-      text = """
-      alias ElixirLS.LanguageServer.Fixtures.ExampleQuotedDefs, as: Quoted
-      Quoted.
-      #      ^
-      """
+    if Version.match?(System.version(), ">= 1.15.0") do
+      test "will suggest remote quoted calls" do
+        text = """
+        alias ElixirLS.LanguageServer.Fixtures.ExampleQuotedDefs, as: Quoted
+        Quoted.
+        #      ^
+        """
 
-      {line, char} = {1, 7}
+        {line, char} = {1, 7}
 
-      TestUtils.assert_has_cursor_char(text, line, char)
-      {line, char} = SourceFile.lsp_position_to_elixir(text, {line, char})
-      parser_context = ParserContextBuilder.from_string(text, {line, char})
+        TestUtils.assert_has_cursor_char(text, line, char)
+        {line, char} = SourceFile.lsp_position_to_elixir(text, {line, char})
+        parser_context = ParserContextBuilder.from_string(text, {line, char})
 
-      assert {:ok, %{"items" => items}} =
-               Completion.completion(
-                 parser_context,
-                 line,
-                 char,
-                 @supports
-               )
+        assert {:ok, %{"items" => items}} =
+                 Completion.completion(
+                   parser_context,
+                   line,
+                   char,
+                   @supports
+                 )
 
-      assert item = Enum.find(items, fn item -> item["label"] == "\"0abc\\\"asd\"" end)
-      assert item["insertText"] == "\"0abc\\\"asd\"($1)$0"
+        assert item = Enum.find(items, fn item -> item["label"] == "\"0abc\\\"asd\"" end)
+        assert item["insertText"] == "\"0abc\\\"asd\"($1)$0"
 
-      assert item["labelDetails"]["description"] ==
-               "ElixirLS.LanguageServer.Fixtures.ExampleQuotedDefs.\"0abc\\\"asd\"/2"
+        assert item["labelDetails"]["description"] ==
+                 "ElixirLS.LanguageServer.Fixtures.ExampleQuotedDefs.\"0abc\\\"asd\"/2"
+      end
     end
   end
 
diff --git a/apps/language_server/test/providers/definition/locator_test.exs b/apps/language_server/test/providers/definition/locator_test.exs
index d4f36248e..3be4e19aa 100644
--- a/apps/language_server/test/providers/definition/locator_test.exs
+++ b/apps/language_server/test/providers/definition/locator_test.exs
@@ -41,7 +41,6 @@ defmodule ElixirLS.LanguageServer.Providers.Definition.LocatorTest do
   end
 
   test "find definition of aliased modules in `use`" do
-    # TODO this test fails if there's no newline between alias and use
     buffer = """
     defmodule MyModule do
       alias ElixirSenseExample.UseExample
@@ -1060,7 +1059,7 @@ defmodule ElixirLS.LanguageServer.Providers.Definition.LocatorTest do
            }
   end
 
-  # TODO not supported in Code.Fragment.surround_context
+  # TODO not supported in Code.Fragment.surround_context as of elixir 1.17
   # test "find definition of &1 capture variable" do
   #   buffer = """
   #   defmodule MyModule do
@@ -1202,7 +1201,7 @@ defmodule ElixirLS.LanguageServer.Providers.Definition.LocatorTest do
            }
 
     # `a` redefined in a case clause
-    # TODO cursor lands in the wrong clause
+    # TODO cursor lands in the wrong clause on 1.17
     # defmodule MyModule do
     #   def my_fun(a, b) do
     #     case a do
diff --git a/apps/language_server/test/providers/references/locator_test.exs b/apps/language_server/test/providers/references/locator_test.exs
index 2538e51ce..3864c5530 100644
--- a/apps/language_server/test/providers/references/locator_test.exs
+++ b/apps/language_server/test/providers/references/locator_test.exs
@@ -243,7 +243,7 @@ defmodule ElixirLS.LanguageServer.Providers.References.LocatorTest do
              %{start: %{line: 65, column: 79}, end: %{line: 65, column: 83}} |> maybe_shift
   end
 
-  # TODO crashes metadata builder
+  # TODO attributes not supported yet
   # test "find references with cursor over a function called via @attr.Submodule.call", %{trace: trace} do
   #   buffer = """
   #   defmodule Caller do

From 5b6b45908d3ef11801a9361a73a8e5c79b7cb110 Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Sat, 5 Oct 2024 10:01:20 +0200
Subject: [PATCH 32/36] bump elixir_sense

fix tests
---
 apps/language_server/lib/language_server/parser.ex     |  2 +-
 .../providers/execute_command/expand_macro.ex          |  3 ++-
 .../test/providers/completion/suggestions_test.exs     | 10 +++++-----
 .../language_server/test/providers/hover/docs_test.exs |  2 +-
 .../test/providers/signature_help/signature_test.exs   |  8 ++++----
 dep_versions.exs                                       |  2 +-
 mix.lock                                               |  2 +-
 7 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/apps/language_server/lib/language_server/parser.ex b/apps/language_server/lib/language_server/parser.ex
index 525957a22..a4df6cede 100644
--- a/apps/language_server/lib/language_server/parser.ex
+++ b/apps/language_server/lib/language_server/parser.ex
@@ -266,7 +266,7 @@ defmodule ElixirLS.LanguageServer.Parser do
 
     queue =
       Enum.reduce(state.queue, [], fn
-        {{^uri, ^parsed_file_version, position}, from}, acc ->
+        {{^uri, ^parsed_file_version, _position}, from}, acc ->
           GenServer.reply(from, updated_file)
           acc
 
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
index 1f71f42d0..4ba1fe799 100644
--- 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
@@ -8,6 +8,7 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.ExpandMacro do
   alias ElixirSense.Core.State
   alias ElixirSense.Core.Parser
   alias ElixirSense.Core.Metadata
+  alias ElixirSense.Core.MetadataBuilder
   alias ElixirSense.Core.Compiler
   alias ElixirLS.LanguageServer.SourceFile
 
@@ -63,7 +64,7 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.ExpandMacro do
     try do
       expr = code |> Code.string_to_quoted!()
 
-      {ast, _state, _env} = Compiler.expand(expr, %State{}, env)
+      {ast, _state, _env} = Compiler.expand(expr, MetadataBuilder.initial_state({line, 1}), env)
 
       %{
         expand_once: expr |> Macro.expand_once(env) |> Macro.to_string(),
diff --git a/apps/language_server/test/providers/completion/suggestions_test.exs b/apps/language_server/test/providers/completion/suggestions_test.exs
index 79b19ffe7..f4bdd95c5 100644
--- a/apps/language_server/test/providers/completion/suggestions_test.exs
+++ b/apps/language_server/test/providers/completion/suggestions_test.exs
@@ -683,7 +683,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
 
     if System.otp_release() |> String.to_integer() >= 23 do
       if System.otp_release() |> String.to_integer() >= 27 do
-        assert "This function is called" <> _ = summary
+        assert "Update the [state]" <> _ = summary
       else
         assert "- OldVsn = Vsn" <> _ = summary
       end
@@ -1265,7 +1265,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
              ] = list
 
       if System.otp_release() |> String.to_integer() >= 27 do
-        assert "Whenever" <> _ = documentation
+        assert "Initialize the state machine" <> _ = documentation
       else
         assert "- Args = " <> _ = documentation
       end
@@ -1385,7 +1385,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
              } = init_res
 
       if System.otp_release() |> String.to_integer() >= 27 do
-        assert "Whenever a new event" <> _ = documentation
+        assert "Initialize the event handler" <> _ = documentation
       else
         assert "- InitArgs = Args" <> _ = documentation
       end
@@ -1476,7 +1476,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
              ] = list
 
       if System.otp_release() |> String.to_integer() >= 27 do
-        assert "Whenever" <> _ = documentation
+        assert "Initialize the state machine" <> _ = documentation
       else
         assert "- Args = " <> _ = documentation
       end
@@ -1511,7 +1511,7 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
              ] = list
 
       if System.otp_release() |> String.to_integer() >= 27 do
-        assert "Whenever" <> _ = documentation
+        assert "Initialize the server" <> _ = documentation
       else
         assert "- Args = " <> _ = documentation
       end
diff --git a/apps/language_server/test/providers/hover/docs_test.exs b/apps/language_server/test/providers/hover/docs_test.exs
index 086972071..cf75f5821 100644
--- a/apps/language_server/test/providers/hover/docs_test.exs
+++ b/apps/language_server/test/providers/hover/docs_test.exs
@@ -725,7 +725,7 @@ defmodule ElixirLS.LanguageServer.Providers.Hover.DocsTest do
 
       if System.otp_release() |> String.to_integer() >= 23 do
         if System.otp_release() |> String.to_integer() >= 27 do
-          assert "Whenever" <> _ = doc.docs
+          assert "Initialize the state machine" <> _ = doc.docs
         else
           assert doc.docs =~
                    "this function is called by"
diff --git a/apps/language_server/test/providers/signature_help/signature_test.exs b/apps/language_server/test/providers/signature_help/signature_test.exs
index c414f01f1..aabf1843b 100644
--- a/apps/language_server/test/providers/signature_help/signature_test.exs
+++ b/apps/language_server/test/providers/signature_help/signature_test.exs
@@ -1023,7 +1023,7 @@ defmodule ElixirLS.LanguageServer.Providers.SignatureHelp.SignatureTest do
 
       if System.otp_release() |> String.to_integer() >= 23 do
         if System.otp_release() |> String.to_integer() >= 27 do
-          assert "Whenever" <> _ = summary
+          assert "Initialize the server" <> _ = summary
         else
           assert "- Args = " <> _ = summary
         end
@@ -1070,7 +1070,7 @@ defmodule ElixirLS.LanguageServer.Providers.SignatureHelp.SignatureTest do
                } = res
 
         if System.otp_release() |> String.to_integer() >= 27 do
-          assert "Whenever" <> _ = documentation
+          assert "Initialize the state machine" <> _ = documentation
         else
           assert "- Args = " <> _ = documentation
         end
@@ -1098,7 +1098,7 @@ defmodule ElixirLS.LanguageServer.Providers.SignatureHelp.SignatureTest do
                } = res
 
         if System.otp_release() |> String.to_integer() >= 27 do
-          assert "Whenever a" <> _ = summary
+          assert "Initialize the server" <> _ = summary
         else
           assert "- Args = " <> _ = summary
         end
@@ -1285,7 +1285,7 @@ defmodule ElixirLS.LanguageServer.Providers.SignatureHelp.SignatureTest do
                } = res
 
         if System.otp_release() |> String.to_integer() >= 27 do
-          assert "Whenever a" <> _ = summary
+          assert "Initialize the state machine" <> _ = summary
         else
           assert "- Args = term" <> _ = summary
         end
diff --git a/dep_versions.exs b/dep_versions.exs
index de7228c82..7d18e6ece 100644
--- a/dep_versions.exs
+++ b/dep_versions.exs
@@ -1,5 +1,5 @@
 [
-  elixir_sense: "749adcdbb4cd8b6b642d4e719feffddf312c5c69",
+  elixir_sense: "4ef2bc0403b8d31f80c06cd6164b104d480f6c86",
   dialyxir_vendored: "462e599aa7004a32cfa548cc715c9c59e95dacaf",
   jason_v: "c81537e2a5e1acacb915cf339fe400357e3c2aaa",
   erl2ex_vendored: "073ac6b9a44282e718b6050c7b27cedf9217a12a",
diff --git a/mix.lock b/mix.lock
index d6706a1fe..194c69776 100644
--- 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", "462e599aa7004a32cfa548cc715c9c59e95dacaf", [ref: "462e599aa7004a32cfa548cc715c9c59e95dacaf"]},
-  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "749adcdbb4cd8b6b642d4e719feffddf312c5c69", [ref: "749adcdbb4cd8b6b642d4e719feffddf312c5c69"]},
+  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "4ef2bc0403b8d31f80c06cd6164b104d480f6c86", [ref: "4ef2bc0403b8d31f80c06cd6164b104d480f6c86"]},
   "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"]},

From 706210777232bd01139109742c176d9545068ca1 Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Sat, 5 Oct 2024 11:42:15 +0200
Subject: [PATCH 33/36] exclude tests

---
 .../replace_remote_function_test.exs           |  8 ++++++++
 .../providers/completion/suggestions_test.exs  |  6 +++++-
 .../execute_command/expand_macro_test.exs      | 18 +++++++++++++-----
 .../test/providers/references/locator_test.exs |  2 ++
 dep_versions.exs                               |  2 +-
 mix.lock                                       |  2 +-
 6 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/apps/language_server/test/providers/code_action/replace_remote_function_test.exs b/apps/language_server/test/providers/code_action/replace_remote_function_test.exs
index cbc6d27b7..8b75ba764 100644
--- a/apps/language_server/test/providers/code_action/replace_remote_function_test.exs
+++ b/apps/language_server/test/providers/code_action/replace_remote_function_test.exs
@@ -183,6 +183,7 @@ defmodule ElixirLS.LanguageServer.Providers.CodeAction.ReplaceRemoteFunctionTest
       end
     end
 
+    if Version.match?(System.version(), ">= 1.15.0") do
     test "when aliased" do
       message = """
       ElixirLS.Test.RemoteFunction.fou/1 is undefined or private. Did you mean:
@@ -199,7 +200,9 @@ defmodule ElixirLS.LanguageServer.Providers.CodeAction.ReplaceRemoteFunctionTest
 
       assert result == "alias ElixirLS.Test.RemoteFunction\nRemoteFunction.foo(42)"
     end
+    end
 
+    if Version.match?(System.version(), ">= 1.15.0") do
     test "when aliased with a custom name" do
       message = """
       ElixirLS.Test.RemoteFunction.fou/1 is undefined or private. Did you mean:
@@ -216,6 +219,7 @@ defmodule ElixirLS.LanguageServer.Providers.CodeAction.ReplaceRemoteFunctionTest
 
       assert result == "alias ElixirLS.Test.RemoteFunction, as: Remote\nRemote.foo(42)"
     end
+    end
   end
 
   describe "fixes captured function" do
@@ -313,6 +317,7 @@ defmodule ElixirLS.LanguageServer.Providers.CodeAction.ReplaceRemoteFunctionTest
       end
     end
 
+    if Version.match?(System.version(), ">= 1.15.0") do
     test "when aliased" do
       message = """
       ElixirLS.Test.RemoteFunction.fou/1 is undefined or private. Did you mean:
@@ -329,7 +334,9 @@ defmodule ElixirLS.LanguageServer.Providers.CodeAction.ReplaceRemoteFunctionTest
 
       assert result == "alias ElixirLS.Test.RemoteFunction\n&RemoteFunction.foo/1"
     end
+    end
 
+    if Version.match?(System.version(), ">= 1.15.0") do
     test "when aliased with a custom name" do
       message = """
       ElixirLS.Test.RemoteFunction.fou/1 is undefined or private. Did you mean:
@@ -347,4 +354,5 @@ defmodule ElixirLS.LanguageServer.Providers.CodeAction.ReplaceRemoteFunctionTest
       assert result == "alias ElixirLS.Test.RemoteFunction, as: Remote\n&Remote.foo/1"
     end
   end
+  end
 end
diff --git a/apps/language_server/test/providers/completion/suggestions_test.exs b/apps/language_server/test/providers/completion/suggestions_test.exs
index f4bdd95c5..47e82dcc1 100644
--- a/apps/language_server/test/providers/completion/suggestions_test.exs
+++ b/apps/language_server/test/providers/completion/suggestions_test.exs
@@ -2127,7 +2127,11 @@ defmodule ElixirLS.LanguageServer.Providers.Completion.SuggestionTest do
         |> Enum.filter(fn s -> s.type == :attribute end)
         |> Enum.map(fn %{name: name} -> name end)
 
-      assert list == ["@macrocallback", "@moduledoc", "@myattr"]
+      if Version.match?(System.version(), ">= 1.15.0") do
+        assert list == ["@macrocallback", "@moduledoc", "@myattr"]
+      else
+        assert list == ["@macrocallback", "@moduledoc"]
+      end
 
       list =
         Suggestion.suggestions(buffer, 5, 7)
diff --git a/apps/language_server/test/providers/execute_command/expand_macro_test.exs b/apps/language_server/test/providers/execute_command/expand_macro_test.exs
index 1bace7beb..40e693072 100644
--- a/apps/language_server/test/providers/execute_command/expand_macro_test.exs
+++ b/apps/language_server/test/providers/execute_command/expand_macro_test.exs
@@ -37,11 +37,19 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.ExpandMacroTest do
                }
              })
 
-    assert res == %{
-             "expand" => "abc\n",
-             "expandAll" => "abc\n",
-             "expandOnce" => "abc\n"
-           }
+    if Version.match?(System.version(), ">= 1.15.0") do
+      assert res == %{
+              "expand" => "abc\n",
+              "expandAll" => "abc\n",
+              "expandOnce" => "abc\n"
+            }
+    else
+      assert res == %{
+              "expand" => "abc\n",
+              "expandAll" => "abc()\n",
+              "expandOnce" => "abc\n"
+            }
+    end
   end
 
   test "expands macro" do
diff --git a/apps/language_server/test/providers/references/locator_test.exs b/apps/language_server/test/providers/references/locator_test.exs
index 3864c5530..e0cfa62e5 100644
--- a/apps/language_server/test/providers/references/locator_test.exs
+++ b/apps/language_server/test/providers/references/locator_test.exs
@@ -810,6 +810,7 @@ defmodule ElixirLS.LanguageServer.Providers.References.LocatorTest do
     assert [] == references
   end
 
+  if Version.match?(System.version(), ">= 1.15.0") do
   test "find references for metadata calls on variable or attribute",
        %{trace: trace} do
     buffer = """
@@ -852,6 +853,7 @@ defmodule ElixirLS.LanguageServer.Providers.References.LocatorTest do
              }
            ] = references
   end
+  end
 
   test "find references for the correct arity version for metadata calls with cursor over module",
        %{trace: trace} do
diff --git a/dep_versions.exs b/dep_versions.exs
index 7d18e6ece..9ac648468 100644
--- a/dep_versions.exs
+++ b/dep_versions.exs
@@ -1,5 +1,5 @@
 [
-  elixir_sense: "4ef2bc0403b8d31f80c06cd6164b104d480f6c86",
+  elixir_sense: "f2b6172e9f7d8da2a1039888e355cc7b7757c2b5",
   dialyxir_vendored: "462e599aa7004a32cfa548cc715c9c59e95dacaf",
   jason_v: "c81537e2a5e1acacb915cf339fe400357e3c2aaa",
   erl2ex_vendored: "073ac6b9a44282e718b6050c7b27cedf9217a12a",
diff --git a/mix.lock b/mix.lock
index 194c69776..0f105f795 100644
--- 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", "462e599aa7004a32cfa548cc715c9c59e95dacaf", [ref: "462e599aa7004a32cfa548cc715c9c59e95dacaf"]},
-  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "4ef2bc0403b8d31f80c06cd6164b104d480f6c86", [ref: "4ef2bc0403b8d31f80c06cd6164b104d480f6c86"]},
+  "elixir_sense": {:git, "https://github.com/elixir-lsp/elixir_sense.git", "f2b6172e9f7d8da2a1039888e355cc7b7757c2b5", [ref: "f2b6172e9f7d8da2a1039888e355cc7b7757c2b5"]},
   "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"]},

From fed32bfa0b9665cd1c53eaad93487a0ffb7825ce Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Sat, 5 Oct 2024 11:48:30 +0200
Subject: [PATCH 34/36] fix from elixir_sense

---
 apps/elixir_ls_utils/lib/completion_engine.ex | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/apps/elixir_ls_utils/lib/completion_engine.ex b/apps/elixir_ls_utils/lib/completion_engine.ex
index 07e305726..54afd6b45 100644
--- a/apps/elixir_ls_utils/lib/completion_engine.ex
+++ b/apps/elixir_ls_utils/lib/completion_engine.ex
@@ -856,19 +856,20 @@ defmodule ElixirLS.Utils.CompletionEngine do
 
   ## Helpers
 
-  # Version.match? is slow, we need to avoid it in a hot loop
-  if Version.match?(System.version(), ">= 1.14.0-dev") do
-    defp usable_as_unquoted_module?(name) do
-      # Conversion to atom is not a problem because
-      # it is only called with existing modules names.
-      # credo:disable-for-lines:7
-      Macro.classify_atom(String.to_atom(name)) in [:identifier, :unquoted] and
-        not String.starts_with?(name, "Elixir.")
-    end
-  else
-    defp usable_as_unquoted_module?(name) do
-      Code.Identifier.classify(String.to_atom(name)) != :other and
-        not String.starts_with?(name, "Elixir.")
+  defp usable_as_unquoted_module?(name) do
+    unquoted_atom_or_identifier?(String.to_atom(name)) and
+      not String.starts_with?(name, "Elixir.")
+  end
+
+  defp unquoted_atom_or_identifier?(atom) when is_atom(atom) do
+    # Version.match? is slow, we need to avoid it in a hot loop
+    # TODO remove this when we require elixir 1.14
+    # Macro.classify_atom/1 was introduced in 1.14.0. If it's not available,
+    # assume we're on an older version and fall back to a private API.
+    if function_exported?(Macro, :classify_atom, 1) do
+      apply(Macro, :classify_atom, [atom]) in [:identifier, :unquoted]
+    else
+      apply(Code.Identifier, :classify, [atom]) != :other
     end
   end
 

From 036159f00201dbfb2367e42b6021a858af7f9efe Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Sat, 5 Oct 2024 11:53:53 +0200
Subject: [PATCH 35/36] fix test on 1.13

---
 .../test/providers/execute_command/expand_macro_test.exs      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/language_server/test/providers/execute_command/expand_macro_test.exs b/apps/language_server/test/providers/execute_command/expand_macro_test.exs
index 40e693072..55d41be95 100644
--- a/apps/language_server/test/providers/execute_command/expand_macro_test.exs
+++ b/apps/language_server/test/providers/execute_command/expand_macro_test.exs
@@ -132,6 +132,9 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.ExpandMacroTest do
                   )
                   """
                 else
+                  if Version.match?(System.version(), "< 1.14.0") do
+                    "Application\n\n(\n  Application\n  @doc false\n  {:stop, 1}\n  nil\n)"
+                  else
                   """
                   (
                     require Application
@@ -146,6 +149,7 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.ExpandMacroTest do
 
                       Module.make_overridable(MyModule, Application)
                   """
+                  end
                 end)
                |> String.trim()
     end

From d1eb9f6c22895730759574465419ad73b1ad7f67 Mon Sep 17 00:00:00 2001
From: Lukasz Samson <lukaszsamson@gmail.com>
Date: Sat, 5 Oct 2024 11:55:39 +0200
Subject: [PATCH 36/36] format

---
 .../replace_remote_function_test.exs          | 80 +++++++++----------
 .../execute_command/expand_macro_test.exs     | 38 ++++-----
 .../providers/references/locator_test.exs     | 70 ++++++++--------
 3 files changed, 94 insertions(+), 94 deletions(-)

diff --git a/apps/language_server/test/providers/code_action/replace_remote_function_test.exs b/apps/language_server/test/providers/code_action/replace_remote_function_test.exs
index 8b75ba764..7de9283d1 100644
--- a/apps/language_server/test/providers/code_action/replace_remote_function_test.exs
+++ b/apps/language_server/test/providers/code_action/replace_remote_function_test.exs
@@ -184,41 +184,41 @@ defmodule ElixirLS.LanguageServer.Providers.CodeAction.ReplaceRemoteFunctionTest
     end
 
     if Version.match?(System.version(), ">= 1.15.0") do
-    test "when aliased" do
-      message = """
-      ElixirLS.Test.RemoteFunction.fou/1 is undefined or private. Did you mean:
+      test "when aliased" do
+        message = """
+        ElixirLS.Test.RemoteFunction.fou/1 is undefined or private. Did you mean:
 
-            * foo/1
-      """
+              * foo/1
+        """
 
-      {:ok, [result]} =
-        ~q{
+        {:ok, [result]} =
+          ~q{
         alias ElixirLS.Test.RemoteFunction
         RemoteFunction.fou(42)
       }
-        |> modify(message: message, suggestion: "RemoteFunction.foo", line: 1)
+          |> modify(message: message, suggestion: "RemoteFunction.foo", line: 1)
 
-      assert result == "alias ElixirLS.Test.RemoteFunction\nRemoteFunction.foo(42)"
-    end
+        assert result == "alias ElixirLS.Test.RemoteFunction\nRemoteFunction.foo(42)"
+      end
     end
 
     if Version.match?(System.version(), ">= 1.15.0") do
-    test "when aliased with a custom name" do
-      message = """
-      ElixirLS.Test.RemoteFunction.fou/1 is undefined or private. Did you mean:
+      test "when aliased with a custom name" do
+        message = """
+        ElixirLS.Test.RemoteFunction.fou/1 is undefined or private. Did you mean:
 
-            * foo/1
-      """
+              * foo/1
+        """
 
-      {:ok, [result]} =
-        ~q{
+        {:ok, [result]} =
+          ~q{
         alias ElixirLS.Test.RemoteFunction, as: Remote
         Remote.fou(42)
       }
-        |> modify(message: message, suggestion: "Remote.foo", line: 1)
+          |> modify(message: message, suggestion: "Remote.foo", line: 1)
 
-      assert result == "alias ElixirLS.Test.RemoteFunction, as: Remote\nRemote.foo(42)"
-    end
+        assert result == "alias ElixirLS.Test.RemoteFunction, as: Remote\nRemote.foo(42)"
+      end
     end
   end
 
@@ -318,41 +318,41 @@ defmodule ElixirLS.LanguageServer.Providers.CodeAction.ReplaceRemoteFunctionTest
     end
 
     if Version.match?(System.version(), ">= 1.15.0") do
-    test "when aliased" do
-      message = """
-      ElixirLS.Test.RemoteFunction.fou/1 is undefined or private. Did you mean:
+      test "when aliased" do
+        message = """
+        ElixirLS.Test.RemoteFunction.fou/1 is undefined or private. Did you mean:
 
-            * foo/1
-      """
+              * foo/1
+        """
 
-      {:ok, [result]} =
-        ~q{
+        {:ok, [result]} =
+          ~q{
         alias ElixirLS.Test.RemoteFunction
         &RemoteFunction.fou/1
       }
-        |> modify(message: message, suggestion: "RemoteFunction.foo", line: 1)
+          |> modify(message: message, suggestion: "RemoteFunction.foo", line: 1)
 
-      assert result == "alias ElixirLS.Test.RemoteFunction\n&RemoteFunction.foo/1"
-    end
+        assert result == "alias ElixirLS.Test.RemoteFunction\n&RemoteFunction.foo/1"
+      end
     end
 
     if Version.match?(System.version(), ">= 1.15.0") do
-    test "when aliased with a custom name" do
-      message = """
-      ElixirLS.Test.RemoteFunction.fou/1 is undefined or private. Did you mean:
+      test "when aliased with a custom name" do
+        message = """
+        ElixirLS.Test.RemoteFunction.fou/1 is undefined or private. Did you mean:
 
-            * foo/1
-      """
+              * foo/1
+        """
 
-      {:ok, [result]} =
-        ~q{
+        {:ok, [result]} =
+          ~q{
         alias ElixirLS.Test.RemoteFunction, as: Remote
         &Remote.fou/1
       }
-        |> modify(message: message, suggestion: "Remote.foo", line: 1)
+          |> modify(message: message, suggestion: "Remote.foo", line: 1)
 
-      assert result == "alias ElixirLS.Test.RemoteFunction, as: Remote\n&Remote.foo/1"
+        assert result == "alias ElixirLS.Test.RemoteFunction, as: Remote\n&Remote.foo/1"
+      end
     end
   end
-  end
 end
diff --git a/apps/language_server/test/providers/execute_command/expand_macro_test.exs b/apps/language_server/test/providers/execute_command/expand_macro_test.exs
index 55d41be95..81bb6293f 100644
--- a/apps/language_server/test/providers/execute_command/expand_macro_test.exs
+++ b/apps/language_server/test/providers/execute_command/expand_macro_test.exs
@@ -39,16 +39,16 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.ExpandMacroTest do
 
     if Version.match?(System.version(), ">= 1.15.0") do
       assert res == %{
-              "expand" => "abc\n",
-              "expandAll" => "abc\n",
-              "expandOnce" => "abc\n"
-            }
+               "expand" => "abc\n",
+               "expandAll" => "abc\n",
+               "expandOnce" => "abc\n"
+             }
     else
       assert res == %{
-              "expand" => "abc\n",
-              "expandAll" => "abc()\n",
-              "expandOnce" => "abc\n"
-            }
+               "expand" => "abc\n",
+               "expandAll" => "abc()\n",
+               "expandOnce" => "abc\n"
+             }
     end
   end
 
@@ -135,20 +135,20 @@ defmodule ElixirLS.LanguageServer.Providers.ExecuteCommand.ExpandMacroTest do
                   if Version.match?(System.version(), "< 1.14.0") do
                     "Application\n\n(\n  Application\n  @doc false\n  {:stop, 1}\n  nil\n)"
                   else
-                  """
-                  (
-                    require Application
-
+                    """
                     (
-                      Module.__put_attribute__(MyModule, :behaviour, Application, nil)
-                      Module.__put_attribute__(MyModule, :doc, {2, false}, nil)
+                      require Application
 
-                      def stop(_state) do
-                        :ok
-                      end
+                      (
+                        Module.__put_attribute__(MyModule, :behaviour, Application, nil)
+                        Module.__put_attribute__(MyModule, :doc, {2, false}, nil)
 
-                      Module.make_overridable(MyModule, Application)
-                  """
+                        def stop(_state) do
+                          :ok
+                        end
+
+                        Module.make_overridable(MyModule, Application)
+                    """
                   end
                 end)
                |> String.trim()
diff --git a/apps/language_server/test/providers/references/locator_test.exs b/apps/language_server/test/providers/references/locator_test.exs
index e0cfa62e5..57d9117ac 100644
--- a/apps/language_server/test/providers/references/locator_test.exs
+++ b/apps/language_server/test/providers/references/locator_test.exs
@@ -811,48 +811,48 @@ defmodule ElixirLS.LanguageServer.Providers.References.LocatorTest do
   end
 
   if Version.match?(System.version(), ">= 1.15.0") do
-  test "find references for metadata calls on variable or attribute",
-       %{trace: trace} do
-    buffer = """
-    defmodule A do
-      @callback abc() :: any()
-    end
+    test "find references for metadata calls on variable or attribute",
+         %{trace: trace} do
+      buffer = """
+      defmodule A do
+        @callback abc() :: any()
+      end
 
-    defmodule B do
-      @behaviour A
+      defmodule B do
+        @behaviour A
 
-      def abc, do: :ok
-    end
+        def abc, do: :ok
+      end
 
-    defmodule X do
-      @b B
-      @b.abc()
-      def a do
-        b = B
-        b.abc()
+      defmodule X do
+        @b B
+        @b.abc()
+        def a do
+          b = B
+          b.abc()
+        end
       end
-    end
-    """
+      """
 
-    references = Locator.references(buffer, 8, 8, trace)
+      references = Locator.references(buffer, 8, 8, trace)
 
-    assert [
-             %{
-               range: %{
-                 end: %{column: 9, line: 13},
-                 start: %{column: 6, line: 13}
-               },
-               uri: nil
-             },
-             %{
-               range: %{
-                 end: %{column: 10, line: 16},
-                 start: %{column: 7, line: 16}
+      assert [
+               %{
+                 range: %{
+                   end: %{column: 9, line: 13},
+                   start: %{column: 6, line: 13}
+                 },
+                 uri: nil
                },
-               uri: nil
-             }
-           ] = references
-  end
+               %{
+                 range: %{
+                   end: %{column: 10, line: 16},
+                   start: %{column: 7, line: 16}
+                 },
+                 uri: nil
+               }
+             ] = references
+    end
   end
 
   test "find references for the correct arity version for metadata calls with cursor over module",