Move total line count validation to Validator

Author: amomchilov

lib/spoom/sorbet/translate/validator.rb

@@ -46,6 +46,10 @@ def validate(original, rewritten)
               end
             end
 
+            if original.lines.count != rewritten.lines.count
+              on_wrong_line << { landmark_id: "EOF", expected: [original.lines.count], actual: [rewritten.lines.count] }
+            end
+
             ValidationResult.new(
               missing_from_rewritten_output: missing,
               excess_in_rewritten_output: excess,

test/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs_test.rb

@@ -1185,11 +1185,6 @@ def assert_rewrites_rbs(
               raise ArgumentError, "Invalid symbol for expected_line_matched_format: #{expected_line_matched_format}"
             end
 
-            assert_equal(source_with_rbs.lines.count, expected_line_matched_format.lines.count, <<~MSG)
-              Precondition: the expected rewritten code should have the same line count as the RBS-containing input.
-              This is a mistake in the test case, not the rewriter.
-            MSG
-
             unless (validation_result = Validator.validate(source_with_rbs, expected_line_matched_format)).valid?
               flunk(<<~MSG)
                 The rewritten code does not match the expected line-matched format.
@@ -1211,7 +1206,7 @@ def assert_rewrites_rbs(
               overloads_strategy:,
             )
 
-            # assert_equal(expected_line_matched_format, rewritten_output)
+            assert_equal(expected_line_matched_format, rewritten_output)
           end
         end
       end

test/spoom/sorbet/translate/validator_test.rb

@@ -54,6 +54,7 @@ def m; end
               { landmark_id: "module M", expected: [2], actual: [3] },
               { landmark_id: "def m", expected: [3], actual: [4] },
               { landmark_id: "__LINE__", expected: [4], actual: [5] },
+              { landmark_id: "EOF", expected: [4], actual: [5] },
             ],
           )
         end
@@ -75,6 +76,7 @@ def m; end
               { landmark_id: "def m", line: 3 },
               { landmark_id: "__LINE__", line: 4 },
             ],
+            on_wrong_line: [{ landmark_id: "EOF", expected: [4], actual: [1] }],
           )
         end
 
@@ -95,6 +97,7 @@ def new_method; end
               { landmark_id: "def new_method", line: 3 },
               { landmark_id: "__LINE__", line: 4 },
             ],
+            on_wrong_line: [{ landmark_id: "EOF", expected: [1], actual: [4] }],
           )
         end