Merge pull request #511 from codacy/normalize-backslashes

add a method to normalize paths from different environments, especially Windows environments because some reports might be created with backslashes
codacy · Aug 27, 2024 · 5d31406 · 5d31406
2 parents 48f0bec + b82dc62
commit 5d31406
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/main/scala/com/codacy/transformation/FileNameMatcher.scala b/src/main/scala/com/codacy/transformation/FileNameMatcher.scala
@@ -16,20 +16,23 @@ object FileNameMatcher {
     Try(Paths.get(filename).getFileName.toString.toLowerCase).getOrElse(filename.toLowerCase)
   }
 
+  private def normalizePath(path: String): String = {
+    path.replace("\\", "/")
+  }
+
   private def haveSameName(file: String, covFile: String): Boolean =
     getFilenameFromPath(file) == getFilenameFromPath(covFile)
 
   private def haveSamePath(file: String, covFile: String): Boolean =
-    file == covFile
+    normalizePath(file) == normalizePath(covFile)
 
   private def fileEndsWithReportPath(file: String, covFile: String): Boolean =
-    file.endsWith(covFile)
+    normalizePath(file).endsWith(normalizePath(covFile))
 
   private def reportEndsWithFilePath(file: String, covFile: String): Boolean =
-    covFile.endsWith(file)
+    normalizePath(covFile).endsWith(normalizePath(file))
 
   private def isTheSameFile(file: String, covFile: String): Boolean = {
-
     haveSameName(file, covFile) && (haveSamePath(file, covFile) ||
     fileEndsWithReportPath(file, covFile) ||
     reportEndsWithFilePath(file, covFile))