1 files changed, 6 insertions, 3 deletions
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ToStringRenderer.java b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ToStringRenderer.java
index 6a967533f304..fd77aa900a7c 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ToStringRenderer.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/ToStringRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,6 +38,8 @@ import org.jetbrains.annotations.NonNls;
 
 import java.util.Iterator;
 
+import static com.intellij.psi.CommonClassNames.JAVA_LANG_STRING;
+
 public class ToStringRenderer extends NodeRendererImpl {
   public static final @NonNls String UNIQUE_ID = "ToStringRenderer";
 
@@ -76,7 +78,8 @@ public class ToStringRenderer extends NodeRendererImpl {
     BatchEvaluator.getBatchEvaluator(evaluationContext.getDebugProcess()).invoke(new ToStringCommand(evaluationContext, value) {
       public void evaluationResult(String message) {
         valueDescriptor.setValueLabel(
-          message == null? "" : "\"" + DebuggerUtils.convertToPresentationString(DebuggerUtilsEx.truncateString(message)) + "\""
+          // no need to add quotes and escape characters here, XValueTextRendererImpl handles the presentation
+          message == null? "" : /*"\"" + DebuggerUtils.convertToPresentationString(*/DebuggerUtilsEx.truncateString(message)/*) + "\""*/
         );
         labelListener.labelChanged();
       }
@@ -103,7 +106,7 @@ public class ToStringRenderer extends NodeRendererImpl {
       return false;
     }
 
-    if(type.name().equals("java.lang.String")) {
+    if(JAVA_LANG_STRING.equals(type.name())) {
       return false; // do not render 'String' objects for performance reasons
     }