rbs 4.0.0.dev.4 → 4.0.0

data/lib/rbs/ast/ruby/annotations.rb

@@ -31,6 +31,52 @@ module RBS
               type: type.map_type_name { yield _1 }
             ) #: self
           end
+
+          def type_fingerprint
+            [
+              "annots/node_type_assertion",
+              type.to_s
+            ]
+          end
+        end
+
+        class AliasAnnotation < Base
+          attr_reader :keyword_location, :type_name_location, :type_name
+
+          def initialize(location:, prefix_location:, keyword_location:, type_name:, type_name_location:)
+            super(location, prefix_location)
+            @keyword_location = keyword_location
+            @type_name = type_name
+            @type_name_location = type_name_location
+          end
+
+          def map_type_name
+            self.class.new(
+              location:,
+              prefix_location:,
+              keyword_location:,
+              type_name: type_name ? yield(type_name) : nil,
+              type_name_location:
+            ) #: self
+          end
+        end
+
+        class ClassAliasAnnotation < AliasAnnotation
+          def type_fingerprint
+            [
+              "annots/class-alias",
+              type_name&.to_s
+            ]
+          end
+        end
+
+        class ModuleAliasAnnotation < AliasAnnotation
+          def type_fingerprint
+            [
+              "annots/module-alias",
+              type_name&.to_s
+            ]
+          end
         end
 
         class ColonMethodTypeAnnotation < Base
@@ -50,17 +96,26 @@ module RBS
               method_type: method_type.map_type {|type| type.map_type_name { yield _1 }}
             ) #: self
           end
+
+          def type_fingerprint
+            [
+              "annots/colon_method_type",
+              annotations.map(&:to_s),
+              method_type.to_s
+            ]
+          end
         end
 
         class MethodTypesAnnotation < Base
           Overload = AST::Members::MethodDefinition::Overload
 
-          attr_reader :overloads, :vertical_bar_locations
+          attr_reader :overloads, :vertical_bar_locations, :dot3_location
 
-          def initialize(location:, prefix_location:, overloads:, vertical_bar_locations:)
+          def initialize(location:, prefix_location:, overloads:, vertical_bar_locations:, dot3_location:)
             super(location, prefix_location)
             @overloads = overloads
             @vertical_bar_locations = vertical_bar_locations
+            @dot3_location = dot3_location
           end
 
           def map_type_name(&block)
@@ -71,7 +126,15 @@ module RBS
               )
             end
 
-            self.class.new(location:, prefix_location:, overloads: ovs, vertical_bar_locations:) #: self
+            self.class.new(location:, prefix_location:, overloads: ovs, vertical_bar_locations:, dot3_location:) #: self
+          end
+
+          def type_fingerprint
+            [
+              "annots/method_types",
+              overloads.map { |o| [o.annotations.map(&:to_s), o.method_type.to_s] },
+              overloading: dot3_location ? true : false
+            ]
           end
         end
 
@@ -83,6 +146,10 @@ module RBS
             @skip_location = skip_location
             @comment_location = comment_location
           end
+
+          def type_fingerprint
+            "annots/skip"
+          end
         end
 
         class ReturnTypeAnnotation < Base
@@ -112,6 +179,229 @@ module RBS
               comment_location: comment_location
             ) #: self
           end
