Merge pull request #206 from soutaro/module-typing

Fix module typing
soutaro · Sep 15, 2020 · 63ed42e · 63ed42e
2 parents 0c64bc7 + 64652a8
commit 63ed42e
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 4 deletions.
diff --git a/lib/steep/type_construction.rb b/lib/steep/type_construction.rb
@@ -287,7 +287,6 @@ def for_module(node)
 
         instance_type = AST::Types::Intersection.build(
           types: [
-            AST::Types::Name::Instance.new(name: module_name, args: module_args),
             AST::Builtin::Object.instance_type,
             *module_entry.self_types.map {|module_self|
               type = case
@@ -305,7 +304,8 @@ def for_module(node)
                        )
                      end
               checker.factory.type(type)
-            }
+            },
+            AST::Types::Name::Instance.new(name: module_name, args: module_args)
           ].compact
         )
 

diff --git a/smoke/module/a.rb b/smoke/module/a.rb
@@ -13,7 +13,7 @@ def count
     # !expects IncompatibleAssignment: lhs_type=::String, rhs_type=::Integer
     s = n
 
-    # !expects NoMethodError: type=(::A & ::Object & ::_Each2[::Integer, ::A]), method=foo
+    # !expects NoMethodError: type=(::Object & ::_Each2[::Integer, ::A] & ::A), method=foo
     foo()
 
     n

diff --git a/test/type_construction_test.rb b/test/type_construction_test.rb
@@ -1126,7 +1126,7 @@ module Steep end
           ),
           for_module.module_context.implement_name
         )
-        assert_equal parse_type("::Steep & ::Object"), for_module.module_context.instance_type
+        assert_equal parse_type("::Object & ::Steep"), for_module.module_context.instance_type
         assert_equal parse_type("singleton(::Steep)"), for_module.module_context.module_type
       end
     end
@@ -5404,4 +5404,34 @@ def foo(x)
       end
     end
   end
+
+  def test_module_method_call
+    with_checker(<<-RBS) do |checker|
+module Types
+  def foo: () -> String
+  def hash: () -> String
+end
+
+class Object
+  def hash: () -> Integer
+end
+    RBS
+      source = parse_ruby(<<-RUBY)
+module Types
+  def foo
+    hash + "a"
+  end
+
+  def hash
+    "foo"
+  end
+end
+      RUBY
+
+      with_standard_construction(checker, source) do |construction, typing|
+        construction.synthesize(source.node)
+        assert_no_error typing
+      end
+    end
+  end
 end