rbs 4.0.0.dev.4 → 4.0.0.dev.5

data/lib/rbs/cli/validate.rb

@@ -21,10 +21,18 @@ module RBS
           finish if @limit == 1
         end
 
+        def try(&block)
+          catch(:finish) do |tag|
+            @tag = tag
+            yield
+            finish()
+          end
+        end
+
         def finish
           if @errors.empty?
             if @exit_error && @has_syntax_error
-              exit 1
+              throw @tag, 1
             else
               # success
             end
@@ -32,8 +40,10 @@ module RBS
             @errors.each do |error|
               RBS.logger.error(build_message(error))
             end
-            exit 1
+            throw @tag, 1
           end
+
+          0
         end
 
         private
@@ -81,14 +91,14 @@ EOU
       end
 
       def run
-        validate_class_module_definition
-        validate_class_module_alias_definition
-        validate_interface
-        validate_constant
-        validate_global
-        validate_type_alias
-
-        @errors.finish
+        @errors.try do
+          validate_class_module_definition
+          validate_class_module_alias_definition
+          validate_interface
+          validate_constant
+          validate_global
+          validate_type_alias
+        end
       end
 
       private
@@ -112,8 +122,6 @@ EOU
             entry.each_decl do |decl|
               if super_class = decl.super_class
                 super_class.args.each do |arg|
-                  void_type_context_validator(arg, true)
-                  no_self_type_validator(arg)
                   no_classish_type_validator(arg)
                   @validator.validate_type(arg, context: nil)
                 end
@@ -123,15 +131,13 @@ EOU
             entry.each_decl do |decl|
               decl.self_types.each do |self_type|
                 self_type.args.each do |arg|
-                  void_type_context_validator(arg, true)
-                  no_self_type_validator(arg)
                   no_classish_type_validator(arg)
                   @validator.validate_type(arg, context: nil)
                 end
 
                 self_params =
                   if self_type.name.class?
-                    @env.normalized_module_entry(self_type.name)&.type_params
+                    @env.module_entry(self_type.name, normalized: true)&.type_params
                   else
                     @env.interface_decls[self_type.name]&.decl&.type_params
                   end
@@ -153,15 +159,16 @@ EOU
 
           d.type_params.each do |param|
             if ub = param.upper_bound_type
-              void_type_context_validator(ub)
-              no_self_type_validator(ub)
               no_classish_type_validator(ub)
               @validator.validate_type(ub, context: nil)
             end
 
+            if lb = param.lower_bound_type
+              no_classish_type_validator(lb)
+              @validator.validate_type(lb, context: nil)
+            end
+
             if dt = param.default_type
-              void_type_context_validator(dt, true)
-              no_self_type_validator(dt)
               no_classish_type_validator(dt)
               @validator.validate_type(dt, context: nil)
             end
@@ -176,21 +183,10 @@ EOU
                 case member
                 when AST::Members::MethodDefinition
                   @validator.validate_method_definition(member, type_name: name)
-                  member.overloads.each do |ov|
-                    void_type_context_validator(ov.method_type)
-                  end
-                when AST::Members::Attribute
-                  void_type_context_validator(member.type)
                 when AST::Members::Mixin
-                  member.args.each do |arg|
-                    no_self_type_validator(arg)
-                    unless arg.is_a?(Types::Bases::Void)
-                      void_type_context_validator(arg, true)
-                    end
-                  end
                   params =
                     if member.name.class?
-                      module_decl = @env.normalized_module_entry(member.name) or raise
+                      module_decl = @env.module_entry(member.name, normalized: true) or raise
                       module_decl.type_params
                     else
                       interface_decl = @env.interface_decls.fetch(member.name)
@@ -199,10 +195,6 @@ EOU
                   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)
-                  end
                 end
               end
             else
@@ -238,15 +230,16 @@ EOU
 
           decl.decl.type_params.each do |param|
             if ub = param.upper_bound_type
-              void_type_context_validator(ub)
-              no_self_type_validator(ub)
               no_classish_type_validator(ub)
               @validator.validate_type(ub, context: nil)
             end
 
+            if lb = param.lower_bound_type
+              no_classish_type_validator(lb)
+              @validator.validate_type(lb, context: nil)
+            end
+
             if dt = param.default_type
