Skip to content

Commit 013d836

Browse files
authored
Merge pull request #8 from rcsofttech85/filediff
display file name in the diff output
2 parents f33a183 + 3bc869d commit 013d836

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

bin/file-diff

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ function fileDiff($oldFilePath, $newFilePath)
6060
$newLineNumber = $i + 1;
6161

6262

63-
$changes[] = ($oldLine === null ? "$colorGreen+ New (Line $newLineNumber): " : "$colorRed- Old (Line $oldLineNumber): ") . ($oldLine ?? $newLine) . "$colorReset";
63+
$changes[] = ($oldLine === null ? "$colorGreen+ $newFilePath (Line $newLineNumber): " : "$colorRed- $oldFilePath (Line $oldLineNumber): ") . ($oldLine ?? $newLine) . "$colorReset";
6464

6565
if ($oldLine !== null && $newLine !== null) {
66-
$changes[] = "$colorGreen+ New (Line $newLineNumber): " . $newLine . "$colorReset";
66+
$changes[] = "$colorGreen+ $newFilePath (Line $newLineNumber): " . $newLine . "$colorReset";
6767
}
6868
}
6969

tests/Integration/FileDiffCommandTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ public static function commandArgumentProvider(): iterable
2525
file_put_contents("new", "this line has same old code" . PHP_EOL, FILE_APPEND);
2626

2727

28-
yield ['old', 'new', 'Old (Line 1):'];
29-
yield ['old', 'new', 'Old (Line 2):'];
28+
yield ['old', 'new', 'old (Line 1):'];
29+
yield ['old', 'new', 'old (Line 2):'];
3030
}
3131

3232
public static function matchingDataProvider(): iterable
@@ -35,7 +35,7 @@ public static function matchingDataProvider(): iterable
3535
file_put_contents("new", "this has matching content" . PHP_EOL, FILE_APPEND);
3636

3737

38-
yield ['old', 'new', 'Old (Line 3):'];
38+
yield ['old', 'new', 'old (Line 3):'];
3939
}
4040

4141
#[Test]

0 commit comments

Comments
 (0)