diktatFix + fixed relativePath when different roots

saveourtool · Dec 12, 2023 · f1c89ba · f1c89ba
1 parent f3e4dde
commit f1c89ba
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/diktat-cli/src/main/kotlin/com/saveourtool/diktat/util/CliUtils.kt b/diktat-cli/src/main/kotlin/com/saveourtool/diktat/util/CliUtils.kt
@@ -75,6 +75,12 @@ private fun Path.walkByGlob(glob: String): Sequence<Path> = if (glob.startsWith(
         }
 }
 
+private fun String.findRoot(): Path = substring(0, indexOf('*'))
+    .let { withoutAsterisks ->
+        withoutAsterisks.substring(0, withoutAsterisks.lastIndexOfAny(charArrayOf('\\', '/')))
+    }
+    .let { Path(it) }
+
 /**
  * @param candidate
  * @param currentDirectory
@@ -92,9 +98,3 @@ private fun getAbsoluteGlobAndRoot(glob: String, currentFolder: Path): Pair<Stri
     roots.any { glob.startsWith(it, true) } -> glob to glob.findRoot()
     else -> "${currentFolder.absolutePathString()}${File.separatorChar}$glob" to currentFolder
 }
-
-private fun String.findRoot(): Path = substring(0, indexOf('*'))
-    .let { withoutAsterisks ->
-        withoutAsterisks.substring(0, withoutAsterisks.lastIndexOfAny(charArrayOf('\\', '/')))
-    }
-    .let { Path(it) }
diff --git a/diktat-ktlint-engine/src/main/kotlin/com/saveourtool/diktat/ktlint/KtLintUtils.kt b/diktat-ktlint-engine/src/main/kotlin/com/saveourtool/diktat/ktlint/KtLintUtils.kt
@@ -22,7 +22,7 @@ import java.io.PrintStream
 import java.nio.file.Path
 
 import kotlin.io.path.invariantSeparatorsPathString
-import kotlin.io.path.relativeTo
+import kotlin.io.path.relativeToOrSelf
 
 private const val CANNOT_BE_AUTOCORRECTED_SUFFIX = " (cannot be auto-corrected)"
 
@@ -92,7 +92,7 @@ fun String.correctErrorDetail(canBeAutoCorrected: Boolean): String = if (canBeAu
  * @param sourceRootDir
  * @return relative path to [sourceRootDir] as [String]
  */
-fun Path.relativePathStringTo(sourceRootDir: Path?): String = (sourceRootDir?.let { relativeTo(it) } ?: this).invariantSeparatorsPathString
+fun Path.relativePathStringTo(sourceRootDir: Path?): String = (sourceRootDir?.let { relativeToOrSelf(it) } ?: this).invariantSeparatorsPathString
 
 /**
  * @param out [OutputStream] for [ReporterV2]