rbs 1.0.3 → 1.1.1

data/lib/rbs/ast/members.rb

@@ -245,6 +245,19 @@ module RBS
         def hash
           self.class.hash ^ name.hash ^ type.hash ^ ivar_name.hash ^ kind.hash
         end
+
+        def update(name: self.name, type: self.type, ivar_name: self.ivar_name, kind: self.kind, annotations: self.annotations, location: self.location, comment: self.comment)
+          klass = _ = self.class
+          klass.new(
+            name: name,
+            type: type,
+            ivar_name: ivar_name,
+            kind: kind,
+            annotations: annotations,
+            location: location,
+            comment: comment
+          )
+        end
       end
 
       class AttrReader < Base

data/lib/rbs/char_scanner.rb

@@ -0,0 +1,20 @@
+module RBS
+  class CharScanner < StringScanner
+    def initialize(string)
+      super(string)
+      @charpos = 0
+    end
+
+    alias original_charpos charpos
+
+    def charpos
+      @charpos
+    end
+
+    def scan(pattern)
+      s = super
+      @charpos += s.size if s
+      s
+    end
+  end
+end

data/lib/rbs/definition_builder.rb

@@ -10,11 +10,11 @@ module RBS
     attr_reader :singleton0_cache
     attr_reader :interface_cache
 
-    def initialize(env:)
+    def initialize(env:, ancestor_builder: nil, method_builder: nil)
       @env = env
       @type_name_resolver = TypeNameResolver.from_env(env)
-      @ancestor_builder = AncestorBuilder.new(env: env)
-      @method_builder = MethodBuilder.new(env: env)
+      @ancestor_builder = ancestor_builder || AncestorBuilder.new(env: env)
+      @method_builder = method_builder || MethodBuilder.new(env: env)
 
       @instance_cache = {}
       @singleton_cache = {}
@@ -80,6 +80,7 @@ module RBS
                      when AST::Members::Alias
                        unless definition.methods.key?(original.old_name)
                          raise UnknownMethodAliasError.new(
+                           type_name: type_name,
                            original_name: original.old_name,
                            aliased_name: original.new_name,
                            location: original.location
@@ -139,9 +140,8 @@ module RBS
         case entry
         when Environment::ClassEntry, Environment::ModuleEntry
           ancestors = ancestor_builder.instance_ancestors(type_name)
-          self_type = Types::ClassInstance.new(name: type_name,
-                                               args: Types::Variable.build(entry.type_params.each.map(&:name)),
-                                               location: nil)
+          args = Types::Variable.build(entry.type_params.each.map(&:name))
+          self_type = Types::ClassInstance.new(name: type_name, args: args, location: nil)
 
           Definition.new(type_name: type_name, entry: entry, self_type: self_type, ancestors: ancestors).tap do |definition|
             one_ancestors = ancestor_builder.one_instance_ancestors(type_name)
@@ -217,6 +217,8 @@ module RBS
                            super_interface_method: entry.is_a?(Environment::ModuleEntry))
 
             entry.decls.each do |d|
+              subst = Substitution.build(d.decl.type_params.each.map(&:name), args)
+
               d.decl.members.each do |member|
                 case member
                 when AST::Members::AttrReader, AST::Members::AttrAccessor, AST::Members::AttrWriter
@@ -229,12 +231,18 @@ module RBS
                                 end
 
                     if ivar_name
-                      insert_variable(type_name, definition.instance_variables, name: ivar_name, type: member.type)
+                      insert_variable(type_name,
+                                      definition.instance_variables,
+                                      name: ivar_name,
+                                      type: member.type.sub(subst))
                     end
                   end
 
                 when AST::Members::InstanceVariable
-                  insert_variable(type_name, definition.instance_variables, name: member.name, type: member.type)
+                  insert_variable(type_name,
+                                  definition.instance_variables,
+                                  name: member.name,
+                                  type: member.type.sub(subst))
 
                 when AST::Members::ClassVariable
                   insert_variable(type_name, definition.class_variables, name: member.name, type: member.type)
@@ -353,15 +361,10 @@ module RBS
         when Environment::ClassEntry, Environment::ModuleEntry
           ancestors = ancestor_builder.singleton_ancestors(type_name)
           self_type = Types::ClassSingleton.new(name: type_name, location: nil)
