Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1810)

Unified Diff: pkg/analysis_server/lib/src/domains/analysis/navigation_dart.dart

Issue 1378713004: Issue 24487. Annotations with constructor resolution should produce navigation reginos to construct… (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 2 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
« no previous file with comments | « no previous file | pkg/analysis_server/test/analysis/notification_navigation_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analysis_server/lib/src/domains/analysis/navigation_dart.dart
diff --git a/pkg/analysis_server/lib/src/domains/analysis/navigation_dart.dart b/pkg/analysis_server/lib/src/domains/analysis/navigation_dart.dart
index 8b87629949fc819391227faa702bb83315cd2440..f1b9100628e1ab0a4d52f49639a718c8f8bf63c4 100644
--- a/pkg/analysis_server/lib/src/domains/analysis/navigation_dart.dart
+++ b/pkg/analysis_server/lib/src/domains/analysis/navigation_dart.dart
@@ -74,6 +74,9 @@ class _DartNavigationCollector {
}
void _addRegionForNode(AstNode node, Element element) {
+ if (node == null) {
+ return;
+ }
int offset = node.offset;
int length = node.length;
_addRegion(offset, length, element);
@@ -92,6 +95,30 @@ class _DartNavigationComputerVisitor extends RecursiveAstVisitor {
_DartNavigationComputerVisitor(this.computer);
@override
+ visitAnnotation(Annotation node) {
+ Element element = node.element;
+ if (element is ConstructorElement && element.isSynthetic) {
+ element = element.enclosingElement;
+ }
+ Identifier name = node.name;
+ if (name is PrefixedIdentifier) {
+ // use constructor in: @PrefixClass.constructorName
+ Element prefixElement = name.prefix.staticElement;
+ if (prefixElement is ClassElement) {
+ prefixElement = element;
+ }
+ computer._addRegionForNode(name.prefix, prefixElement);
+ // always constructor
+ computer._addRegionForNode(name.identifier, element);
+ } else {
+ computer._addRegionForNode(name, element);
+ }
+ computer._addRegionForNode(node.constructorName, element);
+ // arguments
+ _safelyVisit(node.arguments);
+ }
+
+ @override
visitAssignmentExpression(AssignmentExpression node) {
_safelyVisit(node.leftHandSide);
computer._addRegionForToken(node.operator, node.bestElement);
« no previous file with comments | « no previous file | pkg/analysis_server/test/analysis/notification_navigation_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698