Rebase against main

Author: kddnewton

Steepfile

@@ -3,7 +3,6 @@
 target :lib do
   signature "sig"
 
-  # Tell Steep about any stdlib "require"s
   library "cgi" # in lib/prism/dot_visitor.rb (Prism::DotVisitor)
 
   check "lib"

lib/prism/parse_result.rb

@@ -67,7 +67,7 @@ def character_column(byte_offset)
     # concept of code units that differs from the number of characters in other
     # encodings, it is not captured here.
     def code_units_offset(byte_offset, encoding)
-      byteslice = source.byteslice(0, byte_offset).encode(encoding)
+      byteslice = (source.byteslice(0, byte_offset) or raise).encode(encoding)
       (encoding == Encoding::UTF_16LE || encoding == Encoding::UTF_16BE) ? (byteslice.bytesize / 2) : byteslice.length
     end
 

lib/prism/ripper_compat.rb

@@ -3,7 +3,6 @@ module Prism
     private
 
     def find_line: (Integer) -> Integer
-    def compute_offsets: (String) -> Array[Integer]
   end
 
   class Location

sig/_shims/symbol.rbs

@@ -43,18 +43,10 @@ module Prism
     def heredoc?: () -> bool?
   end
 
-  class FloatNode < Node
-    def value: () -> Float
-  end
-
   class ImaginaryNode < Node
     def value: () -> Complex
   end
 
-  class IntegerNode < Node
-    def value: () -> Integer
-  end
-
   class RationalNode < Node
     def value: () -> Rational
   end

sig/prism/_private/parse_result.rbs

@@ -13,6 +13,8 @@ module Prism
     def column: (Integer byte_offset) -> Integer
     def character_offset: (Integer byte_offset) -> Integer
     def character_column: (Integer byte_offset) -> Integer
+    def code_units_offset: (Integer byte_offset, Encoding encoding) -> Integer
+    def code_units_column: (Integer byte_offset, Encoding encoding) -> Integer
   end
 
   class Location
@@ -81,17 +83,19 @@ module Prism
   class ParseError
     attr_reader message: String
     attr_reader location: Location
+    attr_reader level: Symbol
 
-    def initialize: (String message, Location location) -> void
-    def deconstruct_keys: (Array[Symbol] keys) -> { message: String, location: Location }
+    def initialize: (String message, Location location, Symbol level) -> void
+    def deconstruct_keys: (Array[Symbol] keys) -> { message: String, location: Location, level: Symbol }
   end
 
   class ParseWarning
     attr_reader message: String
     attr_reader location: Location
+    attr_reader level: Symbol
 
-    def initialize: (String message, Location location) -> void
-    def deconstruct_keys: (Array[Symbol] keys) -> { message: String, location: Location }
+    def initialize: (String message, Location location, Symbol level) -> void
+    def deconstruct_keys: (Array[Symbol] keys) -> { message: String, location: Location, level: Symbol }
   end
 
   class ParseResult[out T]
@@ -110,11 +114,12 @@ module Prism
   end
 
   class Token
+    attr_reader source: Source
     attr_reader type: Symbol
     attr_reader value: String
     attr_reader location: Location
 
-    def initialize: (Symbol type, String value, Location location) -> void
+    def initialize: (Source source, Symbol type, String value, Location location) -> void
     def deconstruct_keys: (Array[Symbol] keys) -> { type: Symbol, value: String, location: Location }
     def pretty_print: (untyped q) -> untyped
     def ==: (untyped other) -> bool