editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/actions/NewSelectionConverter.java - Issue 474193003: Make more use of generated code in Java analysis server.

Unified Diff: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/actions/NewSelectionConverter.java

Issue 474193003: Make more use of generated code in Java analysis server. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« editor/tools/plugins/com.google.dart.server_test/src/com/google/dart/server/internal/remote/RemoteAnalysisServerImplTest.java ('K') | « editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/internal/search/ui/SearchResultPage_NEW.java ('k') | editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/dart/DartReconcilingStrategy.java » ('j') | editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/dart/DartReconcilingStrategy.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 9a6096c71871e55bcce41135350144011d0789a1..9977b0dadeeb8278d29b5bd3a468a45f56683602 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

@@ -27,12 +27,14 @@ import com.google.dart.engine.ast.visitor.GeneralizingAstVisitor;

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.NavigationRegion;

+import com.google.dart.server.generated.types.NavigationRegion;

import com.google.dart.tools.core.DartCore;

import com.google.dart.tools.ui.internal.text.editor.DartEditor;

import org.eclipse.jface.text.ITextSelection;

+import java.util.List;

/**

* To replace {@link SelectionConverter}.

@@ -177,7 +179,8 @@ public class NewSelectionConverter {

NavigationRegion[] regions = DartCore.getAnalysisServerData().getNavigation(file);

for (NavigationRegion navigationRegion : regions) {

if (navigationRegion.containsInclusive(offset)) {

- return navigationRegion.getTargets();

+ List<com.google.dart.server.generated.types.Element> elements = navigationRegion.getTargets();

+ return elements.toArray(new com.google.dart.server.generated.types.Element[elements.size()]);

}

return com.google.dart.server.generated.types.Element.EMPTY_ARRAY;