| Index: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/correction/QuickAssistProcessor.java
|
| diff --git a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/correction/QuickAssistProcessor.java b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/correction/QuickAssistProcessor.java
|
| index 565c9b6430f7cdcb9d917b0a608b9452dc4a32d0..578219b15a737c760e8ec6e84a3fd1672a15ae0f 100644
|
| --- a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/correction/QuickAssistProcessor.java
|
| +++ b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/correction/QuickAssistProcessor.java
|
| @@ -22,6 +22,8 @@ import com.google.dart.engine.services.correction.CorrectionProcessors;
|
| import com.google.dart.engine.services.correction.CorrectionProposal;
|
| import com.google.dart.engine.source.Source;
|
| import com.google.dart.server.GetAssistsConsumer;
|
| +import com.google.dart.server.GetAvailableRefactoringsConsumer;
|
| +import com.google.dart.server.generated.types.RefactoringKind;
|
| import com.google.dart.server.generated.types.RequestError;
|
| import com.google.dart.server.generated.types.SourceChange;
|
| import com.google.dart.tools.core.DartCore;
|
| @@ -106,7 +108,6 @@ public class QuickAssistProcessor {
|
| if (DartCoreDebug.ENABLE_ANALYSIS_SERVER) {
|
| // add refactoring proposals
|
| addProposal_convertGetterToMethodRefactoring();
|
| - addProposal_convertMethodToGetterRefactoring();
|
| // TODO(scheglov) add other proposals
|
| // addProposal_renameRefactoring();
|
| addProposal_format();
|
| @@ -116,7 +117,7 @@ public class QuickAssistProcessor {
|
| @Override
|
| public void run() throws Exception {
|
| final List<SourceChange> changes = Lists.newArrayList();
|
| - final CountDownLatch latch = new CountDownLatch(1);
|
| + final CountDownLatch latch = new CountDownLatch(2);
|
| String file = context.getFile();
|
| DartCore.getAnalysisServer().edit_getAssists(
|
| file,
|
| @@ -134,6 +135,24 @@ public class QuickAssistProcessor {
|
| latch.countDown();
|
| }
|
| });
|
| + DartCore.getAnalysisServer().edit_getAvailableRefactorings(
|
| + file,
|
| + selection.getOffset(),
|
| + selection.getLength(),
|
| + new GetAvailableRefactoringsConsumer() {
|
| + @Override
|
| + public void computedRefactoringKinds(List<String> refactoringKinds) {
|
| + if (refactoringKinds.contains(RefactoringKind.CONVERT_METHOD_TO_GETTER)) {
|
| + addProposal_convertMethodToGetterRefactoring();
|
| + }
|
| + latch.countDown();
|
| + }
|
| +
|
| + @Override
|
| + public void onError(RequestError requestError) {
|
| + latch.countDown();
|
| + }
|
| + });
|
| Uninterruptibles.awaitUninterruptibly(latch, 2000, TimeUnit.MILLISECONDS);
|
| addServerProposals(proposals, changes);
|
| }
|
|
|