rbi 0.0.12 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff552cac7ef282e9673502662c239c6e60e370d4d9e6d137db16ed03bd3c5a32
-  data.tar.gz: 6ca736d5854621dde27bafffd8ad4b393d2c60d5f7b9e4eba8ab938e7f9123f4
+  metadata.gz: a98dd77d2fde6771b24b8ab87d585b94b944beea38a2d60a2ba38f7738deb67b
+  data.tar.gz: 56eb299a37b8755b57ebd72ffc4dcf6179a739e4146f6903c3d63450a586307b
 SHA512:
-  metadata.gz: 9540175cf17bd99421f4c0e2d81dae2a6b79a0ba3528409c1aeb0fbc4923eb01b2b9a5d6d28a17c1b7d0ac4a4b06f10775ecabc460f54ad39fa5099256554730
-  data.tar.gz: 75a8657c94d508c5b53793be7b53fe6570850c6088cd67fc75c85b5d42555824b248d6f2c7a62527e8e50555276eb4e32ba33bb406c948d66a1f0a11f7f16014
+  metadata.gz: 7e2a8e48b3210f41a3b38bf2844d895a0d232c8296b7122ecb64705ec9b77d56dd88ca0e1dd3b2fa15755ce90e63ee3ef17ccbc1174b3034b4d825bb4444c357
+  data.tar.gz: df19f77e6e4dd24e9309b03d4a1cd3008386bc3a48fe6998782008459fac78f9f97c52f603db2f65b1c68d42c3fe49f1145a7d40fcc845473c667ec4287127af

data/Gemfile

@@ -1,4 +1,4 @@
-# typed: true
+# typed: strict
 # frozen_string_literal: true
 
 source "https://rubygems.org"
@@ -14,5 +14,5 @@ group(:development, :test) do
   gem("rubocop-shopify", require: false)
   gem("rubocop-sorbet", require: false)
   gem("sorbet", ">= 0.5.9204", require: false)
-  gem("tapioca", "0.5.2", require: false)
+  gem("tapioca", require: false)
 end

data/Rakefile

@@ -1,4 +1,4 @@
-# typed: true
+# typed: strict
 # frozen_string_literal: true
 
 require "bundler/gem_tasks"

data/lib/rbi/loc.rb

@@ -32,5 +32,20 @@ module RBI
     def to_s
       "#{file}:#{begin_line}:#{begin_column}-#{end_line}:#{end_column}"
     end
+
+    sig { returns(T.nilable(String)) }
+    def source
+      file = self.file
+      return nil unless file
+      return nil unless ::File.file?(file)
+
+      return ::File.read(file) unless begin_line && end_line
+
+      string = String.new
+      ::File.foreach(file).with_index do |line, line_number|
+        string << line if line_number + 1 >= begin_line && line_number + 1 <= end_line
+      end
+      string
+    end
   end
 end

data/lib/rbi/parser.rb

@@ -17,6 +17,39 @@ module RBI
     end
   end
 
+  class UnexpectedParserError < StandardError
+    extend T::Sig
+
+    sig { returns(Loc) }
+    attr_reader :last_location
+
+    sig { params(parent_exception: Exception, last_location: Loc).void }
+    def initialize(parent_exception, last_location)
+      super(parent_exception)
+      set_backtrace(parent_exception.backtrace)
+      @last_location = last_location
+    end
+
+    sig { params(io: T.any(IO, StringIO)).void }
+    def print_debug(io: $stderr)
+      io.puts ""
+      io.puts "##################################"
+      io.puts "### RBI::Parser internal error ###"
+      io.puts "##################################"
+      io.puts ""
+      io.puts "There was an internal parser error while processing this source."
+      io.puts ""
+      io.puts "Error: #{message} while parsing #{last_location}:"
+      io.puts ""
+      io.puts last_location.source || "<no source>"
+      io.puts ""
+      io.puts "Please open an issue at https://github.com/Shopify/rbi/issues/new."
+      io.puts ""
+      io.puts "##################################"
+      io.puts ""
+    end
+  end
+
   class Parser
     extend T::Sig
 
@@ -77,6 +110,19 @@ module RBI
       builder.tree
     rescue ::Parser::SyntaxError => e
       raise ParseError.new(e.message, Loc.from_ast_loc(file, e.diagnostic.location))
+    rescue ParseError => e
+      raise e
+    rescue => e
+      last_node = builder&.last_node
+      last_location = if last_node
+        Loc.from_ast_loc(file, last_node.location)
+      else
+        Loc.new(file: file)
+      end
+
+      exception = UnexpectedParserError.new(e, last_location)
+      exception.print_debug
+      raise exception
     end
   end
 
@@ -113,6 +159,9 @@ module RBI
     sig { returns(Tree) }
     attr_reader :tree
 
