gotta now fix assert visibility

Author: sampersand

core/module.rbs

@@ -735,7 +735,7 @@ class Module
   #
   # Also see Module#const_defined?.
   #
-  def constants: (?boolish inherit) -> ::Array[Symbol]
+  def constants: (?boolish inherit) -> Array[Symbol]
 
   # <!--
   #   rdoc-file=proc.c
@@ -795,8 +795,7 @@ class Module
   #     HTTP::NOT_FOUND
   #     # warning: constant HTTP::NOT_FOUND is deprecated
   #
-  def deprecate_constant: () -> self
-                        | (interned name, *interned more_names) -> self
+  def deprecate_constant: (*interned names) -> self
 
   def equal?: (untyped other) -> bool
 
@@ -830,7 +829,7 @@ class Module
 
   # <!--
   #   rdoc-file=object.c
-  #   - extended(othermod)
+  #   -   (othermod)
   # -->
   # The equivalent of `included`, but for extended modules.
   #
@@ -952,8 +951,9 @@ class Module
   # Assign the module to a constant (name starting uppercase) if you want to treat
   # it like a regular module.
   #
-  def initialize: () -> void
-                | () { (Module arg0) -> untyped } -> void
+  def initialize: () ?{ (Module mod) [self: self] -> void } -> void
+
+  def initialize_clone: (Module source, ?freeze: bool?) -> void
 
   # <!--
   #   rdoc-file=proc.c
@@ -1021,7 +1021,7 @@ class Module
   #     end
   #     C.instance_methods(false).sort               #=> [:method2, :method3, :method4]
   #
-  def instance_methods: (?boolish include_super) -> ::Array[Symbol]
+  def instance_methods: (?boolish include_super) -> Array[Symbol]
 
   # <!--
   #   rdoc-file=object.c
@@ -1339,8 +1339,7 @@ class Module
   # -->
   # Makes a list of existing constants private.
   #
-  def private_constant: () -> self
-                      | (interned name, *interned more_names) -> self
+  def private_constant: (*interned names) -> self
 
   # <!--
   #   rdoc-file=object.c
@@ -1357,7 +1356,7 @@ class Module
   #     Mod.instance_methods           #=> [:method2]
   #     Mod.private_instance_methods   #=> [:method1]
   #
-  def private_instance_methods: (?boolish include_super) -> ::Array[Symbol]
+  def private_instance_methods: (?boolish include_super) -> Array[Symbol]
 
   # <!--
   #   rdoc-file=vm_method.c
@@ -1463,7 +1462,7 @@ class Module
   # Returns a list of the protected instance methods defined in *mod*. If the
   # optional parameter is `false`, the methods of any ancestors are not included.
   #
-  def protected_instance_methods: (?boolish include_super) -> ::Array[Symbol]
+  def protected_instance_methods: (?boolish include_super) -> Array[Symbol]
 
   # <!--
   #   rdoc-file=vm_method.c
@@ -1540,8 +1539,7 @@ class Module
   # -->
   # Makes a list of existing constants public.
   #
-  def public_constant: () -> self
-                     | (interned name, *interned more_names) -> self
+  def public_constant: (*interned names) -> self
 
   # <!--
   #   rdoc-file=proc.c

lib/rbs/unit_test/type_assertions.rb

@@ -297,7 +297,7 @@ def assert_const_type(type, constant_name)
       end
 
       def assert_visibility(vis, receiver, method)
-        omit 'TODO: visibility for types'
+        puts 'TODO: visibility for types'
       end
 
       def assert_type(type, value)

test/stdlib/Module_test.rb

@@ -312,7 +312,7 @@ def bar; end
     end
 
     # With the array version
-    assert_send_type  '(Array[String]) -> Array[String]',
+    assert_send_type  '(Array[Symbol]) -> Array[Symbol]',
                       mod, visibility, [:foo]
     with_string 'foo' do |foo|
       assert_send_type  '[T < _ToStr] (Array[T]) -> Array[T]',
@@ -346,8 +346,10 @@ def self.foo; end
       def self.bar; end
     end
 
-    assert_send_type  '() -> Module',
-                      mod, :private_class_method
+    disable_verbose do
+      assert_send_type  '() -> Module',
+                        mod, :private_class_method
+    end
 
     with_interned :foo do |foo|
       assert_send_type  '(interned) -> Module',
@@ -368,8 +370,10 @@ def self.foo; end
       def self.bar; end
     end
 
