Merge pull request #7645 from xuwei-k/scalafmt

[2.x] Update `.scalafmt.conf`. re-format

.github/workflows/ci.yml

@@ -77,7 +77,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: sbt/zinc
-          ref: wip/sbt-2.x
+          ref: develop
           path: zinc
       - name: Setup JDK
         uses: actions/setup-java@v4

.scalafmt.conf

@@ -23,9 +23,3 @@ align.openParenDefnSite = false
 danglingParentheses.preset = true
 
 trailingCommas = preserve
-
-# TODO update scalafmt and enable Scala 3
-project.excludeFilters = [
-  "internal/util-position/src/main/scala-3/sbt/internal/util/SourcePositionMacro.scala",
-  "main-settings/src/main/scala/sbt/Def.scala",
-]

internal/util-position/src/main/scala-3/sbt/internal/util/SourcePositionMacro.scala

@@ -11,7 +11,8 @@ import scala.quoted.{ Expr, Quotes, quotes }
 
 abstract class SourcePositionImpl {
 
-  /** Creates a SourcePosition by using the enclosing position of the invocation of this method.
+  /**
+   * Creates a SourcePosition by using the enclosing position of the invocation of this method.
    *
    * @return SourcePosition
    */
@@ -26,8 +27,8 @@ object SourcePositionImpl {
 
     '{
       LinePosition(
-        path = ${Expr(x.sourceFile.name)},
-        startLine = ${Expr(x.startLine + 1)}
+        path = ${ Expr(x.sourceFile.name) },
+        startLine = ${ Expr(x.startLine + 1) }
       )
     }
   }

main-settings/src/main/scala/sbt/Def.scala

@@ -16,7 +16,13 @@ import sbt.Scope.{ GlobalScope, ThisScope }
 import sbt.internal.util.Types.const
 import sbt.internal.util.complete.Parser
 import sbt.internal.util.{ Terminal => ITerminal, * }
-import sbt.util.{ ActionCacheStore, AggregateActionCacheStore, BuildWideCacheConfiguration, cacheLevel , DiskActionCacheStore }
+import sbt.util.{
+  ActionCacheStore,
+  AggregateActionCacheStore,
+  BuildWideCacheConfiguration,
+  cacheLevel,
+  DiskActionCacheStore
+}
 import Util._
 import sbt.util.Show
 import xsbti.{ HashedVirtualFileRef, VirtualFile, VirtualFileRef }
@@ -426,9 +432,10 @@ object Def extends Init[Scope] with TaskMacroExtra with InitializeImplicits:
 
   private[sbt] def dummyTask[T](name: String): Task[T] = {
     import TaskExtra.toTaskInfo
-    val base: Task[T] = TaskExtra.task(
-      sys.error(s"Dummy task '$name' did not get converted to a full task.")
-    )
+    val base: Task[T] = TaskExtra
+      .task(
+        sys.error(s"Dummy task '$name' did not get converted to a full task.")
+      )
       .named(name)
     base.copy(info = base.info.set(isDummyTask, true))
   }