Make rake typecheck:steep pass

Author: eregon

lib/prism/parse_result.rb

@@ -147,7 +147,8 @@ def code_units_column(byte_offset, encoding)
     def line_and_column_to_byte_offset(line, column)
       line_start = offsets[line - 1]
       line_end = offsets[line]
-      line_start + @source.byteslice(line_start, line_end)[0...column].bytesize
+      byte_column = (@source.byteslice(line_start, line_end) or raise)[0...column]&.bytesize #: Integer
+      line_start + byte_column
     end
 
     # Freeze this object and the objects it contains.
@@ -921,7 +922,7 @@ def self.node_for(callable)
     source_location = callable.source_location
     raise ArgumentError, "#source_location is nil for #{callable}" if source_location.nil?
     raise ArgumentError, '#source_location does not contain column and end_line, this method only works on Ruby 4+' if source_location.size != 5
-    file, start_line, start_column, end_line, end_column = source_location
+    file, start_line, start_column, end_line, end_column = source_location #: [String, Integer, Integer, Integer, Integer]
 
     unless File.exist?(file)
       raise ArgumentError, "#source_location[0] is #{file} but this file does not exist"
@@ -945,8 +946,10 @@ def self.node_for(callable)
       when CallNode
         # Proc#source_location returns start_column 5 for `proc { ... }` (the `{`)
         node.block.is_a?(BlockNode) && node.block.opening_loc.start_offset == start_offset && node.end_offset == end_offset
+      else
+        false
       end
-    end
+    end #: DefNode | LambdaNode | CallNode
 
     raise ArgumentError, "Could not find node for #{callable} in #{file} at (#{start_line},#{start_column})-(#{end_line},#{end_column})" unless found
     found

templates/sig/prism.rbs.erb

@@ -31,7 +31,8 @@ module Prism
     ?main_script: bool,
     ?offset: Integer,
     ?scopes: Array[Array[Symbol]],
-    ?verbose: bool
+    ?verbose: bool,
+    ?version: String
   ) -> <%= return_type %>
   <%- end -%>
 
@@ -68,7 +69,8 @@ module Prism
     ?main_script: bool,
     ?offset: Integer,
     ?scopes: Array[Array[Symbol]],
-    ?verbose: bool
+    ?verbose: bool,
+    ?version: String
   ) -> <%= return_type %>
   <%- end -%>
 
@@ -86,7 +88,8 @@ module Prism
     ?main_script: bool,
     ?offset: Integer,
     ?scopes: Array[Array[Symbol]],
-    ?verbose: bool
+    ?verbose: bool,
+    ?version: String
   ) -> ParseResult
 
   def self.scope: (?locals: Array[Symbol], ?forwarding: Array[Symbol]) -> Scope