rbs 3.9.4 → 4.2.0

data/lib/rbs/prototype/runtime/value_object_generator.rb

@@ -212,7 +212,6 @@ module RBS
 
       class DataGenerator < ValueObjectBase
         def self.generatable?(target)
-          return false unless RUBY_VERSION >= '3.2'
           return false unless target < Data
           # Avoid direct inherited class like `class Option < Data`
           return false unless target.respond_to?(:members)

data/lib/rbs/prototype/runtime.rb

@@ -27,6 +27,10 @@ module RBS
           method_definition = @builder.build_singleton(module_name.absolute!).methods[method.name]
           return false unless method_definition
 
+          return false unless method_definition.defs.any? do |type_def|
+            type_def.implemented_in&.relative!.to_s == method.owner.to_s.delete_prefix("#<Class:").delete_suffix(">")
+          end
+
           method_definition.accessibility == accessibility
         end
 
@@ -36,6 +40,10 @@ module RBS
           method_definition = @builder.build_instance(module_name.absolute!).methods[method.name]
           return false unless method_definition
 
+          return false unless method_definition.defs.any? do |type_def|
+            type_def.implemented_in&.relative!.to_s == method.owner.to_s
+          end
+
           method_definition.accessibility == accessibility
         end
 
@@ -50,8 +58,8 @@ module RBS
           type_name_absolute = type_name.absolute!
           @mixin_decls_cache ||= {} #: Hash[TypeName, Array[AST::Members::Mixin]]
           @mixin_decls_cache.fetch(type_name_absolute) do
-            @mixin_decls_cache[type_name_absolute] = @builder.env.class_decls[type_name_absolute].decls.flat_map do |d|
-              d.decl.members.select { |m| m.kind_of?(AST::Members::Mixin) }
+            @mixin_decls_cache[type_name_absolute] = @builder.env.class_decls[type_name_absolute].each_decl.flat_map do |decl|
+              decl.members.select { |m| m.kind_of?(AST::Members::Mixin) }
             end
           end
         end
@@ -69,6 +77,8 @@ module RBS
       attr_accessor :outline
 
       def initialize(patterns:, env:, merge:, todo: false, owners_included: [])
+        Kernel.warn("RBS::Prototype::Runtime is deprecated. See https://github.com/ruby/rbs/issues/2841")
+
         @patterns = patterns
         @decls = nil
         @modules = {}
@@ -517,7 +527,7 @@ module RBS
 
         generate_mixin(mod, decl, type_name, type_name_absolute)
 
-        unless mod < Struct || (RUBY_VERSION >= '3.2' && mod < Data)
+        unless mod < Struct || mod < Data
           generate_methods(mod, type_name, decl.members) unless outline
         end
 

data/lib/rbs/resolver/constant_resolver.rb

@@ -32,7 +32,7 @@ module RBS
           end
 
           environment.class_alias_decls.each do |name, entry|
-            normalized_entry = environment.normalized_module_class_entry(name) or next
+            normalized_entry = environment.module_class_entry(name, normalized: true) or next
             constant = constant_of_module(name, normalized_entry)
 
             # Insert class/module aliases into `children_table` and `toplevel` table
@@ -176,7 +176,7 @@ module RBS
       end
 
       def constants_from_ancestors(module_name, constants:)
-        entry = builder.env.normalized_module_class_entry(module_name) or raise
+        entry = builder.env.module_class_entry(module_name, normalized: true) or raise
 
         if entry.is_a?(Environment::ClassEntry) || entry.is_a?(Environment::ModuleEntry)
           constants.merge!(table.children(BuiltinNames::Object.name) || raise)

data/lib/rbs/resolver/type_name_resolver.rb

@@ -5,85 +5,161 @@ module RBS
     class TypeNameResolver
       attr_reader :all_names
       attr_reader :cache
-      attr_reader :env
+      attr_reader :aliases
 
-      def initialize(env)
-        @all_names = Set[]
+      def initialize(all_names, aliases)
+        @all_names = all_names
+        @aliases = aliases
         @cache = {}
