rbs 2.6.0 → 2.7.0.pre.1

data/lib/rbs/definition_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBS
   class DefinitionBuilder
     attr_reader :env
@@ -173,11 +175,15 @@ module RBS
                          end
 
                   # Successor interface method overwrites.
-                  merge_definition(src: defn,
-                                   dest: definition,
-                                   subst: Substitution.build(defn.type_params, ans.args),
-                                   keep_super: true)
+                  merge_definition(
+                    src: defn,
+                    dest: definition,
+                    subst: Substitution.build(defn.type_params, ans.args),
+                    keep_super: true
+                  )
                 end
+              else
+                methods_with_self = build_instance(type_name, no_self_types: false).methods
               end
             end
 
@@ -211,10 +217,16 @@ module RBS
               end
             end
 
-            define_methods(definition,
-                           interface_methods: interface_methods,
-                           methods: methods,
-                           super_interface_method: entry.is_a?(Environment::ModuleEntry))
+            if entry.is_a?(Environment::ModuleEntry)
+              define_methods_module_instance(
+                definition,
+                methods: methods,
+                interface_methods: interface_methods,
+                module_self_methods: methods_with_self
+              )
+            else
+              define_methods_instance(definition, methods: methods, interface_methods: interface_methods)
+            end
 
             entry.decls.each do |d|
               subst = Substitution.build(d.decl.type_params.each.map(&:name), args)
@@ -328,7 +340,7 @@ module RBS
             end
 
             methods = method_builder.build_singleton(type_name)
-            define_methods(definition, interface_methods: interface_methods, methods: methods, super_interface_method: false)
+            define_methods_singleton(definition, methods: methods, interface_methods: interface_methods)
 
             entry.decls.each do |d|
               d.decl.members.each do |member|
@@ -379,6 +391,18 @@ module RBS
             if entry.is_a?(Environment::ClassEntry)
               new_method = definition.methods[:new]
               if new_method.defs.all? {|d| d.defined_in == BuiltinNames::Class.name }
+                alias_methods = definition.methods.each.with_object([]) do |entry, array|
+                  # @type var method: Definition::Method?
+                  name, method = entry
+                  while method
+                    if method.alias_of == new_method
+                      array << name
+                      break
+                    end
+                    method = method.alias_of
+                  end
+                end
+
                 # The method is _untyped new_.
 
                 instance = build_instance(type_name)
@@ -389,7 +413,7 @@ module RBS
 
                   # Inject a virtual _typed new_.
                   initialize_defs = initialize.defs
-                  definition.methods[:new] = Definition::Method.new(
+                  typed_new = Definition::Method.new(
                     super_method: new_method,
                     defs: initialize_defs.map do |initialize_def|
                       method_type = initialize_def.type
@@ -442,6 +466,15 @@ module RBS
                     annotations: [],
                     alias_of: nil
                   )
+
+                  definition.methods[:new] = typed_new
+
+                  alias_methods.each do |alias_name|
+                    definition.methods[alias_name] = definition.methods[alias_name].update(
+                      alias_of: typed_new,
+                      defs: typed_new.defs
+                    )
+                  end
                 end
               end
             end
@@ -564,14 +597,41 @@ module RBS
       )
     end
 
-    def define_methods(definition, interface_methods:, methods:, super_interface_method:)
+    def define_methods_instance(definition, methods:, interface_methods:)
+      define_methods(
+        definition,
+        methods: methods,
+        interface_methods: interface_methods,
+        methods_with_self: nil,
+        super_interface_method: false
+      )
+    end
+
+    def define_methods_module_instance(definition, methods:, interface_methods:, module_self_methods:)
+      define_methods(definition, methods: methods, interface_methods: interface_methods, methods_with_self: module_self_methods, super_interface_method: true)
+    end
+
+    def define_methods_singleton(definition, methods:, interface_methods:)
+      define_methods(
+        definition,
+        methods: methods,
+        interface_methods: interface_methods,
+        methods_with_self: nil,
+        super_interface_method: false
+      )
+    end
+
+    def define_methods(definition, methods:, interface_methods:, methods_with_self:, super_interface_method:)
       methods.each do |method_def|
         method_name = method_def.name
         original = method_def.original
 
         if original.is_a?(AST::Members::Alias)
           existing_method = interface_methods[method_name] || definition.methods[method_name]
