rbi 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5ef2a157e342a16c69748e0f09b67839152d10e99a3b7eab4da23354b8993f9
-  data.tar.gz: 6622c783e58b67a950e4661a025f8d0a9508612eda9ee53af45f72e6c5057286
+  metadata.gz: 570f1035fa8bb56861eabd49590fbf2374f428c053f0fc189e27958feedf0c4b
+  data.tar.gz: 0dbb944e45b675851de18089c22a23c4c527f03dfca281426db8fb3cff94372e
 SHA512:
-  metadata.gz: 598e6384b4aca8b6db5aa97d6a00e6a75cb1bb4273d5401006c969c4d89730797942c8d0ff7fed0a8da25f6170747126c064c6aadbec210ebb28e4781772ab26
-  data.tar.gz: 6021bd1134be4dfd834ece8648ea904ad30666216411c7524a9f4245f14ecab7b1e6da9d013a8c0bb4a9620fde7db83190b54f7bb512f7d1d23275300112482e
+  metadata.gz: 45e5f53144cc46f1cd2c86b55c1d490ab5bd4b2d3bf5e593b3f6405e6b4583645c13130cdc6762f0e5eb18f5f74bfa1dfe990d108f6db21da394ba4d30a7b810
+  data.tar.gz: 603617b73fc3e4e862f897bf0b10b165efd4ac608c07b71e3ef43e1190e4d1fff2f26484a65d8f4d9e5965eafa99435d02bf668fef756abe5a24f1fa3e41f52b

data/Gemfile

@@ -1,4 +1,4 @@
-# typed: true
+# typed: strict
 # frozen_string_literal: true
 
 source "https://rubygems.org"

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,6 +176,7 @@ 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])
 
       separate_header_comments
@@ -141,6 +191,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)
@@ -165,6 +217,8 @@ module RBI
       else
         visit_all(node.children)
       end
+
+      @last_node = nil
     end
 
     private
@@ -612,19 +666,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.13"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbi
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Alexandre Terrasa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-03 00:00:00.000000000 Z
+date: 2022-03-15 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