Merge branch 'master' into codex/rewriter-line-endings

Author: soutaro

Gemfile.lock

@@ -1,8 +1,8 @@
 GIT
   remote: https://github.com/soutaro/steep.git
-  revision: 2a52643c6554c553cd0dc31a6daef717304c3985
+  revision: 3b75b367c9ad3d07f8f053c0c1f28e4bab560f5d
   specs:
-    steep (2.1.0.dev.1)
+    steep (2.1.0)
       concurrent-ruby (>= 1.1.10)
       csv (>= 3.0.9)
       fileutils (>= 1.1.0)
@@ -13,7 +13,7 @@ GIT
       parser (>= 3.2)
       prism (>= 0.25.0)
       rainbow (>= 2.2.2, < 4.0)
-      rbs (~> 4.0)
+      rbs (~> 4.2)
       securerandom (>= 0.1)
       strscan (>= 1.0.0)
       terminal-table (>= 2, < 5)
@@ -97,7 +97,7 @@ GEM
       prism (~> 1.5)
     minitest-mock (5.27.0)
     mutex_m (0.3.0)
-    net-protocol (0.2.2)
+    net-protocol (0.3.0)
       timeout
     net-smtp (0.5.1)
       net-protocol

Steepfile

@@ -24,7 +24,6 @@ target :lib do
   signature "stdlib/rdoc/0/"
   signature "stdlib/ripper/0"
   signature "stdlib/pp/0"
-  signature "steep/patch.rbs"
 
   # configure_code_diagnostics do |config|
   #   config[D::Ruby::MethodDefinitionMissing] = :hint

lib/rbs/definition_builder.rb

@@ -504,6 +504,11 @@ def source_location(source, decl)
     def validate_type_params(definition, ancestors:, methods:)
       type_params = definition.type_params_decl
 
+      # Without type params nothing can violate the variance: the ancestor validation
+      # iterates the (empty) params, and the type params of the methods themselves are
+      # invariant, which `Result#compatible?` always accepts
+      return if type_params.empty?
+
       calculator = VarianceCalculator.new(builder: self)
       param_names = type_params.each.map(&:name)
 
@@ -1048,9 +1053,10 @@ def validate_type_presence(type)
     end
 
     def validate_type_name(name, location)
-      name = name.absolute! unless name.absolute?
-      return if env.type_name?(env.normalize_type_name(name))
+      absolute = name.absolute? ? name : name.absolute!
+      return if env.type_name?(env.normalize_type_name(absolute))
 
+      # Report the name as it is written in the signature
       raise NoTypeFoundError.new(type_name: name, location: location)
     end
   end

lib/rbs/definition_builder/method_builder.rb

@@ -46,40 +46,47 @@ def validate!
           self
         end
 
-        def each
-          if block_given?
-            Sorter.new(methods).each_strongly_connected_component do |scc|
-              if scc.size > 1
-                raise RecursiveAliasDefinitionError.new(type: type, defs: scc)
+        def each(&block)
+          if block
+            # Yields the original method of an alias before the alias, like the
+            # topological sort did, and detects recursive alias definitions on the way
+            if methods.each_value.any? {|defn| defn.original.is_a?(AST::Members::Alias) }
+              done = {} #: Hash[Definition, bool]
+              done.compare_by_identity
+              methods.each_value do |defn|
+                each_alias_first(defn, done, [], &block)
               end
-
-              yield scc[0]
+            else
+              methods.each_value(&block)
             end
           else
             enum_for :each
           end
         end
 
-        class Sorter
-          include TSort
+        private
 
-          attr_reader :methods
+        def each_alias_first(defn, done, visiting, &block)
+          return if done[defn]
 
-          def initialize(methods)
-            @methods = methods
+          if visiting.any? {|other| other.equal?(defn) }
+            index = visiting.index {|other| other.equal?(defn) } or raise
+            raise RecursiveAliasDefinitionError.new(type: type, defs: visiting[index..] || raise)
           end
 
-          def tsort_each_node(&block)
-            methods.each_value(&block)
-          end
-
-          def tsort_each_child(defn)
-            if (member = defn.original).is_a?(AST::Members::Alias)
-              if old = methods[member.old_name]
-                yield old
+          if (member = defn.original).is_a?(AST::Members::Alias)
+            if old = methods.fetch(member.old_name, nil)
+              # A self alias forms a size-1 SCC that the topological sort yielded as is
+              unless old.equal?(defn)
+                visiting.push(defn)
+                each_alias_first(old, done, visiting, &block)
+                visiting.pop
               end
             end
           end
+
+          done[defn] = true
+          yield defn
         end
       end
 

lib/rbs/environment/class_entry.rb

@@ -15,6 +15,7 @@ def initialize(name)
       def <<(context_decl)
         context_decls << context_decl
         @primary_decl = nil
+        @type_params_validated = nil
         self
       end
 
@@ -50,6 +51,10 @@ def type_params
       end
 
       def validate_type_params
+        # The entry only changes with `<<`, which resets the memo -- a failed
+        # validation is not recorded and raises again
+        return if @type_params_validated
+
         unless context_decls.empty?
           first_decl, *rest_decls = each_decl.to_a
           first_decl or raise