-          instance_type = Types::ClassInstance.new(
-            name: type_name,
-            args: entry.type_params.each.map { Types::Bases::Any.new(location: nil) },
-            location: nil
-          )
 
           Definition.new(type_name: type_name, entry: entry, self_type: self_type, ancestors: ancestors).tap do |definition|
             def0 = build_singleton0(type_name)
-            subst = Substitution.build([], [], instance_type: instance_type)
+            subst = Substitution.new
 
             merge_definition(src: def0, dest: definition, subst: subst, keep_super: true)
 
@@ -554,6 +557,7 @@ module RBS
 
           unless original_method
             raise UnknownMethodAliasError.new(
+              type_name: definition.type_name,
               original_name: original.old_name,
               aliased_name: original.new_name,
               location: original.location
@@ -723,11 +727,13 @@ module RBS
     end
 
     def merge_method(type_name, methods, name, method, sub, implemented_in: :keep, keep_super: false)
-      defs = method.defs.yield_self do |defs|
+      if sub.empty? && implemented_in == :keep && keep_super
+        methods[name] = method
+      else
         if sub.empty? && implemented_in == :keep
-          defs
+          defs = method.defs
         else
-          defs.map do |defn|
+          defs = method.defs.map do |defn|
             defn.update(
               type: sub.empty? ? defn.type : defn.type.sub(sub),
               implemented_in: case implemented_in
@@ -741,16 +747,16 @@ module RBS
             )
           end
         end
-      end
 
-      super_method = methods[name]
+        super_method = methods[name]
 
-      methods[name] = Definition::Method.new(
-        super_method: keep_super ? method.super_method : super_method,
-        accessibility: method.accessibility,
-        defs: defs,
-        alias_of: method.alias_of
-      )
+        methods[name] = Definition::Method.new(
+          super_method: keep_super ? method.super_method : super_method,
+          accessibility: method.accessibility,
+          defs: defs,
+          alias_of: method.alias_of
+        )
+      end
     end
 
     def try_cache(type_name, cache:, key: type_name)
@@ -781,5 +787,24 @@ module RBS
       ensure_namespace!(type_name.namespace, location: entry.decl.location)
       entry.decl.type
     end
+
+    def update(env:, except:, ancestor_builder:)
+      method_builder = self.method_builder.update(env: env, except: except)
+
+      DefinitionBuilder.new(env: env, ancestor_builder: ancestor_builder, method_builder: method_builder).tap do |builder|
+        builder.instance_cache.merge!(instance_cache)
+        builder.singleton_cache.merge!(singleton_cache)
+        builder.singleton0_cache.merge!(singleton0_cache)
+        builder.interface_cache.merge!(interface_cache)
+
+        except.each do |name|
+          builder.instance_cache.delete([name, true])
+          builder.instance_cache.delete([name, false])
+          builder.singleton_cache.delete(name)
+          builder.singleton0_cache.delete(name)
+          builder.interface_cache.delete(name)
+        end
+      end
+    end
   end
 end

data/lib/rbs/definition_builder/method_builder.rb

@@ -96,15 +96,22 @@ module RBS
             type = Types::ClassInstance.new(name: type_name, args: args, location: nil)
             Methods.new(type: type).tap do |methods|
               entry.decls.each do |d|
+                subst = Substitution.build(d.decl.type_params.each.map(&:name), args)
                 each_member_with_accessibility(d.decl.members) do |member, accessibility|
                   case member
                   when AST::Members::MethodDefinition
                     if member.instance?
-                      build_method(methods, type, member: member, accessibility: accessibility)
+                      build_method(methods,
+                                   type,
+                                   member: member.update(types: member.types.map {|type| type.sub(subst) }),
+                                   accessibility: accessibility)
                     end
                   when AST::Members::AttrReader, AST::Members::AttrWriter, AST::Members::AttrAccessor
                     if member.kind == :instance
-                      build_attribute(methods, type, member: member, accessibility: accessibility)
+                      build_attribute(methods,
+                                      type,
+                                      member: member.update(type: member.type.sub(subst)),
+                                      accessibility: accessibility)
                     end
                   when AST::Members::Alias
                     if member.kind == :instance
@@ -212,6 +219,20 @@ module RBS
           end
         end
       end
+
+      def update(env:, except:)
+        MethodBuilder.new(env: env).tap do |copy|
+          copy.instance_methods.merge!(instance_methods)
+          copy.singleton_methods.merge!(singleton_methods)
+          copy.interface_methods.merge!(interface_methods)
+
+          except.each do |type_name|
+            copy.instance_methods.delete(type_name)
+            copy.singleton_methods.delete(type_name)
+            copy.interface_methods.delete(type_name)
+          end
+        end
+      end
     end
   end
 end

data/lib/rbs/environment.rb

@@ -1,6 +1,5 @@
 module RBS
   class Environment
-    attr_reader :buffers
     attr_reader :declarations
 
     attr_reader :class_decls
@@ -169,7 +168,7 @@ module RBS
           # @type var decl: AST::Declarations::Class
           existing_entry.insert(decl: decl, outer: outer)
         else
-          raise DuplicatedDeclarationError.new(name, decl, existing_entry.primary.decl)
+          raise DuplicatedDeclarationError.new(name, decl, existing_entry.decls[0].decl)
         end
 
         prefix = outer + [decl]
@@ -204,12 +203,22 @@ module RBS
       self
     end
 
-    def resolve_type_names
+    def validate_type_params
+      class_decls.each_value do |decl|
+        decl.primary
+      end
+    end
+
+    def resolve_type_names(only: nil)
       resolver = TypeNameResolver.from_env(self)
       env = Environment.new()
 
       declarations.each do |decl|
-        env << resolve_declaration(resolver, decl, outer: [], prefix: Namespace.root)
+        if only && !only.member?(decl)
+          env << decl
+        else
+          env << resolve_declaration(resolver, decl, outer: [], prefix: Namespace.root)
+        end
       end
 
       env
@@ -431,8 +440,36 @@ module RBS
     end
 
     def inspect
-      ivars = %i[@buffers @declarations @class_decls @interface_decls @alias_decls @constant_decls @global_decls]
+      ivars = %i[@declarations @class_decls @interface_decls @alias_decls @constant_decls @global_decls]
       "\#<RBS::Environment #{ivars.map { |iv| "#{iv}=(#{instance_variable_get(iv).size} items)"}.join(' ')}>"
     end
+
+    def buffers
+      buffers_decls.keys.compact
+    end
+
+    def buffers_decls
+      # @type var hash: Hash[Buffer, Array[AST::Declarations::t]]
+      hash = {}
+
+      declarations.each do |decl|
+        location = decl.location or next
+        (hash[location.buffer] ||= []) << decl
+      end
+
+      hash
+    end
+
+    def reject
+      env = Environment.new
+
+      declarations.each do |decl|
+        unless yield(decl)
+          env << decl
+        end
+      end
+
+      env
+    end
   end
 end

data/lib/rbs/environment_walker.rb

@@ -1,14 +1,14 @@
 module RBS
   class EnvironmentWalker
-    InstanceNode = Struct.new(:type_name, keyword_init: true)
-    SingletonNode = Struct.new(:type_name, keyword_init: true)
-    TypeNameNode = Struct.new(:type_name, keyword_init: true)
+    InstanceNode = _ = Struct.new(:type_name, keyword_init: true)
+    SingletonNode = _ = Struct.new(:type_name, keyword_init: true)
+    TypeNameNode = _ = Struct.new(:type_name, keyword_init: true)
 
     attr_reader :env
 
     def initialize(env:)
       @env = env
-      @only_ancestors = nil
+      @only_ancestors = false
     end
 
     def builder

data/lib/rbs/errors.rb

@@ -14,7 +14,12 @@ module RBS
     end
   end
 
-  class InvalidTypeApplicationError < StandardError
+  class ErrorBase < StandardError; end
+  class ParsingError < ErrorBase; end
+  class LoadingError < ErrorBase; end
+  class DefinitionError < ErrorBase; end
+
+  class InvalidTypeApplicationError < DefinitionError
     attr_reader :type_name
     attr_reader :args
     attr_reader :params
@@ -35,7 +40,7 @@ module RBS
     end
   end
 
-  class RecursiveAncestorError < StandardError
+  class RecursiveAncestorError < DefinitionError
     attr_reader :ancestors
     attr_reader :location
 
@@ -73,7 +78,7 @@ module RBS
     end
   end
 
-  class NoTypeFoundError < StandardError
+  class NoTypeFoundError < ErrorBase
     attr_reader :type_name
     attr_reader :location
 
@@ -102,7 +107,7 @@ module RBS
     end
   end
 
-  class NoSuperclassFoundError < StandardError
+  class NoSuperclassFoundError < DefinitionError
     attr_reader :type_name
     attr_reader :location
 
@@ -118,7 +123,7 @@ module RBS
     end
   end
 
-  class NoSelfTypeFoundError < StandardError
+  class NoSelfTypeFoundError < DefinitionError
     attr_reader :type_name
     attr_reader :location
 
@@ -145,7 +150,7 @@ module RBS
     end
   end
 
-  class NoMixinFoundError < StandardError
+  class NoMixinFoundError < DefinitionError
     attr_reader :type_name
     attr_reader :member
 
@@ -174,7 +179,7 @@ module RBS
     end
   end
 
-  class DuplicatedMethodDefinitionError < StandardError
+  class DuplicatedMethodDefinitionError < DefinitionError
     attr_reader :type
     attr_reader :method_name
     attr_reader :members
@@ -200,6 +205,10 @@ module RBS
       end
     end
 
+    def type_name
+      type.name
+    end
+
     def location
       members[0].location
     end
@@ -209,7 +218,7 @@ module RBS
     end
   end
 
-  class DuplicatedInterfaceMethodDefinitionError < StandardError
+  class DuplicatedInterfaceMethodDefinitionError < DefinitionError
     attr_reader :type
     attr_reader :method_name
     attr_reader :member
@@ -230,23 +239,29 @@ module RBS
         "#{type.name}##{method_name}"
       end
     end
+
+    def type_name
+      type.name
+    end
   end
 
-  class UnknownMethodAliasError < StandardError
+  class UnknownMethodAliasError < DefinitionError
+    attr_reader :type_name
     attr_reader :original_name
     attr_reader :aliased_name
     attr_reader :location
 
-    def initialize(original_name:, aliased_name:, location:)
+    def initialize(type_name:, original_name:, aliased_name:, location:)
+      @type_name = type_name
       @original_name = original_name
       @aliased_name = aliased_name
       @location = location
 
-      super "#{Location.to_string location}: Unknown method alias name: #{original_name} => #{aliased_name}"
+      super "#{Location.to_string location}: Unknown method alias name: #{original_name} => #{aliased_name} (#{type_name})"
     end
   end
 
-  class SuperclassMismatchError < StandardError
+  class SuperclassMismatchError < DefinitionError
     attr_reader :name
     attr_reader :entry
 
@@ -257,7 +272,7 @@ module RBS
     end
   end
 
-  class InvalidOverloadMethodError < StandardError
+  class InvalidOverloadMethodError < DefinitionError
     attr_reader :type_name
     attr_reader :method_name
     attr_reader :kind
@@ -280,7 +295,7 @@ module RBS
     end
   end
 
-  class GenericParameterMismatchError < StandardError
+  class GenericParameterMismatchError < LoadingError
     attr_reader :name
     attr_reader :decl
 
@@ -291,7 +306,7 @@ module RBS
     end
   end
 
-  class DuplicatedDeclarationError < StandardError
+  class DuplicatedDeclarationError < LoadingError
     attr_reader :name
     attr_reader :decls
 
@@ -304,7 +319,7 @@ module RBS
     end
   end
 
-  class InvalidVarianceAnnotationError < StandardError
+  class InvalidVarianceAnnotationError < DefinitionError
     attr_reader :type_name
     attr_reader :param
     attr_reader :location
@@ -318,7 +333,7 @@ module RBS
     end
   end
 
-  class RecursiveAliasDefinitionError < StandardError
+  class RecursiveAliasDefinitionError < DefinitionError
     attr_reader :type
     attr_reader :defs