Merge pull request #2305 from ruby/no-class-variable-duplication-validation

No class variable duplication validation

Author: soutaro

lib/rbs/definition_builder.rb

@@ -575,10 +575,6 @@ def validate_variable(var)
         if r.source.instance_of?(AST::Members::ClassInstanceVariable) && l.declared_in == r.declared_in
           raise ClassInstanceVariableDuplicationError.new(member: l.source)
         end
-      when AST::Members::ClassVariable
-        if r.source.instance_of?(AST::Members::ClassVariable)
-          raise ClassVariableDuplicationError.new(member: l.source)
-        end
       end
     end
 

lib/rbs/errors.rb

@@ -345,9 +345,6 @@ class InstanceVariableDuplicationError < VariableDuplicationError
   class ClassInstanceVariableDuplicationError < VariableDuplicationError
   end
 
-  class ClassVariableDuplicationError < VariableDuplicationError
-  end
-
   class UnknownMethodAliasError < DefinitionError
     include DetailedMessageable
 

sig/errors.rbs

@@ -193,15 +193,9 @@ module RBS
   end
 
   class InstanceVariableDuplicationError < VariableDuplicationError
-    def self.check!: (variables: Hash[Symbol, Definition::Variable], member: AST::Members::InstanceVariable, type_name: TypeName) -> void
   end
 
   class ClassInstanceVariableDuplicationError < VariableDuplicationError
-    def self.check!: (variables: Hash[Symbol, Definition::Variable], member: AST::Members::ClassInstanceVariable, type_name: TypeName) -> void
-  end
-
-  class ClassVariableDuplicationError < VariableDuplicationError
-    def self.check!: (variables: Hash[Symbol, Definition::Variable], member: AST::Members::ClassVariable, type_name: TypeName) -> void
   end
 
   # The `alias` member declares an alias from unknown method

test/rbs/definition_builder_test.rb

@@ -2838,11 +2838,6 @@ class ClassInstanceVariable
   self.@class_instance: Integer
   self.@class_instance: Integer
 end
-
-class ClassVariable
-  @@class: Integer
-  @@class: Integer
-end
       EOF
 
       manager.build do |env|
@@ -2866,34 +2861,6 @@ class ClassVariable
         assert_raises(RBS::ClassInstanceVariableDuplicationError) do
           builder.build_singleton(type_name("::ClassInstanceVariable"))
         end
-        assert_raises(RBS::ClassVariableDuplicationError) do
-          builder.build_instance(type_name("::ClassVariable"))
-        end
-      end
-    end
-
-    SignatureManager.new do |manager|
-      manager.add_file("inherited.rbs", <<-EOF)
-class A
-  @instance: Integer
-  self.@class_instance: Integer
-  @@class: Integer
-end
-
-class B < A
-  @instance: Integer
-  self.@class_instance: Integer
-  @@class: Integer
-end
-      EOF
-
-      manager.build do |env|
-        builder = DefinitionBuilder.new(env: env)
-
-        builder.build_instance(type_name("::A"))
-        assert_raises(RBS::ClassVariableDuplicationError) do
-          builder.build_instance(type_name("::B"))
-        end
       end
     end
   end