-              void_type_context_validator(dt, true)
-              no_self_type_validator(dt)
               no_classish_type_validator(dt)
               @validator.validate_type(dt, context: nil)
             end
@@ -259,7 +252,6 @@ EOU
             when AST::Members::MethodDefinition
               @validator.validate_method_definition(member, type_name: name)
               member.overloads.each do |ov|
-                void_type_context_validator(ov.method_type)
                 no_classish_type_validator(ov.method_type)
               end
             end
@@ -274,9 +266,7 @@ EOU
           RBS.logger.info "Validating constant: `#{name}`..."
           @validator.validate_type const.decl.type, context: const.context
           @builder.ensure_namespace!(name.namespace, location: const.decl.location)
-          no_self_type_validator(const.decl.type)
           no_classish_type_validator(const.decl.type)
-          void_type_context_validator(const.decl.type)
         rescue BaseError => error
           @errors.add(error)
         end
@@ -286,9 +276,7 @@ EOU
         @env.global_decls.each do |name, global|
           RBS.logger.info "Validating global: `#{name}`..."
           @validator.validate_type global.decl.type, context: nil
-          no_self_type_validator(global.decl.type)
           no_classish_type_validator(global.decl.type)
-          void_type_context_validator(global.decl.type)
         rescue BaseError => error
           @errors.add(error)
         end
@@ -311,15 +299,16 @@ EOU
 
           decl.decl.type_params.each do |param|
             if ub = param.upper_bound_type
-              void_type_context_validator(ub)
-              no_self_type_validator(ub)
               no_classish_type_validator(ub)
               @validator.validate_type(ub, context: nil)
             end
 
+            if lb = param.lower_bound_type
+              no_classish_type_validator(lb)
+              @validator.validate_type(lb, context: nil)
+            end
+
             if dt = param.default_type
-              void_type_context_validator(dt, true)
-              no_self_type_validator(dt)
               no_classish_type_validator(dt)
               @validator.validate_type(dt, context: nil)
             end
@@ -327,9 +316,7 @@ EOU
 
           TypeParamDefaultReferenceError.check!(decl.decl.type_params)
 
-          no_self_type_validator(decl.decl.type)
           no_classish_type_validator(decl.decl.type)
-          void_type_context_validator(decl.decl.type)
         rescue BaseError => error
           @errors.add(error)
         end
@@ -353,7 +340,7 @@ EOU
         if allowed_here
           return if type.is_a?(Types::Bases::Void)
         end
-        if type.with_nonreturn_void?
+        if type.with_nonreturn_void? # steep:ignore DeprecatedReference
           @errors.add WillSyntaxError.new("`void` type is only allowed in return type or generics parameter", location: type.location)
         end
       end

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)
@@ -946,7 +972,7 @@ Import documents from RDoc and update RBS files.
 
 Examples:
 
-  $ rbs annotate stdlib/pathname/**/*.rbs
+  $ rbs annotate stdlib/logger/**/*.rbs
 
 Options:
         EOB
@@ -975,6 +1001,8 @@ Options:
           annotator.annotate_file(path, preserve: preserve)
         end
       end
+
+      0
     end
 
     def test_opt options
@@ -1028,7 +1056,7 @@ EOB
 
       if args.length.zero?
         stdout.puts opts.help
-        exit 1
+        return 1
       end
 
       # @type var env_hash: Hash[String, String?]
@@ -1044,11 +1072,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 +1102,7 @@ EOB
       when 'init'
         if config_path.exist?
           puts "#{config_path} already exists"
-          exit 1
+          return 1
         end
 
         config_path.write(<<~'YAML')
@@ -1101,15 +1130,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 +1202,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 +1211,7 @@ EOB
 
       if minuend_paths.empty?
         stdout.puts opts.help
-        exit 1
+        return 1
       end
 
       subtrahend = Environment.new.tap do |env|
@@ -1213,10 +1244,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

@@ -14,6 +14,7 @@ module RBS
           "net-smtp" => nil,
           "nkf" => nil,
           "observer" => nil,
+          "cgi" => nil,
         }
 
         class GemfileLockMismatchError < StandardError
@@ -183,6 +184,13 @@ module RBS
               lockfile.gems[name] = { name: name, version: "0", source: source }
             end
             return
+          when 'set', 'pathname'
+            # set and pathname 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

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)