Merge pull request #2328 from ruby/update-steep

Update steep

Author: soutaro

core/kernel.rbs

@@ -1729,7 +1729,7 @@ module Kernel : BasicObject
   def self?.sleep: (?nil) -> bot
                  | (Time::_Timeout duration) -> Integer
 
-  %a{steep:deprecated}
+  %a{deprecated}
   interface _Divmod
     def divmod: (Numeric) -> [ Numeric, Numeric ]
   end

core/module.rbs

@@ -1699,6 +1699,6 @@ class Module < Object
   def attr: (*interned arg0) -> Array[Symbol]
 
   # A previous incarnation of `interned` for backward-compatibility (see #1499)
-  %a{steep:deprecated}
+  %a{deprecated: Use `interned`}
   type id = interned
 end

core/object.rbs

@@ -106,5 +106,5 @@ class Object < BasicObject
 end
 
 # A previous incarnation of `interned` for backward-compatibility (see #1499)
-%a{steep:deprecated}
+%a{deprecated: Use `interned` instead}
 type Object::name = interned

core/string.rbs

@@ -3574,10 +3574,10 @@ class String
   def valid_encoding?: () -> bool
 end
 
-%a{steep:deprecated}
+%a{deprecated}
 interface _ArefFromStringToString
   def []: (String) -> String
 end
 
-%a{steep:deprecated}
+%a{deprecated}
 type String::encode_fallback = Hash[String, String] | Proc | Method | _ArefFromStringToString

lib/rbs/ast/type_param.rb

@@ -56,16 +56,6 @@ def to_json(state = JSON::State.new)
         }.to_json(state)
       end
 
-      def rename(name)
-        TypeParam.new(
-          name: name,
-          variance: variance,
-          upper_bound: upper_bound_type,
-          location: location,
-          default_type: default_type
-        ).unchecked!(unchecked?)
-      end
-
       def map_type(&block)
         if b = upper_bound_type
           _upper_bound_type = yield(b)

lib/rbs/prototype/rb.rb

@@ -382,7 +382,8 @@ def process(node, decls:, comments:, context:)
             name: const_name,
             type: type,
             location: nil,
-            comment: comments[node.first_lineno - 1]
+            comment: comments[node.first_lineno - 1],
+            annotations: []
           )
 
         when :IASGN

lib/rbs/prototype/rbi.rb

@@ -257,7 +257,8 @@ def process(node, outer: [], comments:)
               name: name,
               type: type,
               location: nil,
-              comment: nil
+              comment: nil,
+              annotations: []
             )
           end
         when :ALIAS

lib/rbs/prototype/runtime.rb

@@ -250,6 +250,8 @@ def merge_rbs(module_name, members, instance: nil, singleton: nil)
               method = builder.build_singleton(module_name.absolute!).methods[singleton]
               method_name = singleton
               kind = :singleton
+            else
+              raise
             end
 
             if method
@@ -462,6 +464,7 @@ def generate_constants(mod, decls)
             name: to_type_name(name.to_s),
             type: type,
             location: nil,
+            annotations: [],
             comment: nil
           )
         end

lib/rbs/types.rb

@@ -109,18 +109,14 @@ class Void < Base; end
       class Any < Base
         def initialize(location:, todo: false)
           super(location: location)
-          todo! if todo
+          if todo
+            @string = "__todo__"
+          end
         end
 
         def to_s(level=0)
           @string || "untyped"
         end
-
-        # @deprecated: this method is now called from the constructor, do not call it from outside
-        def todo!
-          @string = '__todo__'
-          self
-        end
       end
       class Nil < Base; end
       class Top < Base; end

lib/rbs/unit_test/with_aliases.rb

@@ -127,7 +127,9 @@ def with_range(start, stop, exclude_end = false)
 
             # `Range` requires `begin <=> end` to return non-nil, but doesn't actually
             # end up using the return value of it. This is to add that in when needed.
-            def lower.<=>(rhs) = :not_nil unless defined? lower.<=>
+            unless defined? lower.<=>
+              def lower.<=>(rhs) = :not_nil # steep:ignore MethodDefinitionInUndeclaredModule
+            end
 
             # If `lower <=> rhs` is defined but nil, then that means we're going to be constructing
             # an illegal range (eg `3..ToInt.new(4)`). So, we need to skip yielding an invalid range

