LoggerOps: use Token.structure for logging

scalameta · Mar 27, 2024 · ec965a5 · ec965a5
1 parent 49e8271
commit ec965a5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatToken.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatToken.scala
@@ -21,8 +21,14 @@ import org.scalafmt.util.TokenOps._
   */
 case class FormatToken(left: Token, right: Token, meta: FormatToken.Meta) {
 
-  override def toString =
-    s"${meta.left.text}∙${meta.right.text}[${left.end}:${right.end}]"
+  override def toString = {
+    val ws = newlinesBetween match {
+      case 0 => between.mkString
+      case 1 => "LF"
+      case _ => "LFLF"
+    }
+    s"${meta.left.text}∙${meta.right.text}: ${left.structure} [$ws] ${right.structure}"
+  }
 
   def inside(range: Set[Range]): Boolean = {
     if (range.isEmpty) true

diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/util/LoggerOps.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/util/LoggerOps.scala
@@ -49,11 +49,7 @@ object LoggerOps {
 
   def log(tokens: Tokens): String = tokens.map(log).mkString("\n")
 
-  def log(token: Token): String =
-    f"[${token.end}]${cleanup(token).slice(0, 30)}%-30s ${getTokenClass(token)}"
-
-  private def getTokenClass(token: Token) =
-    token.getClass.getName.stripPrefix("scala.meta.tokens.Token$")
+  def log(token: Token): String = f"[${token.structure}%-40s"
 
   def log(t: Tree): String = log(t, false)
   def log(t: Tree, tokensOnly: Boolean): String = {