remove references to module variants

Author: lukaszsamson

apps/debug_adapter/lib/debug_adapter/server.ex

@@ -2059,17 +2059,26 @@ defmodule ElixirLS.DebugAdapter.Server do
 
       for line <- lines do
         env = ElixirSense.Core.Metadata.get_env(metadata, {line |> elem(0), 1})
-        metadata_modules = Enum.filter(env.module_variants, &(&1 != Elixir))
+        metadata_module = env.module
 
         modules_to_break =
-          if metadata_modules != [] and
-               Enum.all?(metadata_modules, &(&1 in loaded_modules_from_path)) do
-            # prefer metadata modules if valid and loaded
-            metadata_modules
-          else
-            # fall back to all loaded modules from file
-            # this may create breakpoints outside module line range
-            loaded_modules_from_path
+          cond do
+            metadata_module != nil and metadata_module in loaded_modules_from_path and
+                env.protocol == nil ->
+              # prefer metadata modules if valid and loaded
+              [metadata_module]
+
+            env.protocol != nil ->
+              {protocol, implementations} = env.protocol
+
+              for implementation <- implementations do
+                Module.concat(protocol, implementation)
+              end
+
+            true ->
+              # fall back to all loaded modules from file
+              # this may create breakpoints outside module line range
+              loaded_modules_from_path
           end
 
         set_breakpoint(modules_to_break, path, line)

apps/language_server/lib/language_server/providers/implementation/locator.ex

@@ -159,9 +159,8 @@ defmodule ElixirLS.LanguageServer.Providers.Implementation.Locator do
     metadata_implementations =
       for {_, env} <- metadata.lines_to_env,
           behaviour in env.behaviours,
-          module <- env.module_variants,
           uniq: true,
-          do: module
+          do: env.module
 
     metadata_implementations_locations =
       metadata_implementations

apps/language_server/lib/language_server/providers/references/locator.ex

@@ -34,13 +34,13 @@ defmodule ElixirLS.LanguageServer.Providers.References.Locator do
 
         env =
           %State.Env{
-            module_variants: module_variants
+            module: module
           } =
           Metadata.get_env(metadata, {line, column})
           |> Metadata.add_scope_vars(metadata, {line, column})
 
         # find last env of current module
-        attributes = get_attributes(metadata, module_variants)
+        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
@@ -72,9 +72,9 @@ defmodule ElixirLS.LanguageServer.Providers.References.Locator do
     end
   end
 
-  defp get_attributes(_metadata, []), do: []
+  defp get_attributes(_metadata, nil), do: []
 
-  defp get_attributes(metadata, [module | _]) do
+  defp get_attributes(metadata, module) do
     %State.Env{attributes: attributes} = Metadata.get_last_module_env(metadata, module)
 
     attributes