-          original_method = interface_methods[original.old_name] || definition.methods[original.old_name]
+          original_method =
+            interface_methods[original.old_name] ||
+            methods_with_self&.[](original.old_name) ||
+            definition.methods[original.old_name]
 
           unless original_method
             raise UnknownMethodAliasError.new(
@@ -791,8 +851,10 @@ module RBS
       end
     end
 
-    def try_cache(type_name, cache:, key: type_name)
+    def try_cache(type_name, cache:, key: nil)
       # @type var cc: Hash[untyped, Definition | nil]
+      # @type var key: untyped
+      key ||= type_name
       cc = _ = cache
 
       cc[key] ||= yield

data/lib/rbs/environment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBS
   class Environment
     attr_reader :declarations

data/lib/rbs/environment_loader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBS
   class EnvironmentLoader
     class UnknownLibraryError < StandardError
@@ -21,7 +23,9 @@ module RBS
     DEFAULT_CORE_ROOT = Pathname(_ = __dir__) + "../../core"
 
     def self.gem_sig_path(name, version)
-      spec = Gem::Specification.find_by_name(name, version)
+      requirements = []
+      requirements << version if version
+      spec = Gem::Specification.find_by_name(name, *requirements)
       path = Pathname(spec.gem_dir) + "sig"
       if path.directory?
         [spec, path]
@@ -34,16 +38,32 @@ module RBS
       @core_root = core_root
       @repository = repository
 
-      @libs = []
+      @libs = Set.new
       @dirs = []
     end
 
-    def add(path: nil, library: nil, version: nil)
+    def add(path: nil, library: nil, version: nil, resolve_dependencies: true)
       case
       when path
         dirs << path
       when library
-        libs << Library.new(name: library, version: version)
+        if libs.add?(Library.new(name: library, version: version)) && resolve_dependencies
+          resolve_dependencies(library: library, version: version)
+        end
+      end
+    end
+
+    def resolve_dependencies(library:, version:)
+      [Collection::Sources::Rubygems.instance, Collection::Sources::Stdlib.instance].each do |source|
+        # @type var gem: { 'name' => String, 'version' => String? }
+        gem = { 'name' => library, 'version' => version }
+        next unless source.has?(gem)
+
+        gem['version'] ||= source.versions(gem).last
+        source.dependencies_of(gem)&.each do |dep|
+          add(library: dep['name'], version: nil)
+        end
+        return
       end
     end
 
@@ -53,7 +73,7 @@ module RBS
       repository.add(collection_config.repo_path)
 
       collection_config.gems.each do |gem|
-        add(library: gem['name'], version: gem['version'])
+        add(library: gem['name'], version: gem['version'], resolve_dependencies: false)
       end
     end
 

data/lib/rbs/environment_walker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBS
   class EnvironmentWalker
     InstanceNode = _ = Struct.new(:type_name, keyword_init: true)

data/lib/rbs/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBS
   module MethodNameHelper
     def method_name_string()
@@ -216,7 +218,7 @@ module RBS
       @method_name = method_name
       @members = members
 
-      message = "#{Location.to_string location}: #{qualified_method_name} has duplicated definitions"
+      message = +"#{Location.to_string location}: #{qualified_method_name} has duplicated definitions"
       if members.size > 1
         message << " in #{other_locations.map { |loc| Location.to_string loc }.join(', ')}"
       end

data/lib/rbs/factory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBS
   class Factory
     def type_name(string)

data/lib/rbs/location_aux.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBS
   class Location
     def inspect
@@ -58,7 +60,7 @@ module RBS
     end
 
     def source
-      @source ||= buffer.content[range] or raise
+      @source ||= (buffer.content[range] || raise)
     end
 
     def to_s

data/lib/rbs/locator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBS
   class Locator
     attr_reader :decls

data/lib/rbs/method_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBS
   class MethodType
     attr_reader :type_params
@@ -62,9 +64,7 @@ module RBS
       self.class.new(
         type_params: type_params,
         type: type.map_type(&block),
-        block: self.block&.yield_self do |b|
-          Types::Block.new(type: b.type.map_type(&block), required: b.required)
-        end,
+        block: self.block&.map_type(&block),
         location: location
       )
     end
@@ -93,11 +93,13 @@ module RBS
     end
 
     def to_s
+      block_self_binding = Types::SelfTypeBindingHelper.self_type_binding_to_s(block&.self_type)
+
       s = case
           when (b = block) && b.required
-            "(#{type.param_to_s}) { (#{b.type.param_to_s}) -> #{b.type.return_to_s} } -> #{type.return_to_s}"
+            "(#{type.param_to_s}) { (#{b.type.param_to_s}) #{block_self_binding}-> #{b.type.return_to_s} } -> #{type.return_to_s}"
           when b = block
-            "(#{type.param_to_s}) ?{ (#{b.type.param_to_s}) -> #{b.type.return_to_s} } -> #{type.return_to_s}"
+            "(#{type.param_to_s}) ?{ (#{b.type.param_to_s}) #{block_self_binding}-> #{b.type.return_to_s} } -> #{type.return_to_s}"
           else
             "(#{type.param_to_s}) -> #{type.return_to_s}"
           end

data/lib/rbs/namespace.rb

@@ -1,18 +1,20 @@
+# frozen_string_literal: true
+
 module RBS
   class Namespace
     attr_reader :path
 
     def initialize(path:, absolute:)
       @path = path
-      @absolute = absolute
+      @absolute = absolute ? true : false
     end
 
     def self.empty
-      new(path: [], absolute: false)
+      @empty ||= new(path: [], absolute: false)
     end
 
     def self.root
-      new(path: [], absolute: true)
+      @root ||= new(path: [], absolute: true)
     end
 
     def +(other)
@@ -28,8 +30,10 @@ module RBS
     end
 
     def parent
-      raise "Parent with empty namespace" if empty?
-      self.class.new(path: path.take(path.size - 1), absolute: absolute?)
+      @parent ||= begin
+        raise "Parent with empty namespace" if empty?
+        self.class.new(path: path.take(path.size - 1), absolute: absolute?)
+      end
     end
 
     def absolute?

data/lib/rbs/parser_aux.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBS
   class Parser
     def self.parse_type(source, line: 1, column: 0, variables: [])

data/lib/rbs/parser_compat/lexer_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RBS.print_warning {
   "RBS::Parser::LexerError is deprecated and will be deleted in RBS 2.0."
 }

data/lib/rbs/parser_compat/located_value.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RBS.print_warning {
   "RBS::Parser::LocatedValue is deprecated and will be deleted in RBS 2.0."
 }

data/lib/rbs/parser_compat/semantics_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RBS.print_warning {
   "RBS::Parser::SemanticsError is deprecated and will be deleted in RBS 2.0."
 }

data/lib/rbs/parser_compat/syntax_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RBS.print_warning {
   "RBS::Parser::SyntaxError is deprecated and will be deleted in RBS 2.0."
 }

data/lib/rbs/prototype/helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBS
   module Prototype
     module Helpers
@@ -13,7 +15,8 @@ module RBS
         if block
           method_block = Types::Block.new(
             required: false,
-            type: Types::Function.empty(untyped)
+            type: Types::Function.empty(untyped),
+            self_type: nil
           )
         end
 
@@ -21,12 +24,14 @@ module RBS
           if (yields = any_node?(body_node) {|n| n.type == :YIELD })
             method_block = Types::Block.new(
               required: true,
-              type: Types::Function.empty(untyped)
+              type: Types::Function.empty(untyped),
+              self_type: nil
             )
 
             yields.each do |yield_node|
               array_content = yield_node.children[0]&.children&.compact || []
 
+              # @type var keywords: node?
               positionals, keywords = if keyword_hash?(array_content.last)
                                         [array_content.take(array_content.size - 1), array_content.last]
                                       else
@@ -86,12 +91,12 @@ module RBS
       end
 
       def keyword_hash?(node)
-        if node
-          if node.type == :HASH
-            node.children[0].children.compact.each_slice(2).all? {|key, _|
-              key.type == :LIT && key.children[0].is_a?(Symbol)
-            }
-          end
+        if node && node.type == :HASH
+          node.children[0].children.compact.each_slice(2).all? {|key, _|
+            key.type == :LIT && key.children[0].is_a?(Symbol)
+          }
+        else
+          false
         end
       end
 

data/lib/rbs/prototype/rb.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBS
   module Prototype
     class RB

data/lib/rbs/prototype/rbi.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBS
   module Prototype
     class RBI
@@ -410,28 +412,31 @@ module RBS
         if block
           if (type = vars[block])
             if type.is_a?(Types::Proc)
-              method_block = Types::Block.new(required: true, type: type.type)
+              method_block = Types::Block.new(required: true, type: type.type, self_type: nil)
             elsif type.is_a?(Types::Bases::Any)
               method_block = Types::Block.new(
                 required: true,
-                type: Types::Function.empty(Types::Bases::Any.new(location: nil))
+                type: Types::Function.empty(Types::Bases::Any.new(location: nil)),
+                self_type: nil
               )
             # Handle an optional block like `T.nilable(T.proc.void)`.
             elsif type.is_a?(Types::Optional) && (proc_type = type.type).is_a?(Types::Proc)
-              method_block = Types::Block.new(required: false, type: proc_type.type)
+              method_block = Types::Block.new(required: false, type: proc_type.type, self_type: nil)
             else
               STDERR.puts "Unexpected block type: #{type}"
               PP.pp args_node, STDERR
               method_block = Types::Block.new(
                 required: true,
-                type: Types::Function.empty(Types::Bases::Any.new(location: nil))
+                type: Types::Function.empty(Types::Bases::Any.new(location: nil)),
+                self_type: nil
               )
             end
           else
             if overloads == 1
               method_block = Types::Block.new(
                 required: false,
-                type: Types::Function.empty(Types::Bases::Any.new(location: nil))
+                type: Types::Function.empty(Types::Bases::Any.new(location: nil)),
+                self_type: nil
               )
             end
           end
@@ -519,7 +524,7 @@ module RBS
         else
           if proc_type?(type_node)
             method_type = method_type(nil, type_node, variables: variables, overloads: 1) or raise
-            Types::Proc.new(type: method_type.type, block: nil, location: nil)
+            Types::Proc.new(type: method_type.type, block: nil, location: nil, self_type: nil)
           else
             STDERR.puts "Unexpected type_node:"
             PP.pp type_node, STDERR

data/lib/rbs/prototype/runtime.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBS
   module Prototype
     class Runtime
@@ -21,6 +23,7 @@ module RBS
 
       def target?(const)
         name = const_name(const)
+        return false unless name
 
         patterns.any? do |pattern|
           if pattern.end_with?("*")
@@ -77,7 +80,7 @@ module RBS
           supers.merge(mix.included_modules)
         end
 
-        if mod.is_a?(Class)
+        if mod.is_a?(Class) && mod.superclass
           mod.superclass.included_modules.each do |mix|
             supers << mix
             supers.merge(mix.included_modules)
@@ -135,7 +138,8 @@ module RBS
           when :block
             block = Types::Block.new(
               type: Types::Function.empty(untyped).update(rest_positionals: Types::Function::Param.new(name: nil, type: untyped)),
-              required: true
+              required: true,
+              self_type: nil
             )
           end
         end
@@ -318,7 +322,12 @@ module RBS
 
       def generate_constants(mod, decls)
         mod.constants(false).sort.each do |name|
-          value = mod.const_get(name)
+          begin
+            value = mod.const_get(name)
+          rescue StandardError, LoadError => e
+            RBS.logger.warn("Skipping constant #{name} of #{mod} since #{e}")
+            next
+          end
 
           next if value.is_a?(Class) || value.is_a?(Module)
           unless value.class.name
@@ -350,7 +359,7 @@ module RBS
       end
 
       def generate_super_class(mod)
-        if mod.superclass == ::Object
+        if mod.superclass.nil? || mod.superclass == ::Object
           nil
         elsif const_name(mod.superclass).nil?
           RBS.logger.warn("Skipping anonymous superclass #{mod.superclass} of #{mod}")

data/lib/rbs/repository.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBS
   class Repository
     DEFAULT_STDLIB_ROOT = Pathname(_ = __dir__) + "../../stdlib"
@@ -79,9 +81,7 @@ module RBS
     end
 
     def self.default
-      new().tap do |repo|
-        repo.add(DEFAULT_STDLIB_ROOT)
-      end
+      new()
     end
 
     def self.find_best_version(version, candidates)
@@ -113,7 +113,7 @@ module RBS
     def lookup_path(gem, version)
       if gem_rbs = gems[gem]
         unless gem_rbs.empty?
-          set = if v = Gem::Version.create(version)&.release
+          set = if version and v = Gem::Version.create(version)&.release
             gem_rbs.find_best_version(v)
           else
             gem_rbs.latest_version

data/lib/rbs/resolver/constant_resolver.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBS
   module Resolver
     class ConstantResolver

data/lib/rbs/resolver/type_name_resolver.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RBS
   module Resolver
     class TypeNameResolver