-        @env = env
+      end
+
+      def self.build(env)
+        all_names = Set.new #: Set[TypeName]
 
         all_names.merge(env.class_decls.keys)
         all_names.merge(env.interface_decls.keys)
         all_names.merge(env.type_alias_decls.keys)
-        all_names.merge(env.class_alias_decls.keys)
-      end
 
-      def try_cache(query)
-        cache.fetch(query) do
-          result = yield
-          cache[query] = result
+        aliases = {} #: Hash[TypeName, [TypeName, context]]
+
+        env.class_alias_decls.each do |name, entry|
+          aliases[name] = [entry.decl.old_name, entry.context]
         end
+
+        new(all_names, aliases)
+      end
+
+      def try_cache(type_name, context)
+        inner = cache[context] ||= {}
+        inner.fetch(type_name) { inner[type_name] = yield }
       end
 
       def resolve(type_name, context:)
-        if type_name.absolute?
+        if type_name.absolute? && has_type_name?(type_name)
           return type_name
         end
 
-        try_cache([type_name, context]) do
-          head, tail = partition(type_name)
-
-          head = resolve_in(head, context)
+        try_cache(type_name, context) do
+          if type_name.class?
+            resolve_namespace0(type_name, context, Set.new) || nil
+          else
+            namespace = type_name.namespace
 
-          if head
-            if tail
-              absolute_name = tail.with_prefix(head.to_namespace)
-              if env.normalize_type_name?(absolute_name)
-                absolute_name
-              end
+            if namespace.empty?
+              resolve_type_name(type_name.name, context)
             else
-              head
+              if namespace = resolve_namespace0(namespace.to_type_name, context, Set.new)
+                type_name = TypeName[namespace.to_namespace, type_name.name]
+                has_type_name?(type_name)
+              end
             end
           end
         end
       end
 
-      def partition(type_name)
-        if type_name.namespace.empty?
-          head = type_name.name
-          tail = nil
-        else
-          head, *tail = type_name.namespace.path
+      def resolve_namespace(type_name, context:)
+        if type_name.absolute? && has_type_name?(type_name)
+          return type_name
+        end
 
-          head or raise
+        unless type_name.class?
+          raise "Type name must be a class name: #{type_name}"
+        end
 
-          tail = TypeName.new(
-            name: type_name.name,
-            namespace: Namespace.new(absolute: false, path: tail)
-          )
+        try_cache(type_name, context) do
+          ns = resolve_namespace0(type_name, context, Set.new) or return ns
         end
+      end
 
-        [head, tail]
+      def has_type_name?(full_name)
+        if all_names.include?(full_name)
+          full_name
+        end
       end
 
-      def resolve_in(head, context)
+      def aliased_name?(type_name)
+        if aliases.key?(type_name)
+          type_name
+        end
+      end
+
+      def resolve_type_name(type_name, context)
         if context
-          parent, child = context
-          case child
+          outer, inner = context
+          case inner
           when false
-            resolve_in(head, parent)
+            resolve_type_name(type_name, outer)
+          else
+            has_type_name?(inner) or raise "Context must be normalized: #{inner.inspect}"
+            has_type_name?(TypeName[inner.to_namespace, type_name]) || resolve_type_name(type_name, outer)
+          end
+        else
+          type_name = TypeName[Namespace.root, type_name]
+          has_type_name?(type_name)
+        end
+      end
+
+      def resolve_head_namespace(head, context)
+        if context
+          outer, inner = context
+          case inner
+          when false
+            resolve_head_namespace(head, outer)
           when TypeName
-            name = TypeName.new(name: head, namespace: child.to_namespace)
-            has_name?(name) || resolve_in(head, parent)
+            has_type_name?(inner) or raise "Context must be normalized: #{inner.inspect}"
+            type_name = TypeName[inner.to_namespace, head]
+            has_type_name?(type_name) || aliased_name?(type_name) || resolve_head_namespace(head, outer)
           end
         else
-          has_name?(TypeName.new(name: head, namespace: Namespace.root))
+          type_name = TypeName[Namespace.root, head]
+          has_type_name?(type_name) || aliased_name?(type_name)
         end
       end
 
