StyleMap: show comment with rewrite rules at odds

scalameta · Jul 12, 2023 · cf76973 · cf76973
1 parent 0f23519
commit cf76973
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -2,7 +2,8 @@ import sbt._
 import sbt.Keys._
 import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
 import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
-// scalafmt: { maxColumn = 120, style = defaultWithAlign }
+
+// scalafmt: { maxColumn = 120, align.preset = more }
 
 object Dependencies {
   val metaconfigV = "0.11.1"

diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/RewriteSettings.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/RewriteSettings.scala
@@ -25,7 +25,8 @@ case class RewriteSettings(
     val intersection = v1rules & v2rules
     val missing = (v1rules | v2rules).diff(intersection).toSeq
     val changed = intersection.toSeq.filter(_.hasChanged(this, v2))
-    Some((missing ++ changed).map(_.toString).sorted).filter(_.nonEmpty)
+    Some((missing ++ changed).map(_.getClass.getSimpleName).sorted)
+      .filter(_.nonEmpty)
   }
 
   private[config] def forSbt: RewriteSettings =

diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/util/StyleMap.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/util/StyleMap.scala
@@ -54,7 +54,8 @@ class StyleMap(
           // TODO(olafur) report error via callback
           configured.foreach(logger.elem(_)) { style =>
             init.rewrite.rulesChanged(style.rewrite).foreach { x =>
-              warn(x.mkString("May not override rewrite settings: ", ",", ""))
+              val rules = x.mkString(",")
+              warn(s"May not override rewrite settings; changed=[$rules]: $c")
             }
             changeStyle(style)
           }