diff --git a/scalafmt-cli/shared/src/main/scala/org/scalafmt/cli/CliOptions.scala b/scalafmt-cli/shared/src/main/scala/org/scalafmt/cli/CliOptions.scala index d3e98b9f9..69419aedd 100644 --- a/scalafmt-cli/shared/src/main/scala/org/scalafmt/cli/CliOptions.scala +++ b/scalafmt-cli/shared/src/main/scala/org/scalafmt/cli/CliOptions.scala @@ -11,7 +11,6 @@ import java.io.InputStream import java.io.PrintStream import java.io.PrintWriter import java.nio.file.Files -import java.nio.file.NoSuchFileException import java.nio.file.Path import scala.io.Codec @@ -123,7 +122,7 @@ case class CliOptions( */ def configPath: Path = tempConfigPath.getOrElse( canonicalConfigFile - .fold(throw new NoSuchFileException("Config file not found"))(_.get), + .fold(throw new RuntimeException("Config file not found"))(_.get), ) private[cli] lazy val canonicalConfigFile: Option[Try[Path]] = gitOps diff --git a/scalafmt-cli/shared/src/test/scala/org/scalafmt/cli/CliOptionsTest.scala b/scalafmt-cli/shared/src/test/scala/org/scalafmt/cli/CliOptionsTest.scala index b909ef65b..504c29220 100644 --- a/scalafmt-cli/shared/src/test/scala/org/scalafmt/cli/CliOptionsTest.scala +++ b/scalafmt-cli/shared/src/test/scala/org/scalafmt/cli/CliOptionsTest.scala @@ -4,7 +4,6 @@ import org.scalafmt.Versions import org.scalafmt.config.ScalafmtConfig import org.scalafmt.sysops._ -import java.nio.file.NoSuchFileException import java.nio.file.Path import FileTestOps._ @@ -66,7 +65,7 @@ class CliOptionsTest extends FunSuite { test(".configPath returns path to workingDirectory's .scalafmt.conf by default, if exists") { assertEquals(baseCliOptions.config, None) assertEquals(baseCliOptions.configStr, None) - intercept[NoSuchFileException](baseCliOptions.configPath) + intercept[RuntimeException](baseCliOptions.configPath) } test(".scalafmtConfig returns the configuration encoded from configStr if configStr is exists") { @@ -98,7 +97,7 @@ class CliOptionsTest extends FunSuite { val opt = baseCliOptions.copy(config = Some(configPath)) assert(opt.scalafmtConfig.isInstanceOf[Configured.NotOk]) val confError = opt.scalafmtConfig.asInstanceOf[Configured.NotOk].error - assert(confError.cause.exists(_.isInstanceOf[NoSuchFileException])) + assert(confError.cause.exists(_.isInstanceOf[RuntimeException])) } test(".scalafmtConfig returns Configured.NotOk for invalid configuration") { diff --git a/scalafmt-sysops/shared/src/main/scala/org/scalafmt/sysops/FileOps.scala b/scalafmt-sysops/shared/src/main/scala/org/scalafmt/sysops/FileOps.scala index c6374992d..10b08d6de 100644 --- a/scalafmt-sysops/shared/src/main/scala/org/scalafmt/sysops/FileOps.scala +++ b/scalafmt-sysops/shared/src/main/scala/org/scalafmt/sysops/FileOps.scala @@ -1,7 +1,5 @@ package org.scalafmt.sysops -import java.nio.file.AccessDeniedException -import java.nio.file.NoSuchFileException import java.nio.file.Path import java.nio.file.Paths @@ -42,7 +40,7 @@ object FileOps { ): Option[Try[Path]] = config.fold(tryGetConfigInDir(workingDirectory)) { x => val file = workingDirectory.join(x) tryCheckConfigFile(file) - .orElse(Some(Failure(new NoSuchFileException(s"Config missing: $file")))) + .orElse(Some(Failure(new RuntimeException(s"Config missing: $file")))) } def tryGetConfigInDir(dir: AbsoluteFile): Option[Try[Path]] = @@ -51,6 +49,6 @@ object FileOps { private def tryCheckConfigFile(file: AbsoluteFile): Option[Try[Path]] = if (!file.exists) None else if (file.isRegularFile) Some(Success(file.path)) - else Some(Failure(new AccessDeniedException(s"Config not a file: $file"))) + else Some(Failure(new RuntimeException(s"Config not a file: $file"))) }