-      def has_name?(full_name)
-        if all_names.include?(full_name)
-          full_name
+      def normalize_namespace(type_name, rhs, context, visited)
+        if visited.include?(type_name)
+          # Cycle detected
+          return false
+        end
+
+        visited << type_name
+
+        begin
+          resolve_namespace0(rhs, context, visited)
+        ensure
+          visited.delete(type_name)
+        end
+      end
+
+      def resolve_namespace0(type_name, context, visited)
+        head, *tail = [*type_name.namespace.path, type_name.name]
+
+        head = head #: Symbol
+
+        head =
+          if type_name.absolute?
+            root_name = TypeName[Namespace.root, head]
+            has_type_name?(root_name) || aliased_name?(root_name)
+          else
+            resolve_head_namespace(head, context)
+          end
+
+        if head
+          if (rhs, context = aliases.fetch(head, nil))
+            head = normalize_namespace(head, rhs, context, visited) or return head
+          end
+
+          tail.inject(head) do |namespace, name|
+            type_name = TypeName[namespace.to_namespace, name]
+            case
+            when has_type_name?(type_name)
+              type_name
+            when (rhs, context = aliases.fetch(type_name, nil))
+              m = normalize_namespace(type_name, rhs, context, visited) or return m
+            else
+              return nil
+            end
+          end
         end
       end
     end

data/lib/rbs/rewriter.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module RBS
+  class Rewriter
+    attr_reader :buffer
+
+    def initialize(buffer)
+      raise "Rewriter only supports toplevel buffers" if buffer.parent
+
+      @buffer = buffer
+      @rewrites = []
+    end
+
+    def rewrite(location, string)
+      @rewrites.each do |existing_location, _|
+        if location.start_pos < existing_location.end_pos && existing_location.start_pos < location.end_pos
+          raise "Overlapping rewrites: #{existing_location} and #{location}"
+        end
+      end
+
+      @rewrites << [location, string]
+      self
+    end
+
+    def add_comment(*locations, content:)
+      earliest = locations.min_by(&:start_pos) or raise "At least one location is required"
+      insert_pos = earliest.start_pos
+      indent = " " * earliest.start_column
+
+      formatted = format_comment(content, indent)
+
+      loc = Location.new(buffer, insert_pos, insert_pos)
+      rewrite(loc, "#{formatted}\n#{indent}")
+    end
+
+    def replace_comment(comment, content:)
+      location = comment.location or raise "Comment must have a location"
+      indent = " " * location.start_column
+
+      rewrite(location, format_comment(content, indent))
+    end
+
+    def delete_comment(comment)
+      location = comment.location or raise "Comment must have a location"
+      line_start = location.start_pos - location.start_column
+      line_end = location.end_pos + 1
+      loc = Location.new(buffer, line_start, line_end)
+      rewrite(loc, "")
+    end
+
+    def string
+      result = buffer.content.dup
+
+      @rewrites.sort_by { |location, _| location.start_pos }.reverse_each do |location, replacement|
+        result[location.start_pos...location.end_pos] = replacement
+      end
+
+      result
+    end
+
+    private
+
+    def format_comment(content, indent)
+      content.lines.map do |line|
+        line = line.chomp
+        line.empty? ? "#" : "# #{line}"
+      end.join("\n#{indent}")
+    end
+  end
+end

data/lib/rbs/source.rb

