Merge pull request #1379 from ruby/backport-to-3.1

Backport to 3.1

Author: soutaro

Gemfile

@@ -18,7 +18,7 @@ gem "dbm"
 gem 'digest'
 gem 'tempfile'
 gem "prime"
-gem "rdoc", "< 6.5.0"
+gem "rdoc", "~> 6.4.0"
 
 # Test gems
 gem "rbs-amber", path: "test/assets/test-gem"

Gemfile.lock

@@ -15,9 +15,6 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     dbm (1.1.0)
-    debase (0.2.5.beta2)
-      debase-ruby_core_source (>= 0.10.12)
-    debase-ruby_core_source (3.2.0)
     diff-lcs (1.5.0)
     digest (3.1.1)
     forwardable (1.3.2)
@@ -29,25 +26,29 @@ GEM
     json (2.6.3)
     json-schema (4.0.0)
       addressable (>= 2.8)
+    language_server-protocol (3.17.0.3)
     marcel (1.0.2)
     minitest (5.18.0)
-    parallel (1.22.1)
-    parser (3.2.2.0)
+    parallel (1.23.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
-    power_assert (2.0.2)
+      racc
+    power_assert (2.0.3)
+    prettier_print (1.2.1)
     prime (0.1.2)
       forwardable
       singleton
     psych (4.0.6)
       stringio
     public_suffix (5.0.1)
+    racc (1.7.1)
     rainbow (3.1.1)
     rake (13.0.6)
-    rake-compiler (1.2.1)
+    rake-compiler (1.2.2)
       rake
     rdoc (6.4.0)
       psych (>= 4.0.0)
-    regexp_parser (2.8.0)
+    regexp_parser (2.8.1)
     rexml (3.2.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -62,29 +63,34 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.50.2)
+    rubocop (1.52.1)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
       rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.28.0)
+    rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
     rubocop-rubycw (0.1.6)
       rubocop (~> 1.0)
-    ruby-debug-ide (0.7.3)
-      rake (>= 0.8.1)
+    ruby-lsp (0.5.1)
+      language_server-protocol (~> 3.17.0)
+      sorbet-runtime
+      syntax_tree (>= 6.1.1, < 7)
     ruby-progressbar (1.13.0)
     singleton (0.1.1)
+    sorbet-runtime (0.5.10827)
     stackprof (0.2.25)
-    stringio (3.0.4)
+    stringio (3.0.7)
     strong_json (2.1.2)
+    syntax_tree (6.1.1)
+      prettier_print (>= 1.2.0)
     tempfile (0.1.3)
-    test-unit (3.5.7)
+    test-unit (3.5.9)
       power_assert
     unicode-display_width (2.4.2)
 
@@ -94,7 +100,6 @@ PLATFORMS
 
 DEPENDENCIES
   dbm
-  debase (>= 0.2.5.beta2)
   digest
   goodcheck
   json
@@ -105,11 +110,11 @@ DEPENDENCIES
   rake-compiler
   rbs!
   rbs-amber!
-  rdoc (< 6.5.0)
+  rdoc (~> 6.4.0)
   rspec
   rubocop
   rubocop-rubycw
-  ruby-debug-ide
+  ruby-lsp
   stackprof
   tempfile
   test-unit

core/file.rbs

@@ -1971,67 +1971,171 @@ File::SEPARATOR: String
 #
 File::Separator: String
 
+# <!-- rdoc-file=file.c -->
+# File::Constants provides file-related constants.  All possible file constants
+# are listed in the documentation but they may not all be present on your
+# platform.
+#
+# If the underlying platform doesn't define a constant the corresponding Ruby
+# constant is not defined.
+#
+# Your platform documentations (e.g. man open(2)) may describe more detailed
+# information.
+#
 module File::Constants
 end
 
+# <!-- rdoc-file=file.c -->
+# append on each write
+#
 File::Constants::APPEND: Integer
 
+# <!-- rdoc-file=file.c -->
+# disable line code conversion
+#
 File::Constants::BINARY: Integer
 
+# <!-- rdoc-file=file.c -->
+# create file if it does not exist
+#
 File::Constants::CREAT: Integer
 
+# <!-- rdoc-file=file.c -->
+# Try to minimize cache effects of the I/O to and from this file.
+#
 File::Constants::DIRECT: Integer
 
+# <!-- rdoc-file=file.c -->
+# any write operation perform synchronously except some meta data
+#
 File::Constants::DSYNC: Integer
 
+# <!-- rdoc-file=file.c -->
+# error if CREAT and the file exists
+#
 File::Constants::EXCL: Integer
 
+# <!-- rdoc-file=dir.c -->
+# Makes File.fnmatch patterns case insensitive (but not Dir.glob patterns).
+#
 File::Constants::FNM_CASEFOLD: Integer
 
+# <!-- rdoc-file=dir.c -->
+# The '*' wildcard matches filenames starting with "." in File.fnmatch and
+# Dir.glob patterns
+#
 File::Constants::FNM_DOTMATCH: Integer
 
+# <!-- rdoc-file=dir.c -->
+# Allows file globbing through "{a,b}" in File.fnmatch patterns.
+#
 File::Constants::FNM_EXTGLOB: Integer
 
