crystal-lang · Aug 19, 2017 · Aug 19, 2017
Showing with 51 additions and 0 deletions.

+47 −0 spec/compiler/semantic/macro_spec.cr

+4 −0 src/compiler/crystal/types.cr
diff --git a/spec/compiler/semantic/macro_spec.cr b/spec/compiler/semantic/macro_spec.cr
@@ -1122,4 +1122,51 @@ describe "Semantic: macro" do
       Moo.bar
       ), inject_primitives: false) { int32 }
   end
+
+  it "finds metaclass instance of instance method (#4739)" do
+    assert_type(%(
+      class Parent
+        macro foo
+          def self.bar
+            1
+          end
+        end
+      end
+
+      class Child < Parent
+        def foo
+        end
+      end
+
+      class GrandChild < Child
+        foo
+      end
+
+      GrandChild.bar
+    )) { int32 }
+  end
+
+  it "finds metaclass instance of instance method (#4639)" do
+    assert_type(%(
+      module Include
+        macro foo
+          def foo
+            1
+          end
+        end
+      end
+
+      class Parent
+        include Include
+
+        foo
+      end
+
+      class Foo < Parent
+        foo
+      end
+
+      Foo.new.foo
+    )) { int32 }
+  end
 end
diff --git a/src/compiler/crystal/types.cr b/src/compiler/crystal/types.cr
@@ -410,6 +410,8 @@ module Crystal
       # We need to go through the instance type because of module
       # inclusion and inheritance.
       instance_type.parents.try &.each do |parent|
+        # Make sure to start the search in the metaclass if we are a metaclass
+        parent = parent.metaclass if self.metaclass?
         parent_macro = parent.lookup_macro(name, args, named_args)
         return parent_macro if parent_macro
       end
@@ -436,6 +438,8 @@ module Crystal
       # We need to go through the instance type because of module
       # inclusion and inheritance.
       instance_type.parents.try &.each do |parent|
+        # Make sure to start the search in the metaclass if we are a metaclass
+        parent = parent.metaclass if self.metaclass?
         parent_macros = parent.lookup_macros(name)
         return parent_macros if parent_macros
       end