@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+module RBS
+  module Source
+    class RBS
+      attr_reader :buffer, :directives, :declarations
+
+      def initialize(buffer, directives, decls)
+        @buffer = buffer
+        @directives = directives
+        @declarations = decls
+      end
+
+      def each_type_name(&block)
+        if block
+          set = Set[] #: Set[TypeName]
+          declarations.each do |decl|
+            each_declaration_type_name(set, decl, &block)
+          end
+        else
+          enum_for :each_type_name
+        end
+      end
+
+      def each_declaration_type_name(names, decl, &block)
+        case decl
+        when AST::Declarations::Class
+          decl.each_decl { each_declaration_type_name(names, _1, &block) }
+          type_name = decl.name
+        when AST::Declarations::Module
+          decl.each_decl { each_declaration_type_name(names, _1, &block) }
+          type_name = decl.name
+        when AST::Declarations::Interface
+          type_name = decl.name
+        when AST::Declarations::TypeAlias
+          type_name = decl.name
+        when AST::Declarations::ModuleAlias
+          type_name = decl.new_name
+        when AST::Declarations::ClassAlias
+          type_name = decl.new_name
+        end
+
+        if type_name
+          unless names.include?(type_name)
+            yield type_name
+            names << type_name
+          end
+        end
+      end
+    end
+
+    class Ruby
+      attr_reader :buffer
+      attr_reader :prism_result
+      attr_reader :declarations
+      attr_reader :diagnostics
+
+      def initialize(buffer, prism, declarations, diagnostics)
+        @buffer = buffer
+        @prism_result = prism
+        @declarations = declarations
+        @diagnostics = diagnostics
+      end
+
+      def each_type_name(&block)
+        if block
+          names = Set[] #: Set[TypeName]
+          declarations.each do |decl|
+            each_declaration_type_name(names, decl, &block)
+          end
+        else
+          enum_for :each_type_name
+        end
+      end
+
+      def each_declaration_type_name(names, decl, &block)
+        case decl
+        when AST::Ruby::Declarations::ClassDecl
+          decl.each_decl do |d|
+            each_declaration_type_name(names, d, &block)
+          end
+          type_name = decl.class_name
+        when AST::Ruby::Declarations::ModuleDecl
+          decl.each_decl do |d|
+            each_declaration_type_name(names, d, &block)
+          end
+          type_name = decl.module_name
+        end
+
+        if type_name
+          unless names.include?(type_name)
+            yield type_name
+            names << type_name
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rbs/subtractor.rb

@@ -107,7 +107,9 @@ module RBS
       each_member(owner).any? do |m|
         case m
         when AST::Members::InstanceVariable
-          m.name == name
+          m.name == name && kind == :instance
+        when AST::Members::ClassInstanceVariable
+          m.name == name && kind == :singleton
         when AST::Members::Attribute
           ivar_name = m.ivar_name == false ? nil : m.ivar_name || :"@#{m.name}"
           ivar_name == name && m.kind == kind
@@ -129,9 +131,10 @@ module RBS
 
       entry = @subtrahend.class_decls[owner]
       return unless entry
-      decls = entry.decls.map { |d| d.decl }
-
-      decls.each { |d| d.members.each { |m| block.call(m) } }
+      entry.each_decl do |d|
+        next unless d.is_a?(AST::Declarations::Base)
+        d.members.each { |m| block.call(m) }
+      end
     end
 
     private def mixin_exist?(owner, mixin, context:)

data/lib/rbs/test/type_check.rb

@@ -245,7 +245,7 @@ module RBS
         when Types::Bases::Any
           true
         when Types::Bases::Bool
-          val.is_a?(TrueClass) || val.is_a?(FalseClass)
+          Test.call(val, IS_AP, TrueClass) || Test.call(val, IS_AP, FalseClass)
         when Types::Bases::Top
           true
         when Types::Bases::Bottom
@@ -264,6 +264,9 @@ module RBS
           klass = get_class(type.name) or return false
           if params = builder.env.normalized_module_class_entry(type.name.absolute!)&.type_params
             args = AST::TypeParam.normalize_args(params, type.args)
+            if args.size != params.size
+              return false
+            end
             unless args == type.args
               type = Types::ClassInstance.new(name: type.name, args: args, location: type.location)
             end
@@ -288,6 +291,19 @@ module RBS
                   values << args
                   nil
                 end
+              when nil
+                values = []
+                count = 10_000
+
+                ret = val.each do |*args|
+                  count -= 1
+                  values << args
+                  break if count <= 0
+                end
+
+                if count == 0
+                  ret = self
+                end
               else
                 values = []
                 ret = val.each do |*args|
@@ -323,7 +339,7 @@ module RBS
                             rescue TypeError
                               return false
                             end
