From fba506eb143ac1d0bb6e076796ff4a28949e38c7 Mon Sep 17 00:00:00 2001
From: Carlos Granados <barel.barelon@gmail.com>
Date: Tue, 3 Feb 2026 12:19:49 +0000
Subject: [PATCH] Show line numbers in diff output

Changes the diff header from `@@ @@` to `@@ Line X @@` where X is the
starting line number of the change. This makes it easier to locate
where changes occur when there are multiple diffs in a file.
---
 e2e/applied-auto-import/expected-output.diff                | 2 +-
 e2e/applied-polyfill-php80/expected-output.diff             | 2 +-
 e2e/applied-rule-change-docblock/expected-output.diff       | 4 ++--
 .../expected-output.diff                                    | 4 ++--
 e2e/applied-rule-removed-node/expected-output.diff          | 4 ++--
 e2e/applied-rule-return-array-nodes/expected-output.diff    | 4 ++--
 e2e/different-path-over-skip-config/expected-output.diff    | 4 ++--
 e2e/no-parallel-reflection-resolver/expected-output.diff    | 4 ++--
 e2e/only-option-quote-double-equalnone/expected-output.diff | 2 +-
 e2e/only-option-quote-single-bsdouble/expected-output.diff  | 2 +-
 e2e/only-option-quote-single-equalnone/expected-output.diff | 2 +-
 e2e/only-option-quote-single/expected-output.diff           | 2 +-
 e2e/only-option/expected-output.diff                        | 2 +-
 e2e/parallel-custom-config/expected-output.diff             | 2 +-
 e2e/parallel-reflection-resolver/expected-output.diff       | 4 ++--
 e2e/print-new-node/expected-output.diff                     | 2 +-
 src/Console/Formatter/ColorConsoleDiffFormatter.php         | 6 +++---
 17 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/e2e/applied-auto-import/expected-output.diff b/e2e/applied-auto-import/expected-output.diff
index fa67573289c..9233afa20c6 100644
--- a/e2e/applied-auto-import/expected-output.diff
+++ b/e2e/applied-auto-import/expected-output.diff
@@ -4,7 +4,7 @@
 1) src/RenameDocblock.php:2
 
     ---------- begin diff ----------
-@@ @@
+@@ Line 2 @@
 
  namespace App;
 
diff --git a/e2e/applied-polyfill-php80/expected-output.diff b/e2e/applied-polyfill-php80/expected-output.diff
index c7d4b153a00..6a52de26b30 100644
--- a/e2e/applied-polyfill-php80/expected-output.diff
+++ b/e2e/applied-polyfill-php80/expected-output.diff
@@ -4,7 +4,7 @@
 1) src/SomeStartWith.php:4
 
     ---------- begin diff ----------
