| 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 66dca628674f37af22ccd3511362459a588594ab..bd4abf958dd2bc919f427f1723edc6b982d07b48 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
|
| @@ -273,6 +273,7 @@ public class MainEngine {
|
| context.addSourceFiles(new File(engineTestFolder, "com/google/dart/engine/scanner"));
|
| context.addSourceFiles(new File(engineTestFolder, "com/google/dart/engine/sdk"));
|
| context.addSourceFiles(new File(engineTestFolder, "com/google/dart/engine/source"));
|
| + context.addSourceFiles(new File(engineTestFolder, "com/google/dart/engine/utilities"));
|
| // configure properties
|
| context.addNotProperty("Lcom/google/dart/engine/parser/Parser;.isFunctionDeclaration()");
|
| context.addNotProperty("Lcom/google/dart/engine/parser/Parser;.isInitializedVariableDeclaration()");
|
| @@ -591,6 +592,13 @@ public class MainEngine {
|
| Files.write(source, new File(targetTestFolder + "/resolver_test.dart"), Charsets.UTF_8);
|
| }
|
| {
|
| + CompilationUnit library = buildUtilitiesTestLibrary();
|
| + Files.write(
|
| + getFormattedSource(library),
|
| + new File(targetTestFolder + "/utilities_test.dart"),
|
| + Charsets.UTF_8);
|
| + }
|
| + {
|
| for (CompilationUnitMember member : movedMembers) {
|
| dartUnit.getDeclarations().remove(member);
|
| }
|
| @@ -1487,6 +1495,26 @@ public class MainEngine {
|
| return unit;
|
| }
|
|
|
| + private static CompilationUnit buildUtilitiesTestLibrary() throws Exception {
|
| + CompilationUnit unit = new CompilationUnit(null, null, null, null, null);
|
| + unit.getDirectives().add(libraryDirective("engine", "utilities_test"));
|
| + List<Statement> mainStatements = Lists.newArrayList();
|
| + for (Entry<File, List<CompilationUnitMember>> entry : context.getFileToMembers().entrySet()) {
|
| + File file = entry.getKey();
|
| + if (isEngineTestPath(file, "utilities/")) {
|
| + List<CompilationUnitMember> unitMembers = entry.getValue();
|
| + for (CompilationUnitMember unitMember : unitMembers) {
|
| + boolean isTestSuite = EngineSemanticProcessor.gatherTestSuites(mainStatements, unitMember);
|
| + if (!isTestSuite) {
|
| + moveMemberToUnit(unit, unitMember);
|
| + }
|
| + }
|
| + }
|
| + }
|
| + EngineSemanticProcessor.addMain(unit, mainStatements);
|
| + return unit;
|
| + }
|
| +
|
| private static void fixUnnecessaryCastHints(String projectPath) throws Exception {
|
| System.out.println();
|
| System.out.println("Removing unnecessary casts.");
|
|
|