From bb173d52a6bac3ee1ab13bdf08e5a91f3db3f59a Mon Sep 17 00:00:00 2001 From: Albert Meltzer <7529386+kitbellew@users.noreply.github.com> Date: Sun, 2 Feb 2025 07:45:19 -0800 Subject: [PATCH] PlatformCompat: inline `fixPathOnNativeWindows` --- .../shared/src/test/scala/org/scalafmt/cli/CliTest.scala | 6 ++---- .../src/main/scala/org/scalafmt/sysops/PlatformCompat.scala | 1 - .../src/main/scala/org/scalafmt/sysops/PlatformCompat.scala | 2 -- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/scalafmt-cli/shared/src/test/scala/org/scalafmt/cli/CliTest.scala b/scalafmt-cli/shared/src/test/scala/org/scalafmt/cli/CliTest.scala index 262791ed00..d7466823b3 100644 --- a/scalafmt-cli/shared/src/test/scala/org/scalafmt/cli/CliTest.scala +++ b/scalafmt-cli/shared/src/test/scala/org/scalafmt/cli/CliTest.scala @@ -726,10 +726,8 @@ trait CliTestBehavior { ExitCode.TestError, assertOut = out => { assertContains(out, "bar.scala") - assertContains( - out, - PlatformCompat.fixPathOnNativeWindows("dir/foo.scala"), - ) + val bslash = PlatformCompat.isNativeOnWindows + assertContains(out, if (bslash) "dir\\foo.scala" else "dir/foo.scala") assertNotContains(out, "baz.scala") }, ) diff --git a/scalafmt-sysops/jvm/src/main/scala/org/scalafmt/sysops/PlatformCompat.scala b/scalafmt-sysops/jvm/src/main/scala/org/scalafmt/sysops/PlatformCompat.scala index 3e78ce67e5..c20a930e4a 100644 --- a/scalafmt-sysops/jvm/src/main/scala/org/scalafmt/sysops/PlatformCompat.scala +++ b/scalafmt-sysops/jvm/src/main/scala/org/scalafmt/sysops/PlatformCompat.scala @@ -5,7 +5,6 @@ import scala.concurrent.ExecutionContext private[scalafmt] object PlatformCompat { def isScalaNative = false def prepareCommand(cmd: Seq[String]) = cmd - def fixPathOnNativeWindows(path: String) = path def isNativeOnWindows = false def relativize(base: AbsoluteFile, path: AbsoluteFile) = base.toUri .relativize(path.toUri) diff --git a/scalafmt-sysops/native/src/main/scala/org/scalafmt/sysops/PlatformCompat.scala b/scalafmt-sysops/native/src/main/scala/org/scalafmt/sysops/PlatformCompat.scala index 81c56d9ba1..c4c02ad39e 100644 --- a/scalafmt-sysops/native/src/main/scala/org/scalafmt/sysops/PlatformCompat.scala +++ b/scalafmt-sysops/native/src/main/scala/org/scalafmt/sysops/PlatformCompat.scala @@ -7,8 +7,6 @@ private[scalafmt] object PlatformCompat { def isScalaNative = true def prepareCommand(cmd: Seq[String]) = if (Platform.isWindows()) cmd.map(arg => s""""$arg"""") else cmd - def fixPathOnNativeWindows(path: String) = - if (Platform.isWindows()) path.replace('/', '\\') else path def isNativeOnWindows = Platform.isWindows() def relativize(base: AbsoluteFile, file: AbsoluteFile) = if (Platform.isWindows()) base.path.relativize(file.path)