Merge pull request #2237 from ksss/validate-variable-type

Validate variable types

Author: soutaro

lib/rbs/cli/validate.rb

@@ -196,6 +196,7 @@ def validate_class_module_definition
                   end
                 InvalidTypeApplicationError.check!(type_name: member.name, params: params, args: member.args, location: member.location)
               when AST::Members::Var
+                @validator.validate_variable(member)
                 void_type_context_validator(member.type)
                 if member.is_a?(AST::Members::ClassVariable)
                   no_self_type_validator(member.type)

lib/rbs/validator.rb

@@ -151,6 +151,10 @@ def validate_type_params(params, type_name: , method_name: nil, location:)
       end
     end
 
+    def validate_variable(var)
+      validate_type(var.type, context: nil)
+    end
+
     def validate_class_alias(entry:)
       case env.normalize_module_name?(entry.decl.new_name)
       when nil

sig/validator.rbs

@@ -49,6 +49,10 @@ module RBS
     #
     def validate_class_alias: (entry: Environment::ClassAliasEntry | Environment::ModuleAliasEntry) -> void
 
+    # Validates instance/class-instance/class variables.
+    #
+    def validate_variable: (AST::Members::Var) -> void
+
     private
 
     # Resolves relative type names to absolute type names in given context.

test/validator_test.rb

@@ -391,4 +391,60 @@ def foo: () -> A
       end
     end
   end
+
+  def test_validate_type__variable
+    SignatureManager.new do |manager|
+      manager.add_file("foo.rbs", <<-EOF)
+class Foo
+  @foo: Nothing
+  @bar: Integer
+
+  self.@foo: Nothing
+  self.@bar: Integer
+
+  @@foo: Nothing
+  @@bar: Integer
+end
+      EOF
+
+      manager.build do |env|
+        root = nil
+
+        resolver = RBS::Resolver::TypeNameResolver.new(env)
+        validator = RBS::Validator.new(env: env, resolver: resolver)
+
+        env.class_decls[RBS::TypeName.parse("::Foo")].decls.first.decl.members.tap do |members|
+          members[0].tap do |member|
+            assert_raises(RBS::NoTypeFoundError) do
+              validator.validate_variable(member)
+            end
+          end
+
+          members[1].tap do |member|
+            validator.validate_variable(member)
+          end
+
+          members[2].tap do |member|
+            assert_raises(RBS::NoTypeFoundError) do
+              validator.validate_variable(member)
+            end
+          end
+
+          members[3].tap do |member|
+            validator.validate_variable(member)
+          end
+
+          members[4].tap do |member|
+            assert_raises(RBS::NoTypeFoundError) do
+              validator.validate_variable(member)
+            end
+          end
+
+          members[5].tap do |member|
+            validator.validate_variable(member)
+          end
+        end
+      end
+    end
+  end
 end