Update Sorbet and start fixing sorbet errors

Author: mickeytgl

.github/workflows/build.yml

@@ -50,8 +50,8 @@ jobs:
       - name: RBS Inline
         run: bundle exec rake rbs_inline
 
-      # - name: Sorbet
-      #   run: bundle exec srb tc
+      - name: Sorbet
+        run: bundle exec srb tc
 
       - name: Run C tests
         run: ./run_herb_tests

Gemfile.lock

@@ -113,11 +113,11 @@ GEM
       prism (~> 1.4)
     ruby-progressbar (1.13.0)
     securerandom (0.4.1)
-    sorbet (0.5.12214)
-      sorbet-static (= 0.5.12214)
-    sorbet-static (0.5.12214-aarch64-linux)
-    sorbet-static (0.5.12214-universal-darwin)
-    sorbet-static (0.5.12214-x86_64-linux)
+    sorbet (0.6.12473)
+      sorbet-static (= 0.6.12473)
+    sorbet-static (0.6.12473-aarch64-linux)
+    sorbet-static (0.6.12473-universal-darwin)
+    sorbet-static (0.6.12473-x86_64-linux)
     steep (1.10.0)
       activesupport (>= 5.1)
       concurrent-ruby (>= 1.1.10)

lib/herb/ast/node.rb

@@ -4,22 +4,30 @@
 module Herb
   module AST
     class Node
-      attr_reader :type #: String
-      attr_reader :location #: Location
-      attr_reader :errors #: Array[Herb::Errors::Error]
-
-      #: (String, Location, Array[Herb::Errors::Error]) -> void
+      #: String
+      attr_reader :type
+      #: Location
+      attr_reader :location
+      #: Array[Herb::Errors::Error]
+      attr_reader :errors
+
+      #: (String, Location, ?Array[Herb::Errors::Error]) -> void
       def initialize(type, location, errors = [])
         @type = type
         @location = location
         @errors = errors
       end
 
+      #: type serialized_node = {
+      #| type: String,
+      #| location: serialized_location,
+      #| errors: Array[serialized_error]
+      #| }
       #: () -> serialized_node
       def to_hash
         {
           type: type,
-          location: location&.to_hash,
+          location: location.to_hash,
           errors: errors.map(&:to_hash),
         }
       end

lib/herb/lex_result.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
+# typed: true
 
 module Herb
   class LexResult < Result
-    attr_reader :value #: TokenList
+    #: Array[Herb::Token]
+    attr_reader :value
 
     #: (Array[Herb::Token], String, Array[Herb::Warnings::Warning], Array[Herb::Errors::Error]) -> void
     def initialize(value, source, warnings, errors)

lib/herb/location.rb

@@ -2,11 +2,14 @@
 # typed: true
 
 module Herb
+  #: type serialized_location = { start: Position, end: Position }
   class Location
-    attr_reader :start #: Position
-    attr_reader :end #: Position
+    #: Herb::Position
+    attr_reader :start
+    #: Herb::Position
+    attr_reader :end
 
-    #: (Position, Position) -> void
+    #: (Herb::Position, Herb::Position) -> void
     def initialize(start_position, end_position)
       @start = start_position
       @end = end_position
@@ -30,7 +33,7 @@ def to_hash
       {
         start: start,
         end: self.end,
-      } #: Herb::serialized_location
+      }
     end
 
     #: (?untyped) -> String

lib/herb/parse_result.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
+# typed: true
 
 require "json"
 
 module Herb
   class ParseResult < Result
-    attr_reader :value #: Herb::AST::DocumentNode
+    #: Herb::AST::DocumentNode
+    attr_reader :value
 
     #: (Herb::AST::DocumentNode, String, Array[Herb::Warnings::Warning], Array[Herb::Errors::Error]) -> void
     def initialize(value, source, warnings, errors)

lib/herb/position.rb

@@ -2,9 +2,12 @@
 # typed: true
 
 module Herb
+  #: type serialized_position = { line: Integer, column: Integer }
   class Position
-    attr_reader :line #: Integer
-    attr_reader :column #: Integer
+    #: Integer
+    attr_reader :line
+    #: Integer
+    attr_reader :column
 
     #: (Integer, Integer) -> void
     def initialize(line, column)

lib/herb/range.rb

@@ -2,9 +2,12 @@
 # typed: true
 
 module Herb
+  #: type serialized_range = [Integer, Integer]
   class Range
-    attr_reader :from #: Integer
-    attr_reader :to #: Integer
+    #: Integer
+    attr_reader :from
+    #: Integer
+    attr_reader :to
 
     #: (Integer, Integer) -> void
     def initialize(from, to)

lib/herb/result.rb

@@ -3,9 +3,12 @@
 
 module Herb
   class Result
-    attr_reader :source #: String
-    attr_reader :warnings #: Array[Herb::Warnings::Warning]
-    attr_reader :errors #: Array[Herb::Errors::Error]
+    #: String
+    attr_reader :source
+    #: Array[Herb::Warnings::Warning]
+    attr_reader :warnings
+    #: Array[Herb::Errors::Error]
+    attr_reader :errors
 
     #: (String, Array[Herb::Warnings::Warning], Array[Herb::Errors::Error]) -> void
     def initialize(source, warnings, errors)

lib/herb/token.rb

@@ -2,11 +2,16 @@
 # typed: true
 
 module Herb
+  #: type serialized_token = { value: String, range: [Integer, Integer], location: serialized_location, type: String }
   class Token
-    attr_reader :value #: String
-    attr_reader :range #: Range
-    attr_reader :location #: Location
-    attr_reader :type #: String
+    #: String
+    attr_reader :value
+    #: Range
+    attr_reader :range
+    #: Location
+    attr_reader :location
+    #: String
+    attr_reader :type
 
     #: (String, Range, Location, String) -> void
     def initialize(value, range, location, type)
@@ -20,10 +25,10 @@ def initialize(value, range, location, type)
     def to_hash
       {
         value: value,
-        range: range&.to_a,
-        location: location&.to_hash,
+        range: range.to_a,
+        location: location.to_hash,
         type: type,
-      } #: Herb::serialized_token
+      }
     end
 
     #: (?untyped) -> String