Merge branch 'master' into Fix_UNIXSocket_send_io_and_recv_io_types

Author: pocke

.github/workflows/windows.yml

@@ -27,8 +27,12 @@ jobs:
         run: |
           ruby -e '
             exit if "${{ matrix.ruby }}" != "ucrt" && "${{ matrix.ruby }}" != "mswin"
-            bundled_gems = Dir.glob("D:/ruby-${{ matrix.ruby }}/lib/ruby/gems/*/cache/*.gem")
-              .map { |path| File.basename(path, ".gem")[/^(.+)-[^-]+$/, 1] }
+
+            require "open-uri"
+            require "json"
+
+            res = URI.parse("https://stdgems.org/bundled_gems.json").read
+            bundled_gems = JSON.parse(res)["gems"].map{_1["gem"]}
             system "gem uninstall #{bundled_gems.join(" ")}", exception: true
           '
       - name: bundle install

Gemfile.lock

@@ -53,22 +53,23 @@ GEM
       addressable (~> 2.8)
       bigdecimal (~> 3.1)
     language_server-protocol (3.17.0.4)
+    lint_roller (1.1.0)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    logger (1.6.5)
+    logger (1.6.6)
     marcel (1.0.4)
     memory_profiler (1.1.0)
     minitest (5.25.4)
     mutex_m (0.3.0)
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
     nkf (0.2.0)
     ostruct (0.6.1)
     parallel (1.26.3)
-    parser (3.3.7.0)
+    parser (3.3.7.1)
       ast (~> 2.4.1)
       racc
     pathname (0.4.0)
@@ -77,7 +78,7 @@ GEM
     psych (4.0.6)
       stringio
     public_suffix (6.0.1)
-    raap (1.1.0)
+    raap (1.2.0)
       rbs (~> 3.0)
       timeout (~> 0.4)
     racc (1.8.1)
@@ -104,14 +105,15 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.2)
-    rubocop (1.71.0)
+    rubocop (1.72.2)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.36.2, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
     rubocop-ast (1.38.0)

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/definition_builder.rb

@@ -151,6 +151,7 @@ def define_instance(definition, type_name, subst)
             end
 
           when AST::Members::InstanceVariable
+            InstanceVariableDuplicationError.check!(variables: definition.instance_variables, member: member, type_name: type_name)
             insert_variable(
               type_name,
               definition.instance_variables,
@@ -159,6 +160,7 @@ def define_instance(definition, type_name, subst)
             )
 
           when AST::Members::ClassVariable
+            ClassVariableDuplicationError.check!(variables: definition.class_variables, member: member, type_name: type_name)
             insert_variable(type_name, definition.class_variables, name: member.name, type: member.type)
           end
         end
@@ -287,9 +289,11 @@ def build_singleton0(type_name)
                 end
 
               when AST::Members::ClassInstanceVariable
+                ClassInstanceVariableDuplicationError.check!(variables: definition.instance_variables, member: member, type_name: type_name)
                 insert_variable(type_name, definition.instance_variables, name: member.name, type: member.type)
 
               when AST::Members::ClassVariable
+                ClassVariableDuplicationError.check!(variables: definition.class_variables, member: member, type_name: type_name)
                 insert_variable(type_name, definition.class_variables, name: member.name, type: member.type)
               end
             end

lib/rbs/errors.rb

@@ -322,6 +322,51 @@ def type_name
     end
   end
 
+  class VariableDuplicationError < DefinitionError
+    include DetailedMessageable
+
+    attr_reader :member
+
+    def initialize(member:)
+      @member = member
+
+      super "#{Location.to_string location}: Duplicated variable name #{member.name}"
+    end
+
+    def location
+      loc = @member.location or raise
+      loc[:name]
+    end
+  end
+
+  class InstanceVariableDuplicationError < VariableDuplicationError
+    def self.check!(variables:, member:, type_name:)
+      if old = variables[member.name]
+        if old.declared_in == type_name
+          raise new(member: member)
+        end
+      end
+    end
+  end
+
+  class ClassInstanceVariableDuplicationError < VariableDuplicationError
+    def self.check!(variables:, member:, type_name:)
+      if old = variables[member.name]
+        if old.declared_in == type_name
+          raise new(member: member)
+        end
+      end
+    end
+  end
+
+  class ClassVariableDuplicationError < VariableDuplicationError
+    def self.check!(variables:, member:, type_name:)
+      if old = variables[member.name]
+        raise new(member: member)
+      end
+    end
+  end
+
   class UnknownMethodAliasError < DefinitionError
     include DetailedMessageable
 

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/errors.rbs

@@ -182,6 +182,28 @@ module RBS
     def location: () -> AST::Members::Mixin::loc?
   end
 
+  class VariableDuplicationError < DefinitionError
+    include DetailedMessageable
+
+    attr_reader member: AST::Members::Var
+
+    def initialize: (member: AST::Members::Var) -> void
+
+    def location: () -> Location[bot, bot]
+  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
   #
   class UnknownMethodAliasError < DefinitionError

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.

steep/Gemfile.lock

@@ -26,14 +26,14 @@ GEM
     fileutils (1.7.3)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.9.1)
+    json (2.10.1)
     language_server-protocol (3.17.0.4)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.6.5)
     minitest (5.25.4)
-    parser (3.3.7.0)
+    parser (3.3.7.1)
       ast (~> 2.4.1)
       racc
     racc (1.8.1)

test/rbs/definition_builder_test.rb

@@ -2705,4 +2705,64 @@ module Foo
       end
     end
   end
+
+  def test_duplicated_variable
+    SignatureManager.new do |manager|
+      manager.add_file("instance.rbs", <<-EOF)
+class InstanceVariable
+  @instance: Integer
+  @instance: Integer
+end
+
+class ClassInstanceVariable
+  self.@class_instance: Integer
+  self.@class_instance: Integer
+end
+
+class ClassVariable
+  @@class: Integer
+  @@class: Integer
+end
+      EOF
+
+      manager.build do |env|
+        builder = DefinitionBuilder.new(env: env)
+
+        assert_raises(RBS::InstanceVariableDuplicationError) do
+          builder.build_instance(type_name("::InstanceVariable"))
+        end
+        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
 end