| Index: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/actions/NewSelectionConverter.java
|
| diff --git a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/actions/NewSelectionConverter.java b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/actions/NewSelectionConverter.java
|
| index 90676fdff35111bbd01044604e09003f4ba395e0..2f51443b1b3b6d2ac7df4c2b500d89e7ce1875e6 100644
|
| --- a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/actions/NewSelectionConverter.java
|
| +++ b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/actions/NewSelectionConverter.java
|
| @@ -28,6 +28,7 @@ import com.google.dart.engine.ast.visitor.NodeLocator;
|
| import com.google.dart.engine.element.Element;
|
| import com.google.dart.engine.services.assist.AssistContext;
|
| import com.google.dart.server.generated.types.NavigationRegion;
|
| +import com.google.dart.server.generated.types.NavigationTarget;
|
| import com.google.dart.tools.core.DartCore;
|
| import com.google.dart.tools.ui.internal.text.editor.DartEditor;
|
|
|
| @@ -174,8 +175,7 @@ public class NewSelectionConverter {
|
| /**
|
| * Returns navigation targets for the given context, may be empty, but not {@code null}.
|
| */
|
| - public static com.google.dart.server.generated.types.Element[] getNavigationTargets(String file,
|
| - int offset) {
|
| + public static NavigationTarget[] getNavigationTargets(String file, int offset) {
|
| // find the smallest navigation region
|
| NavigationRegion result = null;
|
| NavigationRegion[] regions = DartCore.getAnalysisServerData().getNavigation(file);
|
| @@ -191,11 +191,11 @@ public class NewSelectionConverter {
|
| }
|
| // found a region
|
| if (result != null) {
|
| - List<com.google.dart.server.generated.types.Element> elements = result.getTargets();
|
| - return elements.toArray(new com.google.dart.server.generated.types.Element[elements.size()]);
|
| + List<NavigationTarget> targets = result.getTargets();
|
| + return targets.toArray(new NavigationTarget[targets.size()]);
|
| }
|
| // not found
|
| - return com.google.dart.server.generated.types.Element.EMPTY_ARRAY;
|
| + return NavigationTarget.EMPTY_ARRAY;
|
| }
|
|
|
| /**
|
|
|