From 44854160fe88d057c0ac2fe63a34d218e6598b39 Mon Sep 17 00:00:00 2001 From: Michael Pollmeier Date: Thu, 15 May 2025 14:28:17 +0200 Subject: [PATCH 1/2] upgrade scalafmt --- .scalafmt.conf | 2 +- .../io/shiftleft/codepropertygraph/generated/Cpg.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 2efa7c1ea..16080b8b1 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.8.1 +version = 3.9.6 runner.dialect = scala3 preset = IntelliJ maxColumn = 120 diff --git a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/Cpg.scala b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/Cpg.scala index f2443f593..1985bc35c 100644 --- a/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/Cpg.scala +++ b/domainClasses/src/main/generated/io/shiftleft/codepropertygraph/generated/Cpg.scala @@ -335,8 +335,8 @@ contains the entire local variable declaration without initialization, e.g., for @flatgraph.help.Doc(info = """A location node summarizes a source code location.""") def location: Iterator[nodes.Location] = wrappedCpg.graph._nodes(23).asInstanceOf[Iterator[nodes.Location]] - /** This node represents a type member of a class, struct or union, e.g., for the type declaration `class Foo{ int i ; - * }`, it represents the declaration of the variable `i`. + /** This node represents a type member of a class, struct or union, e.g., for the type declaration + * `class Foo{ int i ; }`, it represents the declaration of the variable `i`. */ @flatgraph.help.Doc(info = """This node represents a type member of a class, struct or union, e.g., for the type declaration `class Foo{ int i ; }`, it represents the declaration of the From ca8fc95b0a3474075d26a46dc946de1c818ebe7a Mon Sep 17 00:00:00 2001 From: Michael Pollmeier Date: Thu, 15 May 2025 16:51:01 +0200 Subject: [PATCH 2/2] fmt --- schema2json/src/main/scala/Schema2Json.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/schema2json/src/main/scala/Schema2Json.scala b/schema2json/src/main/scala/Schema2Json.scala index 2c8d5b0ec..49b818b7c 100644 --- a/schema2json/src/main/scala/Schema2Json.scala +++ b/schema2json/src/main/scala/Schema2Json.scala @@ -49,7 +49,7 @@ object Schema2Json extends App { val description = info.getDeclaringClass.getDeclaredMethod("description").invoke(null).asInstanceOf[String] val providedByFrontend = info.getDeclaringClass.getDeclaredMethod("providedByFrontend").invoke(null).asInstanceOf[Boolean] - ("name" -> name) ~ + ("name" -> name) ~ ("description" -> description) ~ ("providedByFrontend" -> providedByFrontend) } @@ -106,7 +106,7 @@ object Schema2Json extends App { .flatMap { edge => val schName = schemaName(edge.schemaInfo) Some( - ("name" -> edge.name) ~ + ("name" -> edge.name) ~ ("comment" -> edge.comment) ~ ("schema" -> schName) ) @@ -120,7 +120,7 @@ object Schema2Json extends App { .flatMap { prop => val schName = schemaName(prop.schemaInfo) Some( - ("name" -> prop.name) ~ + ("name" -> prop.name) ~ ("comment" -> prop.comment) ~ ("schema" -> schName) )