rbs 3.0.3 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a5d2a9cd76c2802e303f61813f418c15a2fc131b23f1eb8e90a92f409efcf37
-  data.tar.gz: d008724c5628a0c21b153a6ae99dadf7604ee90ad4caa210e07bbad974f91894
+  metadata.gz: ae81eb182ddb9f708925c47a5c98adcf0535ec1ddd7ff06127ba2602f076daf9
+  data.tar.gz: f791c1e0d14b1407ec6ae8ecb0deec2f9c5069852b67d716243a9262b4d49831
 SHA512:
-  metadata.gz: 4c903cc9f9b536281e0632aff0cae6d520856152bdf33b1d8fc34b2dd8e5caab93af6aaa1387eb7433b430d2d90dafcd5557c7aeba0b043d6ab340bc22d36dcb
-  data.tar.gz: 1913b79a1bb5b6510734aaca4aee8fa1759dae851486662ee5055040b8d70554b9466d061cc53c971ade8d76d75312486fe39cea5b1f4c7d3bfa333501fb56da
+  metadata.gz: 11b754b36d8a1c903538638774e1b51fa6abb08370ae1009d0c0c389a12b72cd222b2706e543dc89bf66f889b0eb60598a32473ee7cf52517410161259c098c8
+  data.tar.gz: 4f3694a3bec4492b4b885cf22d1ecf2c8e3408fc55609db45081de6865d2925ec31c7bccfb05258198b390c34f3348fe0ffc33f8f47b82cfba44f1fb3d393b43

data/CHANGELOG.md

@@ -2,6 +2,49 @@
 
 ## master
 
