diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaHttpServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaHttpServerCodegen.java index 3fb7d1d7f685..72f7b1510e06 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaHttpServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaAkkaHttpServerCodegen.java @@ -241,6 +241,8 @@ public void processOpts() { supportingFiles.add(new SupportingFile("controller.mustache", (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "Controller.scala")); supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); + supportingFiles.add(new SupportingFile("project/plugins.mustache", "project", "plugins.sbt")); + supportingFiles.add(new SupportingFile("scalafmt.mustache", "", ".scalafmt.conf")); } supportingFiles.add(new SupportingFile("helper.mustache", (sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "AkkaHttpHelper.scala")); diff --git a/modules/openapi-generator/src/main/resources/scala-akka-http-server/project/plugins.mustache b/modules/openapi-generator/src/main/resources/scala-akka-http-server/project/plugins.mustache new file mode 100644 index 000000000000..eefc0dd27b23 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/scala-akka-http-server/project/plugins.mustache @@ -0,0 +1 @@ +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6") diff --git a/modules/openapi-generator/src/main/resources/scala-akka-http-server/scalafmt.mustache b/modules/openapi-generator/src/main/resources/scala-akka-http-server/scalafmt.mustache new file mode 100644 index 000000000000..e66032cc83c3 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/scala-akka-http-server/scalafmt.mustache @@ -0,0 +1,58 @@ +version=3.10.6 +runner.dialect = scala213 +project { + git = false + excludeFilters = [ + scalafmt-benchmarks/src/resources, + sbt-test + bin/issue + ] + layout = StandardConvention +} +align { + preset = none + stripMargin = true +} +binPack { + importSelectors = fold +} +newlines { + avoidForSimpleOverflow = all + ignoreInSyntax = false + source = fold +} +rewrite { + rules = [ + AvoidInfix, + Imports, + RedundantBraces, + RedundantParens, + SortModifiers, + ] + imports { + selectors = fold + removeRedundantSelectors = true + sort = ascii + groups = [ + ["org\\.scalafmt\\..*"], + ["scala\\.meta\\..*", "org\\.scalameta\\..*"], + ["sbt\\..*"], + ["java.?\\..*"], + ["scala\\..*"], + ["org\\..*"], + ["com\\..*"], + ] + } + redundantBraces { + preset = all + oneStatApply { + parensMaxSpan = 300 + bracesMinSpan = 300 + } + } + redundantParens { + preset = all + } + sortModifiers.preset = styleGuide + trailingCommas.style = "always" +} diff --git a/samples/server/petstore/scala-akka-http-server/.openapi-generator/FILES b/samples/server/petstore/scala-akka-http-server/.openapi-generator/FILES index cfcbab175e5d..c390aafc0132 100644 --- a/samples/server/petstore/scala-akka-http-server/.openapi-generator/FILES +++ b/samples/server/petstore/scala-akka-http-server/.openapi-generator/FILES @@ -1,5 +1,7 @@ +.scalafmt.conf README.md build.sbt +project/plugins.sbt src/main/scala/org/openapitools/server/AkkaHttpHelper.scala src/main/scala/org/openapitools/server/Controller.scala src/main/scala/org/openapitools/server/MultipartDirectives.scala diff --git a/samples/server/petstore/scala-akka-http-server/.scalafmt.conf b/samples/server/petstore/scala-akka-http-server/.scalafmt.conf new file mode 100644 index 000000000000..e66032cc83c3 --- /dev/null +++ b/samples/server/petstore/scala-akka-http-server/.scalafmt.conf @@ -0,0 +1,58 @@ +version=3.10.6 +runner.dialect = scala213 +project { + git = false + excludeFilters = [ + scalafmt-benchmarks/src/resources, + sbt-test + bin/issue + ] + layout = StandardConvention +} +align { + preset = none + stripMargin = true +} +binPack { + importSelectors = fold +} +newlines { + avoidForSimpleOverflow = all + ignoreInSyntax = false + source = fold +} +rewrite { + rules = [ + AvoidInfix, + Imports, + RedundantBraces, + RedundantParens, + SortModifiers, + ] + imports { + selectors = fold + removeRedundantSelectors = true + sort = ascii + groups = [ + ["org\\.scalafmt\\..*"], + ["scala\\.meta\\..*", "org\\.scalameta\\..*"], + ["sbt\\..*"], + ["java.?\\..*"], + ["scala\\..*"], + ["org\\..*"], + ["com\\..*"], + ] + } + redundantBraces { + preset = all + oneStatApply { + parensMaxSpan = 300 + bracesMinSpan = 300 + } + } + redundantParens { + preset = all + } + sortModifiers.preset = styleGuide + trailingCommas.style = "always" +} diff --git a/samples/server/petstore/scala-akka-http-server/project/plugins.sbt b/samples/server/petstore/scala-akka-http-server/project/plugins.sbt new file mode 100644 index 000000000000..eefc0dd27b23 --- /dev/null +++ b/samples/server/petstore/scala-akka-http-server/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6")