-    assert_send_type  '() -> Module',
-                      mod, :public_class_method
+    disable_verbose do
+      assert_send_type  '() -> Module',
+                        mod, :public_class_method
+    end
 
     with_interned :foo do |foo|
       assert_send_type  '(interned) -> Module',
@@ -455,8 +459,8 @@ def test_attr_accessor
 
   def test_ruby2_keywords
     mod = Module.new do
-      def a(*x) = 3
-      def b(*x) = 3
+      def foo(*x) = 3
+      def bar(*x) = 3
     end
 
     assert_visibility :private,
@@ -612,7 +616,22 @@ def test_const_get
   end
 
   def test_const_missing
-    omit 'todo'
+    assert_type_meth = method(:assert_type)
+    mod = Module.new do
+      define_singleton_method :const_missing do |name|
+        assert_type_meth.call('Symbol', name)
+        1r
+      end
+    end
+
+    assert_type 'Rational',
+                mod::Foo # Test the `::` syntax works
+
+    # Make sure that `const_get` also always passes a symbol
+    with_interned :Foo do |name|
+      assert_send_type  '(interned) -> Rational',
+                        mod, :const_get, name
+    end
   end
 
   def test_const_set
@@ -625,7 +644,19 @@ def test_const_set
   end
 
   def test_define_method
-    omit 'todo'
+    with_interned :meth do |name|
+      assert_send_type  '(interned, ^(?) [self: top] -> untyped) -> Symbol',
+                        Module.new, :define_method, name, proc {}
+
+      assert_send_type  '(interned, Method) -> Symbol',
+                        Module.new, :define_method, name, method(:puts)
+
+      assert_send_type  '(interned, UnboundMethod) -> Symbol',
+                        Module.new, :define_method, name, method(:puts).unbind
+
+      assert_send_type  '(interned) { (?) [self: top] -> untyped } -> Symbol',
+                        Module.new, :define_method, name do end
+    end
   end
 
   def constant_visibility_helper(method)
@@ -668,11 +699,22 @@ def test_included_modules
   end
 
   def test_initialize
-    omit 'todo'
+    assert_send_type  '() -> void',
+                      Module.new, :initialize
+
+    assert_send_type  '() { (Module) [self: Module] -> void } -> void',
+                      Module.new, :initialize do end
   end
 
   def test_initialize_clone
-    omit 'todo'
+    assert_send_type  '(Module) -> void',
+                      Module.new, :initialize_clone, Module.new
+
+
+    with_bool.and_nil do |freeze|
+      assert_send_type  '(Module, freeze: bool?) -> void',
+                        Module.new, :initialize_clone, Module.new, freeze: freeze
+    end
   end
 
   def test_instance_method
@@ -1027,50 +1069,74 @@ def foo = 4
   end
 
   def test_append_features
-    omit 'todo' # private
+    assert_visibility :private,
+                      Module.new, :append_features
+    omit 'todo'
   end
 
   def test_const_added
-    omit 'todo' # private
+    assert_visibility :private,
+                      Module.new, :const_added
+    omit 'todo'
   end
 
   def test_extend_object
-    omit 'todo' # private
+    assert_visibility :private,
+                      Module.new, :extend_object
+    omit 'todo'
   end
 
   def test_extended
-    omit 'todo' # private
+    assert_visibility :private,
+                      Module.new, :extended
+    omit 'todo'
   end
 
   def test_included
-    omit 'todo' # private
+    assert_visibility :private,
+                      Module.new, :included
+    omit 'todo'
   end
 
   def test_method_added
-    omit 'todo' # private
+    assert_visibility :private,
+                      Module.new, :method_added
+    omit 'todo'
   end
 
   def test_method_removed
-    omit 'todo' # private
+    assert_visibility :private,
+                      Module.new, :method_removed
+    omit 'todo'
   end
 
   def test_method_undefined
-    omit 'todo' # private
+    assert_visibility :private,
+                      Module.new, :method_undefined
+    omit 'todo'
   end
 
   def test_prepend_features
-    omit 'todo' # private
+    assert_visibility :private,
+                      Module.new, :prepend_features
+    omit 'todo'
   end
 
   def test_prepended
-    omit 'todo' # private
+    assert_visibility :private,
+                      Module.new, :prepended
+    omit 'todo'
   end
 
   def test_remove_const
-    omit 'todo' # private
+    assert_visibility :private,
+                      Module.new, :remove_const
+    omit 'todo'
   end
 
   def test_using
-    omit 'todo' # private
+    assert_visibility :private,
+                      Module.new, :using
+    omit 'todo'
   end
 end