Merge pull request #2801 from ruby/fix-tapioca

Fix tapioca require order
ruby · May 10, 2024 · 79c62d0 · 79c62d0
2 parents ef589e6 + 15bf727
commit 79c62d0
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/lib/prism/parse_result/comments.rb b/lib/prism/parse_result/comments.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Prism
-  class ParseResult
+  class ParseResult < Result
     # When we've parsed the source, we have both the syntax tree and the list of
     # comments that we found in the source. This class is responsible for
     # walking the tree and finding the nearest location to attach each comment.

diff --git a/lib/prism/parse_result/newlines.rb b/lib/prism/parse_result/newlines.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Prism
-  class ParseResult
+  class ParseResult < Result
     # The :line tracepoint event gets fired whenever the Ruby VM encounters an
     # expression on a new line. The types of expressions that can trigger this
     # event are:

diff --git a/rakelib/typecheck.rake b/rakelib/typecheck.rake
@@ -37,7 +37,6 @@ namespace :typecheck do
         - ./lib/prism/parse_result.rb
         - ./lib/prism/visitor.rb
         - ./lib/prism/translation/ripper.rb
-        - ./lib/prism/translation/ripper/ripper_compiler.rb
         - ./lib/prism/translation/ripper/sexp.rb
         - ./lib/prism/translation/ruby_parser.rb
         - ./lib/prism/inspect_visitor.rb

diff --git a/rbi/prism/parse_result.rbi b/rbi/prism/parse_result.rbi
@@ -16,7 +16,7 @@ class Prism::Source
   sig { returns(Encoding) }
   def encoding; end
 
-  sig { returns(T::Array[Integer]) }
+  sig { returns(T::Array[String]) }
   def lines; end
 
   sig { params(byte_offset: Integer, length: Integer).returns(String) }