rbs 4.0.0.dev.4 → 4.1.0.pre.2

data/lib/rbs/cli.rb

@@ -136,10 +136,12 @@ module RBS
       case command
       when :version
         stdout.puts opts.ver
+        0
       when *COMMANDS
         __send__ :"run_#{command}", args, options
       else
         stdout.puts opts.help
+        0
       end
     end
 
@@ -191,6 +193,8 @@ EOB
 
       stdout.print JSON.generate(decls)
       stdout.flush
+
+      0
     end
 
     def run_list(args, options)
@@ -254,6 +258,8 @@ EOB
           stdout.puts "#{name} (interface)"
         end
       end
+
+      0
     end
 
     def run_ancestors(args, options)
@@ -279,7 +285,7 @@ EOU
 
       unless args.size == 1
         stdout.puts "Expected one argument."
-        return
+        return 1
       end
 
       loader = options.loader()
@@ -317,6 +323,8 @@ EOU
       else
         stdout.puts "Cannot find class: #{type_name}"
       end
+
+      0
     end
 
     def run_methods(args, options)
@@ -344,7 +352,7 @@ EOU
 
       unless args.size == 1
         stdout.puts "Expected one argument."
-        return
+        return 1
       end
 
       loader = options.loader()
@@ -373,6 +381,8 @@ EOU
       else
         stdout.puts "Cannot find class: #{type_name}"
       end
+
+      0
     end
 
     def run_method(args, options)
@@ -398,7 +408,7 @@ EOU
 
       unless args.size == 2
         stdout.puts "Expected two arguments, but given #{args.size}."
-        return
+        return 1
       end
 
       loader = options.loader()
@@ -410,7 +420,7 @@ EOU
 
       unless env.module_name?(type_name)
         stdout.puts "Cannot find class: #{type_name}"
-        return
+        return 1
       end
 
       definition = case kind
@@ -426,7 +436,7 @@ EOU
 
       unless method
         stdout.puts "Cannot find method: #{method_name}"
-        return
+        return 1
       end
 
       stdout.puts "#{type_name}#{kind == :instance ? "#" : "."}#{method_name}"
@@ -440,6 +450,8 @@ EOU
         stdout.puts format("    %s %-#{length_max}s   at %s", separator, type, type.location)
         separator = "|"
       end
+
+      0
     end
 
     def run_validate(args, options)
@@ -469,7 +481,7 @@ EOU
 
       unless args.size == 1
         stdout.puts "Expected one argument."
-        return
+        return 1
       end
 
       loader = options.loader()
@@ -502,6 +514,8 @@ EOU
       else
         stdout.puts " => [no constant]"
       end
+
+      0
     end
 
     def run_paths(args, options)
@@ -544,6 +558,8 @@ EOU
           stdout.puts "#{dir} (#{kind_of[dir]}, library, name=#{source.name})"
         end
       end
+
+      0
     end
 
     def run_prototype(args, options)
@@ -647,6 +663,8 @@ EOU
 
         writer = Writer.new(out: stdout)
         writer.write decls
+
+        0
       else
         stdout.puts <<EOU
 Usage: rbs prototype [generator...] [args...]
@@ -660,7 +678,7 @@ Examples:
   $ rbs prototype rbi foo.rbi
   $ rbs prototype runtime String
 EOU
-        exit 1
+        1
       end
     end
 
@@ -712,12 +730,12 @@ EOU
 
       unless has_parser?
         stdout.puts "Not supported on this interpreter (#{RUBY_ENGINE})."
-        exit 1
+        return 1
       end
 
       if args.empty?
         stdout.puts opts
-        return nil
+        return 1
       end
 
       new_parser = -> do
@@ -827,6 +845,8 @@ EOU
         writer = Writer.new(out: stdout)
         writer.write parser.decls
       end
+
+      0
     end
 
     def run_vendor(args, options)
@@ -880,6 +900,8 @@ Options:
 
       stdout.puts "  Copying RBS files..."
       vendorer.copy!
