From 1a3449df03fbf82c6af0a0ff009a0629275702e4 Mon Sep 17 00:00:00 2001 From: Albert Meltzer <7529386+kitbellew@users.noreply.github.com> Date: Wed, 20 Nov 2024 20:31:41 -0800 Subject: [PATCH] LoggerOps: log tree name with parent name --- .../src/main/scala/org/scalafmt/util/LoggerOps.scala | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) 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 index 963c4211ef..9f09c349fb 100644 --- a/scalafmt-core/shared/src/main/scala/org/scalafmt/util/LoggerOps.scala +++ b/scalafmt-core/shared/src/main/scala/org/scalafmt/util/LoggerOps.scala @@ -62,8 +62,8 @@ object LoggerOps { val rt = ft.meta.right.text val ls = tokWithoutPos(ft.left) val rs = tokWithoutPos(ft.right) - val lo = treeName(ft.leftOwner) - val ro = treeName(ft.rightOwner) + val lo = treeNameWithParent(ft.leftOwner) + val ro = treeNameWithParent(ft.rightOwner) s"[${ft.idx}] $lt $rt >>> $ls | $rs >>> $lo | $ro" } @@ -103,7 +103,13 @@ object LoggerOps { } } - def treeInfo(t: Tree): String = s"${treeName(t)} ${position(t)}" + def treeName(t: Option[Tree]): String = t.fold("")(treeName) + + def treeNameWithParent(t: Tree): String = + s"${treeName(t)} [${treeName(t.parent)}]" + + def treeInfo(t: Tree): String = + s"${treeName(t)} ${position(t)} [${treeName(t.parent)}]" def log(t: Tree): String = log(t, false) def log(t: Tree, tokensOnly: Boolean): String = {