From 7b1e6a0244f31e10fbb212d3a2ea54df403f382b Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Wed, 7 Jul 2010 22:17:00 +0400
Subject: [PATCH] AST tree printing method in DebugUtil

---
 .../formatting/InitialInfoBuilder.java        |  2 +-
 .../src/com/intellij/psi/impl/DebugUtil.java  | 37 ++++++++++++-------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/formatting/InitialInfoBuilder.java b/platform/lang-impl/src/com/intellij/formatting/InitialInfoBuilder.java
index ef42425be6e7..327ced5fa31c 100644
--- a/platform/lang-impl/src/com/intellij/formatting/InitialInfoBuilder.java
+++ b/platform/lang-impl/src/com/intellij/formatting/InitialInfoBuilder.java
@@ -326,7 +326,7 @@ class InitialInfoBuilder {
       final PsiFile[] roots = file.getPsiRoots();
       for (PsiFile root : roots) {
         buffer.append("Root ");
-        DebugUtil.treeToBuffer(buffer, root.getNode(), 0, false, true, true);
+        DebugUtil.treeToBuffer(buffer, root.getNode(), 0, false, true, true, true);
       }
       buffer.append('\n');
     }
diff --git a/platform/lang-impl/src/com/intellij/psi/impl/DebugUtil.java b/platform/lang-impl/src/com/intellij/psi/impl/DebugUtil.java
index 8b12ca1326bc..665bbb0e6654 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/DebugUtil.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/DebugUtil.java
@@ -33,10 +33,8 @@ import com.intellij.util.ArrayUtil;
 import com.intellij.util.CharTable;
 import org.jetbrains.annotations.NotNull;
 
-/**
- *
- */
-@SuppressWarnings({"HardCodedStringLiteral"})
+
+@SuppressWarnings({"HardCodedStringLiteral", "UtilityClassWithoutPrivateConstructor"})
 public class DebugUtil {
   private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.DebugUtil");
 
@@ -54,17 +52,22 @@ public class DebugUtil {
 
   public static String treeToString(@NotNull ASTNode root, boolean skipWhitespaces) {
     StringBuilder buffer = new StringBuilder();
-    treeToBuffer(buffer, root, 0, skipWhitespaces, false, false);
+    treeToBuffer(buffer, root, 0, skipWhitespaces, false, false, true);
+    return buffer.toString();
+  }
+
+  public static String nodeTreeToString(@NotNull ASTNode root, boolean skipWhitespaces) {
+    StringBuilder buffer = new StringBuilder();
+    treeToBuffer(buffer, root, 0, skipWhitespaces, false, false, false);
     return buffer.toString();
   }
 
   public static String treeToString(@NotNull ASTNode root, boolean skipWhitespaces, boolean showRanges) {
     StringBuilder buffer = new StringBuilder();
-    treeToBuffer(buffer, root, 0, skipWhitespaces, showRanges, false);
+    treeToBuffer(buffer, root, 0, skipWhitespaces, showRanges, false, true);
     return buffer.toString();
   }
 
-
   public static String treeToStringWithUserData(TreeElement root, boolean skipWhitespaces) {
     StringBuilder buffer = new StringBuilder();
     treeToBufferWithUserData(buffer, root, 0, skipWhitespaces);
@@ -82,19 +85,25 @@ public class DebugUtil {
                                   int indent,
                                   boolean skipWhiteSpaces,
                                   boolean showRanges,
-                                  final boolean showChildrenRanges) {
+                                  final boolean showChildrenRanges,
+                                  final boolean usePsi) {
     if (skipWhiteSpaces && root.getElementType() == TokenType.WHITE_SPACE) return;
 
     for (int i = 0; i < indent; i++) {
       buffer.append(' ');
     }
     if (root instanceof CompositeElement) {
-      final PsiElement psiElement = root.getPsi();
-      if (psiElement != null) {
-        buffer.append(psiElement.toString());
+      if (usePsi) {
+        final PsiElement psiElement = root.getPsi();
+        if (psiElement != null) {
+          buffer.append(psiElement.toString());
+        }
+        else {
+          buffer.append(root.getElementType().toString());
+        }
       }
       else {
-        buffer.append(root.getElementType().toString());
+        buffer.append(root.toString());
       }
     }
     else {
@@ -117,7 +126,7 @@ public class DebugUtil {
       }
       else {
         while (child != null) {
-          treeToBuffer(buffer, child, indent + 2, skipWhiteSpaces, showChildrenRanges, showChildrenRanges);
+          treeToBuffer(buffer, child, indent + 2, skipWhiteSpaces, showChildrenRanges, showChildrenRanges, usePsi);
           child = child.getTreeNext();
         }
       }
@@ -268,7 +277,7 @@ public class DebugUtil {
       psiToBuffer(result, root, 0, skipWhiteSpaces, showRanges, showRanges);
     }
     else {
-      treeToBuffer(result, root.getNode(), 0, skipWhiteSpaces, showRanges, showRanges);
+      treeToBuffer(result, root.getNode(), 0, skipWhiteSpaces, showRanges, showRanges, true);
     }
     return result.toString();
   }