Show ExpandableIndent, make alignments visible in Darcula

diff --git a/platform/lang-impl/src/com/intellij/formatting/ExpandableIndent.java b/platform/lang-impl/src/com/intellij/formatting/ExpandableIndent.java
index c3d40c6bad40f7e03ca0dee208e61be083f0a983..ac410df7959a6194d847f42e9186b51d6e6a364f 100644 (file)
--- a/platform/lang-impl/src/com/intellij/formatting/ExpandableIndent.java
+++ b/platform/lang-impl/src/com/intellij/formatting/ExpandableIndent.java
@@ -32,4 +32,8 @@ public class ExpandableIndent extends IndentImpl {
     myEnforceIndent = value;
   }
 
+  @Override
+  public String toString() {
+    return "SmartIndent";
+  }
 }

diff --git a/platform/lang-impl/src/com/intellij/internal/psiView/formattingblocks/BlockTreeNode.java b/platform/lang-impl/src/com/intellij/internal/psiView/formattingblocks/BlockTreeNode.java
index 106a9c76d143386e2da531936c47fa3207715bed..f10fe29acf5f8d1ebe30333fa2e4de1cc842fb7d 100644 (file)
--- a/platform/lang-impl/src/com/intellij/internal/psiView/formattingblocks/BlockTreeNode.java
+++ b/platform/lang-impl/src/com/intellij/internal/psiView/formattingblocks/BlockTreeNode.java
@@ -18,14 +18,13 @@ package com.intellij.internal.psiView.formattingblocks;
 import com.intellij.formatting.Block;
 import com.intellij.formatting.templateLanguages.DataLanguageBlockWrapper;
 import com.intellij.ide.projectView.PresentationData;
+import com.intellij.ui.JBColor;
 import com.intellij.ui.SimpleTextAttributes;
 import com.intellij.ui.treeStructure.SimpleNode;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.PlatformColors;
 import org.jetbrains.annotations.NotNull;
-
-import java.awt.*;
 public class BlockTreeNode extends SimpleNode {
   private final Block myBlock;
 
@@ -64,7 +63,7 @@ public class BlockTreeNode extends SimpleNode {
     }
     if (myBlock.getAlignment() != null) {
       presentation
-        .addText(" " + String.valueOf(myBlock.getAlignment()), new SimpleTextAttributes(SimpleTextAttributes.STYLE_BOLD, Color.darkGray));
+        .addText(" " + String.valueOf(myBlock.getAlignment()), new SimpleTextAttributes(SimpleTextAttributes.STYLE_BOLD, JBColor.darkGray));
     }
     if (myBlock.getWrap() != null) {
       presentation