diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 6ffb689ad7..08ad929487 100644 --- 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 index 2b0e68fa7c..c40d23305c 100644 --- 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 index 0a107c0371..33f61e845f 100644 --- 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) }