Prepare for -1 as nameOffset of synthetic PropertyAccessorElement(s).

scheglov · commit-bot@chromium.org · commit 4936904e9aae · 2021-06-11T16:38:06.000Z
Change-Id: Ia8f2760475e2bc465329c1bcdc08732d1a338ecc Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/203295 Commit-Queue: Konstantin Shcheglov <scheglov@google.com> Reviewed-by: Samuel Rawlins <srawlins@google.com> Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/analysis_server/lib/src/computer/computer_overrides.dart b/pkg/analysis_server/lib/src/computer/computer_overrides.dart
@@ -58,11 +58,13 @@ class DartUnitOverridesComputer {
       var interfaceElements = overridesResult.interfaceElements;
       if (superElements.isNotEmpty || interfaceElements.isNotEmpty) {
         var superMember = superElements.isNotEmpty
-            ? proto.newOverriddenMember_fromEngine(superElements.first,
+            ? proto.newOverriddenMember_fromEngine(
+                superElements.first.nonSynthetic,
                 withNullability: _unit.isNonNullableByDefault)
             : null;
         var interfaceMembers = interfaceElements
-            .map((member) => proto.newOverriddenMember_fromEngine(member,
+            .map((member) => proto.newOverriddenMember_fromEngine(
+                member.nonSynthetic,
                 withNullability: _unit.isNonNullableByDefault))
             .toList();
         _overrides.add(proto.Override(node.offset, node.length,
diff --git a/pkg/analysis_server/lib/src/search/type_hierarchy.dart b/pkg/analysis_server/lib/src/search/type_hierarchy.dart
@@ -82,10 +82,11 @@ class TypeHierarchyComputer {
       }
       // create a subclass item
       var subMemberElement = _findMemberElement(subElement);
+      var subMemberElementDeclared = subMemberElement?.nonSynthetic;
       subItem = TypeHierarchyItem(
           convertElement(subElement, withNullability: _isNonNullableByDefault),
-          memberElement: subMemberElement != null
-              ? convertElement(subMemberElement,
+          memberElement: subMemberElementDeclared != null
+              ? convertElement(subMemberElementDeclared,
                   withNullability: _isNonNullableByDefault)
               : null,
           superclass: itemId);
@@ -126,12 +127,13 @@ class TypeHierarchyComputer {
         displayName = classElement.displayName + '<' + typeArgumentsStr + '>';
       }
       var memberElement = _findMemberElement(classElement);
+      var memberElementDeclared = memberElement?.nonSynthetic;
       item = TypeHierarchyItem(
           convertElement(classElement,
               withNullability: _isNonNullableByDefault),
           displayName: displayName,
-          memberElement: memberElement != null
-              ? convertElement(memberElement,
+          memberElement: memberElementDeclared != null
+              ? convertElement(memberElementDeclared,
                   withNullability: _isNonNullableByDefault)
               : null);
       _elementItemMap[classElement] = item;
diff --git a/pkg/analysis_server/test/search/type_hierarchy_test.dart b/pkg/analysis_server/test/search/type_hierarchy_test.dart
@@ -539,13 +539,18 @@ class B extends A {
   var test = 2;
 }
 ''');
-    var items = await _getTypeHierarchy('test = 2;');
-    var itemB = items[0];
-    var itemA = items[itemB.superclass!];
-    expect(itemA.classElement.name, 'A');
-    expect(itemB.classElement.name, 'B');
-    expect(itemA.memberElement!.location!.offset, findOffset('test = 1;'));
-    expect(itemB.memberElement!.location!.offset, findOffset('test = 2;'));
+
+    void checkItems(List<TypeHierarchyItem> items) {
+      var itemA = items.firstWhere((e) => e.classElement.name == 'A');
+      var itemB = items.firstWhere((e) => e.classElement.name == 'B');
+      var memberA = itemA.memberElement!;
+      var memberB = itemB.memberElement!;
+      expect(memberA.location!.offset, findOffset('test = 1;'));
+      expect(memberB.location!.offset, findOffset('test = 2;'));
+    }
+
+    checkItems(await _getTypeHierarchy('test = 1;'));
+    checkItems(await _getTypeHierarchy('test = 2;'));
   }
 
   Future<void> test_member_fromField_toGetter() async {
@@ -557,13 +562,18 @@ class B extends A {
   var test = 2;
 }
 ''');
-    var items = await _getTypeHierarchy('test = 2;');
-    var itemB = items[0];
-    var itemA = items[itemB.superclass!];
-    expect(itemA.classElement.name, 'A');
-    expect(itemB.classElement.name, 'B');
-    expect(itemA.memberElement!.location!.offset, findOffset('test => 1'));
-    expect(itemB.memberElement!.location!.offset, findOffset('test = 2;'));
+
+    void checkItems(List<TypeHierarchyItem> items) {
+      var itemA = items.firstWhere((e) => e.classElement.name == 'A');
+      var itemB = items.firstWhere((e) => e.classElement.name == 'B');
+      var memberA = itemA.memberElement!;
+      var memberB = itemB.memberElement!;
+      expect(memberA.location!.offset, findOffset('test => 1'));
+      expect(memberB.location!.offset, findOffset('test = 2;'));
+    }
+
+    checkItems(await _getTypeHierarchy('test => 1;'));
+    checkItems(await _getTypeHierarchy('test = 2;'));
   }
 
   Future<void> test_member_fromField_toSetter() async {
@@ -575,13 +585,18 @@ class B extends A {
   var test = 2;
 }
 ''');
-    var items = await _getTypeHierarchy('test = 2;');
-    var itemB = items[0];
-    var itemA = items[itemB.superclass!];
-    expect(itemA.classElement.name, 'A');
-    expect(itemB.classElement.name, 'B');
-    expect(itemA.memberElement!.location!.offset, findOffset('test(a) {}'));
-    expect(itemB.memberElement!.location!.offset, findOffset('test = 2;'));
+
+    void checkItems(List<TypeHierarchyItem> items) {
+      var itemA = items.firstWhere((e) => e.classElement.name == 'A');
+      var itemB = items.firstWhere((e) => e.classElement.name == 'B');
+      var memberA = itemA.memberElement!;
+      var memberB = itemB.memberElement!;
+      expect(memberA.location!.offset, findOffset('test(a) {}'));
+      expect(memberB.location!.offset, findOffset('test = 2;'));
+    }
+
+    checkItems(await _getTypeHierarchy('test(a) {}'));
+    checkItems(await _getTypeHierarchy('test = 2;'));
   }
 
   Future<void> test_member_fromFinalField_toGetter() async {
@@ -593,13 +608,18 @@ class B extends A {
   final test = 2;
 }
 ''');
-    var items = await _getTypeHierarchy('test = 2;');
-    var itemB = items[0];
-    var itemA = items[itemB.superclass!];
-    expect(itemA.classElement.name, 'A');
-    expect(itemB.classElement.name, 'B');
-    expect(itemA.memberElement!.location!.offset, findOffset('test => 1;'));
-    expect(itemB.memberElement!.location!.offset, findOffset('test = 2;'));
+
+    void checkItems(List<TypeHierarchyItem> items) {
+      var itemA = items.firstWhere((e) => e.classElement.name == 'A');
+      var itemB = items.firstWhere((e) => e.classElement.name == 'B');
+      var memberA = itemA.memberElement!;
+      var memberB = itemB.memberElement!;
+      expect(memberA.location!.offset, findOffset('test => 1'));
+      expect(memberB.location!.offset, findOffset('test = 2;'));
+    }
+
+    checkItems(await _getTypeHierarchy('test => 1;'));
+    checkItems(await _getTypeHierarchy('test = 2;'));
   }
 
   Future<void> test_member_fromFinalField_toSetter() async {
@@ -612,10 +632,8 @@ class B extends A {
 }
 ''');
     var items = await _getTypeHierarchy('test = 2;');
-    var itemB = items[0];
-    var itemA = items[itemB.superclass!];
-    expect(itemA.classElement.name, 'A');
-    expect(itemB.classElement.name, 'B');
+    var itemA = items.firstWhere((e) => e.classElement.name == 'A');
+    var itemB = items.firstWhere((e) => e.classElement.name == 'B');
     expect(itemA.memberElement, isNull);
     expect(itemB.memberElement!.location!.offset, findOffset('test = 2;'));
   }
diff --git a/pkg/analyzer/lib/error/listener.dart b/pkg/analyzer/lib/error/listener.dart
@@ -71,8 +71,8 @@ class ErrorReporter {
   /// is used to compute the location of the error.
   void reportErrorForElement(ErrorCode errorCode, Element element,
       [List<Object>? arguments]) {
-    reportErrorForOffset(
-        errorCode, element.nameOffset, element.nameLength, arguments);
+    reportErrorForOffset(errorCode, element.nonSynthetic.nameOffset,
+        element.nameLength, arguments);
   }
 
   /// Report a diagnostic with the given [code] and [arguments]. The
diff --git a/pkg/analyzer/lib/src/dart/analysis/driver.dart b/pkg/analyzer/lib/src/dart/analysis/driver.dart
@@ -82,7 +82,7 @@ import 'package:meta/meta.dart';
 /// TODO(scheglov) Clean up the list of implicitly analyzed files.
 class AnalysisDriver implements AnalysisDriverGeneric {
   /// The version of data format, should be incremented on every format change.
-  static const int DATA_VERSION = 146;
+  static const int DATA_VERSION = 147;
 
   /// The number of exception contexts allowed to write. Once this field is
   /// zero, we stop writing any new exception contexts in this process.
diff --git a/pkg/analyzer/lib/src/generated/resolver.dart b/pkg/analyzer/lib/src/generated/resolver.dart
@@ -3432,7 +3432,7 @@ class _WhyNotPromotedVisitor
         filePath: property.source.fullName,
         message:
             "'$propertyName' refers to a property so it couldn't be promoted",
-        offset: property.nameOffset,
+        offset: property.nonSynthetic.nameOffset,
         length: property.nameLength,
         url: reason.documentationLink);
   }
diff --git a/pkg/analyzer/test/src/dart/micro/simple_file_resolver_test.dart b/pkg/analyzer/test/src/dart/micro/simple_file_resolver_test.dart
@@ -835,7 +835,7 @@ var b = a;
     await resolveTestFile();
     {
       var element = findNode.simple('a;').staticElement!;
-      expect(element.nameOffset, 4);
+      expect(element.nonSynthetic.nameOffset, 4);
     }
 
     // New resolver.
@@ -844,7 +844,7 @@ var b = a;
     await resolveTestFile();
     {
       var element = findNode.simple('a;').staticElement!;
-      expect(element.nameOffset, 4);
+      expect(element.nonSynthetic.nameOffset, 4);
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -3432,7 +3432,7 @@ class _WhyNotPromotedVisitor`
`3432`	`3432`	`filePath: property.source.fullName,`
`3433`	`3433`	`message:`
`3434`	`3434`	`"'$propertyName' refers to a property so it couldn't be promoted",`
`3435`		`- offset: property.nameOffset,`
	`3435`	`+ offset: property.nonSynthetic.nameOffset,`
`3436`	`3436`	`length: property.nameLength,`
`3437`	`3437`	`url: reason.documentationLink);`
`3438`	`3438`	`}`
Original file line number	Diff line number	Diff line change
`@@ -835,7 +835,7 @@ var b = a;`
`835`	`835`	`await resolveTestFile();`
`836`	`836`	`{`
`837`	`837`	`var element = findNode.simple('a;').staticElement!;`
`838`		`- expect(element.nameOffset, 4);`
	`838`	`+ expect(element.nonSynthetic.nameOffset, 4);`
`839`	`839`	`}`
`840`	`840`
`841`	`841`	`// New resolver.`
`@@ -844,7 +844,7 @@ var b = a;`
`844`	`844`	`await resolveTestFile();`
`845`	`845`	`{`
`846`	`846`	`var element = findNode.simple('a;').staticElement!;`
`847`		`- expect(element.nameOffset, 4);`
	`847`	`+ expect(element.nonSynthetic.nameOffset, 4);`
`848`	`848`	`}`
`849`	`849`	`}`
`850`	`850`