Merge pull request #3766 from scala-steward-bot/update/scalafmt-core-3.9.7

xuwei-k · web-flow · commit 983975620bc5 · 2025-06-01T08:27:00.000+09:00
Update scalafmt-core to 3.9.7
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -3,3 +3,6 @@
 
 # Scala Steward: Reformat with scalafmt 3.8.2
 f1360f44c61f8e12666965c10e79f11cd75d6d30
+
+# Scala Steward: Reformat with scalafmt 3.9.7
+a54fb4960ff0762738f4895cdc29bf2715a57f87
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.9.6"
+version = "3.9.7"
 project.git = true
 
 maxColumn = 120
diff --git a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
@@ -628,7 +628,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
     new Constraint() {
       override def validate(name: String, value: String, messages: Messages): Option[String] =
         getAccountByUserName(value) match {
-          case None => Some("User does not exist.")
+          case None    => Some("User does not exist.")
           case Some(x) =>
             if (x.userName == params("owner")) {
               Some("This is current repository owner.")
diff --git a/src/main/scala/gitbucket/core/controller/api/ApiGitReferenceControllerBase.scala b/src/main/scala/gitbucket/core/controller/api/ApiGitReferenceControllerBase.scala
@@ -138,7 +138,7 @@ trait ApiGitReferenceControllerBase extends ControllerBase {
 
     val name = RepositoryName(repository)
     val result = JsonFormat(revstr match {
-      case "tags" => repository.tags.map(ApiRef.fromTag(name, _))
+      case "tags"                     => repository.tags.map(ApiRef.fromTag(name, _))
       case x if x.startsWith("tags/") =>
         val tagName = x.substring("tags/".length)
         repository.tags.find(_.name == tagName) match {
diff --git a/src/main/scala/gitbucket/core/controller/api/ApiIssueMilestoneControllerBase.scala b/src/main/scala/gitbucket/core/controller/api/ApiIssueMilestoneControllerBase.scala
@@ -29,7 +29,7 @@ trait ApiIssueMilestoneControllerBase extends ControllerBase {
         )
       }).reverse
     state match {
-      case "all" => JsonFormat(apiMilestones)
+      case "all"             => JsonFormat(apiMilestones)
       case "open" | "closed" =>
         JsonFormat(
           apiMilestones.filter(p => p.state == state)
diff --git a/src/main/scala/gitbucket/core/service/AccountFederationService.scala b/src/main/scala/gitbucket/core/service/AccountFederationService.scala
@@ -59,7 +59,7 @@ trait AccountFederationService {
       .orElse(extractSafeStringForUserName(mailAddress)) match {
       case Some(safeUserName) =>
         getAccountByUserName(safeUserName, includeRemoved = true) match {
-          case None => Some(safeUserName)
+          case None    => Some(safeUserName)
           case Some(_) =>
             logger.info(
               s"User ($safeUserName) already exists. preferredUserName=$preferredUserName, mailAddress=$mailAddress"
diff --git a/src/main/scala/gitbucket/core/service/AccountService.scala b/src/main/scala/gitbucket/core/service/AccountService.scala
@@ -46,7 +46,7 @@ trait AccountService {
       case account if !account.isGroupAccount =>
         account.password match {
           case pbkdf2re(iter, salt, hash) if (pbkdf2_sha256(iter.toInt, salt, password) == hash) => Some(account)
-          case p if p == sha1(password) =>
+          case p if p == sha1(password)                                                          =>
             updateAccount(account.copy(password = pbkdf2_sha256(password)))
             Some(account)
           case _ => None
diff --git a/src/main/scala/gitbucket/core/service/HandleCommentService.scala b/src/main/scala/gitbucket/core/service/HandleCommentService.scala
@@ -62,7 +62,7 @@ trait HandleCommentService {
         .getOrElse(None -> None)
 
       val commentId = (content, action) match {
-        case (None, None) => None
+        case (None, None)         => None
         case (None, Some(action)) =>
           Some(createComment(owner, name, userName, issue.issueId, action.capitalize, action))
         case (Some(content), _) =>
diff --git a/src/main/scala/gitbucket/core/service/PullRequestService.scala b/src/main/scala/gitbucket/core/service/PullRequestService.scala
@@ -427,7 +427,7 @@ trait PullRequestService {
         case Some(patch) =>
           file -> comments.foreach { case (commentId, lineNumber) =>
             lineNumber match {
-              case Left(oldLine) => updateCommitCommentPosition(commentId, newCommitId, Some(oldLine), None)
+              case Left(oldLine)  => updateCommitCommentPosition(commentId, newCommitId, Some(oldLine), None)
               case Right(newLine) =>
                 var counter = newLine
                 patch.getDeltas.asScala.filter(_.getSource.getPosition < newLine).foreach { delta =>
diff --git a/src/main/scala/gitbucket/core/servlet/ApiAuthenticationFilter.scala b/src/main/scala/gitbucket/core/servlet/ApiAuthenticationFilter.scala
@@ -42,7 +42,7 @@ class ApiAuthenticationFilter extends Filter with AccessTokenService with Accoun
           updateLastLoginDate(account.userName)
         }
         chain.doFilter(req, res)
-      case None => chain.doFilter(req, res)
+      case None          => chain.doFilter(req, res)
       case Some(Left(_)) => {
         response.setStatus(HttpServletResponse.SC_UNAUTHORIZED)
         response.setContentType("application/json; charset=utf-8")
diff --git a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
@@ -543,7 +543,7 @@ class WikiCommitHook(owner: String, repository: String, pusher: String, baseUrl:
     case ChangeType.ADD | ChangeType.RENAME => "created"
     case ChangeType.MODIFY                  => "edited"
     case ChangeType.DELETE                  => "deleted"
-    case other =>
+    case other                              =>
       logger.error(s"Unsupported Wiki action: $other")
       "unsupported action"
   }
@@ -560,7 +560,7 @@ class WikiCommitHook(owner: String, repository: String, pusher: String, baseUrl:
       case "created" => Some(CreateWikiPageInfo(owner, repo, commit.committerName, pageName))
       case "edited"  => Some(EditWikiPageInfo(owner, repo, commit.committerName, pageName, commit.id))
       case "deleted" => Some(DeleteWikiInfo(owner, repo, commit.committerName, pageName))
-      case other =>
+      case other     =>
         logger.info(s"Attempted to build wiki record for unsupported action: $other")
         None
     }
diff --git a/src/main/scala/gitbucket/core/util/Directory.scala b/src/main/scala/gitbucket/core/util/Directory.scala
@@ -10,7 +10,7 @@ object Directory {
   val GitBucketHome = (System.getProperty("gitbucket.home") match {
     // -Dgitbucket.home=<path>
     case path if (path != null) => new File(path)
-    case _ =>
+    case _                      =>
       scala.util.Properties.envOrNone("GITBUCKET_HOME") match {
         // environment variable GITBUCKET_HOME
         case Some(env) => new File(env)
diff --git a/src/main/scala/gitbucket/core/util/JGitUtil.scala b/src/main/scala/gitbucket/core/util/JGitUtil.scala
@@ -669,7 +669,7 @@ object JGitUtil {
       val objectId = git.getRepository.resolve(name)
       git.getRepository.open(objectId).getType match {
         case Constants.OBJ_COMMIT => objectId
-        case Constants.OBJ_TAG =>
+        case Constants.OBJ_TAG    =>
           val ref = git.getRepository.getRefDatabase.findRef(name)
           git.getRepository.getRefDatabase.peel(ref).getPeeledObjectId
         case _ => ObjectId.zeroId()
diff --git a/src/main/scala/gitbucket/core/view/helpers.scala b/src/main/scala/gitbucket/core/view/helpers.scala
@@ -53,8 +53,8 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
   def datetimeAgoRecentOnly(date: Date): String = {
     val duration = new Date().getTime - date.getTime
     timeUnits.find(tuple => duration / tuple._1 > 0) match {
-      case Some((_, "month")) => s"on ${new SimpleDateFormat("d MMM", Locale.ENGLISH).format(date)}"
-      case Some((_, "year"))  => s"on ${new SimpleDateFormat("d MMM yyyy", Locale.ENGLISH).format(date)}"
+      case Some((_, "month"))            => s"on ${new SimpleDateFormat("d MMM", Locale.ENGLISH).format(date)}"
+      case Some((_, "year"))             => s"on ${new SimpleDateFormat("d MMM yyyy", Locale.ENGLISH).format(date)}"
       case Some((unitValue, unitString)) =>
         val value = duration / unitValue
         s"${value} ${unitString}${if (value > 1) "s" else ""} ago"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version = "3.9.6"`
	`1`	`+version = "3.9.7"`
`2`	`2`	`project.git = true`
`3`	`3`
`4`	`4`	`maxColumn = 120`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ trait ApiIssueMilestoneControllerBase extends ControllerBase {`
`29`	`29`	`)`
`30`	`30`	`}).reverse`
`31`	`31`	`state match {`
`32`		`- case "all" => JsonFormat(apiMilestones)`
	`32`	`+ case "all" => JsonFormat(apiMilestones)`
`33`	`33`	`case "open" \| "closed" =>`
`34`	`34`	`JsonFormat(`
`35`	`35`	`apiMilestones.filter(p => p.state == state)`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class ApiAuthenticationFilter extends Filter with AccessTokenService with Accoun`
`42`	`42`	`updateLastLoginDate(account.userName)`
`43`	`43`	`}`
`44`	`44`	`chain.doFilter(req, res)`
`45`		`- case None => chain.doFilter(req, res)`
	`45`	`+ case None => chain.doFilter(req, res)`
`46`	`46`	`case Some(Left(_)) => {`
`47`	`47`	`response.setStatus(HttpServletResponse.SC_UNAUTHORIZED)`
`48`	`48`	`response.setContentType("application/json; charset=utf-8")`