+# <!-- rdoc-file=dir.c -->
+# Disables escapes in File.fnmatch and Dir.glob patterns
+#
 File::Constants::FNM_NOESCAPE: Integer
 
+# <!-- rdoc-file=dir.c -->
+# Wildcards in File.fnmatch and Dir.glob patterns do not match directory
+# separators
+#
 File::Constants::FNM_PATHNAME: Integer
 
+# <!-- rdoc-file=dir.c -->
+# Makes patterns to match short names if existing.  Valid only on Microsoft
+# Windows.
+#
 File::Constants::FNM_SHORTNAME: Integer
 
+# <!-- rdoc-file=dir.c -->
+# System default case insensitiveness, equals to FNM_CASEFOLD or 0.
+#
 File::Constants::FNM_SYSCASE: Integer
 
+# <!-- rdoc-file=file.c -->
+# exclusive lock. see File#flock
+#
 File::Constants::LOCK_EX: Integer
 
+# <!-- rdoc-file=file.c -->
+# non-blocking lock. used with LOCK_SH or LOCK_EX. see File#flock
+#
 File::Constants::LOCK_NB: Integer
 
+# <!-- rdoc-file=file.c -->
+# shared lock. see File#flock
+#
 File::Constants::LOCK_SH: Integer
 
+# <!-- rdoc-file=file.c -->
+# unlock. see File#flock
+#
 File::Constants::LOCK_UN: Integer
 
+# <!-- rdoc-file=file.c -->
+# do not change atime
+#
 File::Constants::NOATIME: Integer
 
+# <!-- rdoc-file=file.c -->
+# not to make opened IO the controlling terminal device
+#
 File::Constants::NOCTTY: Integer
 
+# <!-- rdoc-file=file.c -->
+# do not follow symlinks
+#
 File::Constants::NOFOLLOW: Integer
 
+# <!-- rdoc-file=file.c -->
+# do not block on open or for data to become available
+#
 File::Constants::NONBLOCK: Integer
 
+# <!-- rdoc-file=file.c -->
+# Name of the null device
+#
 File::Constants::NULL: String
 
+# <!-- rdoc-file=file.c -->
+# open for reading only
+#
 File::Constants::RDONLY: Integer
 
+# <!-- rdoc-file=file.c -->
+# open for reading and writing
+#
 File::Constants::RDWR: Integer
 
+# <!-- rdoc-file=file.c -->
+# any read operation perform synchronously. used with SYNC or DSYNC.
+#
 File::Constants::RSYNC: Integer
 
+# <!-- rdoc-file=file.c -->
+# can delete opened file
+#
 File::Constants::SHARE_DELETE: Integer
 
+# <!-- rdoc-file=file.c -->
+# any write operation perform synchronously
+#
 File::Constants::SYNC: Integer
 
+# <!-- rdoc-file=file.c -->
+# Create an unnamed temporary file
+#
 File::Constants::TMPFILE: Integer
 
+# <!-- rdoc-file=file.c -->
+# truncate size to 0
+#
 File::Constants::TRUNC: Integer
 
+# <!-- rdoc-file=file.c -->
+# open for writing only
+#
 File::Constants::WRONLY: Integer
 
 # <!-- rdoc-file=file.c -->

core/gc.rbs

@@ -234,13 +234,6 @@ module GC
   #
   def self.verify_internal_consistency: () -> nil
 
-  # <!--
-  #   rdoc-file=gc.c
-  #   - verify_transient_heap_internal_consistency()
-  # -->
-  #
-  def self.verify_transient_heap_internal_consistency: () -> nil
-
   # <!--
   #   rdoc-file=gc.rb
   #   - GC.latest_gc_info -> hash

core/process.rbs

@@ -1645,6 +1645,9 @@ module Process::UID
   def self.eid=: (Integer user) -> Integer
 end
 
+# <!-- rdoc-file=process.c -->
+# Placeholder for rusage
+#
 class Process::Tms < Struct[Float]
 end
 

lib/rbs/collection/config/lockfile_generator.rb

@@ -133,10 +133,14 @@ def generate
             end
           end
 
-          gem_hash[name].dependencies.each do |dep|
-            if spec = gem_hash[dep.name]
-              assign_gem(name: dep.name, version: spec.version, src_data: nil, ignored_gems: ignored_gems)
+          if spec = gem_hash.fetch(name, nil)
+            spec.dependencies.each do |dep|
+              if dep_spec = gem_hash[dep.name]
+                assign_gem(name: dep.name, version: dep_spec.version, src_data: nil, ignored_gems: ignored_gems)
+              end
             end
+          else
+            RBS.logger.warn "Cannot find `#{name}` gem. Using incorrect Bundler context? (#{definition.lockfile})"
           end
         end
 

lib/rdoc/discover.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 begin
-  gem 'rdoc', '~> 6.4.0'
+  gem 'rdoc', '~> 6.4'
   require 'rdoc_plugin/parser'
   module RDoc
     class Parser

sig/shims/rubygems.rbs

@@ -12,4 +12,8 @@ module Gem
   class Dependency
     def name: () -> String
   end
+
+  module ::Kernel
+    def self?.gem: (String, *String) -> void
+  end
 end