Update AST

Author: soutaro

lib/rbs/ast/ruby/declarations.rb

@@ -16,17 +16,60 @@ def initialize(buffer)
         end
 
         class ClassDecl < Base
+          class SuperClass
+            attr_reader :type_name_location
+
+            attr_reader :operator_location
+
+            attr_reader :type_name
+
+            attr_reader :type_annotation
+
+            def initialize(type_name_location, operator_location, type_name, type_annotation)
+              @type_name_location = type_name_location
+              @operator_location = operator_location
+              @type_name = type_name
+              @type_annotation = type_annotation
+            end
+
+            def type_args
+              if type_annotation
+                type_annotation.type_args
+              else
+                []
+              end
+            end
+
+            def location
+              if type_annotation
+                Location.new(
+                  type_name_location.buffer,
+                  type_name_location.start_pos,
+                  type_annotation.location.end_pos
+                )
+              else
+                type_name_location
+              end
+            end
+
+            alias name type_name
+            alias args type_args
+          end
+
           attr_reader :class_name
 
           attr_reader :members
 
           attr_reader :node
 
-          def initialize(buffer, name, node)
+          attr_reader :super_class
+
+          def initialize(buffer, name, node, super_class)
             super(buffer)
             @class_name = name
             @node = node
             @members = []
+            @super_class = super_class
           end
 
           def each_decl(&block)
@@ -39,8 +82,6 @@ def each_decl(&block)
             end
           end
 
-          def super_class = nil
-
           def type_params = []
 
           def location

lib/rbs/environment.rb

@@ -679,7 +679,16 @@ def resolve_ruby_decl(resolver, decl, context:, prefix:)
         inner_context = [context, full_name] #: Resolver::context
         inner_prefix = full_name.to_namespace
 
-        AST::Ruby::Declarations::ClassDecl.new(decl.buffer, full_name, decl.node).tap do |resolved|
+        super_class = decl.super_class&.yield_self do |super_class|
+          AST::Ruby::Declarations::ClassDecl::SuperClass.new(
+            super_class.type_name_location,
+            super_class.operator_location,
+            absolute_type_name(resolver, nil, super_class.name, context: context),
+            super_class.type_annotation&.map_type_name {|name, _, _| absolute_type_name(resolver, nil, name, context: context) }
+          )
+        end
+
+        AST::Ruby::Declarations::ClassDecl.new(decl.buffer, full_name, decl.node, super_class).tap do |resolved|
           decl.members.each do |member|
             case member
             when AST::Ruby::Declarations::Base

lib/rbs/inline_parser.rb

@@ -100,7 +100,7 @@ def visit_class_node(node)
           return
         end
 
-        class_decl = AST::Ruby::Declarations::ClassDecl.new(buffer, class_name, node)
+        class_decl = AST::Ruby::Declarations::ClassDecl.new(buffer, class_name, node, nil)
         insert_declaration(class_decl)
         push_module_nesting(class_decl) do
           visit_child_nodes(node)

sig/ast/ruby/declarations.rbs

@@ -14,21 +14,41 @@ module RBS
         end
 
         class ClassDecl < Base
+          class SuperClass
+            attr_reader operator_location: Location
+
+            attr_reader type_name_location: Location
+
+            attr_reader type_name: TypeName
+
+            attr_reader type_annotation: Annotations::TypeApplicationAnnotation?
+
+            def type_args: () -> Array[Types::t]
+
+            alias name type_name
+
+            alias args type_args
+
+            def initialize: (Location type_name_location, Location operator_location, TypeName, RBS::AST::Ruby::Annotations::TypeApplicationAnnotation?) -> void
+
+            def location: () -> Location
+          end
+
           type member = t | Members::t
 
           attr_reader class_name: TypeName
 
           attr_reader node: Prism::ClassNode
 
+          attr_reader super_class: SuperClass?
+
           attr_reader members: Array[member]
 
-          def initialize: (Buffer, TypeName, Prism::ClassNode) -> void
+          def initialize: (Buffer, TypeName, Prism::ClassNode, SuperClass?) -> void
 
           def each_decl: () { (t) -> void } -> void
                         | () -> Enumerator[t]
 
-          def super_class: () -> nil
-
           def type_params: () -> Array[AST::TypeParam]
 
           def location: () -> Location

sig/errors.rbs

@@ -308,19 +308,21 @@ module RBS
   # InheritModuleError is raised if a class definition inherits a module (not a class)
   #
   class InheritModuleError < DefinitionError
+    type super_class = AST::Declarations::Class::Super | AST::Ruby::Declarations::ClassDecl::SuperClass
+
     include DetailedMessageable
 
-    attr_reader super_decl: AST::Declarations::Class::Super
+    attr_reader super_decl: super_class
 
-    def initialize: (AST::Declarations::Class::Super) -> void
+    def initialize: (super_class) -> void
 
     def location: () -> Location[untyped, untyped]?
 
     # Confirms if `super` inherits specifies a class
     #
     # Automatically normalize the name of super.
     #
-    def self.check!: (AST::Declarations::Class::Super, env: Environment) -> void
+    def self.check!: (super_class, env: Environment) -> void
   end
 
   class RecursiveTypeAliasError < BaseError