When searching for file by path, also search for the filepath before the file was renamed. (#1210)

Author: frankdekker

src/Service/CodeReview/DiffFinder.php

@@ -32,6 +32,7 @@ public function findFileByPath(array $files, ?string $filePath): ?DiffFile
 
         // filepath matched, but not the hash
         $partiallyMatchedFile = null;
+        $renameMatchedFile    = null;
 
         foreach ($files as $file) {
             if ($file->getPathname() === $filePath) {
@@ -41,9 +42,12 @@ public function findFileByPath(array $files, ?string $filePath): ?DiffFile
                     return $file;
                 }
             }
+            if ($file->isRename() && $file->filePathBefore === $filePath) {
+                $renameMatchedFile = $file;
+            }
         }
 
-        return $partiallyMatchedFile;
+        return $partiallyMatchedFile ?? $renameMatchedFile;
     }
 
     /**

tests/Unit/Service/CodeReview/DiffFinderTest.php

@@ -42,7 +42,7 @@ public function testFindFileByPath(): void
 
         static::assertNull($this->finder->findFileByPath($files, null));
         static::assertSame($fileA, $this->finder->findFileByPath($files, '/path/to/file/deleted.txt'));
-        static::assertNull($this->finder->findFileByPath($files, '/path/to/file/changed.txt'));
+        static::assertSame($fileB, $this->finder->findFileByPath($files, '/path/to/file/changed.txt'));
         static::assertSame($fileB, $this->finder->findFileByPath($files, '/path/to/file/changed.doc'));
         static::assertSame($fileC, $this->finder->findFileByPath($files, '/path/to/file/created.txt'));