+## 3.1.0 (2023-04-26)
+
+### Signature updates
+
+* `Module#attr_*` methods ([#1300](https://github.com/ruby/rbs/pull/1300))
+* `Object#define_singleton_method` ([#1299](https://github.com/ruby/rbs/pull/1299))
+* `String#scan` ([#1297](https://github.com/ruby/rbs/pull/1297))
+* Removed `Gem.datadir` ([#1273](https://github.com/ruby/rbs/pull/1273))
+
+### Language updates
+
+### Library changes
+
+* Use fenced code block instead of indented one in .rbs files ([#1312](https://github.com/ruby/rbs/pull/1312))
+* Fix single use clause `:type_name` location ([#1307](https://github.com/ruby/rbs/pull/1307))
+* Fix `InvalidOverloadMethodError` on overloading extended method ([#1294](https://github.com/ruby/rbs/pull/1294))
+* Fix super class of `NoTypeFoundError` from `BaseError` to `DefinitionError` ([#1290](https://github.com/ruby/rbs/pull/1290))
+* Support `#detailed_message` for `NonregularTypeAliasError`, `CyclicTypeParameterBound`, `InconsistentClassModuleAliasError` and `CyclicClassAliasDefinitionError` ([#1289](https://github.com/ruby/rbs/pull/1289))
+* Implement `rbs subtract` command ([#1287](https://github.com/ruby/rbs/pull/1287))
+* Support `#detailed_message` for `InvalidVarianceAnnotationError`, `RecursiveAliasDefinitionError`, `MixinClassError` and `RecursiveTypeAliasError` ([#1285](https://github.com/ruby/rbs/pull/1285))
+* Support `#detailed_message` for `NoTypeError`, `InheritModuleError`, `NoSelfTypeFoundError` and `NoMixinFoundError` ([#1280](https://github.com/ruby/rbs/pull/1280))
+* Validate duplicate type aliases ([#1279](https://github.com/ruby/rbs/pull/1279))
+* Add `-e`, `--type`, and `--method-type` options to `rbs parse` ([#1252](https://github.com/ruby/rbs/pull/1252))
+
+#### rbs prototype
+
+* Convert `include` in `class << self` to `extend` by `prototype rb` ([#1255](https://github.com/ruby/rbs/pull/1255))
+
+#### rbs collection
+
+* Skip loading `#gemspec` gems via RBS collection ([#1319](https://github.com/ruby/rbs/pull/1319))
+
+### Miscellaneous
+
+* Run `bundle install` automatically in `bin/steep` ([#1308](https://github.com/ruby/rbs/pull/1308))
+* Fix warnings ([#1314](https://github.com/ruby/rbs/pull/1314))
+
+## 3.0.4 (2023-03-13)
+
+### Library changes
+
+* Add missing implementation to support class/module alias ([#1271](https://github.com/ruby/rbs/pull/1271))
+
 ## 3.0.3 (2023-03-07)
 
 ### Library changes

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbs (3.0.3)
+    rbs (3.1.0)
 
 PATH
   remote: test/assets/test-gem
@@ -11,8 +11,8 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.4)
+      public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     dbm (1.1.0)
     debase (0.2.5.beta2)
@@ -27,12 +27,12 @@ GEM
       rainbow (>= 3.0, < 4.0)
       strong_json (>= 1.1, < 2.2)
     json (2.6.3)
-    json-schema (3.0.0)
+    json-schema (4.0.0)
       addressable (>= 2.8)
     marcel (1.0.2)
-    minitest (5.17.0)
+    minitest (5.18.0)
     parallel (1.22.1)
-    parser (3.2.1.0)
+    parser (3.2.2.0)
       ast (~> 2.4.1)
     power_assert (2.0.2)
     prime (0.1.2)
@@ -40,14 +40,14 @@ GEM
       singleton
     psych (4.0.6)
       stringio
-    public_suffix (4.0.7)
+    public_suffix (5.0.1)
     rainbow (3.1.1)
     rake (13.0.6)
     rake-compiler (1.2.1)
       rake
     rdoc (6.4.0)
       psych (>= 4.0.0)
-    regexp_parser (2.7.0)
+    regexp_parser (2.8.0)
     rexml (3.2.5)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -62,25 +62,25 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.45.1)
+    rubocop (1.50.2)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.24.1, < 2.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.26.0)
+    rubocop-ast (1.28.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-progressbar (1.11.0)
+    ruby-progressbar (1.13.0)
     singleton (0.1.1)
-    stackprof (0.2.23)
+    stackprof (0.2.25)
     stringio (3.0.4)
     strong_json (2.1.2)
     tempfile (0.1.3)

data/Steepfile

@@ -9,7 +9,7 @@ target :lib do
     "lib/rbs/test.rb"
   )
 
-  library "set", "pathname", "json", "logger", "monitor", "tsort", "uri", 'dbm', 'pstore', 'singleton', 'shellwords', 'fileutils', 'find', 'digest'
+  library "set", "pathname", "json", "logger", "monitor", "tsort", "uri", 'dbm', 'pstore', 'singleton', 'shellwords', 'fileutils', 'find', 'digest', 'abbrev'
   signature 'stdlib/yaml/0'
   signature "stdlib/strscan/0/"
   signature "stdlib/optparse/0/"

data/core/io/buffer.rbs

@@ -541,13 +541,11 @@ class IO
 
     # <!--
     #   rdoc-file=io_buffer.c
-    #   - read(io, [length, [offset]]) -> read length or -errno
+    #   - read(io, length, [offset]) -> read length or -errno
     # -->
     # Read at most `length` bytes from `io` into the buffer, starting at `offset`.
     # If an error occurs, return `-errno`.
     #
-    # If `length` is not given, read until the end of the buffer.
-    #
     # If `offset` is not given, read from the beginning of the buffer.
     #
     # If `length` is 0, read nothing.

data/core/module.rbs

@@ -284,7 +284,7 @@ class Module < Object
   #     end
   #     Mod.instance_methods.sort   #=> [:one, :one=, :two, :two=]
   #
-  def attr_accessor: (*Symbol | String arg0) -> Array[Symbol]
+  def attr_accessor: (*Object::name arg0) -> Array[Symbol]
 
   # <!--
   #   rdoc-file=object.c
@@ -298,7 +298,7 @@ class Module < Object
   # in turn. String arguments are converted to symbols. Returns an array of
   # defined method names as symbols.
   #
-  def attr_reader: (*Symbol | String arg0) -> Array[Symbol]
+  def attr_reader: (*Object::name arg0) -> Array[Symbol]
 
   # <!--
   #   rdoc-file=object.c
@@ -309,7 +309,7 @@ class Module < Object
   # *symbol*`.id2name`. String arguments are converted to symbols. Returns an
   # array of defined method names as symbols.
   #
-  def attr_writer: (*Symbol | String arg0) -> Array[Symbol]
+  def attr_writer: (*Object::name arg0) -> Array[Symbol]
 
   # <!--
   #   rdoc-file=load.c
@@ -1629,5 +1629,5 @@ class Module < Object
   # `attr_reader(name)` but deprecated. Returns an array of defined method names
   # as symbols.
   #
-  def attr: (*Symbol | String arg0) -> Array[Symbol]
+  def attr: (*Object::name arg0) -> Array[Symbol]
 end

data/core/object.rbs

@@ -205,8 +205,8 @@ class Object < BasicObject
   #     chris.define_singleton_method(:greet) {|greeting| "#{greeting}, I'm Chris!" }
   #     chris.greet("Hi") #=> "Hi, I'm Chris!"
   #
-  def define_singleton_method: (Symbol, Method | UnboundMethod) -> Symbol
-                             | (Symbol) { (*untyped) -> untyped } -> Symbol
+  def define_singleton_method: (name, Method | UnboundMethod) -> Symbol
+                             | (name) { (*untyped) -> untyped } -> Symbol
 
   # <!--
   #   rdoc-file=io.c

data/core/rubygems/rubygems.rbs

@@ -261,15 +261,6 @@ module Gem
   #
   def self.data_home: () -> String
 
-  # <!--
-  #   rdoc-file=lib/rubygems.rb
-  #   - datadir(gem_name)
-  # -->
-  # The path to the data directory specified by the gem name.  If the package is
-  # not available as a gem, return nil.
-  #
-  def self.datadir: (String gem_name) -> String?
-
   # <!--
   #   rdoc-file=lib/rubygems/defaults.rb
   #   - default_bindir()

data/core/string.rbs

@@ -2600,8 +2600,10 @@ class String
   #     <<cruel>> <<world>>
   #     rceu lowlr
   #
-  def scan: (Regexp | string pattern) -> Array[String | Array[String]]
-          | (Regexp | string pattern) { (String | Array[String]) -> void } -> self
+  def scan: (Regexp pattern) -> Array[String | Array[String]]
+          | (Regexp pattern) { (String | Array[String]) -> void } -> self
+          | (string pattern) -> Array[String]
+          | (string pattern) { (String) -> void } -> self
 
   # <!--
   #   rdoc-file=string.c

data/ext/rbs_extension/parser.c

@@ -2649,13 +2649,9 @@ void parse_use_clauses(parserstate *state, VALUE clauses) {
 
         VALUE location = rbs_new_location(state->buffer, clause_range);
         rbs_loc *loc = rbs_check_location(location);
-        rbs_loc_add_required_child(loc, rb_intern("type_name"), state->current_token.range);
-        if (!null_range_p(keyword_range)) {
-          rbs_loc_add_optional_child(loc, rb_intern("keyword"), keyword_range);
-        }
-        if (!null_range_p(new_name_range)) {
-          rbs_loc_add_optional_child(loc, rb_intern("new_name"), new_name_range);
-        }
+        rbs_loc_add_required_child(loc, rb_intern("type_name"), type_name_range);
+        rbs_loc_add_optional_child(loc, rb_intern("keyword"), keyword_range);
+        rbs_loc_add_optional_child(loc, rb_intern("new_name"), new_name_range);
 
         rb_ary_push(clauses, rbs_ast_directives_use_single_clause(type_name, new_name, location));
 
@@ -2739,7 +2735,7 @@ VALUE parse_signature(parserstate *state) {
 }
 
 static VALUE
-rbsparser_parse_type(VALUE self, VALUE buffer, VALUE start_pos, VALUE end_pos, VALUE variables)
+rbsparser_parse_type(VALUE self, VALUE buffer, VALUE start_pos, VALUE end_pos, VALUE variables, VALUE require_eof)
 {
   parserstate *parser = alloc_parser(buffer, FIX2INT(start_pos), FIX2INT(end_pos), variables);
 
@@ -2749,13 +2745,17 @@ rbsparser_parse_type(VALUE self, VALUE buffer, VALUE start_pos, VALUE end_pos, V
 
   VALUE type = parse_type(parser);
 
+  if (RB_TEST(require_eof)) {
+    parser_advance_assert(parser, pEOF);
+  }
+
   free_parser(parser);
 
   return type;
 }
 
 static VALUE
-rbsparser_parse_method_type(VALUE self, VALUE buffer, VALUE start_pos, VALUE end_pos, VALUE variables)
+rbsparser_parse_method_type(VALUE self, VALUE buffer, VALUE start_pos, VALUE end_pos, VALUE variables, VALUE require_eof)
 {
   parserstate *parser = alloc_parser(buffer, FIX2INT(start_pos), FIX2INT(end_pos), variables);
 
@@ -2765,6 +2765,10 @@ rbsparser_parse_method_type(VALUE self, VALUE buffer, VALUE start_pos, VALUE end
 
   VALUE method_type = parse_method_type(parser);
 
+  if (RB_TEST(require_eof)) {
+    parser_advance_assert(parser, pEOF);
+  }
+
   free_parser(parser);
 
   return method_type;
@@ -2782,7 +2786,7 @@ rbsparser_parse_signature(VALUE self, VALUE buffer, VALUE end_pos)
 
 void rbs__init_parser(void) {
   RBS_Parser = rb_define_class_under(RBS, "Parser", rb_cObject);
-  rb_define_singleton_method(RBS_Parser, "_parse_type", rbsparser_parse_type, 4);
-  rb_define_singleton_method(RBS_Parser, "_parse_method_type", rbsparser_parse_method_type, 4);
+  rb_define_singleton_method(RBS_Parser, "_parse_type", rbsparser_parse_type, 5);
+  rb_define_singleton_method(RBS_Parser, "_parse_method_type", rbsparser_parse_method_type, 5);
   rb_define_singleton_method(RBS_Parser, "_parse_signature", rbsparser_parse_signature, 2);
 }

data/lib/rbs/cli.rb

@@ -3,6 +3,8 @@
 require "open3"
 require "optparse"
 require "shellwords"
+require "abbrev"
+require "stringio"
 
 module RBS
   class CLI
@@ -88,7 +90,7 @@ module RBS
       @stderr = stderr
     end
 
-    COMMANDS = [:ast, :annotate, :list, :ancestors, :methods, :method, :validate, :constant, :paths, :prototype, :vendor, :parse, :test, :collection]
+    COMMANDS = [:ast, :annotate, :list, :ancestors, :methods, :method, :validate, :constant, :paths, :prototype, :vendor, :parse, :test, :collection, :subtract]
 
     def parse_logging_options(opts)
       opts.on("--log-level LEVEL", "Specify log level (defaults to `warn`)") do |level|
@@ -230,6 +232,19 @@ EOB
             end
           end
         end
+
+        env.class_alias_decls.each do |name, entry|
+          case entry
+          when Environment::ModuleAliasEntry
+            if list.include?(:module)
+              stdout.puts "#{name} (module alias)"
+            end
+          when Environment::ClassAliasEntry
+            if list.include?(:class)
+              stdout.puts "#{name} (class alias)"
+            end
+          end
+        end
       end
 
       if list.include?(:interface)
@@ -272,7 +287,10 @@ EOU
       builder = DefinitionBuilder::AncestorBuilder.new(env: env)
       type_name = TypeName(args[0]).absolute!
 
-      if env.class_decls.key?(type_name)
+      case env.constant_entry(type_name)
+      when Environment::ClassEntry, Environment::ModuleEntry, Environment::ClassAliasEntry, Environment::ModuleAliasEntry
+        type_name = env.normalize_module_name(type_name)
+
         ancestors = case kind
                     when :instance
                       builder.instance_ancestors(type_name)
@@ -334,7 +352,7 @@ EOU
       builder = DefinitionBuilder.new(env: env)
       type_name = TypeName(args[0]).absolute!
 
-      if env.class_decls.key?(type_name)
+      if env.module_name?(type_name)
         definition = case kind
                      when :instance
                        builder.build_instance(type_name)
@@ -388,7 +406,7 @@ EOU
       type_name = TypeName(args[0]).absolute!
       method_name = args[1].to_sym
 
-      unless env.class_decls.key?(type_name)
+      unless env.module_name?(type_name)
         stdout.puts "Cannot find class: #{type_name}"
         return
       end
@@ -434,7 +452,6 @@ Examples:
 EOU
 
         opts.on("--silent") do
-          require "stringio"
           @stdout = StringIO.new
         end
       end.parse!(args)
@@ -904,6 +921,10 @@ Options:
     end
 
     def run_parse(args, options)
+      parse_method = :parse_signature
+      # @type var e_code: String?
+      e_code = nil
+
       OptionParser.new do |opts|
         opts.banner = <<-EOB
 Usage: rbs parse [files...]
@@ -913,22 +934,35 @@ Parse given RBS files and print syntax errors.
 Examples:
 
   $ rbs parse sig/app/models.rbs sig/app/controllers.rbs
+
+Options:
         EOB
-      end.parse!(args)
 
-      loader = options.loader()
+        opts.on('-e CODE', 'One line RBS script to parse') { |e| e_code = e }
+        opts.on('--type', 'Parse code as a type') { |e| parse_method = :parse_type }
+        opts.on('--method-type', 'Parse code as a method type') { |e| parse_method = :parse_method_type }
+      end.parse!(args)
 
       syntax_error = false
-      args.each do |path|
+      bufs = args.flat_map do |path|
         path = Pathname(path)
-        loader.each_file(path, skip_hidden: false, immediate: true) do |file_path|
-          RBS.logger.info "Parsing #{file_path}..."
-          buffer = Buffer.new(content: file_path.read, name: file_path)
-          Parser.parse_signature(buffer)
-        rescue RBS::ParsingError => ex
-          stdout.puts ex.message
-          syntax_error = true
+        FileFinder.each_file(path, skip_hidden: false, immediate: true).map do |file_path|
+          Buffer.new(content: file_path.read, name: file_path)
+        end
+      end
+      bufs << Buffer.new(content: e_code, name: '-e') if e_code
+
+      bufs.each do |buf|
+        RBS.logger.info "Parsing #{buf.name}..."
+        case parse_method
+        when :parse_signature
+          Parser.parse_signature(buf)
+        else
+          Parser.public_send(parse_method, buf, require_eof: true)
         end
+      rescue RBS::ParsingError => ex
+        stdout.puts ex.message
+        syntax_error = true
       end
 
       exit 1 if syntax_error
@@ -1062,7 +1096,8 @@ EOB
       config_path = options.config_path or raise
       lock_path = Collection::Config.to_lockfile_path(config_path)
 
-      case args[0]
+      subcommand = Abbrev.abbrev(['install', 'update', 'help'])[args[0]] || args[0]
+      case subcommand
       when 'install'
         unless params[:frozen]
           Collection::Config.generate_lockfile(config_path: config_path, definition: Bundler.definition)
@@ -1138,5 +1173,80 @@ EOB
         opts.on('--frozen') if args[0] == 'install'
       end
     end
+
+    def run_subtract(args, _)
+      write_to_file = false
+      # @type var subtrahend_paths: Array[String]
+      subtrahend_paths = []
+
+      opts = OptionParser.new do |opts|
+        opts.banner = <<~HELP
+          Usage:
+            rbs subtract [options...] minuend.rbs [minuend2.rbs, ...] subtrahend.rbs
+            rbs subtract [options...] minuend.rbs [minuend2.rbs, ...] --subtrahend subtrahend_1.rbs --subtrahend subtrahend_2.rbs
+
+          Remove duplications between RBS files.
+
+          Examples:
+
+            # Generate RBS files from the codebase.
+            $ rbs prototype rb lib/ > generated.rbs
+
+            # Write more descrictive types by hand.
+            $ $EDITOR handwritten.rbs
+
+            # Remove hand-written method definitions from generated.rbs.
+            $ rbs subtract --write generated.rbs handwritten.rbs
+
+          Options:
+        HELP
+        opts.on('-w', '--write', 'Overwrite files directry') { write_to_file = true }
+        opts.on('--subtrahend=PATH', '') { |path| subtrahend_paths << path }
+        opts.parse!(args)
+      end
+
+      if subtrahend_paths.empty?
+        *minuend_paths, subtrahend_path = args
+        unless subtrahend_path
+          stdout.puts opts.help
+          exit 1
+        end
+        subtrahend_paths << subtrahend_path
+      else
+        minuend_paths = args
+      end
+
+      if minuend_paths.empty?
+        stdout.puts opts.help
+        exit 1
+      end
+
+      subtrahend = Environment.new.tap do |env|
+        loader = EnvironmentLoader.new(core_root: nil)
+        subtrahend_paths.each do |path|
+          loader.add(path: Pathname(path))
+        end
+        loader.load(env: env)
+      end
+
+      minuend_paths.each do |minuend_path|
+        FileFinder.each_file(Pathname(minuend_path), immediate: true, skip_hidden: true) do |rbs_path|
+          buf = Buffer.new(name: rbs_path, content: rbs_path.read)
+          _, dirs, decls = Parser.parse_signature(buf)
+          subtracted = Subtractor.new(decls, subtrahend).call
+
+          io = StringIO.new
+          w = Writer.new(out: io)
+          w.write(dirs)
+          w.write(subtracted)
+
+          if write_to_file
+            rbs_path.write(io.string)
+          else
+            stdout.puts(io.string)
+          end
+        end
+      end
+    end
   end
 end

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

@@ -76,7 +76,7 @@ module RBS
             end
 
             if spec = gem_hash[dep.name]
-              assign_gem(name: dep.name, version: spec.version, ignored_gems: ignored_gems, src_data: nil)
+              assign_gem(name: dep.name, version: spec.version, ignored_gems: ignored_gems, src_data: nil, skip: dep.source.is_a?(Bundler::Source::Gemspec))
             end
           end
 
@@ -91,43 +91,45 @@ module RBS
           end
         end
 
-        private def assign_gem(name:, version:, src_data:, ignored_gems:)
+        private def assign_gem(name:, version:, src_data:, ignored_gems:, skip: false)
           return if ignored_gems.include?(name)
           return if lockfile.gems.key?(name)
 
-          # @type var locked: Lockfile::library?
+          unless skip
+            # @type var locked: Lockfile::library?
 
-          if existing_lockfile
-            locked = existing_lockfile.gems[name]
-          end
+            if existing_lockfile
+              locked = existing_lockfile.gems[name]
+            end
 
-          # If rbs_collection.lock.yaml contain the gem, use it.
-          # Else find the gem from gem_collection.
-          unless locked
-            source =
-              if src_data
-                Sources.from_config_entry(src_data, base_directory: config.config_path.dirname)
-              else
-                find_source(name: name)
+            # If rbs_collection.lock.yaml contain the gem, use it.
+            # Else find the gem from gem_collection.
+            unless locked
+              source =
+                if src_data
+                  Sources.from_config_entry(src_data, base_directory: config.config_path.dirname)
+                else
+                  find_source(name: name)
+                end
+
+              if source
+                installed_version = version
+                best_version = find_best_version(version: installed_version, versions: source.versions(name))
+
+                locked = {
+                  name: name,
+                  version: best_version.to_s,
+                  source: source,
+                }
               end
-
-            if source
-              installed_version = version
-              best_version = find_best_version(version: installed_version, versions: source.versions(name))
-
-              locked = {
-                name: name,
-                version: best_version.to_s,
-                source: source,
-              }
             end
-          end
 
-          if locked
-            lockfile.gems[name] = locked
+            if locked
+              lockfile.gems[name] = locked
 
-            locked[:source].dependencies_of(locked[:name], locked[:version])&.each do |dep|
-              assign_stdlib(name: dep["name"], from_gem: name)
+              locked[:source].dependencies_of(locked[:name], locked[:version])&.each do |dep|
+                assign_stdlib(name: dep["name"], from_gem: name)
+              end
             end
           end
 

data/lib/rbs/definition_builder.rb

@@ -239,14 +239,6 @@ module RBS
             definition.class_variables.merge!(defn.class_variables)
           end
 
-          all_interfaces = one_ancestors.each_extended_interface.flat_map do |interface|
-            other_interfaces = ancestor_builder.interface_ancestors(interface.name).ancestors #: Array[Definition::Ancestor::Instance]
-            other_interfaces = other_interfaces.select {|ancestor| ancestor.source }
-            [interface, *other_interfaces]
-          end
-          interface_methods = interface_methods(all_interfaces)
-          import_methods(definition, type_name, methods, interface_methods, Substitution.new)
-
           one_ancestors.each_extended_module do |mod|
             mod.args.each do |arg|
               validate_type_presence(arg)
@@ -256,7 +248,12 @@ module RBS
             define_instance(definition, mod.name, subst)
           end
 
-          interface_methods = interface_methods(one_ancestors.each_extended_interface.to_a)
+          all_interfaces = one_ancestors.each_extended_interface.flat_map do |interface|
+            other_interfaces = ancestor_builder.interface_ancestors(interface.name).ancestors #: Array[Definition::Ancestor::Instance]
+            other_interfaces = other_interfaces.select {|ancestor| ancestor.source }
+            [interface, *other_interfaces]
+          end
+          interface_methods = interface_methods(all_interfaces)
           import_methods(definition, type_name, methods, interface_methods, Substitution.new)
 
           entry.decls.each do |d|

data/lib/rbs/environment.rb

@@ -365,7 +365,7 @@ module RBS
         name = decl.name.with_prefix(namespace)
 
         if interface_entry = interface_decls[name]
-          DuplicatedDeclarationError.new(name, decl, interface_entry.decl)
+          raise DuplicatedDeclarationError.new(name, decl, interface_entry.decl)
         end
 
         interface_decls[name] = InterfaceEntry.new(name: name, decl: decl, outer: outer)
@@ -374,7 +374,7 @@ module RBS
         name = decl.name.with_prefix(namespace)
 
         if entry = type_alias_decls[name]
-          DuplicatedDeclarationError.new(name, decl, entry.decl)
+          raise DuplicatedDeclarationError.new(name, decl, entry.decl)
         end
 
         type_alias_decls[name] = TypeAliasEntry.new(name: name, decl: decl, outer: outer)