Update scalafmt-core to 3.5.9 (joernio#1675)

* Update scalafmt-core to 3.5.9 * Reformat with scalafmt 3.5.9 Executed command: scalafmt --non-interactive * Add 'Reformat with scalafmt 3.5.9' to .git-blame-ignore-revs * Revert commit(s) c4c2a4c, 189a046, 79d7280 * Update scalafmt-core to 3.5.9 * Reformat with scalafmt 3.5.9 Executed command: scalafmt --non-interactive * Add 'Reformat with scalafmt 3.5.9' to .git-blame-ignore-revs * Revert commit(s) a9fb14e, e93a966, 6b616c6 * Update scalafmt-core to 3.5.9 * Reformat with scalafmt 3.5.9 Executed command: scalafmt --non-interactive * Add 'Reformat with scalafmt 3.5.9' to .git-blame-ignore-revs * Revert commit(s) bd495aa, 1933384, 1507ce4 * Update scalafmt-core to 3.5.9 * Reformat with scalafmt 3.5.9 Executed command: scalafmt --non-interactive * Add 'Reformat with scalafmt 3.5.9' to .git-blame-ignore-revs
Privado-Inc · Oct 26, 2022 · 2a20652 · 2a20652
1 parent 688a577
commit 2a20652
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 21 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -1,2 +1,5 @@
 # Scala Steward: Reformat with scalafmt 3.5.8
 f7015c7121a95cf4ea078fa5e703fefd7a86e9f2
+
+# Scala Steward: Reformat with scalafmt 3.5.9
+ad7116e128cd8d2b3d42fdd6168ed719a1578b52
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.5.8
+version = 3.5.9
 runner.dialect = scala213
 preset = IntelliJ
 maxColumn = 120

diff --git a/benchmarks/build.sbt b/benchmarks/build.sbt
@@ -10,9 +10,7 @@ dependsOn(Projects.joerncli)
 dependsOn(Projects.javasrc2cpg)
 dependsOn(Projects.jimple2cpg)
 
-libraryDependencies ++= Seq(
-  "org.scalatest"           %% "scalatest"        % Versions.scalatest % Test
-)
+libraryDependencies ++= Seq("org.scalatest" %% "scalatest" % Versions.scalatest % Test)
 
 Compile / doc / sources ~= (_ filter (_ => false))
 

diff --git a/build.sbt b/build.sbt
@@ -38,7 +38,7 @@ lazy val aggregatedProjects: Seq[ProjectReference] = Seq(
   kotlin2cpg
 )
 
-ThisBuild / libraryDependencies += 
+ThisBuild / libraryDependencies +=
   "org.apache.logging.log4j" % "log4j-slf4j-impl" % Versions.log4j % Test
 
 ThisBuild / compile / javacOptions ++= Seq(

diff --git a/console/build.sbt b/console/build.sbt
@@ -9,7 +9,13 @@ val CirceVersion          = "0.14.2"
 val AmmoniteVersion       = "2.5.3"
 val ZeroturnaroundVersion = "1.15"
 
-dependsOn(Projects.semanticcpg, Projects.macros, Projects.jssrc2cpg, Projects.c2cpg % Test, Projects.x2cpg % "compile->compile;test->test")
+dependsOn(
+  Projects.semanticcpg,
+  Projects.macros,
+  Projects.jssrc2cpg,
+  Projects.c2cpg % Test,
+  Projects.x2cpg % "compile->compile;test->test"
+)
 
 libraryDependencies ++= Seq(
   "io.shiftleft"         %% "codepropertygraph" % Versions.cpg,

diff --git a/...frontends/ghidra2cpg/src/test/scala/io/joern/ghidra2cpg/querying/mips/DataFlowTests.scala b/...frontends/ghidra2cpg/src/test/scala/io/joern/ghidra2cpg/querying/mips/DataFlowTests.scala
@@ -12,7 +12,7 @@ import io.shiftleft.semanticcpg.layers._
 class DataFlowTests extends GhidraBinToCpgSuite {
 
   implicit val resolver: ICallResolver = NoResolve
-  implicit var context: EngineContext = EngineContext()
+  implicit var context: EngineContext  = EngineContext()
 
   override def passes(cpg: Cpg): Unit = {
     applyDefaultOverlays(cpg)
@@ -26,7 +26,6 @@ class DataFlowTests extends GhidraBinToCpgSuite {
     buildCpgForBin("linux/mips/t1_to_t9")
   }
 
-
   "should find flows through `add*` instructions" in {
     def source = cpg.call.code("li t1,0x2a").argument(1)
     def sink =

diff --git a/.../src/test/scala/io/joern/ghidra2cpg/querying/mips/DataFlowThroughLoHiRegistersTests.scala b/.../src/test/scala/io/joern/ghidra2cpg/querying/mips/DataFlowThroughLoHiRegistersTests.scala
@@ -37,7 +37,7 @@ class DataFlowThroughLoHiRegistersTests extends GhidraBinToCpgSuite {
        |"<operator>.incBy" 1->1 2->1 3->1 4->1
        |"<operator>.rotateRight" 2->1
        |""".stripMargin
-  implicit val semantics: Semantics            = Semantics.fromList(new Parser().parse(customSemantics))
+  implicit val semantics: Semantics   = Semantics.fromList(new Parser().parse(customSemantics))
   implicit val context: EngineContext = EngineContext(semantics)
 
   "should find flows through `div*` instructions" in {

diff --git a/joern-cli/frontends/javasrc2cpg/build.sbt b/joern-cli/frontends/javasrc2cpg/build.sbt
@@ -9,9 +9,9 @@ libraryDependencies ++= Seq(
   "io.shiftleft"            %% "codepropertygraph" % Versions.cpg,
   "org.apache.logging.log4j" % "log4j-slf4j-impl"  % Versions.log4j % Runtime,
   "io.joern" % "javaparser-symbol-solver-core" % "3.24.3-SL3", // custom build of our fork, sources at https://github.com/mpollmeier/javaparser
-  "org.gradle"     % "gradle-tooling-api" % Versions.gradleTooling,
-  "org.scalatest" %% "scalatest"          % Versions.scalatest     % Test,
-  "org.projectlombok" % "lombok" % "1.18.24"
+  "org.gradle"        % "gradle-tooling-api" % Versions.gradleTooling,
+  "org.scalatest"    %% "scalatest"          % Versions.scalatest % Test,
+  "org.projectlombok" % "lombok"             % "1.18.24"
 )
 
 scalacOptions ++= Seq(

diff --git a/joern-cli/frontends/kotlin2cpg/build.sbt b/joern-cli/frontends/kotlin2cpg/build.sbt
@@ -10,14 +10,14 @@ libraryDependencies ++= Seq(
   "com.lihaoyi"             %% "ujson"                      % "2.0.0",
   "com.squareup.tools.build" % "maven-archeologist"         % "0.0.10",
   "io.shiftleft"            %% "codepropertygraph"          % Versions.cpg,
-  "org.apache.logging.log4j" % "log4j-slf4j-impl"           % Versions.log4j         % Runtime,
+  "org.apache.logging.log4j" % "log4j-slf4j-impl"           % Versions.log4j % Runtime,
   "org.slf4j"                % "slf4j-api"                  % "1.7.35",
   "org.gradle"               % "gradle-tooling-api"         % Versions.gradleTooling,
   "org.jetbrains.kotlin"     % "kotlin-stdlib-jdk8"         % kotlinVersion,
   "org.jetbrains.kotlin"     % "kotlin-stdlib"              % kotlinVersion,
   "org.jetbrains.kotlin"     % "kotlin-compiler-embeddable" % kotlinVersion,
   "org.jetbrains.kotlin"     % "kotlin-allopen"             % kotlinVersion,
-  "org.scalatest"           %% "scalatest"                  % "3.2.9"                % Test
+  "org.scalatest"           %% "scalatest"                  % "3.2.9"        % Test
 )
 
 enablePlugins(JavaAppPackaging, LauncherJarPlugin)

diff --git a/joern-cli/frontends/php2cpg/build.sbt b/joern-cli/frontends/php2cpg/build.sbt
@@ -9,12 +9,12 @@ crossScalaVersions := Seq("2.13.8", "3.1.3")
 dependsOn(Projects.dataflowengineoss, Projects.x2cpg % "compile->compile;test->test")
 
 libraryDependencies ++= Seq(
-  "com.lihaoyi"   %% "ujson"             % "2.0.0",
-  "com.lihaoyi"   %% "upickle"           % "2.0.0",
-  "io.shiftleft"  %% "codepropertygraph" % Versions.cpg,
-  "org.scalatest" %% "scalatest"         % Versions.scalatest % Test,
-  "org.apache.logging.log4j" % "log4j-slf4j-impl"  % Versions.log4j % Runtime,
-  "io.circe"      %% "circe-core"        % "0.15.0-M1"
+  "com.lihaoyi"             %% "ujson"             % "2.0.0",
+  "com.lihaoyi"             %% "upickle"           % "2.0.0",
+  "io.shiftleft"            %% "codepropertygraph" % Versions.cpg,
+  "org.scalatest"           %% "scalatest"         % Versions.scalatest % Test,
+  "org.apache.logging.log4j" % "log4j-slf4j-impl"  % Versions.log4j     % Runtime,
+  "io.circe"                %% "circe-core"        % "0.15.0-M1"
 )
 
 scalacOptions ++= Seq(
@@ -23,7 +23,7 @@ scalacOptions ++= Seq(
 
 lazy val phpParseInstallTask = taskKey[Unit]("Install PHP-Parse using PHP Composer")
 phpParseInstallTask := {
-  val phpBinDir = baseDirectory.value / "bin"
+  val phpBinDir      = baseDirectory.value / "bin"
   val phpParseBinary = phpBinDir / "vendor" / "bin" / "php-parse"
   if (!phpParseBinary.exists) {
     val installSciptPath =