From 1cead74bd539550417a4992780eee8803af270a4 Mon Sep 17 00:00:00 2001
From: xuwei-k <6b656e6a69@gmail.com>
Date: Tue, 26 Dec 2023 12:54:21 +0900
Subject: [PATCH] Update scalafmt

---
 .scalafmt.conf              |  2 +-
 project/KeywordPlugin.scala | 42 ++++++++++++++++++-------------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.scalafmt.conf b/.scalafmt.conf
index e0d9a66..cf8e735 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.3.1
+version = 3.7.17
 maxColumn = 140
 project.git = true
 project.excludeFilters = [ /sbt-test/, /input_sources/, /contraband-scala/ ]
diff --git a/project/KeywordPlugin.scala b/project/KeywordPlugin.scala
index 3897b0c..a443cc9 100644
--- a/project/KeywordPlugin.scala
+++ b/project/KeywordPlugin.scala
@@ -7,28 +7,28 @@ object KeywordPlugin extends AutoPlugin {
   lazy val scalaKeywords = TaskKey[Set[String]]("scala-keywords")
   lazy val generateKeywords = TaskKey[File]("generateKeywords")
 
-  def getScalaKeywords: Set[String] =
-    {
-      val g = new scala.tools.nsc.Global(new scala.tools.nsc.Settings)
-      g.nme.keywords.map(_.toString)
-    }
-  def writeScalaKeywords(base: File, keywords: Set[String]): File =
-    {
-      val init = keywords.toList.sortBy(identity).map(tn => '"' + tn + '"').mkString("Set(", ", ", ")")
-      val objectName = "ScalaKeywords"
-      val packageName = "sbt.contraband"
-      val keywordsSrc =
-        s"""package $packageName
+  def getScalaKeywords: Set[String] = {
+    val g = new scala.tools.nsc.Global(new scala.tools.nsc.Settings)
+    g.nme.keywords.map(_.toString)
+  }
+  def writeScalaKeywords(base: File, keywords: Set[String]): File = {
+    val init = keywords.toList.sortBy(identity).map(tn => '"' + tn + '"').mkString("Set(", ", ", ")")
+    val objectName = "ScalaKeywords"
+    val packageName = "sbt.contraband"
+    val keywordsSrc =
+      s"""package $packageName
            |object $objectName {
            |  val values = $init
            |}""".stripMargin
-      val out = base / packageName.replace('.', '/') / (objectName + ".scala")
-      IO.write(out, keywordsSrc)
-      out
-    }
-  override def projectSettings: Seq[Setting[_]] = inConfig(Compile)(Seq(
-    scalaKeywords := getScalaKeywords,
-    generateKeywords := writeScalaKeywords(sourceManaged.value, scalaKeywords.value),
-    sourceGenerators += Def.task(Seq(generateKeywords.value)).taskValue
-  ))
+    val out = base / packageName.replace('.', '/') / (objectName + ".scala")
+    IO.write(out, keywordsSrc)
+    out
+  }
+  override def projectSettings: Seq[Setting[_]] = inConfig(Compile)(
+    Seq(
+      scalaKeywords := getScalaKeywords,
+      generateKeywords := writeScalaKeywords(sourceManaged.value, scalaKeywords.value),
+      sourceGenerators += Def.task(Seq(generateKeywords.value)).taskValue
+    )
+  )
 }