sig/annotate/rdoc_source.rbs

@@ -25,6 +25,8 @@ module RBS
                      | (TypeName, singleton_method: Symbol) -> Array[RDoc::AnyMethod]?
 
       def find_attribute: (TypeName, Symbol, singleton: bool) -> Array[RDoc::Attr]?
+
+      def class_docs: (TypeName) -> Array[::RDoc::Markup::Document | ::RDoc::Comment | ::String]?
     end
   end
 end

sig/cli.rbs

@@ -80,6 +80,8 @@ module RBS
 
     def run_subtract: (Array[String], top) -> void
 
+    def run_diff: (Array[String], LibraryOptions) -> void
+
     def test_opt: (LibraryOptions) -> String?
 
     def collection_options: (Array[String]) -> OptionParser

sig/namespace.rbs

@@ -142,5 +142,5 @@ end
 
 module Kernel
   # Deprecated: Use `RBS::Namespace.parse` instead
-  %a{steep:deprecated} def Namespace: (String) -> RBS::Namespace
+  %a{deprecated} def Namespace: (String) -> RBS::Namespace
 end

sig/typename.rbs

@@ -75,5 +75,5 @@ end
 
 module Kernel
   # Deprecated: Use `RBS::TypeName.parse` instead
-  %a{steep:deprecated} def TypeName: (String name) -> RBS::TypeName
+  %a{deprecated: Use `RBS::TypeName.parse` instead} def TypeName: (String name) -> RBS::TypeName
 end

sig/types.rbs

@@ -114,9 +114,6 @@ module RBS
         @string: String?
 
         def initialize: (location: Location[bot, bot]?, ?todo: bool) -> void
-
-        %a{steep:deprecated}
-        def todo!: () -> self
       end
 
       class Nil < Base

stdlib/net-http/0/net-http.rbs

@@ -2404,7 +2404,7 @@ module Net
     alias length size
 
     # A previous incarnation of `interned` for backward-compatibility (see #1499)
-    %a{steep:deprecated}
+    %a{deprecated: Use `interned` instead}
     type key = interned
 
     # <!--

steep/Gemfile

@@ -1,4 +1,4 @@
 source "https://rubygems.org"
 
-gem "rbs", "~> 3.8.1"
-gem "steep", "~> 1.9.4"
+gem "rbs", "~> 3.9.pre"
+gem "steep", "~> 1.10.pre"

steep/Gemfile.lock

@@ -33,6 +33,7 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.6.6)
     minitest (5.25.5)
+    mutex_m (0.3.0)
     parser (3.3.7.1)
       ast (~> 2.4.1)
       racc
@@ -41,39 +42,42 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rbs (3.8.1)
+    rbs (3.9.0.pre.2)
       logger
     securerandom (0.4.1)
-    steep (1.9.4)
+    steep (1.10.0.pre.3)
       activesupport (>= 5.1)
       concurrent-ruby (>= 1.1.10)
       csv (>= 3.0.9)
       fileutils (>= 1.1.0)
       json (>= 2.1.0)
-      language_server-protocol (>= 3.15, < 4.0)
+      language_server-protocol (>= 3.17.0.4, < 4.0)
       listen (~> 3.0)
       logger (>= 1.3.0)
+      mutex_m (>= 0.3.0)
       parser (>= 3.1)
       rainbow (>= 2.2.2, < 4.0)
-      rbs (~> 3.8)
+      rbs (~> 3.9.pre)
       securerandom (>= 0.1)
       strscan (>= 1.0.0)
-      terminal-table (>= 2, < 4)
+      terminal-table (>= 2, < 5)
       uri (>= 0.12.0)
     strscan (3.1.2)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.6.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
     uri (1.0.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  rbs (~> 3.8.1)
-  steep (~> 1.9.4)
+  rbs (~> 3.9.pre)
+  steep (~> 1.10.pre)
 
 BUNDLED WITH
    2.6.3