+
+      0
     end
 
     def run_parse(args, options)
@@ -927,7 +949,11 @@ Options:
         syntax_error = true
       end
 
-      exit 1 if syntax_error
+      if syntax_error
+        1
+      else
+        0
+      end
     end
 
     def run_annotate(args, options)
@@ -936,8 +962,6 @@ Options:
       source = RBS::Annotate::RDocSource.new()
       annotator = RBS::Annotate::RDocAnnotator.new(source: source)
 
-      preserve = true
-
       OptionParser.new do |opts|
         opts.banner = <<-EOB
 Usage: rbs annotate [options...] [files...]
@@ -946,7 +970,7 @@ Import documents from RDoc and update RBS files.
 
 Examples:
 
-  $ rbs annotate stdlib/pathname/**/*.rbs
+  $ rbs annotate stdlib/logger/**/*.rbs
 
 Options:
         EOB
@@ -958,7 +982,7 @@ Options:
         opts.on("-d", "--dir DIRNAME", "Load RDoc from DIRNAME") {|d| source.extra_dirs << Pathname(d) }
         opts.on("--[no-]arglists", "Generate arglists section (defaults to true)") {|b| annotator.include_arg_lists = b }
         opts.on("--[no-]filename", "Include source file name in the documentation (defaults to true)") {|b| annotator.include_filename = b }
-        opts.on("--[no-]preserve", "Try preserve the format of the original file (defaults to true)") {|b| preserve = b }
+        opts.on("--[no-]preserve", "[Deprecated] It always preserves the format") { stdout.puts "The `--preserve` option is deprecated. The tool always preserves the format of RBS files." }
       end.parse!(args)
 
       source.load()
@@ -968,13 +992,15 @@ Options:
         if path.directory?
           Pathname.glob((path + "**/*.rbs").to_s).each do |path|
             stdout.puts "Processing #{path}..."
-            annotator.annotate_file(path, preserve: preserve)
+            annotator.annotate_file(path)
           end
         else
           stdout.puts "Processing #{path}..."
-          annotator.annotate_file(path, preserve: preserve)
+          annotator.annotate_file(path)
         end
       end
+
+      0
     end
 
     def test_opt options
@@ -1028,7 +1054,7 @@ EOB
 
       if args.length.zero?
         stdout.puts opts.help
-        exit 1
+        return 1
       end
 
       # @type var env_hash: Hash[String, String?]
@@ -1044,11 +1070,12 @@ EOB
 
       # @type var out: String
       # @type var err: String
+      # @type var status: Process::Status
       out, err, status = __skip__ = Open3.capture3(env_hash, *args)
       stdout.print(out)
       stderr.print(err)
 
-      status
+      status.to_i
     end
 
     def run_collection(args, options)
@@ -1073,7 +1100,7 @@ EOB
       when 'init'
         if config_path.exist?
           puts "#{config_path} already exists"
-          exit 1
+          return 1
         end
 
         config_path.write(<<~'YAML')
@@ -1101,15 +1128,17 @@ EOB
       when 'clean'
         unless lock_path.exist?
           puts "#{lock_path} should exist to clean"
-          exit 1
+          return 1
         end
         Collection::Cleaner.new(lockfile_path: lock_path)
       when 'help', 'hel', 'he', 'h'
         puts opts.help
       else
         puts opts.help
-        exit 1
+        return 1
       end
+
+      0
     end
 
     def collection_options(args)
@@ -1171,7 +1200,7 @@ EOB
         *minuend_paths, subtrahend_path = args
         unless subtrahend_path
           stdout.puts opts.help
-          exit 1
+          return 1
         end
         subtrahend_paths << subtrahend_path
       else
@@ -1180,7 +1209,7 @@ EOB
 
       if minuend_paths.empty?
         stdout.puts opts.help
-        exit 1
+        return 1
       end
 
       subtrahend = Environment.new.tap do |env|
@@ -1213,10 +1242,12 @@ EOB
           end
         end
       end