-@@ @@
+@@ Line 4 @@
  {
      public function run($a)
      {
diff --git a/e2e/applied-rule-change-docblock/expected-output.diff b/e2e/applied-rule-change-docblock/expected-output.diff
index 6445d3be395..3acf9cf9ac2 100644
--- a/e2e/applied-rule-change-docblock/expected-output.diff
+++ b/e2e/applied-rule-change-docblock/expected-output.diff
@@ -4,7 +4,7 @@
 1) src/RenameDocblock.php:1
 
     ---------- begin diff ----------
-@@ @@
+@@ Line 1 @@
  <?php
 
  /**
@@ -22,7 +22,7 @@ Applied rules:
 2) src/UselessVarTag.php:2
 
     ---------- begin diff ----------
-@@ @@
+@@ Line 2 @@
 
  final class UselessVarTag
  {
diff --git a/e2e/applied-rule-removed-node-with-cache/expected-output.diff b/e2e/applied-rule-removed-node-with-cache/expected-output.diff
index 448b4e515cb..94f3ee2fa9d 100644
--- a/e2e/applied-rule-removed-node-with-cache/expected-output.diff
+++ b/e2e/applied-rule-removed-node-with-cache/expected-output.diff
@@ -4,7 +4,7 @@
 1) src/AlwaysTrue.php:4
 
     ---------- begin diff ----------
-@@ @@
+@@ Line 4 @@
  {
      public function run()
      {
@@ -23,7 +23,7 @@ Applied rules:
 2) src/DeadConstructor.php:2
 
     ---------- begin diff ----------
-@@ @@
+@@ Line 2 @@
 
  final class DeadConstructor
  {
diff --git a/e2e/applied-rule-removed-node/expected-output.diff b/e2e/applied-rule-removed-node/expected-output.diff
index 448b4e515cb..94f3ee2fa9d 100644
--- a/e2e/applied-rule-removed-node/expected-output.diff
+++ b/e2e/applied-rule-removed-node/expected-output.diff
@@ -4,7 +4,7 @@
 1) src/AlwaysTrue.php:4
 
     ---------- begin diff ----------
-@@ @@
+@@ Line 4 @@
  {
      public function run()
      {
@@ -23,7 +23,7 @@ Applied rules:
 2) src/DeadConstructor.php:2
 
     ---------- begin diff ----------
-@@ @@
+@@ Line 2 @@
 
  final class DeadConstructor
  {
diff --git a/e2e/applied-rule-return-array-nodes/expected-output.diff b/e2e/applied-rule-return-array-nodes/expected-output.diff
index 0009fa9cd79..e6ff457faec 100644
--- a/e2e/applied-rule-return-array-nodes/expected-output.diff
+++ b/e2e/applied-rule-return-array-nodes/expected-output.diff
@@ -4,7 +4,7 @@
 1) src/MultiRules.php:6
 
     ---------- begin diff ----------
-@@ @@
+@@ Line 6 @@
      {
          if (true === false) {
              return -1;
@@ -28,7 +28,7 @@ Applied rules:
 2) src/RemoveAlwaysElse.php:6
 
     ---------- begin diff ----------
-@@ @@
+@@ Line 6 @@
      {
          if ($value) {
              throw new \InvalidStateException;
diff --git a/e2e/different-path-over-skip-config/expected-output.diff b/e2e/different-path-over-skip-config/expected-output.diff
index 551adaef6dc..f0234988b27 100644
--- a/e2e/different-path-over-skip-config/expected-output.diff
+++ b/e2e/different-path-over-skip-config/expected-output.diff
@@ -4,7 +4,7 @@
 1) src/models/DeadConstructor.php:4
 
     ---------- begin diff ----------
-@@ @@
+@@ Line 4 @@
 
  final class DeadConstructor
  {
@@ -18,4 +18,4 @@ Applied rules:
  * RemoveEmptyClassMethodRector
 
 
- [OK] 1 file would have been changed (dry-run) by Rector
\ No newline at end of file
+ [OK] 1 file would have been changed (dry-run) by Rector
diff --git a/e2e/no-parallel-reflection-resolver/expected-output.diff b/e2e/no-parallel-reflection-resolver/expected-output.diff
index 2c688392f34..a9e4b1fbc8f 100644
--- a/e2e/no-parallel-reflection-resolver/expected-output.diff
+++ b/e2e/no-parallel-reflection-resolver/expected-output.diff
@@ -4,7 +4,7 @@
 1) src/NamespacedSomeClassFound.php:6
 
     ---------- begin diff ----------
-@@ @@
+@@ Line 6 @@
 
  final class NamespacedSomeClassFound
  {
@@ -19,7 +19,7 @@ Applied rules:
 2) src/SomeClassNotFound.php:4
 
     ---------- begin diff ----------
-@@ @@
+@@ Line 4 @@
 
  final class SomeClassNotFound
  {
diff --git a/e2e/only-option-quote-double-equalnone/expected-output.diff b/e2e/only-option-quote-double-equalnone/expected-output.diff
index 1c2d805a6a0..6c525ad985f 100644
--- a/e2e/only-option-quote-double-equalnone/expected-output.diff
+++ b/e2e/only-option-quote-double-equalnone/expected-output.diff
@@ -4,7 +4,7 @@
 1) ../only-option/src/MultiRules.php:10
 
     ---------- begin diff ----------
-@@ @@
+@@ Line 10 @@
              echo 'a statement';
          }
      }
diff --git a/e2e/only-option-quote-single-bsdouble/expected-output.diff b/e2e/only-option-quote-single-bsdouble/expected-output.diff
index 1c2d805a6a0..6c525ad985f 100644
--- a/e2e/only-option-quote-single-bsdouble/expected-output.diff
+++ b/e2e/only-option-quote-single-bsdouble/expected-output.diff
@@ -4,7 +4,7 @@
 1) ../only-option/src/MultiRules.php:10
 
     ---------- begin diff ----------
-@@ @@
+@@ Line 10 @@
              echo 'a statement';
          }
      }
diff --git a/e2e/only-option-quote-single-equalnone/expected-output.diff b/e2e/only-option-quote-single-equalnone/expected-output.diff
index 1c2d805a6a0..6c525ad985f 100644
--- a/e2e/only-option-quote-single-equalnone/expected-output.diff
+++ b/e2e/only-option-quote-single-equalnone/expected-output.diff
@@ -4,7 +4,7 @@
 1) ../only-option/src/MultiRules.php:10
 
     ---------- begin diff ----------
-@@ @@
+@@ Line 10 @@
              echo 'a statement';
          }
      }
diff --git a/e2e/only-option-quote-single/expected-output.diff b/e2e/only-option-quote-single/expected-output.diff
index 1c2d805a6a0..6c525ad985f 100644
--- a/e2e/only-option-quote-single/expected-output.diff
+++ b/e2e/only-option-quote-single/expected-output.diff
@@ -4,7 +4,7 @@
 1) ../only-option/src/MultiRules.php:10
 
     ---------- begin diff ----------
-@@ @@
+@@ Line 10 @@
              echo 'a statement';
          }
      }
diff --git a/e2e/only-option/expected-output.diff b/e2e/only-option/expected-output.diff
index 4f52d0f36c7..7bb469c4f6d 100644
--- a/e2e/only-option/expected-output.diff
+++ b/e2e/only-option/expected-output.diff
@@ -4,7 +4,7 @@
 1) src/MultiRules.php:10
 
     ---------- begin diff ----------
-@@ @@
+@@ Line 10 @@
              echo 'a statement';
          }
      }
diff --git a/e2e/parallel-custom-config/expected-output.diff b/e2e/parallel-custom-config/expected-output.diff
index f89d642f6d8..b29db192fee 100644
--- a/e2e/parallel-custom-config/expected-output.diff
+++ b/e2e/parallel-custom-config/expected-output.diff
@@ -4,7 +4,7 @@
 1) src/SomeClass.php:7
 
     ---------- begin diff ----------
-@@ @@
+@@ Line 7 @@
  class SomeClass
  {
      public function __construct(
diff --git a/e2e/parallel-reflection-resolver/expected-output.diff b/e2e/parallel-reflection-resolver/expected-output.diff
index 2c688392f34..a9e4b1fbc8f 100644
--- a/e2e/parallel-reflection-resolver/expected-output.diff
+++ b/e2e/parallel-reflection-resolver/expected-output.diff
@@ -4,7 +4,7 @@
 1) src/NamespacedSomeClassFound.php:6
 
     ---------- begin diff ----------
-@@ @@
+@@ Line 6 @@
 
  final class NamespacedSomeClassFound
  {
@@ -19,7 +19,7 @@ Applied rules:
 2) src/SomeClassNotFound.php:4
 
     ---------- begin diff ----------
-@@ @@
+@@ Line 4 @@
 
  final class SomeClassNotFound
  {
diff --git a/e2e/print-new-node/expected-output.diff b/e2e/print-new-node/expected-output.diff
index bae2f52cd3a..7423bc78f19 100644
--- a/e2e/print-new-node/expected-output.diff
+++ b/e2e/print-new-node/expected-output.diff
@@ -4,7 +4,7 @@
 1) src/ExtendingTestClass.php:1
 
     ---------- begin diff ----------
-@@ @@
+@@ Line 1 @@
  <?php
 
  class ExtendingTestClass extends TestClass {
diff --git a/src/Console/Formatter/ColorConsoleDiffFormatter.php b/src/Console/Formatter/ColorConsoleDiffFormatter.php
index 42635b2e8ac..62788ea19dd 100644
--- a/src/Console/Formatter/ColorConsoleDiffFormatter.php
+++ b/src/Console/Formatter/ColorConsoleDiffFormatter.php
@@ -34,7 +34,7 @@
     /**
      * @see https://regex101.com/r/8MXnfa/2
      */
-    private const string AT_DIFF_LINE_REGEX = '#^\<fg=cyan\>@@ \-\d+,\d+ \+\d+,\d+ @@\<\/fg=cyan\>$#';
+    private const string AT_DIFF_LINE_REGEX = '#^\<fg=cyan\>@@ \-(\d+),\d+ \+\d+,\d+ @@\<\/fg=cyan\>$#';
 
     private string $template;
 
@@ -89,11 +89,11 @@ private function formatWithTemplate(string $diff, string $template): string
     }
 
     /**
-     * Remove number diff, eg; @@ -67,6 +67,8 @@ to become @@ @@
+     * Simplify diff line info, eg; @@ -67,6 +67,8 @@ to become @@ Line 67 @@
      */
     private function normalizeLineAtDiff(string $string): string
     {
-        return Strings::replace($string, self::AT_DIFF_LINE_REGEX, '<fg=cyan>@@ @@</fg=cyan>');
+        return Strings::replace($string, self::AT_DIFF_LINE_REGEX, '<fg=cyan>@@ Line $1 @@</fg=cyan>');
     }
 
     private function makePlusLinesGreen(string $string): string