Translate parts of engine.services project.

editor/tools/plugins/com.google.dart.engine.services/src/com/google/dart/engine/services/internal/correction/QuickAssistProcessorImpl.java

Index: editor/tools/plugins/com.google.dart.engine.services/src/com/google/dart/engine/services/internal/correction/QuickAssistProcessorImpl.java
diff --git a/editor/tools/plugins/com.google.dart.engine.services/src/com/google/dart/engine/services/internal/correction/QuickAssistProcessorImpl.java b/editor/tools/plugins/com.google.dart.engine.services/src/com/google/dart/engine/services/internal/correction/QuickAssistProcessorImpl.java
index b31bf0f9166aa52855870f49dad9f75c9acb8385..4f3fc36cbcdb1911a7fa3e8c986fb3ed4817a6bf 100644
--- a/editor/tools/plugins/com.google.dart.engine.services/src/com/google/dart/engine/services/internal/correction/QuickAssistProcessorImpl.java
+++ b/editor/tools/plugins/com.google.dart.engine.services/src/com/google/dart/engine/services/internal/correction/QuickAssistProcessorImpl.java
@@ -17,8 +17,8 @@ package com.google.dart.engine.services.internal.correction;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-import com.google.dart.engine.ast.AstNode;
 import com.google.dart.engine.ast.AssignmentExpression;
+import com.google.dart.engine.ast.AstNode;
 import com.google.dart.engine.ast.BinaryExpression;
 import com.google.dart.engine.ast.Block;
 import com.google.dart.engine.ast.BlockFunctionBody;
@@ -59,6 +59,7 @@ import com.google.dart.engine.element.ImportElement;
 import com.google.dart.engine.element.LibraryElement;
 import com.google.dart.engine.scanner.Keyword;
 import com.google.dart.engine.scanner.KeywordToken;
+import com.google.dart.engine.scanner.Token;
 import com.google.dart.engine.scanner.TokenClass;
 import com.google.dart.engine.scanner.TokenType;
 import com.google.dart.engine.search.SearchEngine;
@@ -77,8 +78,6 @@ import com.google.dart.engine.services.correction.LinkedPositionProposal;
 import com.google.dart.engine.services.correction.QuickAssistProcessor;
 import com.google.dart.engine.services.correction.SourceCorrectionProposal;
 import com.google.dart.engine.services.internal.correction.CorrectionUtils.InsertDesc;
-import com.google.dart.engine.services.internal.util.ExecutionUtils;
-import com.google.dart.engine.services.internal.util.RunnableEx;
 import com.google.dart.engine.services.internal.util.TokenUtils;
 import com.google.dart.engine.source.Source;
 import com.google.dart.engine.type.Type;
@@ -264,15 +263,13 @@ public class QuickAssistProcessorImpl implements QuickAssistProcessor {
     // run with instrumentation
     final InstrumentationBuilder instrumentation = Instrumentation.builder(this.getClass());
     try {
-      for (final Method method : QuickAssistProcessorImpl.class.getDeclaredMethods()) {
+      for (Method method : QuickAssistProcessorImpl.class.getDeclaredMethods()) {
         if (method.getName().startsWith("addProposal_")) {
           resetProposalElements();
-          ExecutionUtils.runIgnore(new RunnableEx() {
-            @Override
-            public void run() throws Exception {
-              method.invoke(QuickAssistProcessorImpl.this);
-            }
-          });
+          try {
+            method.invoke(QuickAssistProcessorImpl.this);
+          } catch (Throwable e) {

[Brian Wilkerson, 2014/04/26 17:04:52]

Shouldn't we at least log this exception, even if it's only an informational
message?

[scheglov, 2014/04/26 18:02:15]

Done.

+          }
         }
       }
       instrumentation.metric("QuickAssist-Offset", selectionOffset);
@@ -322,7 +319,7 @@ public class QuickAssistProcessorImpl implements QuickAssistProcessor {
       {
         SourceRange modifiersRange = rangeStartEnd(declarationList, variable);
         String modifiersSource = utils.getText(modifiersRange);
-        List<com.google.dart.engine.scanner.Token> tokens = TokenUtils.getTokens(modifiersSource);
+        List<Token> tokens = TokenUtils.getTokens(modifiersSource);
         varToken = TokenUtils.findKeywordToken(tokens, Keyword.VAR);
       }
       // replace "var", or insert type before name
@@ -641,7 +638,7 @@ public class QuickAssistProcessorImpl implements QuickAssistProcessor {
       newContent += utils.getEndOfLine();
       newContent += utils.getEndOfLine();
       newContent += getSource(linesRange);
-      createFileChange = new CreateFileChange(newFile, newContent, fileName);
+      createFileChange = new CreateFileChange(fileName, newFile, newContent);
     }
     // add 'part'
     SourceChange libraryChange = getInsertPartDirectiveChange(unitLibrarySource, fileName);