@@ -63,6 +68,8 @@ def validate_type_params
             end
           end
         end
+
+        @type_params_validated = true
       end
 
       def align_params(decl)

lib/rbs/environment/module_entry.rb

@@ -14,6 +14,7 @@ def initialize(name)
 
       def <<(context_decl)
         context_decls << context_decl
+        @type_params_validated = nil
         self
       end
 
@@ -72,6 +73,10 @@ def align_params(decl)
       end
 
       def validate_type_params
+        # The entry only changes with `<<`, which resets the memo -- a failed
+        # validation is not recorded and raises again
+        return if @type_params_validated
+
         unless context_decls.empty?
           first_decl, *rest_decls = each_decl.to_a
           first_decl or raise
@@ -85,6 +90,8 @@ def validate_type_params
             end
           end
         end
+
+        @type_params_validated = true
       end
     end
   end

lib/rbs/method_type.rb

@@ -129,12 +129,12 @@ def has_classish_type?
     end
 
     def with_nonreturn_void?
-      if type.with_nonreturn_void? # steep:ignore DeprecatedReference
+      if type.with_nonreturn_void?
         true
       else
         if block = block()
-          block.type.with_nonreturn_void? || # steep:ignore DeprecatedReference
-            block.self_type&.with_nonreturn_void? || # steep:ignore DeprecatedReference
+          block.type.with_nonreturn_void? ||
+            block.self_type&.with_nonreturn_void? ||
             false
         else
           false

lib/rbs/prototype/helpers.rb

@@ -6,7 +6,7 @@ module Helpers
       private
 
       def parse_comments(string, include_trailing:)
-        Prism.parse_comments(string, version: "current").yield_self do |prism_comments| # steep:ignore UnexpectedKeywordArgument
+        Prism.parse_comments(string, version: "current").yield_self do |prism_comments|
           prism_comments.each_with_object({}) do |comment, hash| #$ Hash[Integer, AST::Comment]
             # Skip EmbDoc comments
             next unless comment.is_a?(Prism::InlineComment)

lib/rbs/types.rb

@@ -251,7 +251,7 @@ def with_nonreturn_void?
             # `void` in immediate generics parameter is allowed
             false
           else
-            type.with_nonreturn_void? # steep:ignore DeprecatedReference
+            type.with_nonreturn_void?
           end
         end
       end
@@ -530,7 +530,7 @@ def has_classish_type?
       end
 
       def with_nonreturn_void?
-        each_type.any? {|type| type.with_nonreturn_void? } # steep:ignore DeprecatedReference
+        each_type.any? {|type| type.with_nonreturn_void? }
       end
     end
 
@@ -648,7 +648,7 @@ def has_classish_type?
       end
 
       def with_nonreturn_void?
-        each_type.any? {|type| type.with_nonreturn_void? } # steep:ignore DeprecatedReference
+        each_type.any? {|type| type.with_nonreturn_void? }
       end
     end
 
@@ -734,7 +734,7 @@ def has_classish_type?
       end
 
       def with_nonreturn_void?
-        each_type.any? {|type| type.with_nonreturn_void? } # steep:ignore DeprecatedReference
+        each_type.any? {|type| type.with_nonreturn_void? }
       end
     end
 
@@ -825,7 +825,7 @@ def has_classish_type?
       end
 
       def with_nonreturn_void?
-        each_type.any? {|type| type.with_nonreturn_void? } # steep:ignore DeprecatedReference
+        each_type.any? {|type| type.with_nonreturn_void? }
       end
     end
 
@@ -908,7 +908,7 @@ def has_classish_type?
       end
 
       def with_nonreturn_void?
-        each_type.any? {|type| type.with_nonreturn_void? } # steep:ignore DeprecatedReference
+        each_type.any? {|type| type.with_nonreturn_void? }
       end
     end
 
@@ -1278,13 +1278,13 @@ def has_classish_type?
       end
 
       def with_nonreturn_void?
-        if each_param.any? {|param| param.type.with_nonreturn_void? } # steep:ignore DeprecatedReference
+        if each_param.any? {|param| param.type.with_nonreturn_void? }
           true
         else
           if return_type.is_a?(Bases::Void)
             false
           else
-            return_type.with_nonreturn_void? # steep:ignore DeprecatedReference
+            return_type.with_nonreturn_void?
           end
         end
       end
@@ -1557,11 +1557,11 @@ def has_classish_type?
       end
 
       def with_nonreturn_void?
-        if type.with_nonreturn_void? || self_type&.with_nonreturn_void? # steep:ignore DeprecatedReference
+        if type.with_nonreturn_void? || self_type&.with_nonreturn_void?
           true
         else
           if block = block()
-            block.type.with_nonreturn_void? || block.self_type&.with_nonreturn_void? || false # steep:ignore DeprecatedReference
+            block.type.with_nonreturn_void? || block.self_type&.with_nonreturn_void? || false
           else
             false
           end

sig/environment/class_entry.rbs

@@ -18,6 +18,8 @@ module RBS
 
       @primary_decl: declaration?
 
+      @type_params_validated: bool?
+
       def initialize: (TypeName) -> void
 
       def <<: (context_decl) -> self