From 1525d4ee8f6827665f49deef9470e0e6805ae981 Mon Sep 17 00:00:00 2001 From: Lukasz Samson Date: Sat, 4 May 2024 09:40:34 +0200 Subject: [PATCH] fix regression on < 1.16 --- lib/elixir_sense/core/state.ex | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/elixir_sense/core/state.ex b/lib/elixir_sense/core/state.ex index f7976057..76a0f494 100644 --- a/lib/elixir_sense/core/state.ex +++ b/lib/elixir_sense/core/state.ex @@ -1783,8 +1783,17 @@ defmodule ElixirSense.Core.State do def no_alias_expansion(other), do: other # defmodule Elixir.Alias - def alias_defmodule({:__aliases__, _, [Elixir, _ | _]}, module, state, env), - do: {module, state, env} + def alias_defmodule({:__aliases__, _, [Elixir, _]}, module, state, env) do + {module, state, env} + end + + if Version.match?(System.version(), ">= 1.16.0-dev") do + # on elixir >= 1.16 no unaliasing is happening + # https://github.com/elixir-lang/elixir/issues/12456 + def alias_defmodule({:__aliases__, _, [Elixir, _ | _]}, module, state, env) do + {module, state, env} + end + end # defmodule Alias in root def alias_defmodule({:__aliases__, _, _}, module, state, %{module: nil} = env),