[WIP] Port to Scala.js (#898)

* Move core tests to tests module * Remove unused sbt-pack * Move cli/test to tests/test * Tiny cleanup in build.sbt * Move src to shared/src * Abstract over config backend. - Use metaconfig-hocon on JS - Use metaconfig-typesafe-config on JVM The first unit test passes on JS! * Format :v * Fix ci-slow command * Add a few more JS unit tests. Let's wait for scalameta/scalameta#812 to get fixed so we can run the full test suite in Scala.js * Skip CI_PUBLISH for ci-sbt-scalafmt * Move all the files! This commit reorganizes the top-level directories to follow a consistent naming convention: scalafmt-MODULE. I'm doing this in this PR because the files have already moved into `shared/` directories so URLs to previous files will get lost anyways. I like the consistent naming scheme because it feels easier to get an overview of the project. * Move scalafmt-readme back to readme/ * Update .scalafmt.conf * Fix ci-sbt-scalafmt command
scalameta · Apr 23, 2017 · d5c3b0a · d5c3b0a
1 parent c64dc59
commit d5c3b0a
Show file tree

Hide file tree

Showing 296 changed files with 171 additions and 79 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -65,7 +65,6 @@ matrix:
       CI_PUBLISH: true
     - CI_TEST: ci-sbt-scalafmt
       CI_SCALA_VERSION: 2.12.2
-      CI_PUBLISH: true
     - CI_TEST: ci-slow
       CI_SCALA_VERSION: 2.11.11
     - CI_TEST: ci-slow

diff --git a/.drone.yml.sig b/.drone.yml.sig
@@ -1 +1 @@
-eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgIyBGZXRjaCBmb2xkZXJzIGZyb20gZGlzdHJpYnV0ZWQgY2FjaGUKICBzZnRwX2NhY2hlX3Jlc3RvcmU6CiAgICBpbWFnZTogcGx1Z2lucy9zZnRwLWNhY2hlCiAgICByZXN0b3JlOiB0cnVlCiAgICBtb3VudDoKICAgICAgLSAvZHJvbmUvLml2eTIvY2FjaGUKICAgICAgLSAvZHJvbmUvLmNvdXJzaWVyLWNhY2hlCiAgICAgIC0gL2Ryb25lLy5zYnQKICAgICAgLSAvZHJvbmUvLmdpdAogICAgd2hlbjoKICAgICAgZXZlbnQ6IFtwdXNoLCBwdWxsX3JlcXVlc3QsIHRhZywgZGVwbG95bWVudF0KCiAgdGVzdHM6CiAgICBpbWFnZTogc2NhbGFwbGF0Zm9ybS9zY2FsYTowLjYKICAgIHZvbHVtZXM6CiAgICAgIC0gL3BsYXRmb3JtOi9rZXlzCiAgICBjb21tYW5kczoKICAgICAgLSBnaXQgZmV0Y2ggLS10YWdzICYmIGdpdCBsb2cgfCBoZWFkIC1uIDIwCiAgICAgIC0gLi9iaW4vY2xlYW51cF9jYWNoZS5zaAogICAgICAtIC4vc2NhbGFmbXQgLS10ZXN0CiAgICAgIC0gc2J0ICRDSV9URVNUCgogIHB1Ymxpc2g6CiAgICBpbWFnZTogb2xhZnVycGcvc2NhbGFmaXg6MC4zLjAKICAgIHB1bGw6IHRydWUKICAgIHZvbHVtZXM6CiAgICAgIC0gL3BsYXRmb3JtOi9rZXlzCiAgICBjb21tYW5kczoKICAgICAgLSAuL2Jpbi9iaW50cmF5LnNoCiAgICB3aGVuOgogICAgICBldmVudDogW3B1c2gsIHRhZ10KICAgICAgYnJhbmNoOiBbbWFzdGVyXQoKICBub3RpZnk6CiAgICBpbWFnZTogZHJpbGxzdGVyL2Ryb25lLWVtYWlsCiAgICBob3N0OiBzbXRwLm1haWxndW4ub3JnCiAgICB1c2VybmFtZTogbm9yZXBseUBkcm9uZS5nZWlyc3Nvbi5jb20KICAgIHBhc3N3b3JkOiAke01BSUxHVU5fUEFTU1dPUkR9CiAgICBmcm9tOiBub3JlcGx5QGRyb25lLmdlaXJzc29uLmNvbQogICAgcmVjaXBpZW50czoKICAgICAgLSBvbGFmdXJwZ0BnbWFpbC5jb20KICAgIHdoZW46CiAgICAgIGV2ZW50OiBwdXNoCiAgICAgIGJyYW5jaDogW21hc3Rlcl0KICAgICAgc3RhdHVzOiBbY2hhbmdlZCwgZmFpbHVyZV0KCiAgIyBTYXZlIGZvbGRlcnMgaW4gZGlzdHJpYnV0ZWQgY2FjaGUKICBzZnRwX2NhY2hlX3JlYnVpbGQ6CiAgICBpbWFnZTogcGx1Z2lucy9zZnRwLWNhY2hlCiAgICByZWJ1aWxkOiB0cnVlCiAgICBtb3VudDoKICAgICAgLSAvZHJvbmUvLml2eTIvY2FjaGUKICAgICAgLSAvZHJvbmUvLmNvdXJzaWVyLWNhY2hlCiAgICAgIC0gL2Ryb25lLy5zYnQKICAgICAgLSAvZHJvbmUvLmdpdAoKbWF0cml4OgogIGluY2x1ZGU6CiAgICAtIENJX1RFU1Q6IGNpLWZhc3QKICAgICAgQ0lfU0NBTEFfVkVSU0lPTjogMi4xMS4xMQogICAgICBDSV9QVUJMSVNIOiB0cnVlCiAgICAtIENJX1RFU1Q6IGNpLWZhc3QKICAgICAgQ0lfU0NBTEFfVkVSU0lPTjogMi4xMi4yCiAgICAgIENJX1BVQkxJU0g6IHRydWUKICAgIC0gQ0lfVEVTVDogY2ktc2J0LXNjYWxhZm10CiAgICAgIENJX1NDQUxBX1ZFUlNJT046IDIuMTIuMgogICAgICBDSV9QVUJMSVNIOiB0cnVlCiAgICAtIENJX1RFU1Q6IGNpLXNsb3cKICAgICAgQ0lfU0NBTEFfVkVSU0lPTjogMi4xMS4xMQogICAgLSBDSV9URVNUOiBjaS1zbG93CiAgICAgIENJX1NDQUxBX1ZFUlNJT046IDIuMTIuMgoK.1Yg5sJhxKLyFDbTx16Ebo44OvkKTvgkpKeJTAejnXpw
+eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgIyBGZXRjaCBmb2xkZXJzIGZyb20gZGlzdHJpYnV0ZWQgY2FjaGUKICBzZnRwX2NhY2hlX3Jlc3RvcmU6CiAgICBpbWFnZTogcGx1Z2lucy9zZnRwLWNhY2hlCiAgICByZXN0b3JlOiB0cnVlCiAgICBtb3VudDoKICAgICAgLSAvZHJvbmUvLml2eTIvY2FjaGUKICAgICAgLSAvZHJvbmUvLmNvdXJzaWVyLWNhY2hlCiAgICAgIC0gL2Ryb25lLy5zYnQKICAgICAgLSAvZHJvbmUvLmdpdAogICAgd2hlbjoKICAgICAgZXZlbnQ6IFtwdXNoLCBwdWxsX3JlcXVlc3QsIHRhZywgZGVwbG95bWVudF0KCiAgdGVzdHM6CiAgICBpbWFnZTogc2NhbGFwbGF0Zm9ybS9zY2FsYTowLjYKICAgIHZvbHVtZXM6CiAgICAgIC0gL3BsYXRmb3JtOi9rZXlzCiAgICBjb21tYW5kczoKICAgICAgLSBnaXQgZmV0Y2ggLS10YWdzICYmIGdpdCBsb2cgfCBoZWFkIC1uIDIwCiAgICAgIC0gLi9iaW4vY2xlYW51cF9jYWNoZS5zaAogICAgICAtIC4vc2NhbGFmbXQgLS10ZXN0CiAgICAgIC0gc2J0ICRDSV9URVNUCgogIHB1Ymxpc2g6CiAgICBpbWFnZTogb2xhZnVycGcvc2NhbGFmaXg6MC4zLjAKICAgIHB1bGw6IHRydWUKICAgIHZvbHVtZXM6CiAgICAgIC0gL3BsYXRmb3JtOi9rZXlzCiAgICBjb21tYW5kczoKICAgICAgLSAuL2Jpbi9iaW50cmF5LnNoCiAgICB3aGVuOgogICAgICBldmVudDogW3B1c2gsIHRhZ10KICAgICAgYnJhbmNoOiBbbWFzdGVyXQoKICBub3RpZnk6CiAgICBpbWFnZTogZHJpbGxzdGVyL2Ryb25lLWVtYWlsCiAgICBob3N0OiBzbXRwLm1haWxndW4ub3JnCiAgICB1c2VybmFtZTogbm9yZXBseUBkcm9uZS5nZWlyc3Nvbi5jb20KICAgIHBhc3N3b3JkOiAke01BSUxHVU5fUEFTU1dPUkR9CiAgICBmcm9tOiBub3JlcGx5QGRyb25lLmdlaXJzc29uLmNvbQogICAgcmVjaXBpZW50czoKICAgICAgLSBvbGFmdXJwZ0BnbWFpbC5jb20KICAgIHdoZW46CiAgICAgIGV2ZW50OiBwdXNoCiAgICAgIGJyYW5jaDogW21hc3Rlcl0KICAgICAgc3RhdHVzOiBbY2hhbmdlZCwgZmFpbHVyZV0KCiAgIyBTYXZlIGZvbGRlcnMgaW4gZGlzdHJpYnV0ZWQgY2FjaGUKICBzZnRwX2NhY2hlX3JlYnVpbGQ6CiAgICBpbWFnZTogcGx1Z2lucy9zZnRwLWNhY2hlCiAgICByZWJ1aWxkOiB0cnVlCiAgICBtb3VudDoKICAgICAgLSAvZHJvbmUvLml2eTIvY2FjaGUKICAgICAgLSAvZHJvbmUvLmNvdXJzaWVyLWNhY2hlCiAgICAgIC0gL2Ryb25lLy5zYnQKICAgICAgLSAvZHJvbmUvLmdpdAoKbWF0cml4OgogIGluY2x1ZGU6CiAgICAtIENJX1RFU1Q6IGNpLWZhc3QKICAgICAgQ0lfU0NBTEFfVkVSU0lPTjogMi4xMS4xMQogICAgICBDSV9QVUJMSVNIOiB0cnVlCiAgICAtIENJX1RFU1Q6IGNpLWZhc3QKICAgICAgQ0lfU0NBTEFfVkVSU0lPTjogMi4xMi4yCiAgICAgIENJX1BVQkxJU0g6IHRydWUKICAgIC0gQ0lfVEVTVDogY2ktc2J0LXNjYWxhZm10CiAgICAgIENJX1NDQUxBX1ZFUlNJT046IDIuMTIuMgogICAgLSBDSV9URVNUOiBjaS1zbG93CiAgICAgIENJX1NDQUxBX1ZFUlNJT046IDIuMTEuMTEKICAgIC0gQ0lfVEVTVDogY2ktc2xvdwogICAgICBDSV9TQ0FMQV9WRVJTSU9OOiAyLjEyLjIKCg.PHp9BifCwMfM-7icmXekHjCFQ2ruZY4qBrn_GziMZIY
diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,8 @@ project/plugins/project/
 .scala_dependencies
 .worksheet
 .idea
+.idea.bak/
 intellij/out
 
+
 *~
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,9 +1,8 @@
 project.git = true
 project.excludeFilters = [
-  benchmarks/src/resources,
+  scalafmt-benchmarks/src/resources,
   sbt-test
   bin/issue
-  metaconfig/src/main/scala
 ]
 # These are disabled by default because vertical
 # alignment still has some false positives/negatives.

diff --git a/build.sbt b/build.sbt
@@ -1,6 +1,5 @@
 import Dependencies._
-
-addCommandAlias("downloadIdea", "intellij/updateIdea")
+import org.scalajs.sbtplugin.cross.CrossProject
 
 lazy val buildSettings = Seq(
   organization := "com.geirsson",
@@ -9,78 +8,66 @@ lazy val buildSettings = Seq(
   crossScalaVersions := Seq(scala211, scala212),
   scalaCompilerBridgeSource :=
     ("org.scala-sbt" % "compiler-interface" % "0.13.15" % "component").sources,
-  updateOptions := updateOptions.value.withCachedResolution(true)
+  updateOptions := updateOptions.value.withCachedResolution(true),
+  resolvers += Resolver.sonatypeRepo("releases"),
+  libraryDependencies += scalatest.value % Test,
+  triggeredMessage in ThisBuild := Watched.clearWhenTriggered,
+  scalacOptions in (Compile, console) := compilerOptions :+ "-Yrepl-class-based",
+  assemblyJarName in assembly := "scalafmt.jar",
+  testOptions in Test += Tests.Argument("-oD")
 )
+lazy val allSettings = buildSettings ++ publishSettings
 
 name := "scalafmtRoot"
 allSettings
 noPublish
-commands += CiCommand("ci-fast")(
-  "test" ::
-    Nil
-)
-commands += CiCommand("ci-slow")(
-  "core/test:runMain org.scalafmt.ScalafmtProps" ::
-    Nil
-)
-commands += CiCommand("ci-sbt-scalafmt")(
-  "scalafmtSbt/it:test" ::
-    Nil
-)
-commands += CiCommand("ci-publish")(
-  if (sys.env.contains("CI_PUBLISH")) s"publish" :: Nil
-  else Nil
-)
+commands ++= ciCommands
+addCommandAlias("downloadIdea", "intellij/updateIdea")
 
-lazy val core = project
+lazy val core = crossProject
+  .in(file("scalafmt-core"))
   .settings(
+    moduleName := "scalafmt-core",
     allSettings,
     metaMacroSettings,
     buildInfoSettings,
     fork.in(run).in(Test) := true,
-    moduleName := "scalafmt-core",
     libraryDependencies ++= Seq(
-      metaconfig,
-      scalameta,
-      "com.typesafe" % "config" % "1.2.1",
-      // Test dependencies
-      "com.googlecode.java-diff-utils" % "diffutils" % "1.3.0" % Test,
-      "com.lihaoyi"                    %% "scalatags" % "0.6.3" % Test,
-      scalametaTestkit                 % Test,
-      scalatest                        % Test
+      metaconfig.value,
+      scalameta.value
     ),
     addCompilerPlugin(paradise)
   )
+  .jsSettings(
+    libraryDependencies += metaconfigHocon.value
+  )
+  .jvmSettings(
+    libraryDependencies += metaconfigTypesafe.value
+  )
   .enablePlugins(BuildInfoPlugin)
-
-lazy val cliJvmOptions = Seq(
-  "-Xss4m"
-)
+lazy val coreJVM = core.jvm
+lazy val coreJS = core.js
 
 lazy val cli = project
+  .in(file("scalafmt-cli"))
   .settings(
+    moduleName := "scalafmt-cli",
     allSettings,
     metaMacroSettings,
-    packSettings,
-    packMain := Map("scalafmt_pack" -> "org.scalafmt.cli.Cli"),
-    packJvmOpts := Map(
-      "scalafmt_pack" -> cliJvmOptions
-    ),
-    moduleName := "scalafmt-cli",
     mainClass in assembly := Some("org.scalafmt.cli.Cli"),
     libraryDependencies ++= Seq(
       "com.martiansoftware" % "nailgun-server" % "0.9.1",
       "com.github.scopt"    %% "scopt"         % "3.5.0"
     )
   )
-  .dependsOn(core % "compile->compile;test->test")
+  .dependsOn(coreJVM)
 
 def isOnly(scalaV: String) = Seq(
   scalaVersion := scalaV,
   crossScalaVersions := Seq(scalaV)
 )
 
-lazy val scalafmtSbt = project
+lazy val `scalafmt-sbt` = project
   .configs(IntegrationTest)
   .settings(
     allSettings,
@@ -91,18 +78,16 @@ lazy val scalafmtSbt = project
     sbtVersion in Global := "1.0.0-M5",
     test.in(IntegrationTest) := RunSbtCommand(
       Seq(
-        s"wow $scala212",
-        "publishLocal",
+        s"plz $scala212 publishLocal",
         """set sbtVersion in Global := "0.13.15" """,
-        "such scalafmtSbtTest/scripted",
-        """set sbtVersion in Global := "1.0.0-M5" """,
-        s"wow $scala211"
+        "such scalafmt-sbt-tests/scripted",
+        """set sbtVersion in Global := "1.0.0-M5" """
       ).mkString("; ", "; ", "")
     )(state.value)
   )
   .dependsOn(cli)
 
-lazy val scalafmtSbtTest = project
+lazy val `scalafmt-sbt-tests` = project
   .settings(
     allSettings,
     noPublish,
@@ -125,7 +110,9 @@ lazy val scalafmtSbtTest = project
     },
     scriptedBufferLog := false
   )
+
 lazy val intellij = project
+  .in(file("scalafmt-intellij"))
   .settings(
     allSettings,
     buildInfoSettings,
@@ -138,18 +125,35 @@ lazy val intellij = project
     libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % "1.0.6",
     cleanFiles += ideaDownloadDirectory.value
   )
-  .dependsOn(core, cli)
+  .dependsOn(coreJVM, cli)
   .enablePlugins(SbtIdeaPlugin)
 
+lazy val tests = project
+  .in(file("scalafmt-tests"))
+  .settings(
+    allSettings,
+    noPublish,
+    libraryDependencies ++= Seq(
+      // Test dependencies
+      "com.googlecode.java-diff-utils" % "diffutils"  % "1.3.0",
+      "com.lihaoyi"                    %% "scalatags" % "0.6.3",
+      scalametaTestkit
+    )
+  )
+  .dependsOn(
+    cli
+  )
+
 lazy val benchmarks = project
+  .in(file("scalafmt-benchmarks"))
   .settings(
     allSettings,
     noPublish,
     isOnly(scala212),
     moduleName := "scalafmt-benchmarks",
     libraryDependencies ++= Seq(
       scalametaTestkit,
-      scalatest % Test
+      scalatest.value % Test
     ),
     javaOptions in run ++= Seq(
       "-Djava.net.preferIPv4Stack=true",
@@ -170,7 +174,7 @@ lazy val benchmarks = project
       "-server"
     )
   )
-  .dependsOn(core)
+  .dependsOn(coreJVM)
   .enablePlugins(JmhPlugin)
 
 lazy val readme = scalatex
@@ -189,7 +193,7 @@ lazy val readme = scalatex
     )
   )
   .dependsOn(
-    core,
+    coreJVM,
     cli
   )
 
