Update scalafmt-core to 3.5.8 (joernio#1557)

* Update scalafmt-core to 3.5.8 * Reformat with scalafmt 3.5.8 Executed command: scalafmt --non-interactive * Add 'Reformat with scalafmt 3.5.8' to .git-blame-ignore-revs
Privado-Inc · Jul 7, 2022 · 8ec8372 · 8ec8372
1 parent c9f4bac
commit 8ec8372
Show file tree

Hide file tree

Showing 18 changed files with 44 additions and 53 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -0,0 +1,2 @@
+# Scala Steward: Reformat with scalafmt 3.5.8
+f7015c7121a95cf4ea078fa5e703fefd7a86e9f2
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.5.3
+version = 3.5.8
 runner.dialect = scala213
 preset = IntelliJ
 maxColumn = 120

diff --git a/benchmarks/src/test/scala/io/joern/benchmarks/BenchmarkTags.scala b/benchmarks/src/test/scala/io/joern/benchmarks/BenchmarkTags.scala
@@ -39,7 +39,7 @@ object BenchmarkTags {
   object Simple           extends Tag("Simple")
   // Additional tags for JInfoFlow
   object Context extends Tag("Context")
-  object Events   extends Tag("Event")
+  object Events  extends Tag("Event")
 
   def TAGS: Seq[String] = Seq(
     Aliasing.name,
@@ -63,7 +63,7 @@ object BenchmarkTags {
     Library.name,
     Simple.name,
     Context.name,
-    Events.name,
+    Events.name
   )
 
   val confusionMatrix = mutable.Map.empty[String, Array[Int]]

diff --git a/benchmarks/src/test/scala/io/joern/benchmarks/ifspec/java/ArraysBenchmark.scala b/benchmarks/src/test/scala/io/joern/benchmarks/ifspec/java/ArraysBenchmark.scala
@@ -62,7 +62,7 @@ class ArraysBenchmark6 extends IfspecArraysFixture(JAVA_EXT, 6) {
 // ArraySizeStrongUpdate
 class ArraysBenchmark7 extends IfspecArraysFixture(JAVA_EXT, 7) {
 
-  s"Arrays$benchmarkNo" should "report secure" taggedAs (Arrays, ExplicitFlows)  in {
+  s"Arrays$benchmarkNo" should "report secure" taggedAs (Arrays, ExplicitFlows) in {
     assertIsSecure(cpg.fieldAccess.code(".*secret"), cpg.call(".*println.*").argument(1))
   }
 

diff --git a/benchmarks/src/test/scala/io/joern/benchmarks/ifspec/java/ExceptionsBenchmark.scala b/benchmarks/src/test/scala/io/joern/benchmarks/ifspec/java/ExceptionsBenchmark.scala
@@ -45,7 +45,10 @@ class ExceptionsBenchmark4 extends IfspecExceptionsFixture(JAVA_EXT, 4) {
 class ExceptionsBenchmark5 extends IfspecExceptionsFixture(JAVA_EXT, 5) {
 
   s"Exceptions$benchmarkNo" should "report insecure" taggedAs (Exceptions, ImplicitFlows) in {
-    assertIsInsecure(cpg.call(".*nextInt.*").receiver, cpg.call.methodFullName(".*writeToDisk.*", ".*writeToDB.*").argument(1))
+    assertIsInsecure(
+      cpg.call(".*nextInt.*").receiver,
+      cpg.call.methodFullName(".*writeToDisk.*", ".*writeToDB.*").argument(1)
+    )
   }
 
 }

diff --git a/benchmarks/src/test/scala/io/joern/benchmarks/ifspec/java/HighConditionalBenchmark.scala b/benchmarks/src/test/scala/io/joern/benchmarks/ifspec/java/HighConditionalBenchmark.scala
@@ -113,4 +113,4 @@ class HighConditionalBenchmark12 extends IfspecHighConditionalFixture(JAVA_EXT,
     assertIsSecure(cpg.call(".*reinit.*").argument, cpg.method("seePreview").methodReturn)
   }
 
-}
+}
diff --git a/benchmarks/src/test/scala/io/joern/benchmarks/ifspec/java/SimpleBenchmark.scala b/benchmarks/src/test/scala/io/joern/benchmarks/ifspec/java/SimpleBenchmark.scala
@@ -158,7 +158,6 @@ class SimpleBenchmark17 extends IfspecSimpleFixture(JAVA_EXT, 17) {
 
 }
 
-
 // Webstore3
 class SimpleBenchmark18 extends IfspecSimpleFixture(JAVA_EXT, 18) {
 
@@ -167,4 +166,3 @@ class SimpleBenchmark18 extends IfspecSimpleFixture(JAVA_EXT, 18) {
   }
 
 }
-
diff --git a/benchmarks/src/test/scala/io/joern/benchmarks/ifspec/jvm/ArraysBenchmark.scala b/benchmarks/src/test/scala/io/joern/benchmarks/ifspec/jvm/ArraysBenchmark.scala
@@ -62,7 +62,7 @@ class ArraysBenchmark6 extends IfspecArraysFixture(JVM_EXT, 6) {
 // ArraySizeStrongUpdate
 class ArraysBenchmark7 extends IfspecArraysFixture(JVM_EXT, 7) {
 
-  s"Arrays$benchmarkNo" should "report secure" taggedAs (Arrays, ExplicitFlows)  in {
+  s"Arrays$benchmarkNo" should "report secure" taggedAs (Arrays, ExplicitFlows) in {
     assertIsSecure(cpg.fieldAccess.code(".*secret"), cpg.call(".*println.*").argument(1))
   }
 

diff --git a/benchmarks/src/test/scala/io/joern/benchmarks/ifspec/jvm/ExceptionsBenchmark.scala b/benchmarks/src/test/scala/io/joern/benchmarks/ifspec/jvm/ExceptionsBenchmark.scala
@@ -45,7 +45,10 @@ class ExceptionsBenchmark4 extends IfspecExceptionsFixture(JVM_EXT, 4) {
 class ExceptionsBenchmark5 extends IfspecExceptionsFixture(JVM_EXT, 5) {
 
   s"Exceptions$benchmarkNo" should "report insecure" taggedAs (Exceptions, ImplicitFlows) in {
-    assertIsInsecure(cpg.call(".*nextInt.*").receiver, cpg.call.methodFullName(".*writeToDisk.*", ".*writeToDB.*").argument(1))
+    assertIsInsecure(
+      cpg.call(".*nextInt.*").receiver,
+      cpg.call.methodFullName(".*writeToDisk.*", ".*writeToDB.*").argument(1)
+    )
   }
 
 }

diff --git a/benchmarks/src/test/scala/io/joern/benchmarks/ifspec/jvm/HighConditionalBenchmark.scala b/benchmarks/src/test/scala/io/joern/benchmarks/ifspec/jvm/HighConditionalBenchmark.scala
@@ -113,4 +113,4 @@ class HighConditionalBenchmark12 extends IfspecHighConditionalFixture(JVM_EXT, 1
     assertIsSecure(cpg.call(".*reinit.*").argument, cpg.method("seePreview").methodReturn)
   }
 
-}
+}
diff --git a/benchmarks/src/test/scala/io/joern/benchmarks/ifspec/jvm/SimpleBenchmark.scala b/benchmarks/src/test/scala/io/joern/benchmarks/ifspec/jvm/SimpleBenchmark.scala
@@ -158,7 +158,6 @@ class SimpleBenchmark17 extends IfspecSimpleFixture(JVM_EXT, 17) {
 
 }
 
-
 // Webstore3
 class SimpleBenchmark18 extends IfspecSimpleFixture(JVM_EXT, 18) {
 
@@ -167,4 +166,3 @@ class SimpleBenchmark18 extends IfspecSimpleFixture(JVM_EXT, 18) {
   }
 
 }
-
diff --git a/benchmarks/src/test/scala/io/joern/benchmarks/testfixtures/BenchmarkFixture.scala b/benchmarks/src/test/scala/io/joern/benchmarks/testfixtures/BenchmarkFixture.scala
@@ -30,9 +30,9 @@ abstract class BenchmarkFixture(
     with Matchers
     with BeforeAndAfterAll {
 
-  val semanticsFile: String = ProjectRoot.relativise("benchmarks/src/test/resources/default.semantics")
-  lazy val defaultSemantics: Semantics           = Semantics.fromList(new Parser().parseFile(semanticsFile))
-  implicit val resolver: ICallResolver           = NoResolve
+  val semanticsFile: String            = ProjectRoot.relativise("benchmarks/src/test/resources/default.semantics")
+  lazy val defaultSemantics: Semantics = Semantics.fromList(new Parser().parseFile(semanticsFile))
+  implicit val resolver: ICallResolver = NoResolve
   implicit lazy val engineContext: EngineContext = EngineContext(defaultSemantics, EngineConfig(maxCallDepth = 4))
 
   private lazy val targetFiles = getListOfFiles(ProjectRoot.relativise(constructTargetFilePath))
@@ -146,9 +146,7 @@ class BenchmarkCpgContext {
         }
       case None =>
         Failure(
-          new RuntimeException(
-            s"Unable to guess which language frontend to use to parse the benchmark at '$inputPath'"
-          )
+          new RuntimeException(s"Unable to guess which language frontend to use to parse the benchmark at '$inputPath'")
         )
     }
     applyDefaultOverlays(cpg.get)

diff --git a/benchmarks/src/test/scala/io/joern/benchmarks/testfixtures/IfspecFixture.scala b/benchmarks/src/test/scala/io/joern/benchmarks/testfixtures/IfspecFixture.scala
@@ -1,12 +1,7 @@
 package io.joern.benchmarks.testfixtures
 
 class IfspecFixture(category: String, fileExt: String, benchmarkNo: String)
-    extends BenchmarkFixture(
-      pkg = "ifspec",
-      category = category,
-      fileExt = fileExt,
-      benchmarkNo = benchmarkNo
-    )
+    extends BenchmarkFixture(pkg = "ifspec", category = category, fileExt = fileExt, benchmarkNo = benchmarkNo)
 
 class IfspecAliasingFixture(fileExt: String, benchmarkNo: Int)
     extends IfspecFixture(category = "Aliasing", fileExt = fileExt, benchmarkNo = benchmarkNo.toString)

diff --git a/benchmarks/src/test/scala/io/joern/benchmarks/testfixtures/JInfoFlowFixture.scala b/benchmarks/src/test/scala/io/joern/benchmarks/testfixtures/JInfoFlowFixture.scala
@@ -2,12 +2,7 @@ package io.joern.benchmarks.testfixtures
 import java.io.File
 
 class JInfoFlowFixture(category: String, fileExt: String, benchmarkNo: String)
-    extends BenchmarkFixture(
-      pkg = "jinfoflow",
-      category = category,
-      fileExt = fileExt,
-      benchmarkNo = benchmarkNo
-    )
+    extends BenchmarkFixture(pkg = "jinfoflow", category = category, fileExt = fileExt, benchmarkNo = benchmarkNo)
 
 class JInfoFlowBasicFixture(fileExt: String, benchmarkNo: Int)
     extends JInfoFlowFixture(category = "Basic", fileExt = fileExt, benchmarkNo = benchmarkNo.toString)
@@ -19,9 +14,9 @@ class JInfoFlowEventsFixture(fileExt: String, benchmarkNo: Int)
     extends JInfoFlowFixture(category = "Events", fileExt = fileExt, benchmarkNo = benchmarkNo.toString) {
 
   override protected def getListOfFiles(dir: String): List[File] = {
-    val targetFiles = super.getListOfFiles(dir)
-    val eventFramework = new java.io.File(s"$dir${java.io.File.separator}eventframework")
-    val events = new java.io.File(s"$dir${java.io.File.separator}events")
+    val targetFiles     = super.getListOfFiles(dir)
+    val eventFramework  = new java.io.File(s"$dir${java.io.File.separator}eventframework")
+    val events          = new java.io.File(s"$dir${java.io.File.separator}events")
     val supportingFiles = eventFramework.listFiles() ++ events.listFiles()
     targetFiles ++ supportingFiles.filter(_.isFile)
   }

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

diff --git a/joern-cli/frontends/kotlin2cpg/build.sbt b/joern-cli/frontends/kotlin2cpg/build.sbt
@@ -19,5 +19,5 @@ libraryDependencies ++= Seq(
 )
 
 enablePlugins(JavaAppPackaging, LauncherJarPlugin)
-trapExit := false
-Test/fork := false
+trapExit    := false
+Test / fork := false
diff --git a/...ontends/kotlin2cpg/src/main/scala/io/joern/kotlin2cpg/types/DefaultTypeInfoProvider.scala b/...ontends/kotlin2cpg/src/main/scala/io/joern/kotlin2cpg/types/DefaultTypeInfoProvider.scala
@@ -203,9 +203,13 @@ class DefaultTypeInfoProvider(environment: KotlinCoreEnvironment) extends TypeIn
     Option(mapForEntity.get(BindingContext.CLASS.getKey))
       .map(getSuperclassDescriptors)
       .filter(_.asScala.nonEmpty)
-      .map(_.asScala.map { superClassDesc =>
-        TypeRenderer.render(superClassDesc.getDefaultType)
-      }.toList)
+      .map(
+        _.asScala
+          .map { superClassDesc =>
+            TypeRenderer.render(superClassDesc.getDefaultType)
+          }
+          .toList
+      )
       .getOrElse(defaultValue)
   }
 

diff --git a/project/Projects.scala b/project/Projects.scala
@@ -11,13 +11,13 @@ object Projects {
   lazy val semanticcpg       = project.in(file("semanticcpg"))
   lazy val benchmarks        = project.in(file("benchmarks"))
 
-  lazy val c2cpg      = project.in(frontendsRoot / "c2cpg")
-  lazy val ghidra2cpg = project.in(frontendsRoot / "ghidra2cpg")
-  lazy val x2cpg      = project.in(frontendsRoot / "x2cpg")
-  lazy val pysrc2cpg  = project.in(frontendsRoot / "pysrc2cpg")
-  lazy val php2cpg    = project.in(frontendsRoot / "php2cpg")
-  lazy val jssrc2cpg  = project.in(frontendsRoot / "jssrc2cpg")
+  lazy val c2cpg       = project.in(frontendsRoot / "c2cpg")
+  lazy val ghidra2cpg  = project.in(frontendsRoot / "ghidra2cpg")
+  lazy val x2cpg       = project.in(frontendsRoot / "x2cpg")
+  lazy val pysrc2cpg   = project.in(frontendsRoot / "pysrc2cpg")
+  lazy val php2cpg     = project.in(frontendsRoot / "php2cpg")
+  lazy val jssrc2cpg   = project.in(frontendsRoot / "jssrc2cpg")
   lazy val javasrc2cpg = project.in(frontendsRoot / "javasrc2cpg")
-  lazy val jimple2cpg = project.in(frontendsRoot / "jimple2cpg")
-  lazy val kotlin2cpg = project.in(frontendsRoot / "kotlin2cpg")
+  lazy val jimple2cpg  = project.in(frontendsRoot / "jimple2cpg")
+  lazy val kotlin2cpg  = project.in(frontendsRoot / "kotlin2cpg")
 }