| Index: editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/engine/MainEngine.java
|
| diff --git a/editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/engine/MainEngine.java b/editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/engine/MainEngine.java
|
| index 1fffc4c3a09ca8bd9d24d46d26d728aaaa180515..add8bfcbad19f8089296a224831db28a0ac202b1 100644
|
| --- a/editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/engine/MainEngine.java
|
| +++ b/editor/util/plugins/com.google.dart.java2dart/src/com/google/dart/java2dart/engine/MainEngine.java
|
| @@ -651,8 +651,9 @@ public class MainEngine {
|
| unit.getDirectives().add(libraryDirective("engine", "error"));
|
| unit.getDirectives().add(importDirective("java_core.dart", null));
|
| unit.getDirectives().add(importDirective("source.dart", null));
|
| - unit.getDirectives().add(importDirective("ast.dart", null, importShowCombinator("ASTNode")));
|
| unit.getDirectives().add(importDirective("scanner.dart", null, importShowCombinator("Token")));
|
| + unit.getDirectives().add(importDirective("ast.dart", null, importShowCombinator("ASTNode")));
|
| + unit.getDirectives().add(importDirective("element.dart", null, importShowCombinator("Element")));
|
| for (Entry<File, List<CompilationUnitMember>> entry : context.getFileToMembers().entrySet()) {
|
| File file = entry.getKey();
|
| if (isEnginePath(file, "error/") || isEnginePath(file, "internal/error/")) {
|
| @@ -1123,7 +1124,7 @@ public class MainEngine {
|
| * Removes trailing spaces from the given Dart source.
|
| */
|
| private static String removeTrailingWhitespaces(String source) {
|
| - String[] lines = StringUtils.split(source, '\n');
|
| + String[] lines = StringUtils.splitPreserveAllTokens(source, '\n');
|
| for (int i = 0; i < lines.length; i++) {
|
| lines[i] = StringUtils.stripEnd(lines[i], null);
|
| }
|
|
|