+
+          def type_fingerprint
+            [
+              "annots/return_type",
+              return_type.to_s,
+              comment_location&.source
+            ]
+          end
+        end
+
+        class TypeApplicationAnnotation < Base
+          attr_reader :type_args, :close_bracket_location, :comma_locations
+
+          def initialize(location:, prefix_location:, type_args:, close_bracket_location:, comma_locations:)
+            super(location, prefix_location)
+            @type_args = type_args
+            @close_bracket_location = close_bracket_location
+            @comma_locations = comma_locations
+          end
+
+          def map_type_name(&block)
+            mapped_type_args = type_args.map { |type| type.map_type_name { yield _1 } }
+
+            self.class.new(
+              location:,
+              prefix_location:,
+              type_args: mapped_type_args,
+              close_bracket_location:,
+              comma_locations:
+            ) #: self
+          end
+
+          def type_fingerprint
+            [
+              "annots/type_application",
+              type_args.map(&:to_s)
+            ]
+          end
+        end
+
+        class InstanceVariableAnnotation < Base
+          attr_reader :ivar_name, :ivar_name_location, :colon_location, :type, :comment_location
+
+          def initialize(location:, prefix_location:, ivar_name:, ivar_name_location:, colon_location:, type:, comment_location:)
+            super(location, prefix_location)
+            @ivar_name = ivar_name
+            @ivar_name_location = ivar_name_location
+            @colon_location = colon_location
+            @type = type
+            @comment_location = comment_location
+          end
+
+          def map_type_name(&block)
+            self.class.new(
+              location:,
+              prefix_location:,
+              ivar_name:,
+              ivar_name_location:,
+              colon_location:,
+              type: type.map_type_name { yield _1 },
+              comment_location:
+            ) #: self
+          end
+
+          def type_fingerprint
+            [
+              "annots/instance_variable",
+              ivar_name.to_s,
+              type.to_s,
+              comment_location&.source
+            ]
+          end
+        end
+
+        class ParamTypeAnnotation < Base
+          attr_reader :name_location, :colon_location, :param_type, :comment_location
+
+          def initialize(location:, prefix_location:, name_location:, colon_location:, param_type:, comment_location:)
+            super(location, prefix_location)
+            @name_location = name_location
+            @colon_location = colon_location
+            @param_type = param_type
+            @comment_location = comment_location
+          end
+
+          def map_type_name(&block)
+            self.class.new(
+              location:,
+              prefix_location:,
+              name_location: name_location,
+              colon_location: colon_location,
+              param_type: param_type.map_type_name { yield _1 },
+              comment_location: comment_location
+            ) #: self
+          end
+
+          def type_fingerprint
+            [
+              "annots/param_type",
+              name_location.source,
+              param_type.to_s,
+              comment_location&.source
+            ]
+          end
+        end
+
+        class SplatParamTypeAnnotation < Base
+          attr_reader :star_location, :name_location, :colon_location, :param_type, :comment_location
+
+          def initialize(location:, prefix_location:, star_location:, name_location:, colon_location:, param_type:, comment_location:)
+            super(location, prefix_location)
+            @star_location = star_location
+            @name_location = name_location
+            @colon_location = colon_location
+            @param_type = param_type
+            @comment_location = comment_location
+          end
+
+          def map_type_name(&block)
+            self.class.new(
+              location:,
+              prefix_location:,
+              star_location: star_location,
+              name_location: name_location,
+              colon_location: colon_location,
+              param_type: param_type.map_type_name { yield _1 },
+              comment_location: comment_location
+            ) #: self
+          end
+
+          def type_fingerprint
+            [
+              "annots/splat_param_type",
+              name_location&.source,
+              param_type.to_s,
+              comment_location&.source
+            ]
+          end
+        end
+
+        class DoubleSplatParamTypeAnnotation < Base
+          attr_reader :star2_location, :name_location, :colon_location, :param_type, :comment_location
+
+          def initialize(location:, prefix_location:, star2_location:, name_location:, colon_location:, param_type:, comment_location:)
+            super(location, prefix_location)
+            @star2_location = star2_location
+            @name_location = name_location
+            @colon_location = colon_location
+            @param_type = param_type
+            @comment_location = comment_location
+          end
+
+          def map_type_name(&block)
+            self.class.new(
+              location:,
+              prefix_location:,
+              star2_location: star2_location,
+              name_location: name_location,
+              colon_location: colon_location,
+              param_type: param_type.map_type_name { yield _1 },
+              comment_location: comment_location
+            ) #: self
+          end
+
+          def type_fingerprint
+            [
+              "annots/double_splat_param_type",
+              name_location&.source,
+              param_type.to_s,
+              comment_location&.source
+            ]
+          end
+        end
+
+        class BlockParamTypeAnnotation < Base
+          attr_reader :ampersand_location, :name_location, :colon_location, :question_location, :type_location, :type, :comment_location
+
+          def initialize(location:, prefix_location:, ampersand_location:, name_location:, colon_location:, question_location:, type_location:, type:, comment_location:)
+            super(location, prefix_location)
+            @ampersand_location = ampersand_location
+            @name_location = name_location
+            @colon_location = colon_location
+            @question_location = question_location
+            @type_location = type_location
+            @type = type
+            @comment_location = comment_location
+          end
+
+          def map_type_name(&block)
+            self.class.new(
+              location:,
+              prefix_location:,
+              ampersand_location: ampersand_location,
+              name_location: name_location,
+              colon_location: colon_location,
+              question_location: question_location,
+              type_location: type_location,
+              type: type.map_type_name { yield _1 },
+              comment_location: comment_location
+            ) #: self
+          end
+
+          def name
+            name_location&.source&.to_sym
+          end
+
+          def optional?
+            question_location ? true : false
+          end
+
+          def required?
+            !optional?
+          end
+
+          def type_fingerprint
+            [
+              "annots/block_param_type",
+              name_location&.source,
+              type.to_s,
+              optional? ? "optional" : "required",
+              comment_location&.source
+            ]
+          end
         end
       end
     end

data/lib/rbs/ast/ruby/comment_block.rb

@@ -177,6 +177,13 @@ module RBS
           Location.new(comment_buffer, start_offset, end_offset)
         end
 
+        def location()
+          first_comment = comments[0] or raise
+          last_comment = comments[-1] or raise
+
+          comment_buffer.rbs_location(first_comment.location.join last_comment.location)
+        end
+
         def parse_annotation_lines(start_line, end_line, variables)
           start_pos = comment_buffer.ranges[start_line].begin
           end_pos = comment_buffer.ranges[end_line].end
@@ -215,6 +222,23 @@ module RBS
 
           false
         end
