| Index: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/search/ui/FindDeclarationsAction_NEW.java
|
| diff --git a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/search/ui/FindDeclarationsAction_NEW.java b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/search/ui/FindDeclarationsAction_NEW.java
|
| index d5a776a21067dda94254e809229f17b0d22aca56..9190bab524459a930d97478513fda2d1d8a53b04 100644
|
| --- a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/search/ui/FindDeclarationsAction_NEW.java
|
| +++ b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/search/ui/FindDeclarationsAction_NEW.java
|
| @@ -15,10 +15,7 @@ package com.google.dart.tools.internal.search.ui;
|
|
|
| import com.google.common.collect.Lists;
|
| import com.google.common.util.concurrent.Uninterruptibles;
|
| -import com.google.dart.server.SearchIdConsumer;
|
| import com.google.dart.server.SearchResult;
|
| -import com.google.dart.tools.core.DartCore;
|
| -import com.google.dart.tools.core.analysis.model.SearchResultsListener;
|
| import com.google.dart.tools.ui.DartToolsPlugin;
|
| import com.google.dart.tools.ui.actions.AbstractDartSelectionAction;
|
| import com.google.dart.tools.ui.instrumentation.UIInstrumentationBuilder;
|
| @@ -37,7 +34,6 @@ import org.eclipse.swt.widgets.Event;
|
| import org.eclipse.ui.IWorkbenchSite;
|
| import org.eclipse.ui.PlatformUI;
|
|
|
| -import java.util.Collections;
|
| import java.util.List;
|
| import java.util.concurrent.CountDownLatch;
|
| import java.util.concurrent.TimeUnit;
|
| @@ -83,22 +79,23 @@ public class FindDeclarationsAction_NEW extends AbstractDartSelectionAction {
|
| protected List<SearchResult> runQuery() {
|
| final List<SearchResult> allResults = Lists.newArrayList();
|
| final CountDownLatch latch = new CountDownLatch(1);
|
| - DartCore.getAnalysisServer().searchClassMemberDeclarations(name, new SearchIdConsumer() {
|
| - @Override
|
| - public void computedSearchId(String searchId) {
|
| - DartCore.getAnalysisServerData().addSearchResultsListener(
|
| - searchId,
|
| - new SearchResultsListener() {
|
| - @Override
|
| - public void computedSearchResults(SearchResult[] results, boolean last) {
|
| - Collections.addAll(allResults, results);
|
| - if (last) {
|
| - latch.countDown();
|
| - }
|
| - }
|
| - });
|
| - }
|
| - });
|
| + // TODO (jwren) re-implement after functionality has been updated in server
|
| +// DartCore.getAnalysisServer().searchClassMemberDeclarations(name, new SearchIdConsumer() {
|
| +// @Override
|
| +// public void computedSearchId(String searchId) {
|
| +// DartCore.getAnalysisServerData().addSearchResultsListener(
|
| +// searchId,
|
| +// new SearchResultsListener() {
|
| +// @Override
|
| +// public void computedSearchResults(SearchResult[] results, boolean last) {
|
| +// Collections.addAll(allResults, results);
|
| +// if (last) {
|
| +// latch.countDown();
|
| +// }
|
| +// }
|
| +// });
|
| +// }
|
| +// });
|
| Uninterruptibles.awaitUninterruptibly(latch, 1, TimeUnit.MINUTES);
|
| return allResults;
|
| }
|
|
|