+
+      0
     end
 
     def run_diff(argv, library_options)
-      Diff.new(argv: argv, library_options: library_options, stdout: stdout, stderr: stderr).run
+      Diff.new(stdout: stdout, stderr: stderr).run(argv: argv, library_options: library_options)
     end
   end
 end

data/lib/rbs/collection/config/lockfile_generator.rb

@@ -8,14 +8,30 @@ module RBS
           "mutex_m" => ">= 0.3.0",
           "abbrev" => nil,
           "base64" => nil,
+          "benchmark" => nil,
           "bigdecimal" => nil,
           "csv" => nil,
+          "kconv" => nil,
+          "logger" => nil,
           "minitest" => nil,
           "net-smtp" => nil,
           "nkf" => nil,
           "observer" => nil,
+          "cgi" => nil,
+          "pstore" => nil,
         }
 
+        NONGEM_STDLIBS = Set[
+          "cgi-escape",
+          "coverage",
+          "monitor",
+          "objspace",
+          "pathname",
+          "pty",
+          "ripper",
+          "socket",
+        ]
+
         class GemfileLockMismatchError < StandardError
           def initialize(expected:, actual:)
             @expected = expected
@@ -163,7 +179,9 @@ module RBS
               end
             end
           else
-            RBS.logger.warn "Cannot find `#{name}` gem. Using incorrect Bundler context? (#{definition.lockfile})"
+            unless NONGEM_STDLIBS.include?(name)
+              RBS.logger.warn "Cannot find `#{name}` gem. Using incorrect Bundler context? (#{definition.lockfile})"
+            end
           end
         end
 
@@ -171,8 +189,8 @@ module RBS
           return if lockfile.gems.key?(name)
 
           case name
