Merge pull request #742 from Shopify/fix-annotation-translation-order-issue

Avoid deleting comments when the comment is not an annotation

Author: st0012

lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs.rb

@@ -132,7 +132,6 @@ def apply_class_annotations(node)
             comments.annotations.reverse_each do |annotation|
               from = adjust_to_line_start(annotation.location.start_offset)
               to = adjust_to_line_end(annotation.location.end_offset)
-              @rewriter << Source::Delete.new(from, to)
 
               content = case annotation.string
               when "@abstract"
@@ -147,8 +146,12 @@ def apply_class_annotations(node)
                 srb_type = ::RBS::Parser.parse_type(annotation.string.delete_prefix("@requires_ancestor: "))
                 rbs_type = RBI::RBS::TypeTranslator.translate(srb_type)
                 "requires_ancestor { #{rbs_type} }"
+              else
+                next
               end
 
+              @rewriter << Source::Delete.new(from, to)
+
               newline = node.body.nil? ? "" : "\n"
               @rewriter << Source::Insert.new(insert_pos, "\n#{indent}#{content}#{newline}")
             end

test/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs_test.rb

@@ -283,6 +283,31 @@ class << self
           RB
         end
 
+        def test_translate_to_rbi_helpers_with_right_order
+          contents = <<~RB
+            # @foo
+            # @bar
+            # @requires_ancestor: Kernel
+            module Baz
+              #: -> void
+              def foo; end
+            end
+          RB
+
+          assert_equal(<<~RB, rbs_comments_to_sorbet_sigs(contents))
+            # @foo
+            # @bar
+            module Baz
+              extend T::Helpers
+
+              requires_ancestor { Kernel }
+
+              sig { void }
+              def foo; end
+            end
+          RB
+        end
+
         def test_translate_to_rbi_generics
           contents = <<~RB
             #: [in A, out B]