diff --git a/ktlint-baseline.xml b/ktlint-baseline.xml index fdabf218f7..4327ef2957 100644 --- a/ktlint-baseline.xml +++ b/ktlint-baseline.xml @@ -1,10 +1,10 @@ - + - + diff --git a/ktlint-reporter-baseline/src/main/kotlin/com/pinterest/ktlint/reporter/baseline/BaselineReporter.kt b/ktlint-reporter-baseline/src/main/kotlin/com/pinterest/ktlint/reporter/baseline/BaselineReporter.kt index caf9b90852..a99a191aed 100644 --- a/ktlint-reporter-baseline/src/main/kotlin/com/pinterest/ktlint/reporter/baseline/BaselineReporter.kt +++ b/ktlint-reporter-baseline/src/main/kotlin/com/pinterest/ktlint/reporter/baseline/BaselineReporter.kt @@ -23,15 +23,11 @@ class BaselineReporter(val out: PrintStream) : Reporter { out.println("""""") for ((file, errList) in acc.entries.sortedBy { it.key }) { val fileName = try { - Paths.get("").toAbsolutePath().relativize(File(file).toPath()).toString().replace('\\', '/') + val rootPath = Paths.get("").toAbsolutePath() + val filePath = Paths.get(file) + rootPath.relativize(filePath).toString().replace(File.separatorChar, '/') } catch (e: IllegalArgumentException) { file - }.let { name -> - if (name[0] != '/') { - "/$name" - } else { - name - } } out.println(""" """) for ((line, col, ruleId, _) in errList) { diff --git a/ktlint-reporter-baseline/src/test/kotlin/com/pinterest/ktlint/reporter/baseline/BaselineReporterTest.kt b/ktlint-reporter-baseline/src/test/kotlin/com/pinterest/ktlint/reporter/baseline/BaselineReporterTest.kt index 0e82f9f31e..edcece007c 100644 --- a/ktlint-reporter-baseline/src/test/kotlin/com/pinterest/ktlint/reporter/baseline/BaselineReporterTest.kt +++ b/ktlint-reporter-baseline/src/test/kotlin/com/pinterest/ktlint/reporter/baseline/BaselineReporterTest.kt @@ -61,10 +61,10 @@ class BaselineReporterTest { """ - + - + diff --git a/ktlint/src/main/kotlin/com/pinterest/ktlint/internal/BaselineUtils.kt b/ktlint/src/main/kotlin/com/pinterest/ktlint/internal/BaselineUtils.kt index 338056da34..ad9908b7de 100644 --- a/ktlint/src/main/kotlin/com/pinterest/ktlint/internal/BaselineUtils.kt +++ b/ktlint/src/main/kotlin/com/pinterest/ktlint/internal/BaselineUtils.kt @@ -113,10 +113,8 @@ internal fun List.containsLintError(error: LintError): Boolean { * Also adjusts the slashes for uniformity between file systems */ internal val File.relativeRoute: String - get() = Paths.get("").toAbsolutePath().relativize(this.toPath()).toString().replace('\\', '/').let { name -> - if (name[0] != '/') { - "/$name" - } else { - name - } + get() { + val rootPath = Paths.get("").toAbsolutePath() + val filePath = this.toPath() + return rootPath.relativize(filePath).toString().replace(File.separatorChar, '/') } diff --git a/ktlint/src/test/resources/test-baseline.xml b/ktlint/src/test/resources/test-baseline.xml index 697e92ea2f..e4eff23900 100644 --- a/ktlint/src/test/resources/test-baseline.xml +++ b/ktlint/src/test/resources/test-baseline.xml @@ -1,10 +1,10 @@ - + - +