-          when 'bigdecimal-math'
-            # The `bigdecimal-math` is never released as a gem.
+          when 'bigdecimal-math', 'kconv'
+            # These gems are never released as a gem.
             # Therefore, `assign_gem` should not be called.
             RBS.logger.info {
               from = from_gem || "rbs_collection.yaml"
@@ -183,6 +201,13 @@ module RBS
               lockfile.gems[name] = { name: name, version: "0", source: source }
             end
             return
+          when 'set'
+            # set is migrated to core from stdlib.
+            RBS.logger.info {
+              from = from_gem || "rbs_collection.yaml"
+              "`#{name}` is a part of the Ruby core library. The dependency to the library can be safely deleted from #{from}."
+            }
+            return
           when *ALUMNI_STDLIBS.keys
             version = ALUMNI_STDLIBS.fetch(name)
             if from_gem

data/lib/rbs/collection/sources/git.rb

@@ -3,6 +3,7 @@
 require 'digest/sha2'
 require 'open3'
 require 'find'
+require 'fileutils'
 
 module RBS
   module Collection
@@ -139,6 +140,12 @@ module RBS
                 # git v2.27.0 or greater
                 git 'clone', '--filter=blob:none', remote, git_dir.to_s, chdir: nil
               rescue CommandError
+                # The failed `--filter=blob:none` clone may leave behind a
+                # partial repository (e.g. when the server returned an error
+                # mid-clone), which would cause the fallback `git clone` to
+                # fail with "destination path ... already exists and is not
+                # an empty directory". Clean it up before retrying.
+                FileUtils.rm_rf(git_dir)
                 git 'clone', remote, git_dir.to_s, chdir: nil
               end
             end

data/lib/rbs/definition.rb

@@ -66,7 +66,7 @@ module RBS
           when AST::Members::Base
             member.comment
           when AST::Ruby::Members::Base
-            nil
+            member.leading_comment&.as_comment
           end
         end
 

data/lib/rbs/definition_builder/ancestor_builder.rb

@@ -220,7 +220,7 @@ module RBS
               InvalidTypeApplicationError.check2!(type_name: super_class.name, args: super_class.args, env: env, location: super_class.location)
             end
 
-            super_entry = env.normalized_class_entry(super_name) or raise
+            super_entry = env.class_entry(super_name, normalized: true) or raise
             super_args = AST::TypeParam.normalize_args(super_entry.type_params, super_args)
 
             ancestors = OneAncestors.class_instance(
@@ -248,7 +248,7 @@ module RBS
 
               module_name = module_self.name
               if module_name.class?
-                module_entry = env.normalized_module_class_entry(module_name) or raise
+                module_entry = env.module_class_entry(module_name, normalized: true) or raise
                 module_name = module_entry.name
                 self_args = AST::TypeParam.normalize_args(module_entry.type_params, module_self.args)
               end
@@ -361,7 +361,7 @@ module RBS
                 MixinClassError.check!(type_name: type_name, env: env, member: member)
                 NoMixinFoundError.check!(member.name, env: env, member: member)
 
-                module_decl = env.normalized_module_entry(module_name) or raise
+                module_decl = env.module_entry(module_name, normalized: true) or raise
                 module_args = AST::TypeParam.normalize_args(module_decl.type_params, module_args)
 
                 module_name = env.normalize_module_name(module_name)
@@ -380,7 +380,7 @@ module RBS
                 MixinClassError.check!(type_name: type_name, env: env, member: member)
                 NoMixinFoundError.check!(member.name, env: env, member: member)
 
-                module_decl = env.normalized_module_entry(member.name) or raise
+                module_decl = env.module_entry(member.name, normalized: true) or raise
                 module_name = module_decl.name
 
                 module_args = member.args.map {|type| align_params ? type.sub(align_params) : type }
@@ -398,7 +398,7 @@ module RBS
                 MixinClassError.check!(type_name: type_name, env: env, member: member)
                 NoMixinFoundError.check!(member.name, env: env, member: member)
 
-                module_decl = env.normalized_module_entry(module_name) or raise
+                module_decl = env.module_entry(module_name, normalized: true) or raise
                 module_args = AST::TypeParam.normalize_args(module_decl.type_params, module_args)
 
                 module_name = env.normalize_module_name(module_name)
@@ -414,7 +414,60 @@ module RBS
             end
           end
         when AST::Ruby::Declarations::Base
-          # noop
+          decl.members.each do |member|
+            case member
+            when AST::Ruby::Members::IncludeMember
+              if included_modules
+                module_name = member.module_name
+                module_args = member.type_args
+
+                # Check if mixing in a class (not allowed)
+                if env.class_decl?(module_name)
+                  raise MixinClassError.new(type_name: type_name, member: member)
+                end
+
+                # Check if module exists
+                module_decl = env.module_entry(module_name, normalized: true) or raise NoMixinFoundError.new(type_name: module_name, member: member)
+                module_args = AST::TypeParam.normalize_args(module_decl.type_params, module_args)
+                module_name = env.normalize_module_name(module_name)
+                included_modules << Definition::Ancestor::Instance.new(name: module_name, args: module_args, source: member)
+              end
+
+            when AST::Ruby::Members::ExtendMember
+              if extended_modules
+                module_name = member.module_name
+                module_args = member.type_args
+
+                # Check if mixing in a class (not allowed)
+                if env.class_decl?(module_name)
+                  raise MixinClassError.new(type_name: type_name, member: member)
+                end
+
+                # Check if module exists
+                module_decl = env.module_entry(module_name, normalized: true) or raise NoMixinFoundError.new(type_name: module_name, member: member)
+                module_args = AST::TypeParam.normalize_args(module_decl.type_params, module_args)
+                module_name = env.normalize_module_name(module_name)
+                extended_modules << Definition::Ancestor::Instance.new(name: module_name, args: module_args, source: member)
+              end
+
+            when AST::Ruby::Members::PrependMember
+              if prepended_modules
+                module_name = member.module_name
+                module_args = member.type_args
+
+                # Check if mixing in a class (not allowed)
+                if env.class_decl?(module_name)
+                  raise MixinClassError.new(type_name: type_name, member: member)
+                end
+
+                # Check if module exists
+                module_decl = env.module_entry(module_name, normalized: true) or raise NoMixinFoundError.new(type_name: module_name, member: member)
+                module_args = AST::TypeParam.normalize_args(module_decl.type_params, module_args)
+                module_name = env.normalize_module_name(module_name)
+                prepended_modules << Definition::Ancestor::Instance.new(name: module_name, args: module_args, source: member)
+              end
+            end
+          end
         end
       end
 
@@ -484,7 +537,7 @@ module RBS
           included_modules.each do |mod|
             name = mod.name
             arg_types = mod.args
-            mod.source.is_a?(AST::Members::Include) or raise
+            (mod.source.is_a?(AST::Members::Include) || mod.source.is_a?(AST::Ruby::Members::IncludeMember)) or raise
             mod_ancestors =
               instance_ancestors(name, building_ancestors: building_ancestors)
                 .apply(arg_types, env: env, location: mod.source.location)
@@ -499,7 +552,7 @@ module RBS
           prepended_modules.each do |mod|
             name = mod.name
             arg_types = mod.args
-            mod.source.is_a?(AST::Members::Prepend) or raise
+            (mod.source.is_a?(AST::Members::Prepend) || mod.source.is_a?(AST::Ruby::Members::PrependMember)) or raise
             mod_ancestors =
               instance_ancestors(name, building_ancestors: building_ancestors)
                 .apply(arg_types, env: env, location: mod.source.location)
@@ -554,7 +607,7 @@ module RBS
         extended_modules.each do |mod|
           name = mod.name
           args = mod.args
-          mod.source.is_a?(AST::Members::Extend) or raise
+          (mod.source.is_a?(AST::Members::Extend) || mod.source.is_a?(AST::Ruby::Members::ExtendMember)) or raise
           mod_ancestors =
             instance_ancestors(name, building_ancestors: building_ancestors)
               .apply(args, env: env, location: mod.source.location)

data/lib/rbs/definition_builder/method_builder.rb

@@ -143,12 +143,16 @@ module RBS
                   decl.members.each do |member|
                     case member
                     when AST::Ruby::Members::DefMember
-                      build_method(
-                        methods,
-                        type,
-                        member: member,
-                        accessibility: :public
-                      )
+                      if member.instance?
+                        build_method(
+                          methods,
+                          type,
+                          member: member,
+                          accessibility: :public
+                        )
+                      end
+                    when AST::Ruby::Members::AttrReaderMember, AST::Ruby::Members::AttrWriterMember, AST::Ruby::Members::AttrAccessorMember
+                      build_ruby_attribute(methods, type, member: member, accessibility: :public)
                     end
                   end
                 end
@@ -179,6 +183,10 @@ module RBS
                     if member.kind == :singleton
                       build_alias(methods, type, member: member)
                     end
+                  when AST::Ruby::Members::DefMember
+                    if member.singleton?
+                      build_method(methods, type, member: member, accessibility: :public)
+                    end
                   end
                 end
               end
@@ -227,6 +235,24 @@ module RBS
         end
       end
 
+      def build_ruby_attribute(methods, type, member:, accessibility:)
+        member.names.each do |name|
+          if member.is_a?(AST::Ruby::Members::AttrReaderMember) || member.is_a?(AST::Ruby::Members::AttrAccessorMember)
+            defn = methods.methods[name] ||= Methods::Definition.empty(type: type, name: name)
+
+            defn.accessibilities << accessibility
+            defn.originals << member
+          end
+
+          if member.is_a?(AST::Ruby::Members::AttrWriterMember) || member.is_a?(AST::Ruby::Members::AttrAccessorMember)
+            defn = methods.methods[:"#{name}="] ||= Methods::Definition.empty(type: type, name: :"#{name}=")
+
+            defn.accessibilities << accessibility
+            defn.originals << member
+          end
+        end
+      end
+
       def build_method(methods, type, member:, accessibility:)
         defn = methods.methods[member.name] ||= Methods::Definition.empty(type: type, name: member.name)