@@ -214,7 +218,7 @@ lazy val noDocs = Seq(
 )
 
 lazy val metaMacroSettings: Seq[Def.Setting[_]] = Seq(
-  libraryDependencies += scalameta,
+  libraryDependencies += scalameta.value,
   addCompilerPlugin(paradise),
   scalacOptions += "-Xplugin-require:macroparadise"
 ) ++ noDocs
@@ -235,13 +239,6 @@ lazy val compilerOptions = Seq(
   "-Xlint"
 )
 
-lazy val commonSettings = Seq(
-  triggeredMessage in ThisBuild := Watched.clearWhenTriggered,
-  scalacOptions in (Compile, console) := compilerOptions :+ "-Yrepl-class-based",
-  assemblyJarName in assembly := "scalafmt.jar",
-  testOptions in Test += Tests.Argument("-oD")
-)
-
 lazy val publishSettings = Seq(
   publishMavenStyle := true,
   publishArtifact := true,
@@ -309,4 +306,21 @@ def extraSbtBootOptions: Seq[String] = {
   sys.props.get(bootProps).map(x => s"-D$bootProps=$x").toList
 }
 
-lazy val allSettings = commonSettings ++ buildSettings ++ publishSettings
+def ciCommands = Seq(
+  CiCommand("ci-fast")(
+    "test" ::
+      Nil
+  ),
+  CiCommand("ci-slow")(
+    "tests/test:runMain org.scalafmt.ScalafmtProps" ::
+      Nil
+  ),
+  Command.command("ci-sbt-scalafmt") { s =>
+    "scalafmt-sbt/it:test" ::
+      s
+  },
+  CiCommand("ci-publish")(
+    if (sys.env.contains("CI_PUBLISH")) s"publish" :: Nil
+    else Nil
+  )
+)
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -1,18 +1,22 @@
 import sbt._
 import sbt.Keys._
+import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
 // scalafmt: { maxColumn = 120, style = defaultWithAlign }
 
 object Dependencies {
-  val metaconfigV = "0.3.0"
+  val metaconfigV = "0.3.2"
   val scalametaV  = "1.7.0"
   val paradiseV   = "3.0.0-M8"
   val scalatestV  = "3.0.1"
   val coursier    = "1.0.0-M15-5"
 
-  val paradise         = "org.scalameta"   % "paradise"                    % paradiseV cross CrossVersion.full
-  val scalameta        = "org.scalameta"   %% "scalameta"                  % scalametaV
-  val scalametaTestkit = "org.scalameta"   %% "testkit"                    % scalametaV
-  val scalatest        = "org.scalatest"   %% "scalatest"                  % scalatestV
-  val metaconfig       = "com.geirsson"    %% "metaconfig-typesafe-config" % metaconfigV
-  val scalariform      = "org.scalariform" %% "scalariform"                % "0.1.8"
+  val paradise         = "org.scalameta"   % "paradise"     % paradiseV cross CrossVersion.full
+  val scalametaTestkit = "org.scalameta"   %% "testkit"     % scalametaV
+  val scalariform      = "org.scalariform" %% "scalariform" % "0.1.8"
+
+  val scalatest          = Def.setting("org.scalatest" %%% "scalatest"                  % scalatestV)
+  val scalameta          = Def.setting("org.scalameta" %%% "scalameta"                  % scalametaV)
+  val metaconfig         = Def.setting("com.geirsson"  %%% "metaconfig-core"            % metaconfigV)
+  val metaconfigTypesafe = Def.setting("com.geirsson"  %%% "metaconfig-typesafe-config" % metaconfigV)
+  val metaconfigHocon    = Def.setting("com.geirsson"  %%% "metaconfig-hocon"           % metaconfigV)
 }
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -10,9 +10,9 @@ addSbtPlugin("io.get-coursier"    % "sbt-coursier"        % "1.0.0-M15-5")
 addSbtPlugin("com.eed3si9n"       % "sbt-doge"            % "0.1.5")
 addSbtPlugin("com.eed3si9n"       % "sbt-assembly"        % "0.14.3")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh"             % "0.2.15")
+addSbtPlugin("org.scala-js"       % "sbt-scalajs"         % "0.6.15")
 addSbtPlugin("com.lihaoyi"        % "scalatex-sbt-plugin" % "0.3.7")
 addSbtPlugin("org.xerial.sbt"     % "sbt-sonatype"        % "1.1")
 addSbtPlugin("com.jsuereth"       % "sbt-pgp"             % "1.0.0")
-addSbtPlugin("org.xerial.sbt"     % "sbt-pack"            % "0.8.0")
 addSbtPlugin("com.dancingrobot84" % "sbt-idea-plugin"     % "0.4.2")
 libraryDependencies += "org.scala-sbt" % "scripted-plugin" % sbtVersion.value
diff --git a/.../scalafmt/benchmarks/MacroBenchmark.scala → .../scalafmt/benchmarks/MacroBenchmark.scala b/.../scalafmt/benchmarks/MacroBenchmark.scala → .../scalafmt/benchmarks/MacroBenchmark.scala
diff --git a/.../scalafmt/benchmarks/MicroBenchmark.scala → .../scalafmt/benchmarks/MicroBenchmark.scala b/.../scalafmt/benchmarks/MicroBenchmark.scala → .../scalafmt/benchmarks/MicroBenchmark.scala
@@ -49,7 +49,9 @@ abstract class MicroBenchmark(path: String*) extends FormatBenchmark {
     // jmh runs from benchmarks directory while tests run from from root.
     // Can't bother to find more generic solution
     if (filename.isFile) filename
-    else FileOps.getFile(Seq("benchmarks", "src", "resources") ++ path: _*)
+    else
+      FileOps.getFile(
+        Seq("scalafmt-benchmarks", "src", "resources") ++ path: _*)
   }
 
   def scalametaParser(): Unit = {

diff --git a/benchmarks/src/resources/Endpoint.scala → ...t-benchmarks/src/resources/Endpoint.scala b/benchmarks/src/resources/Endpoint.scala → ...t-benchmarks/src/resources/Endpoint.scala
diff --git a/...rks/src/resources/scala-js/Analyzer.scala → ...rks/src/resources/scala-js/Analyzer.scala b/...rks/src/resources/scala-js/Analyzer.scala → ...rks/src/resources/scala-js/Analyzer.scala
diff --git a/...s/src/resources/scala-js/BaseLinker.scala → ...s/src/resources/scala-js/BaseLinker.scala b/...s/src/resources/scala-js/BaseLinker.scala → ...s/src/resources/scala-js/BaseLinker.scala
diff --git a/...urces/scala-js/CopyOnWriteArrayList.scala → ...urces/scala-js/CopyOnWriteArrayList.scala b/...urces/scala-js/CopyOnWriteArrayList.scala → ...urces/scala-js/CopyOnWriteArrayList.scala
diff --git a/...rks/src/resources/scala-js/Division.scala → ...rks/src/resources/scala-js/Division.scala b/...rks/src/resources/scala-js/Division.scala → ...rks/src/resources/scala-js/Division.scala
diff --git a/...resources/scala-js/EventSerializers.scala → ...resources/scala-js/EventSerializers.scala b/...resources/scala-js/EventSerializers.scala → ...resources/scala-js/EventSerializers.scala
diff --git a/...ks/src/resources/scala-js/GenJSCode.scala → ...ks/src/resources/scala-js/GenJSCode.scala b/...ks/src/resources/scala-js/GenJSCode.scala → ...ks/src/resources/scala-js/GenJSCode.scala
diff --git a/...src/resources/scala-js/JSDependency.scala → ...src/resources/scala-js/JSDependency.scala b/...src/resources/scala-js/JSDependency.scala → ...src/resources/scala-js/JSDependency.scala
diff --git a/...c/resources/scala-js/JavaLangString.scala → ...c/resources/scala-js/JavaLangString.scala b/...c/resources/scala-js/JavaLangString.scala → ...c/resources/scala-js/JavaLangString.scala
diff --git a/benchmarks/src/resources/scala-js/LICENSE → ...benchmarks/src/resources/scala-js/LICENSE b/benchmarks/src/resources/scala-js/LICENSE → ...benchmarks/src/resources/scala-js/LICENSE
diff --git a/...rc/resources/scala-js/OptimizerCore.scala → ...rc/resources/scala-js/OptimizerCore.scala b/...rc/resources/scala-js/OptimizerCore.scala → ...rc/resources/scala-js/OptimizerCore.scala
diff --git a/...ks/src/resources/scala-js/Primality.scala → ...ks/src/resources/scala-js/Primality.scala b/...ks/src/resources/scala-js/Primality.scala → ...ks/src/resources/scala-js/Primality.scala
diff --git a/.../resources/scala-js/PrintStreamTest.scala → .../resources/scala-js/PrintStreamTest.scala b/.../resources/scala-js/PrintStreamTest.scala → .../resources/scala-js/PrintStreamTest.scala
diff --git a/...ources/scala-js/ScalaJSClassEmitter.scala → ...ources/scala-js/ScalaJSClassEmitter.scala b/...ources/scala-js/ScalaJSClassEmitter.scala → ...ources/scala-js/ScalaJSClassEmitter.scala
diff --git a/...ks/src/resources/scala-js/Semantics.scala → ...ks/src/resources/scala-js/Semantics.scala b/...ks/src/resources/scala-js/Semantics.scala → ...ks/src/resources/scala-js/Semantics.scala
diff --git a/.../resources/scala-js/SourceMapWriter.scala → .../resources/scala-js/SourceMapWriter.scala b/.../resources/scala-js/SourceMapWriter.scala → .../resources/scala-js/SourceMapWriter.scala
diff --git a/...hmarks/src/resources/scala-js/Trees.scala → ...hmarks/src/resources/scala-js/Trees.scala b/...hmarks/src/resources/scala-js/Trees.scala → ...hmarks/src/resources/scala-js/Trees.scala
diff --git a/...ks/src/resources/scala-js/TypeKinds.scala → ...ks/src/resources/scala-js/TypeKinds.scala b/...ks/src/resources/scala-js/TypeKinds.scala → ...ks/src/resources/scala-js/TypeKinds.scala
diff --git a/...hmarks/src/resources/scala-js/Utils.scala → ...hmarks/src/resources/scala-js/Utils.scala b/...hmarks/src/resources/scala-js/Utils.scala → ...hmarks/src/resources/scala-js/Utils.scala
diff --git a/benchmarks/src/resources/scala-js/readme.md → ...nchmarks/src/resources/scala-js/readme.md b/benchmarks/src/resources/scala-js/readme.md → ...nchmarks/src/resources/scala-js/readme.md
diff --git a/...hmarks/src/resources/scalafmt/Basic.scala → ...hmarks/src/resources/scalafmt/Basic.scala b/...hmarks/src/resources/scalafmt/Basic.scala → ...hmarks/src/resources/scalafmt/Basic.scala
diff --git a/...esources/spark/HiveMetastoreCatalog.scala → ...esources/spark/HiveMetastoreCatalog.scala b/...esources/spark/HiveMetastoreCatalog.scala → ...esources/spark/HiveMetastoreCatalog.scala
diff --git a/...org/scalafmt/benchmarks/BenchmarkOK.scala → ...org/scalafmt/benchmarks/BenchmarkOK.scala b/...org/scalafmt/benchmarks/BenchmarkOK.scala → ...org/scalafmt/benchmarks/BenchmarkOK.scala
diff --git a/...src/main/scala/org/scalafmt/cli/Cli.scala → ...src/main/scala/org/scalafmt/cli/Cli.scala b/...src/main/scala/org/scalafmt/cli/Cli.scala → ...src/main/scala/org/scalafmt/cli/Cli.scala
diff --git a/...scala/org/scalafmt/cli/CliArgParser.scala → ...scala/org/scalafmt/cli/CliArgParser.scala b/...scala/org/scalafmt/cli/CliArgParser.scala → ...scala/org/scalafmt/cli/CliArgParser.scala
diff --git a/...n/scala/org/scalafmt/cli/CliOptions.scala → ...n/scala/org/scalafmt/cli/CliOptions.scala b/...n/scala/org/scalafmt/cli/CliOptions.scala → ...n/scala/org/scalafmt/cli/CliOptions.scala
diff --git a/.../scala/org/scalafmt/cli/InputMethod.scala → .../scala/org/scalafmt/cli/InputMethod.scala b/.../scala/org/scalafmt/cli/InputMethod.scala → .../scala/org/scalafmt/cli/InputMethod.scala
diff --git a/...in/scala/org/scalafmt/cli/LegacyCli.scala → ...in/scala/org/scalafmt/cli/LegacyCli.scala b/...in/scala/org/scalafmt/cli/LegacyCli.scala → ...in/scala/org/scalafmt/cli/LegacyCli.scala
diff --git a/.../scala/org/scalafmt/cli/Scalafmt210.scala → .../scala/org/scalafmt/cli/Scalafmt210.scala b/.../scala/org/scalafmt/cli/Scalafmt210.scala → .../scala/org/scalafmt/cli/Scalafmt210.scala
diff --git a/...n/scala/org/scalafmt/cli/StyleCache.scala → ...n/scala/org/scalafmt/cli/StyleCache.scala b/...n/scala/org/scalafmt/cli/StyleCache.scala → ...n/scala/org/scalafmt/cli/StyleCache.scala
diff --git a/.../scala/org/scalafmt/cli/TermDisplay.scala → .../scala/org/scalafmt/cli/TermDisplay.scala b/.../scala/org/scalafmt/cli/TermDisplay.scala → .../scala/org/scalafmt/cli/TermDisplay.scala
diff --git a/scalafmt-core/js/src/main/scala/org/scalafmt/config/Platform.config b/scalafmt-core/js/src/main/scala/org/scalafmt/config/Platform.config
diff --git a/scalafmt-core/js/src/main/scala/org/scalafmt/config/PlatformConfig.scala b/scalafmt-core/js/src/main/scala/org/scalafmt/config/PlatformConfig.scala
@@ -0,0 +1,5 @@
+package org.scalafmt.config
+
+object PlatformConfig {
+  implicit val parser = metaconfig.hocon.hoconMetaconfigParser
+}
diff --git a/scalafmt-core/jvm/src/main/scala/org/scalafmt/config/PlatformConfig.scala b/scalafmt-core/jvm/src/main/scala/org/scalafmt/config/PlatformConfig.scala
@@ -0,0 +1,6 @@
+package org.scalafmt.config
+
+object PlatformConfig {
+  implicit val parser =
+    metaconfig.typesafeconfig.typesafeConfigMetaconfigParser
+}
diff --git a/core/src/main/scala/org/scalafmt/Error.scala → ...d/src/main/scala/org/scalafmt/Error.scala b/core/src/main/scala/org/scalafmt/Error.scala → ...d/src/main/scala/org/scalafmt/Error.scala
diff --git a/...c/main/scala/org/scalafmt/Formatted.scala → ...c/main/scala/org/scalafmt/Formatted.scala b/...c/main/scala/org/scalafmt/Formatted.scala → ...c/main/scala/org/scalafmt/Formatted.scala
diff --git a/...rc/main/scala/org/scalafmt/Scalafmt.scala → ...rc/main/scala/org/scalafmt/Scalafmt.scala b/...rc/main/scala/org/scalafmt/Scalafmt.scala → ...rc/main/scala/org/scalafmt/Scalafmt.scala
diff --git a/...ain/scala/org/scalafmt/config/Align.scala → ...ain/scala/org/scalafmt/config/Align.scala b/...ain/scala/org/scalafmt/config/Align.scala → ...ain/scala/org/scalafmt/config/Align.scala
diff --git a/...cala/org/scalafmt/config/AlignToken.scala → ...cala/org/scalafmt/config/AlignToken.scala b/...cala/org/scalafmt/config/AlignToken.scala → ...cala/org/scalafmt/config/AlignToken.scala
diff --git a/...scala/org/scalafmt/config/BaseStyle.scala → ...scala/org/scalafmt/config/BaseStyle.scala b/...scala/org/scalafmt/config/BaseStyle.scala → ...scala/org/scalafmt/config/BaseStyle.scala
diff --git a/...n/scala/org/scalafmt/config/BinPack.scala → ...n/scala/org/scalafmt/config/BinPack.scala b/...n/scala/org/scalafmt/config/BinPack.scala → ...n/scala/org/scalafmt/config/BinPack.scala
diff --git a/...in/scala/org/scalafmt/config/Config.scala → ...in/scala/org/scalafmt/config/Config.scala b/...in/scala/org/scalafmt/config/Config.scala → ...in/scala/org/scalafmt/config/Config.scala
@@ -2,6 +2,8 @@ package org.scalafmt.config
 
 import scala.language.reflectiveCalls
 
+import metaconfig._
+import scala.meta.inputs.Input
 import scala.meta.internal.parsers.ScalametaParser
 
 import java.io.File
@@ -12,8 +14,7 @@ import metaconfig.Configured
 import metaconfig.Configured.Ok
 import metaconfig.HasFields
 import metaconfig.String2AnyMap
-import metaconfig.typesafeconfig.TypesafeConfig2Class
-import org.scalameta.logger
+import org.scalafmt.config.PlatformConfig._
 
 object Config {
 
@@ -40,16 +41,23 @@ object Config {
       Seq(s" = $output")
   }
 
-  /** Read ScalafmtConfig from String contents from an optional HOCON path. */
+  def fromInput(input: Input, path: Option[String]): Configured[Conf] = {
+    val configured = implicitly[MetaconfigParser].fromInput(input)
+    path match {
+      case Some(x) => ConfDynamic(configured).selectDynamic(x).asConf
+      case None => configured
+    }
+  }
+
   def fromHoconString(
       string: String,
       path: Option[String] = None): Configured[ScalafmtConfig] =
-    fromConf(TypesafeConfig2Class.gimmeConfFromString(string), path)
+    fromConf(fromInput(Input.String(string), path))
 
   /** Read ScalafmtConfig from String contents from an optional HOCON path. */
   def fromHoconFile(file: File,
                     path: Option[String] = None): Configured[ScalafmtConfig] =
-    fromConf(TypesafeConfig2Class.gimmeConfFromFile(file), path)
+    fromConf(fromInput(Input.File(file), path))
 
   def fromConf(conf: Configured[Conf],
                path: Option[String] = None): Configured[ScalafmtConfig] =

diff --git a/.../scalafmt/config/ContinuationIndent.scala → .../scalafmt/config/ContinuationIndent.scala b/.../scalafmt/config/ContinuationIndent.scala → .../scalafmt/config/ContinuationIndent.scala
diff --git a/...cala/org/scalafmt/config/Docstrings.scala → ...cala/org/scalafmt/config/Docstrings.scala b/...cala/org/scalafmt/config/Docstrings.scala → ...cala/org/scalafmt/config/Docstrings.scala
diff --git a/...a/org/scalafmt/config/FilterMatcher.scala → ...a/org/scalafmt/config/FilterMatcher.scala b/...a/org/scalafmt/config/FilterMatcher.scala → ...a/org/scalafmt/config/FilterMatcher.scala
diff --git a/...ala/org/scalafmt/config/FormatEvent.scala → ...ala/org/scalafmt/config/FormatEvent.scala b/...ala/org/scalafmt/config/FormatEvent.scala → ...ala/org/scalafmt/config/FormatEvent.scala
diff --git a/.../scala/org/scalafmt/config/GitModel.scala → .../scala/org/scalafmt/config/GitModel.scala b/.../scala/org/scalafmt/config/GitModel.scala → .../scala/org/scalafmt/config/GitModel.scala
diff --git a/...org/scalafmt/config/ImportSelectors.scala → ...org/scalafmt/config/ImportSelectors.scala b/...org/scalafmt/config/ImportSelectors.scala → ...org/scalafmt/config/ImportSelectors.scala
diff --git a/...la/org/scalafmt/config/IndentConfig.scala → ...la/org/scalafmt/config/IndentConfig.scala b/...la/org/scalafmt/config/IndentConfig.scala → ...la/org/scalafmt/config/IndentConfig.scala
diff --git a/.../org/scalafmt/config/IndentOperator.scala → .../org/scalafmt/config/IndentOperator.scala b/.../org/scalafmt/config/IndentOperator.scala → .../org/scalafmt/config/IndentOperator.scala
diff --git a/...ala/org/scalafmt/config/LineEndings.scala → ...ala/org/scalafmt/config/LineEndings.scala b/...ala/org/scalafmt/config/LineEndings.scala → ...ala/org/scalafmt/config/LineEndings.scala
diff --git a/.../scala/org/scalafmt/config/Newlines.scala → .../scala/org/scalafmt/config/Newlines.scala b/.../scala/org/scalafmt/config/Newlines.scala → .../scala/org/scalafmt/config/Newlines.scala
diff --git a/...ain/scala/org/scalafmt/config/OptIn.scala → ...ain/scala/org/scalafmt/config/OptIn.scala b/...ain/scala/org/scalafmt/config/OptIn.scala → ...ain/scala/org/scalafmt/config/OptIn.scala
diff --git a/...n/scala/org/scalafmt/config/Pattern.scala → ...n/scala/org/scalafmt/config/Pattern.scala b/...n/scala/org/scalafmt/config/Pattern.scala → ...n/scala/org/scalafmt/config/Pattern.scala
diff --git a/...la/org/scalafmt/config/ProjectFiles.scala → ...la/org/scalafmt/config/ProjectFiles.scala b/...la/org/scalafmt/config/ProjectFiles.scala → ...la/org/scalafmt/config/ProjectFiles.scala
diff --git a/...cala/org/scalafmt/config/ReaderUtil.scala → ...cala/org/scalafmt/config/ReaderUtil.scala b/...cala/org/scalafmt/config/ReaderUtil.scala → ...cala/org/scalafmt/config/ReaderUtil.scala
diff --git a/...afmt/config/RedundantBracesSettings.scala → ...afmt/config/RedundantBracesSettings.scala b/...afmt/config/RedundantBracesSettings.scala → ...afmt/config/RedundantBracesSettings.scala
diff --git a/...org/scalafmt/config/RewriteSettings.scala → ...org/scalafmt/config/RewriteSettings.scala b/...org/scalafmt/config/RewriteSettings.scala → ...org/scalafmt/config/RewriteSettings.scala
diff --git a/...calafmt/config/ScalafmtConfDecoders.scala → ...calafmt/config/ScalafmtConfDecoders.scala b/...calafmt/config/ScalafmtConfDecoders.scala → ...calafmt/config/ScalafmtConfDecoders.scala
diff --git a/.../org/scalafmt/config/ScalafmtConfig.scala → .../org/scalafmt/config/ScalafmtConfig.scala b/.../org/scalafmt/config/ScalafmtConfig.scala → .../org/scalafmt/config/ScalafmtConfig.scala
diff --git a/...g/scalafmt/config/ScalafmtOptimizer.scala → ...g/scalafmt/config/ScalafmtOptimizer.scala b/...g/scalafmt/config/ScalafmtOptimizer.scala → ...g/scalafmt/config/ScalafmtOptimizer.scala
diff --git a/.../org/scalafmt/config/ScalafmtRunner.scala → .../org/scalafmt/config/ScalafmtRunner.scala b/.../org/scalafmt/config/ScalafmtRunner.scala → .../org/scalafmt/config/ScalafmtRunner.scala
diff --git a/.../scala/org/scalafmt/config/Settings.scala → .../scala/org/scalafmt/config/Settings.scala b/.../scala/org/scalafmt/config/Settings.scala → .../scala/org/scalafmt/config/Settings.scala
diff --git a/...in/scala/org/scalafmt/config/Spaces.scala → ...in/scala/org/scalafmt/config/Spaces.scala b/...in/scala/org/scalafmt/config/Spaces.scala → ...in/scala/org/scalafmt/config/Spaces.scala
diff --git a/...n/scala/org/scalafmt/config/package.scala → ...n/scala/org/scalafmt/config/package.scala b/...n/scala/org/scalafmt/config/package.scala → ...n/scala/org/scalafmt/config/package.scala
diff --git a/...g/scalafmt/internal/BestFirstSearch.scala → ...g/scalafmt/internal/BestFirstSearch.scala b/...g/scalafmt/internal/BestFirstSearch.scala → ...g/scalafmt/internal/BestFirstSearch.scala
diff --git a/...cala/org/scalafmt/internal/Decision.scala → ...cala/org/scalafmt/internal/Decision.scala b/...cala/org/scalafmt/internal/Decision.scala → ...cala/org/scalafmt/internal/Decision.scala
diff --git a/...ala/org/scalafmt/internal/FormatOps.scala → ...ala/org/scalafmt/internal/FormatOps.scala b/...ala/org/scalafmt/internal/FormatOps.scala → ...ala/org/scalafmt/internal/FormatOps.scala
diff --git a/...a/org/scalafmt/internal/FormatToken.scala → ...a/org/scalafmt/internal/FormatToken.scala b/...a/org/scalafmt/internal/FormatToken.scala → ...a/org/scalafmt/internal/FormatToken.scala
diff --git a/.../org/scalafmt/internal/FormatWriter.scala → .../org/scalafmt/internal/FormatWriter.scala b/.../org/scalafmt/internal/FormatWriter.scala → .../org/scalafmt/internal/FormatWriter.scala
diff --git a/.../scala/org/scalafmt/internal/Indent.scala → .../scala/org/scalafmt/internal/Indent.scala b/.../scala/org/scalafmt/internal/Indent.scala → .../scala/org/scalafmt/internal/Indent.scala
diff --git a/.../org/scalafmt/internal/Modification.scala → .../org/scalafmt/internal/Modification.scala b/.../org/scalafmt/internal/Modification.scala → .../org/scalafmt/internal/Modification.scala
diff --git a/.../scala/org/scalafmt/internal/Policy.scala → .../scala/org/scalafmt/internal/Policy.scala b/.../scala/org/scalafmt/internal/Policy.scala → .../scala/org/scalafmt/internal/Policy.scala
diff --git a/...org/scalafmt/internal/PolicySummary.scala → ...org/scalafmt/internal/PolicySummary.scala b/...org/scalafmt/internal/PolicySummary.scala → ...org/scalafmt/internal/PolicySummary.scala
diff --git a/.../scala/org/scalafmt/internal/Router.scala → .../scala/org/scalafmt/internal/Router.scala b/.../scala/org/scalafmt/internal/Router.scala → .../scala/org/scalafmt/internal/Router.scala
diff --git a/...n/scala/org/scalafmt/internal/Split.scala → ...n/scala/org/scalafmt/internal/Split.scala b/...n/scala/org/scalafmt/internal/Split.scala → ...n/scala/org/scalafmt/internal/Split.scala
diff --git a/...n/scala/org/scalafmt/internal/State.scala → ...n/scala/org/scalafmt/internal/State.scala b/...n/scala/org/scalafmt/internal/State.scala → ...n/scala/org/scalafmt/internal/State.scala
diff --git a/...ala/org/scalafmt/rewrite/AvoidInfix.scala → ...ala/org/scalafmt/rewrite/AvoidInfix.scala b/...ala/org/scalafmt/rewrite/AvoidInfix.scala → ...ala/org/scalafmt/rewrite/AvoidInfix.scala
diff --git a/...lafmt/rewrite/ExpandImportSelectors.scala → ...lafmt/rewrite/ExpandImportSelectors.scala b/...lafmt/rewrite/ExpandImportSelectors.scala → ...lafmt/rewrite/ExpandImportSelectors.scala
diff --git a/...in/scala/org/scalafmt/rewrite/Patch.scala → ...in/scala/org/scalafmt/rewrite/Patch.scala b/...in/scala/org/scalafmt/rewrite/Patch.scala → ...in/scala/org/scalafmt/rewrite/Patch.scala
diff --git a/...rg/scalafmt/rewrite/PreferCurlyFors.scala → ...rg/scalafmt/rewrite/PreferCurlyFors.scala b/...rg/scalafmt/rewrite/PreferCurlyFors.scala → ...rg/scalafmt/rewrite/PreferCurlyFors.scala
diff --git a/...rg/scalafmt/rewrite/RedundantBraces.scala → ...rg/scalafmt/rewrite/RedundantBraces.scala b/...rg/scalafmt/rewrite/RedundantBraces.scala → ...rg/scalafmt/rewrite/RedundantBraces.scala
diff --git a/...rg/scalafmt/rewrite/RedundantParens.scala → ...rg/scalafmt/rewrite/RedundantParens.scala b/...rg/scalafmt/rewrite/RedundantParens.scala → ...rg/scalafmt/rewrite/RedundantParens.scala
diff --git a/.../scala/org/scalafmt/rewrite/Rewrite.scala → .../scala/org/scalafmt/rewrite/Rewrite.scala b/.../scala/org/scalafmt/rewrite/Rewrite.scala → .../scala/org/scalafmt/rewrite/Rewrite.scala
diff --git a/...la/org/scalafmt/rewrite/SortImports.scala → ...la/org/scalafmt/rewrite/SortImports.scala b/...la/org/scalafmt/rewrite/SortImports.scala → ...la/org/scalafmt/rewrite/SortImports.scala
diff --git a/...cala/org/scalafmt/util/AbsoluteFile.scala → ...cala/org/scalafmt/util/AbsoluteFile.scala b/...cala/org/scalafmt/util/AbsoluteFile.scala → ...cala/org/scalafmt/util/AbsoluteFile.scala
diff --git a/...ain/scala/org/scalafmt/util/FileOps.scala → ...ain/scala/org/scalafmt/util/FileOps.scala b/...ain/scala/org/scalafmt/util/FileOps.scala → ...ain/scala/org/scalafmt/util/FileOps.scala
diff --git a/...main/scala/org/scalafmt/util/GitOps.scala → ...main/scala/org/scalafmt/util/GitOps.scala b/...main/scala/org/scalafmt/util/GitOps.scala → ...main/scala/org/scalafmt/util/GitOps.scala
diff --git a/...ala/org/scalafmt/util/HasStringKeys.scala → ...ala/org/scalafmt/util/HasStringKeys.scala b/...ala/org/scalafmt/util/HasStringKeys.scala → ...ala/org/scalafmt/util/HasStringKeys.scala
diff --git a/...in/scala/org/scalafmt/util/LogLevel.scala → ...in/scala/org/scalafmt/util/LogLevel.scala b/...in/scala/org/scalafmt/util/LogLevel.scala → ...in/scala/org/scalafmt/util/LogLevel.scala
diff --git a/...n/scala/org/scalafmt/util/LoggerOps.scala → ...n/scala/org/scalafmt/util/LoggerOps.scala b/...n/scala/org/scalafmt/util/LoggerOps.scala → ...n/scala/org/scalafmt/util/LoggerOps.scala
diff --git a/.../scala/org/scalafmt/util/OsSpecific.scala → .../scala/org/scalafmt/util/OsSpecific.scala b/.../scala/org/scalafmt/util/OsSpecific.scala → .../scala/org/scalafmt/util/OsSpecific.scala
diff --git a/...in/scala/org/scalafmt/util/StyleMap.scala → ...in/scala/org/scalafmt/util/StyleMap.scala b/...in/scala/org/scalafmt/util/StyleMap.scala → ...in/scala/org/scalafmt/util/StyleMap.scala
diff --git a/...cala/org/scalafmt/util/TokenClasses.scala → ...cala/org/scalafmt/util/TokenClasses.scala b/...cala/org/scalafmt/util/TokenClasses.scala → ...cala/org/scalafmt/util/TokenClasses.scala
diff --git a/...in/scala/org/scalafmt/util/TokenOps.scala → ...in/scala/org/scalafmt/util/TokenOps.scala b/...in/scala/org/scalafmt/util/TokenOps.scala → ...in/scala/org/scalafmt/util/TokenOps.scala
diff --git a/...la/org/scalafmt/util/TokenTraverser.scala → ...la/org/scalafmt/util/TokenTraverser.scala b/...la/org/scalafmt/util/TokenTraverser.scala → ...la/org/scalafmt/util/TokenTraverser.scala
diff --git a/...scala/org/scalafmt/util/TreeClasses.scala → ...scala/org/scalafmt/util/TreeClasses.scala b/...scala/org/scalafmt/util/TreeClasses.scala → ...scala/org/scalafmt/util/TreeClasses.scala
diff --git a/...la/org/scalafmt/util/TreeExtractors.scala → ...la/org/scalafmt/util/TreeExtractors.scala b/...la/org/scalafmt/util/TreeExtractors.scala → ...la/org/scalafmt/util/TreeExtractors.scala
diff --git a/...ain/scala/org/scalafmt/util/TreeOps.scala → ...ain/scala/org/scalafmt/util/TreeOps.scala b/...ain/scala/org/scalafmt/util/TreeOps.scala → ...ain/scala/org/scalafmt/util/TreeOps.scala
diff --git a/...ala/org/scalafmt/util/ValidationOps.scala → ...ala/org/scalafmt/util/ValidationOps.scala b/...ala/org/scalafmt/util/ValidationOps.scala → ...ala/org/scalafmt/util/ValidationOps.scala
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgIyBGZXRjaCBmb2xkZXJzIGZyb20gZGlzdHJpYnV0ZWQgY2FjaGUKICBzZnRwX2NhY2hlX3Jlc3RvcmU6CiAgICBpbWFnZTogcGx1Z2lucy9zZnRwLWNhY2hlCiAgICByZXN0b3JlOiB0cnVlCiAgICBtb3VudDoKICAgICAgLSAvZHJvbmUvLml2eTIvY2FjaGUKICAgICAgLSAvZHJvbmUvLmNvdXJzaWVyLWNhY2hlCiAgICAgIC0gL2Ryb25lLy5zYnQKICAgICAgLSAvZHJvbmUvLmdpdAogICAgd2hlbjoKICAgICAgZXZlbnQ6IFtwdXNoLCBwdWxsX3JlcXVlc3QsIHRhZywgZGVwbG95bWVudF0KCiAgdGVzdHM6CiAgICBpbWFnZTogc2NhbGFwbGF0Zm9ybS9zY2FsYTowLjYKICAgIHZvbHVtZXM6CiAgICAgIC0gL3BsYXRmb3JtOi9rZXlzCiAgICBjb21tYW5kczoKICAgICAgLSBnaXQgZmV0Y2ggLS10YWdzICYmIGdpdCBsb2cgfCBoZWFkIC1uIDIwCiAgICAgIC0gLi9iaW4vY2xlYW51cF9jYWNoZS5zaAogICAgICAtIC4vc2NhbGFmbXQgLS10ZXN0CiAgICAgIC0gc2J0ICRDSV9URVNUCgogIHB1Ymxpc2g6CiAgICBpbWFnZTogb2xhZnVycGcvc2NhbGFmaXg6MC4zLjAKICAgIHB1bGw6IHRydWUKICAgIHZvbHVtZXM6CiAgICAgIC0gL3BsYXRmb3JtOi9rZXlzCiAgICBjb21tYW5kczoKICAgICAgLSAuL2Jpbi9iaW50cmF5LnNoCiAgICB3aGVuOgogICAgICBldmVudDogW3B1c2gsIHRhZ10KICAgICAgYnJhbmNoOiBbbWFzdGVyXQoKICBub3RpZnk6CiAgICBpbWFnZTogZHJpbGxzdGVyL2Ryb25lLWVtYWlsCiAgICBob3N0OiBzbXRwLm1haWxndW4ub3JnCiAgICB1c2VybmFtZTogbm9yZXBseUBkcm9uZS5nZWlyc3Nvbi5jb20KICAgIHBhc3N3b3JkOiAke01BSUxHVU5fUEFTU1dPUkR9CiAgICBmcm9tOiBub3JlcGx5QGRyb25lLmdlaXJzc29uLmNvbQogICAgcmVjaXBpZW50czoKICAgICAgLSBvbGFmdXJwZ0BnbWFpbC5jb20KICAgIHdoZW46CiAgICAgIGV2ZW50OiBwdXNoCiAgICAgIGJyYW5jaDogW21hc3Rlcl0KICAgICAgc3RhdHVzOiBbY2hhbmdlZCwgZmFpbHVyZV0KCiAgIyBTYXZlIGZvbGRlcnMgaW4gZGlzdHJpYnV0ZWQgY2FjaGUKICBzZnRwX2NhY2hlX3JlYnVpbGQ6CiAgICBpbWFnZTogcGx1Z2lucy9zZnRwLWNhY2hlCiAgICByZWJ1aWxkOiB0cnVlCiAgICBtb3VudDoKICAgICAgLSAvZHJvbmUvLml2eTIvY2FjaGUKICAgICAgLSAvZHJvbmUvLmNvdXJzaWVyLWNhY2hlCiAgICAgIC0gL2Ryb25lLy5zYnQKICAgICAgLSAvZHJvbmUvLmdpdAoKbWF0cml4OgogIGluY2x1ZGU6CiAgICAtIENJX1RFU1Q6IGNpLWZhc3QKICAgICAgQ0lfU0NBTEFfVkVSU0lPTjogMi4xMS4xMQogICAgICBDSV9QVUJMSVNIOiB0cnVlCiAgICAtIENJX1RFU1Q6IGNpLWZhc3QKICAgICAgQ0lfU0NBTEFfVkVSU0lPTjogMi4xMi4yCiAgICAgIENJX1BVQkxJU0g6IHRydWUKICAgIC0gQ0lfVEVTVDogY2ktc2J0LXNjYWxhZm10CiAgICAgIENJX1NDQUxBX1ZFUlNJT046IDIuMTIuMgogICAgICBDSV9QVUJMSVNIOiB0cnVlCiAgICAtIENJX1RFU1Q6IGNpLXNsb3cKICAgICAgQ0lfU0NBTEFfVkVSU0lPTjogMi4xMS4xMQogICAgLSBDSV9URVNUOiBjaS1zbG93CiAgICAgIENJX1NDQUxBX1ZFUlNJT046IDIuMTIuMgoK.1Yg5sJhxKLyFDbTx16Ebo44OvkKTvgkpKeJTAejnXpw
		eyJhbGciOiJIUzI1NiJ9.cGlwZWxpbmU6CiAgIyBGZXRjaCBmb2xkZXJzIGZyb20gZGlzdHJpYnV0ZWQgY2FjaGUKICBzZnRwX2NhY2hlX3Jlc3RvcmU6CiAgICBpbWFnZTogcGx1Z2lucy9zZnRwLWNhY2hlCiAgICByZXN0b3JlOiB0cnVlCiAgICBtb3VudDoKICAgICAgLSAvZHJvbmUvLml2eTIvY2FjaGUKICAgICAgLSAvZHJvbmUvLmNvdXJzaWVyLWNhY2hlCiAgICAgIC0gL2Ryb25lLy5zYnQKICAgICAgLSAvZHJvbmUvLmdpdAogICAgd2hlbjoKICAgICAgZXZlbnQ6IFtwdXNoLCBwdWxsX3JlcXVlc3QsIHRhZywgZGVwbG95bWVudF0KCiAgdGVzdHM6CiAgICBpbWFnZTogc2NhbGFwbGF0Zm9ybS9zY2FsYTowLjYKICAgIHZvbHVtZXM6CiAgICAgIC0gL3BsYXRmb3JtOi9rZXlzCiAgICBjb21tYW5kczoKICAgICAgLSBnaXQgZmV0Y2ggLS10YWdzICYmIGdpdCBsb2cgfCBoZWFkIC1uIDIwCiAgICAgIC0gLi9iaW4vY2xlYW51cF9jYWNoZS5zaAogICAgICAtIC4vc2NhbGFmbXQgLS10ZXN0CiAgICAgIC0gc2J0ICRDSV9URVNUCgogIHB1Ymxpc2g6CiAgICBpbWFnZTogb2xhZnVycGcvc2NhbGFmaXg6MC4zLjAKICAgIHB1bGw6IHRydWUKICAgIHZvbHVtZXM6CiAgICAgIC0gL3BsYXRmb3JtOi9rZXlzCiAgICBjb21tYW5kczoKICAgICAgLSAuL2Jpbi9iaW50cmF5LnNoCiAgICB3aGVuOgogICAgICBldmVudDogW3B1c2gsIHRhZ10KICAgICAgYnJhbmNoOiBbbWFzdGVyXQoKICBub3RpZnk6CiAgICBpbWFnZTogZHJpbGxzdGVyL2Ryb25lLWVtYWlsCiAgICBob3N0OiBzbXRwLm1haWxndW4ub3JnCiAgICB1c2VybmFtZTogbm9yZXBseUBkcm9uZS5nZWlyc3Nvbi5jb20KICAgIHBhc3N3b3JkOiAke01BSUxHVU5fUEFTU1dPUkR9CiAgICBmcm9tOiBub3JlcGx5QGRyb25lLmdlaXJzc29uLmNvbQogICAgcmVjaXBpZW50czoKICAgICAgLSBvbGFmdXJwZ0BnbWFpbC5jb20KICAgIHdoZW46CiAgICAgIGV2ZW50OiBwdXNoCiAgICAgIGJyYW5jaDogW21hc3Rlcl0KICAgICAgc3RhdHVzOiBbY2hhbmdlZCwgZmFpbHVyZV0KCiAgIyBTYXZlIGZvbGRlcnMgaW4gZGlzdHJpYnV0ZWQgY2FjaGUKICBzZnRwX2NhY2hlX3JlYnVpbGQ6CiAgICBpbWFnZTogcGx1Z2lucy9zZnRwLWNhY2hlCiAgICByZWJ1aWxkOiB0cnVlCiAgICBtb3VudDoKICAgICAgLSAvZHJvbmUvLml2eTIvY2FjaGUKICAgICAgLSAvZHJvbmUvLmNvdXJzaWVyLWNhY2hlCiAgICAgIC0gL2Ryb25lLy5zYnQKICAgICAgLSAvZHJvbmUvLmdpdAoKbWF0cml4OgogIGluY2x1ZGU6CiAgICAtIENJX1RFU1Q6IGNpLWZhc3QKICAgICAgQ0lfU0NBTEFfVkVSU0lPTjogMi4xMS4xMQogICAgICBDSV9QVUJMSVNIOiB0cnVlCiAgICAtIENJX1RFU1Q6IGNpLWZhc3QKICAgICAgQ0lfU0NBTEFfVkVSU0lPTjogMi4xMi4yCiAgICAgIENJX1BVQkxJU0g6IHRydWUKICAgIC0gQ0lfVEVTVDogY2ktc2J0LXNjYWxhZm10CiAgICAgIENJX1NDQUxBX1ZFUlNJT046IDIuMTIuMgogICAgLSBDSV9URVNUOiBjaS1zbG93CiAgICAgIENJX1NDQUxBX1ZFUlNJT046IDIuMTEuMTEKICAgIC0gQ0lfVEVTVDogY2ktc2xvdwogICAgICBDSV9TQ0FMQV9WRVJTSU9OOiAyLjEyLjIKCg.PHp9BifCwMfM-7icmXekHjCFQ2ruZY4qBrn_GziMZIY