Ensure full alias is stored in context_modules

Author: José Valim

lib/elixir/lib/kernel.ex

@@ -2787,7 +2787,7 @@ defmodule Kernel do
 
           # Generate the alias for this module definition
           { new, old } = module_nesting(env_module(env), full)
-          meta = [defined: true, context: true] ++ alias_meta(alias)
+          meta = [defined: full, context: true] ++ alias_meta(alias)
 
           { full, { :alias, meta, [old, [as: new, warn: false]] } }
         false ->

lib/elixir/src/elixir_translator.erl

@@ -569,9 +569,8 @@ translate_alias(Meta, IncludeByDefault, Old, TKV, #elixir_scope{context_modules=
   %% Add the alias to context_modules if defined is true.
   %% This is used by defmodule.
   NewContext =
-    case (lists:keyfind(defined, 1, Meta) == { defined, true }) andalso
-         not lists:member(Old, Context) of
-      true  -> [Old|Context];
+    case lists:keyfind(defined, 1, Meta) of
+      { defined, Mod } when is_atom(Mod) -> [Mod|Context];
       false -> Context
     end,
 

lib/elixir/test/elixir/macro_test.exs

@@ -428,6 +428,12 @@ defmodule MacroTest do
     assert env.stacktrace == [{ :elixir_compiler, :__FILE__, 1, [file: "foo", line: 12] }]
   end
 
+  test :context_modules do
+    defmodule Foo.Bar do
+      assert __MODULE__ in __ENV__.context_modules
+    end
+  end
+
   ## pipe/unpipe
 
   test :pipe do