Merge pull request #746 from Shopify/uk-granular-error-handling

Add granular error handling for RBS to RBI translation

Author: Morriar

lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs.rb

@@ -55,7 +55,7 @@ def visit_def_node(node)
               signature.location.end_offset,
               sig.string,
             )
-          rescue ::RBS::ParsingError
+          rescue ::RBS::ParsingError, ::RBI::Error
             # Ignore signatures with errors
             next
           end
@@ -106,6 +106,9 @@ def visit_attr(node)
               signature.location.end_offset,
               sig.string,
             )
+          rescue ::RBS::ParsingError, ::RBI::Error
+            # Ignore signatures with errors
+            next
           end
         end
 
@@ -154,6 +157,9 @@ def apply_class_annotations(node)
 
               newline = node.body.nil? ? "" : "\n"
               @rewriter << Source::Insert.new(insert_pos, "\n#{indent}#{content}#{newline}")
+            rescue ::RBS::ParsingError, ::RBI::Error
+              # Ignore annotations with errors
+              next
             end
           end
 
@@ -195,6 +201,9 @@ def apply_class_annotations(node)
 
                 newline = node.body.nil? ? "" : "\n"
                 @rewriter << Source::Insert.new(insert_pos, "\n#{indent}#{type_member}#{newline}")
+              rescue ::RBS::ParsingError, ::RBI::Error
+                # Ignore signatures with errors
+                next
               end
             end
           end

rbi/spoom.rbi

@@ -432,6 +432,12 @@ module Spoom::Context::Sorbet
 end
 
 class Spoom::Counters < ::Hash
+  extend T::Generic
+
+  K = type_member { { fixed: String } }
+  V = type_member { { fixed: Integer } }
+  Elem = type_member { { fixed: [String, Integer] } }
+
   sig { void }
   def initialize; end
 
@@ -2465,25 +2471,29 @@ end
 class Spoom::ParseError < ::Spoom::Error; end
 
 class Spoom::Poset
+  extend T::Generic
+
+  E = type_member { { upper: Object } }
+
   sig { void }
   def initialize; end
 
-  sig { params(value: T.untyped).returns(Spoom::Poset::Element[T.untyped]) }
+  sig { params(value: E).returns(Spoom::Poset::Element[E]) }
   def [](value); end
 
-  sig { params(from: T.untyped, to: T.untyped).void }
+  sig { params(from: E, to: E).void }
   def add_direct_edge(from, to); end
 
-  sig { params(value: T.untyped).returns(Spoom::Poset::Element[T.untyped]) }
+  sig { params(value: E).returns(Spoom::Poset::Element[E]) }
   def add_element(value); end
 
-  sig { params(from: T.untyped, to: T.untyped).returns(T::Boolean) }
+  sig { params(from: E, to: E).returns(T::Boolean) }
   def direct_edge?(from, to); end
 
-  sig { params(from: T.untyped, to: T.untyped).returns(T::Boolean) }
+  sig { params(from: E, to: E).returns(T::Boolean) }
   def edge?(from, to); end
 
-  sig { params(value: T.untyped).returns(T::Boolean) }
+  sig { params(value: E).returns(T::Boolean) }
   def element?(value); end
 
   sig { params(direct: T::Boolean, transitive: T::Boolean).void }
@@ -2494,36 +2504,39 @@ class Spoom::Poset
 end
 
 class Spoom::Poset::Element
+  extend T::Generic
   include ::Comparable
 
-  sig { params(value: T.untyped).void }
+  E = type_member { { upper: Object } }
+
+  sig { params(value: E).void }
   def initialize(value); end
 
   sig { params(other: T.untyped).returns(T.nilable(::Integer)) }
   def <=>(other); end
 
-  sig { returns(T::Array[T.untyped]) }
+  sig { returns(T::Array[E]) }
   def ancestors; end
 
-  sig { returns(T::Array[T.untyped]) }
+  sig { returns(T::Array[E]) }
   def children; end
 
-  sig { returns(T::Array[T.untyped]) }
+  sig { returns(T::Array[E]) }
   def descendants; end
 
   def dfroms; end
 
-  sig { returns(T::Set[Spoom::Poset::Element[T.untyped]]) }
+  sig { returns(T::Set[Spoom::Poset::Element[E]]) }
   def dtos; end
 
   def froms; end
 
-  sig { returns(T::Array[T.untyped]) }
+  sig { returns(T::Array[E]) }
   def parents; end
 
   def tos; end
 
-  sig { returns(T.untyped) }
+  sig { returns(E) }
   def value; end
 end