+
+        def as_comment
+          lines = [] #: Array[String]
+
+          each_paragraph([]) do |paragraph|
+            case paragraph
+            when Location
+              lines << paragraph.local_source
+            end
+          end
+
+          string = lines.join("\n")
+
+          unless string.strip.empty?
+            AST::Comment.new(string: string, location: location)
+          end
+        end
       end
     end
   end

data/lib/rbs/ast/ruby/declarations.rb

@@ -16,17 +16,67 @@ module RBS
         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
+
+            def type_fingerprint
+              [
+                type_name.to_s,
+                type_annotation&.type_fingerprint
+              ]
+            end
+          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,13 +89,26 @@ module RBS
             end
           end
 
-          def super_class = nil
-
           def type_params = []
 
           def location
             rbs_location(node.location)
           end
+
+          def name_location
+            rbs_location(node.constant_path.location)
+          end
+
+          def type_fingerprint
+            result = [] #: Array[untyped]
+
+            result << "decls/class"
+            result << class_name.to_s
+            result << super_class&.type_fingerprint
+            result << members.map { _1.type_fingerprint }
+
+            result
+          end
         end
 
         class ModuleDecl < Base
@@ -79,6 +142,138 @@ module RBS
           def location
             rbs_location(node.location)
           end
+
+          def name_location
+            rbs_location(node.constant_path.location)
+          end
+
+          def type_fingerprint
+            result = [] #: Array[untyped]
+
+            result << "decls/module"
+            result << module_name.to_s
+            result << members.map { _1.type_fingerprint}
+
+            result
+          end
+        end
+
+        class ConstantDecl < Base
+          attr_reader :leading_comment
+          attr_reader :constant_name
+          attr_reader :node
+          attr_reader :type_annotation
+
+          def initialize(buffer, constant_name, node, leading_comment, type_annotation)
+            super(buffer)
+            @constant_name = constant_name
+            @node = node
+            @leading_comment = leading_comment
+            @type_annotation = type_annotation
+          end
+
+          def location
+            rbs_location(node.location)
+          end
+
+          def name_location
+            case node
+            when Prism::ConstantWriteNode
+              rbs_location(node.name_loc)
+            when Prism::ConstantPathWriteNode
+              rbs_location(node.target.location)
+            end
+          end
+
+          def type
+            return type_annotation.type if type_annotation
+
+            case node.value
+            when Prism::IntegerNode
+              BuiltinNames::Integer.instance_type
+            when Prism::FloatNode
+              BuiltinNames::Float.instance_type
+            when Prism::StringNode
+              BuiltinNames::String.instance_type
+            when Prism::TrueNode, Prism::FalseNode
+              Types::Bases::Bool.new(location: nil)
+            when Prism::SymbolNode
+              BuiltinNames::Symbol.instance_type
+            when Prism::NilNode
+              Types::Bases::Nil.new(location: nil)
+            else
+              Types::Bases::Any.new(location: nil)
+            end
+          end
+
+          def comment
+            leading_comment&.as_comment
+          end
+
+          def type_fingerprint
+            [
+              "decls/constant",
+              constant_name.to_s,
+              type.to_s,
+              leading_comment&.as_comment&.string
+            ]
+          end
+        end
+
+        class ClassModuleAliasDecl < Base
+          attr_reader :node
+          attr_reader :leading_comment
+          attr_reader :new_name
+          attr_reader :infered_old_name
+          attr_reader :annotation
+
+          def initialize(buffer, node, new_name, infered_old_name, leading_comment, annotation)
+            super(buffer)
+            @node = node
+            @new_name = new_name
+            @infered_old_name = infered_old_name
+            @leading_comment = leading_comment
+            @annotation = annotation
+          end
+
+          def location
+            rbs_location(node.location)
+          end
+
+          def name_location
+            case node
+            when Prism::ConstantWriteNode
+              rbs_location(node.name_loc)
+            when Prism::ConstantPathWriteNode
+              rbs_location(node.target.location)
+            end
+          end
+
+          def old_name
+            # Return explicit type name from annotation if provided, otherwise use inferred name
+            case
+            when annotation.type_name
+              annotation.type_name
+            when infered_old_name
+              infered_old_name
+            else
+              raise "No old name available"
+            end
+          end
+
+          def comment
+            leading_comment&.as_comment
+          end
+
+          def type_fingerprint
+            [
+              "decls/class_module_alias",
+              annotation.type_fingerprint,
+              new_name.to_s,
+              old_name.to_s,
+              leading_comment&.as_comment&.string
+            ]
+          end
         end
       end
     end

data/lib/rbs/ast/ruby/helpers/constant_helper.rb

@@ -15,6 +15,10 @@ module RBS
               rescue Prism::ConstantPathNode::DynamicPartsInConstantPathError
                 nil
               end
+            when Prism::ConstantWriteNode
+              TypeName.new(name: node.name, namespace: Namespace.empty)
+            when Prism::ConstantPathWriteNode
+              constant_as_type_name(node.target)
             end
           end
         end