-          val.is_a?(singleton_class)
+          Test.call(val, IS_AP, singleton_class)
         when Types::Interface
           if (definition = builder.build_interface(type.name.absolute!))
             definition.methods.each.all? do |method_name, method|
@@ -340,7 +356,12 @@ module RBS
         when Types::Variable
           true
         when Types::Literal
-          type.literal == val
+          begin
+            type.literal == val
+          rescue NoMethodError
+            raise if defined?(val.==)
+            false
+          end
         when Types::Union
           type.types.any? {|type| value(val, type) }
         when Types::Intersection
@@ -351,6 +372,7 @@ module RBS
           value(val, builder.expand_alias2(type.name.absolute!, type.args))
         when Types::Tuple
           Test.call(val, IS_AP, ::Array) &&
+            type.types.length == val.length &&
             type.types.map.with_index {|ty, index| value(val[index], ty) }.all?
         when Types::Record
           Test::call(val, IS_AP, ::Hash) &&

data/lib/rbs/type_name.rb

@@ -22,21 +22,47 @@ module RBS
               end
     end
 
+    # Process-wide flyweight cache. Two-level Hash keyed by canonical
+    # Namespace identity (outer uses `compare_by_identity`) and name
+    # Symbol.
+    @intern_mutex = Mutex.new
+    @intern_cache = {}  #: Hash[Namespace, Hash[Symbol, TypeName]]
+    @intern_cache.compare_by_identity
+
+    # Returns a canonical `TypeName` instance for the given `namespace` /
+    # `name` pair. The namespace is canonicalized through `Namespace.[]`
+    # so identity-based lookup works regardless of the caller passing a
+    # fresh `Namespace.new` or an already-interned instance.
+    def self.[](namespace, name)
+      ns = Namespace[namespace.path, namespace.absolute?]
+
+      inner = @intern_cache[ns]
+      if inner && (cached = inner[name])
+        return cached
+      end
+
+      @intern_mutex.synchronize do
+        inner = (@intern_cache[ns] ||= {})
+        inner[name] ||= new(namespace: ns, name: name)
+      end
+    end
+
     def ==(other)
+      return true if equal?(other)
       other.is_a?(self.class) && other.namespace == namespace && other.name == name
     end
 
     alias eql? ==
 
     def hash
-      namespace.hash ^ name.hash
+      @hash ||= namespace.hash ^ name.hash
     end
 
     def to_s
       "#{namespace.to_s}#{name}"
     end
 
-    def to_json(state = _ = nil)
+    def to_json(state = nil)
       to_s.to_json(state)
     end
 
@@ -53,7 +79,7 @@ module RBS
     end
 
     def absolute!
-      self.class.new(namespace: namespace.absolute!, name: name)
+      TypeName[namespace.absolute!, name]
     end
 
     def absolute?
@@ -61,7 +87,7 @@ module RBS
     end
 
     def relative!
-      self.class.new(namespace: namespace.relative!, name: name)
+      TypeName[namespace.relative!, name]
     end
 
     def interface?
@@ -69,7 +95,7 @@ module RBS
     end
 
     def with_prefix(namespace)
-      self.class.new(namespace: namespace + self.namespace, name: name)
+      TypeName[namespace + self.namespace, name]
     end
 
     def split
@@ -80,30 +106,17 @@ module RBS
       if other.absolute?
         other
       else
-        TypeName.new(
-          namespace: self.to_namespace + other.namespace,
-          name: other.name
-        )
+        TypeName[self.to_namespace + other.namespace, other.name]
       end
     end
-    
+
     def self.parse(string)
       absolute = string.start_with?("::")
 
       *path, name = string.delete_prefix("::").split("::").map(&:to_sym)
       raise unless name
 
-      TypeName.new(
-        name: name,
-        namespace: RBS::Namespace.new(path: path, absolute: absolute)
-      )
+      TypeName[Namespace[path, absolute], name]
     end
   end
 end
-
-module Kernel
-  def TypeName(string)
-    warn "Kernel#TypeName() is deprecated. Use RBS::TypeName.parse instead.", category: :deprecated
-    RBS::TypeName.parse(string)
-  end
-end