From b880775de5f3f98529f0b51715fb0a6559adebf7 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 20 Aug 2014 17:27:12 +0400 Subject: [PATCH] JS backend: removed JsBlock toString() truncation Truncation complicates debugging. Some inline tests depend on functions strings comparison. --- .../backend/js/JsToStringGenerationVisitor.java | 16 ++-------------- .../js/compiler/JsSourceGenerationVisitor.java | 5 ----- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/JsToStringGenerationVisitor.java b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/JsToStringGenerationVisitor.java index fe8735cba8f..a0c73d3e1dc 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/JsToStringGenerationVisitor.java +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/JsToStringGenerationVisitor.java @@ -48,11 +48,6 @@ public class JsToStringGenerationVisitor extends JsVisitor { private static final char[] HEX_DIGITS = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'}; - /** - * How many lines of code to print inside of a JsBlock when printing terse. - */ - private static final int JSBLOCK_LINES_TO_PRINT = 3; - public static CharSequence javaScriptString(String value) { return javaScriptString(value, false); } @@ -278,7 +273,7 @@ public class JsToStringGenerationVisitor extends JsVisitor { @Override public void visitBlock(JsBlock x) { - printJsBlock(x, true, true); + printJsBlock(x, true); } @Override @@ -927,7 +922,7 @@ public class JsToStringGenerationVisitor extends JsVisitor { } } - protected void printJsBlock(JsBlock x, boolean truncate, boolean finalNewline) { + protected void printJsBlock(JsBlock x, boolean finalNewline) { if (!lineBreakAfterBlock) { finalNewline = false; lineBreakAfterBlock = true; @@ -938,16 +933,10 @@ public class JsToStringGenerationVisitor extends JsVisitor { blockOpen(); } - int count = 0; Iterator iterator = x.getStatements().iterator(); while (iterator.hasNext()) { boolean isGlobal = x.isGlobalBlock() || globalBlocks.contains(x); - if (truncate && count > JSBLOCK_LINES_TO_PRINT) { - p.print("[...]"); - newlineOpt(); - break; - } JsStatement statement = iterator.next(); if (statement instanceof JsEmpty) { continue; @@ -999,7 +988,6 @@ public class JsToStringGenerationVisitor extends JsVisitor { newlineOpt(); } } - ++count; } if (needBraces) { diff --git a/js/js.translator/src/org/jetbrains/js/compiler/JsSourceGenerationVisitor.java b/js/js.translator/src/org/jetbrains/js/compiler/JsSourceGenerationVisitor.java index 29dc2b42788..6d4ac41cc8a 100644 --- a/js/js.translator/src/org/jetbrains/js/compiler/JsSourceGenerationVisitor.java +++ b/js/js.translator/src/org/jetbrains/js/compiler/JsSourceGenerationVisitor.java @@ -42,11 +42,6 @@ public class JsSourceGenerationVisitor extends JsToStringGenerationVisitor imple x.acceptChildren(this); } - @Override - public void visitBlock(JsBlock x) { - printJsBlock(x, false, true); - } - @Override public void newLined() { if (sourceMapBuilder != null) {