Merge branch 'master' into openssl-raap

Author: ksss

.github/workflows/typecheck.yml

@@ -20,6 +20,8 @@ jobs:
           bundler: none
       - name: Set working directory as safe
         run: git config --global --add safe.directory $(pwd)
+      - name: Set up permission
+        run: chmod -R o-w /opt/hostedtoolcache/Ruby
       - name: Install dependencies
         run: |
           sudo apt-get update

.github/workflows/windows.yml

@@ -20,6 +20,21 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
+
+      # ucrt and mswin have the dev version Ruby.
+      # It introduce checksum mismatches for bundled gems. So remove them before `bundle install`
+      - name: Purge gem caches
+        run: |
+          ruby -e '
+            exit if "${{ matrix.ruby }}" != "ucrt" && "${{ matrix.ruby }}" != "mswin"
+
+            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
         run: |
           bundle config set without profilers libs

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)
@@ -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)
@@ -196,4 +198,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   2.5.16
+   2.6.3

lib/rbs/ast/members.rb

@@ -30,6 +30,8 @@ def update(annotations: self.annotations, method_type: self.method_type)
           end
 
           def sub(subst)
+            return self if subst.empty?
+
             update(method_type: self.method_type.sub(subst))
           end
 

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

@@ -14,6 +14,8 @@ def initialize(parent_variable:, type:, declared_in:)
       end
 
       def sub(s)
+        return self if s.empty?
+
         self.class.new(
           parent_variable: parent_variable,
           type: type.sub(s),
@@ -142,6 +144,8 @@ def private?
       end
 
       def sub(s)
+        return self if s.empty?
+
         self.class.new(
           super_method: super_method&.sub(s),
           defs: defs.map {|defn| defn.update(type: defn.type.sub(s)) },
@@ -347,6 +351,8 @@ def type_params_decl
     end
 
     def sub(s)
+      return self if s.empty?
+
       definition = self.class.new(type_name: type_name, self_type: _ = self_type.sub(s), ancestors: ancestors, entry: entry)
 
       definition.methods.merge!(methods.transform_values {|method| method.sub(s) })

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

@@ -33,6 +33,8 @@ def to_json(state = _ = nil)
     def sub(s)
       sub = s.without(*type_param_names)
 
+      return self if sub.empty?
+
       self.class.new(
         type_params: type_params.map do |param|
           param.map_type do |bound|

lib/rbs/types.rb

@@ -329,6 +329,8 @@ def to_json(state = _ = nil)
       end
 
       def sub(s)
+        return self if s.empty?
+
         self.class.new(name: name,
                        args: args.map {|ty| ty.sub(s) },
                        location: location)
@@ -371,6 +373,8 @@ def to_json(state = _ = nil)
       end
 
       def sub(s)
+        return self if s.empty?
+
         self.class.new(name: name,
                        args: args.map {|ty| ty.sub(s) },
                        location: location)
@@ -413,6 +417,8 @@ def to_json(state = _ = nil)
       end
 
       def sub(s)
+        return self if s.empty?
+
         Alias.new(name: name, args: args.map {|ty| ty.sub(s) }, location: location)
       end
 
@@ -469,6 +475,8 @@ def to_json(state = _ = nil)
       end
 
       def sub(s)
+        return self if s.empty?
+
         self.class.new(types: types.map {|ty| ty.sub(s) },
                        location: location)
       end
@@ -574,6 +582,8 @@ def to_json(state = _ = nil)
       end
 
       def sub(s)
+        return self if s.empty?
+
         self.class.new(
           all_fields: all_fields.transform_values {|ty, required| [ty.sub(s), required] },
           location: location
@@ -664,6 +674,8 @@ def to_json(state = _ = nil)
       end
 
       def sub(s)
+        return self if s.empty?
+
         self.class.new(type: type.sub(s), location: location)
       end
 
@@ -752,6 +764,8 @@ def to_json(state = _ = nil)
       end
 
       def sub(s)
+        return self if s.empty?
+
         self.class.new(types: types.map {|ty| ty.sub(s) },
                        location: location)
       end
@@ -841,6 +855,8 @@ def to_json(state = _ = nil)
       end
 
       def sub(s)
+        return self if s.empty?
+
         self.class.new(types: types.map {|ty| ty.sub(s) },
                        location: location)
       end
@@ -1093,6 +1109,8 @@ def to_json(state = _ = nil)
       end
 
       def sub(s)
+        return self if s.empty?
+
         map_type {|ty| ty.sub(s) }
       end
 
@@ -1272,6 +1290,8 @@ def to_json(state = _ = nil)
       end
 
       def sub(subst)
+        return self if subst.empty?
+
         map_type { _1.sub(subst) }
       end
 
@@ -1346,6 +1366,8 @@ def to_json(state = _ = nil)
       end
 
       def sub(s)
+        return self if s.empty?
+
         self.class.new(
           type: type.sub(s),
           required: required,
@@ -1415,6 +1437,8 @@ def to_json(state = _ = nil)
       end
 
       def sub(s)
+        return self if s.empty?
+
         self.class.new(
           type: type.sub(s),
           block: block&.sub(s),