+    sig { returns(T.nilable(::AST::Node)) }
+    attr_reader :last_node
+
     sig do
       params(
         file: String,
@@ -127,7 +176,9 @@ module RBI
       @nodes_comments_assoc = nodes_comments_assoc
       @tree = T.let(Tree.new, Tree)
       @scopes_stack = T.let([@tree], T::Array[Tree])
+      @last_node = T.let(nil, T.nilable(::AST::Node))
       @last_sigs = T.let([], T::Array[RBI::Sig])
+      @last_sigs_comments = T.let([], T::Array[Comment])
 
       separate_header_comments
     end
@@ -141,6 +192,8 @@ module RBI
     sig { override.params(node: T.nilable(Object)).void }
     def visit(node)
       return unless node.is_a?(AST::Node)
+      @last_node = node
+
       case node.type
       when :module, :class, :sclass
         scope = parse_scope(node)
@@ -156,15 +209,18 @@ module RBI
         node = parse_send(node)
         current_scope << node if node
       when :block
-        node = parse_block(node)
-        if node.is_a?(Sig)
-          @last_sigs << node
-        elsif node
-          current_scope << node
+        rbi_node = parse_block(node)
+        if rbi_node.is_a?(Sig)
+          @last_sigs << rbi_node
+          @last_sigs_comments.concat(node_comments(node))
+        elsif rbi_node
+          current_scope << rbi_node
         end
       else
         visit_all(node.children)
       end
+
+      @last_node = nil
     end
 
     private
@@ -214,7 +270,7 @@ module RBI
           params: node.children[1].children.map { |child| parse_param(child) },
           sigs: current_sigs,
           loc: loc,
-          comments: node_comments(node)
+          comments: current_sigs_comments + node_comments(node)
         )
       when :defs
         Method.new(
@@ -223,7 +279,7 @@ module RBI
           is_singleton: true,
           sigs: current_sigs,
           loc: loc,
-          comments: node_comments(node)
+          comments: current_sigs_comments + node_comments(node)
         )
       else
         raise ParseError.new("Unsupported def node type `#{node.type}`", loc)
@@ -270,13 +326,13 @@ module RBI
       case method_name
       when :attr_reader
         symbols = node.children[2..-1].map { |child| child.children[0] }
-        AttrReader.new(*symbols, sigs: current_sigs, loc: loc, comments: comments)
+        AttrReader.new(*symbols, sigs: current_sigs, loc: loc, comments: current_sigs_comments + comments)
       when :attr_writer
         symbols = node.children[2..-1].map { |child| child.children[0] }
-        AttrWriter.new(*symbols, sigs: current_sigs, loc: loc, comments: comments)
+        AttrWriter.new(*symbols, sigs: current_sigs, loc: loc, comments: current_sigs_comments + comments)
       when :attr_accessor
         symbols = node.children[2..-1].map { |child| child.children[0] }
-        AttrAccessor.new(*symbols, sigs: current_sigs, loc: loc, comments: comments)
+        AttrAccessor.new(*symbols, sigs: current_sigs, loc: loc, comments: current_sigs_comments + comments)
       when :include
         names = node.children[2..-1].map { |child| parse_expr(child) }
         Include.new(*names, loc: loc, comments: comments)
@@ -429,7 +485,14 @@ module RBI
     sig { params(node: AST::Node).returns(TEnumBlock) }
     def parse_enum(node)
       enum = TEnumBlock.new
-      node.children[2].children.each do |child|
+
+      body = if node.children[2].type == :begin
+        node.children[2].children
+      else
+        [node.children[2]]
+      end
+
+      body.each do |child|
         enum << parse_name(child)
       end
       enum.loc = node_loc(node)
@@ -472,6 +535,13 @@ module RBI
       sigs
     end
 
+    sig { returns(T::Array[Comment]) }
+    def current_sigs_comments
+      comments = @last_sigs_comments.dup
+      @last_sigs_comments.clear
+      comments
+    end
+
     sig { void }
     def assoc_dangling_comments
       last_line = T.let(nil, T.nilable(Integer))
@@ -605,19 +675,25 @@ module RBI
       when :overridable
         @current.is_overridable = true
       when :checked
-        @current.checked = node.children[2].children[0]
+        if node.children.length >= 3
+          @current.checked = node.children[2].children[0]
+        end
       when :type_parameters
         node.children[2..-1].each do |child|
           @current.type_params << child.children[0].to_s
         end
       when :params
-        node.children[2].children.each do |child|
-          name = child.children[0].children[0].to_s
-          type = parse_expr(child.children[1])
-          @current << SigParam.new(name, type)
+        if node.children.length >= 3
+          node.children[2].children.each do |child|
+            name = child.children[0].children[0].to_s
+            type = parse_expr(child.children[1])
+            @current << SigParam.new(name, type)
+          end
         end
       when :returns
-        @current.return_type = parse_expr(node.children[2])
+        if node.children.length >= 3
+          @current.return_type = parse_expr(node.children[2])
+        end
       when :void
         @current.return_type = nil
       else

data/lib/rbi/version.rb

@@ -1,6 +1,6 @@
-# typed: true
+# typed: strict
 # frozen_string_literal: true
 
 module RBI
-  VERSION = "0.0.12"
+  VERSION = "0.0.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbi
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.15
 platform: ruby
 authors:
 - Alexandre Terrasa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-08 00:00:00.000000000 Z
+date: 2022-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.6.4.0
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime
   requirement: !ruby/object:Gem::Requirement
@@ -107,14 +107,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.20
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: RBI generation framework