Render whitespace in elements without newlines and tabs

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/JetElementInstructionImpl.java

@@ -16,6 +16,7 @@
 
 package org.jetbrains.jet.lang.cfg.pseudocode;
 
+import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.JetElement;
 
@@ -32,4 +33,8 @@ public abstract class JetElementInstructionImpl extends InstructionImpl implemen
     public JetElement getElement() {
         return element;
     }
+
+    protected String render(PsiElement element) {
+        return element.getText().replaceAll("\\s+", " ");
+    }
 }

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/LocalFunctionDeclarationInstruction.java

@@ -59,7 +59,7 @@ public class LocalFunctionDeclarationInstruction extends InstructionWithNext {
 
     @Override
     public String toString() {
-        return "d" + "(" + element.getText() + ")";
+        return "d" + "(" + render(element) + ")";
     }
 
     @NotNull

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/ReadValueInstruction.java

@@ -32,7 +32,7 @@ public class ReadValueInstruction extends InstructionWithNext {
 
     @Override
     public String toString() {
-        return "r(" + element.getText() + ")";
+        return "r(" + render(element) + ")";
     }
 
     @NotNull

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/UnsupportedElementInstruction.java

@@ -32,7 +32,7 @@ public class UnsupportedElementInstruction extends InstructionWithNext {
 
     @Override
     public String toString() {
-        return "unsupported(" + element + " : " + element.getText() + ")";
+        return "unsupported(" + element + " : " + render(element) + ")";
     }
 
     @NotNull

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/VariableDeclarationInstruction.java

@@ -19,7 +19,6 @@ package org.jetbrains.jet.lang.cfg.pseudocode;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.psi.JetDeclaration;
 import org.jetbrains.jet.lang.psi.JetParameter;
-import org.jetbrains.jet.lang.psi.JetProperty;
 import org.jetbrains.jet.lang.psi.JetVariableDeclaration;
 
 public class VariableDeclarationInstruction extends InstructionWithNext {
@@ -42,7 +41,7 @@ public class VariableDeclarationInstruction extends InstructionWithNext {
 
     @Override
     public String toString() {
-        return "v(" + element.getText() + ")";
+        return "v(" + render(element) + ")";
     }
 
     @NotNull

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/WriteValueInstruction.java

@@ -45,7 +45,7 @@ public class WriteValueInstruction extends InstructionWithNext {
             JetNamedDeclaration value = (JetNamedDeclaration) lValue;
             return "w(" + value.getName() + ")";
         }
-        return "w(" + lValue.getText() + ")";
+        return "w(" + render(lValue) + ")";
     }
 
     @NotNull

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions.kt

@@ -31,7 +31,7 @@ class CallInstruction(
 
     override fun createCopy() = CallInstruction(element, resolvedCall)
 
-    override fun toString() = "call(${element.getText()}, ${resolvedCall.getResultingDescriptor()!!.getName()})"
+    override fun toString() = "call(${render(element)}, ${resolvedCall.getResultingDescriptor()!!.getName()})"
 }
 
 class CompilationErrorInstruction(
@@ -45,5 +45,5 @@ class CompilationErrorInstruction(
 
     override fun createCopy() = CompilationErrorInstruction(element, message)
 
-    override fun toString() = "error(${element.getText()}, $message)"
+    override fun toString() = "error(${render(element)}, $message)"
 }