Resynthesize nameOffset for properties/parameters.

R=brianwilkerson@google.com

Change-Id: Ib3213529836df20f580a5d8805006ba13b82bf20
Reviewed-on: https://dart-review.googlesource.com/68761
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>

Author: scheglov

pkg/analysis_server/test/analysis/notification_navigation_test.dart

@@ -1038,10 +1038,6 @@ class AnalysisNotificationNavigationTest_UseCFE
   @override
   bool get useCFE => true;
 
-  @failingTest
-  @override
-  test_annotationField() async => super.test_annotationField();
-
   @failingTest
   @override
   test_inComment() async => super.test_inComment();

pkg/analysis_server/test/analysis/notification_overrides_test.dart

@@ -632,18 +632,6 @@ class AnalysisNotificationOverridesTest_UseCFE
   @override
   bool get useCFE => true;
 
-  @failingTest
-  @override
-  test_super_fieldByField() async => super.test_super_fieldByField();
-
-  @failingTest
-  @override
-  test_super_fieldByGetter() async => super.test_super_fieldByGetter();
-
-  @failingTest
-  @override
-  test_super_fieldBySetter() async => super.test_super_fieldBySetter();
-
   @failingTest
   @override
   test_super_method_superTypeCycle() async {

pkg/analysis_server/test/integration/analysis/navigation_test.dart

@@ -139,8 +139,4 @@ part of foo;
 class AnalysisNavigationTest_UseCFE extends AnalysisNavigationTest {
   @override
   bool get useCFE => true;
-
-  @override
-  @failingTest
-  test_navigation() => super.test_navigation();
 }

pkg/analysis_server/test/search/type_hierarchy_test.dart

@@ -1103,28 +1103,6 @@ class GetTypeHierarchyTest_UseCFE extends GetTypeHierarchyTest {
 //    return callFailingTest(super.test_fromField_toMixinSetter);
   }
 
-  @failingTest
-  @override
-  test_member_fromField_toField() => super.test_member_fromField_toField();
-
-  @failingTest
-  @override
-  test_member_fromField_toGetter() => super.test_member_fromField_toGetter();
-
-  @failingTest
-  @override
-  test_member_fromField_toSetter() => super.test_member_fromField_toSetter();
-
-  @failingTest
-  @override
-  test_member_fromFinalField_toGetter() =>
-      super.test_member_fromFinalField_toGetter();
-
-  @failingTest
-  @override
-  test_member_fromFinalField_toSetter() =>
-      super.test_member_fromFinalField_toSetter();
-
   @failingTest
   @override
   test_member_getter() {

pkg/analyzer/lib/src/dart/element/element.dart

@@ -8078,8 +8078,13 @@ abstract class NonParameterVariableElementImpl extends VariableElementImpl {
   @override
   int get nameOffset {
     int offset = super.nameOffset;
-    if (offset == 0 && _unlinkedVariable != null) {
-      return _unlinkedVariable.nameOffset;
+    if (offset == 0) {
+      if (_kernel != null) {
+        return _kernel.fileOffset;
+      }
+      if (_unlinkedVariable != null) {
+        return _unlinkedVariable.nameOffset;
+      }
     }
     return offset;
   }
@@ -8446,14 +8451,19 @@ class ParameterElementImpl extends VariableElementImpl
   @override
   int get nameOffset {
     int offset = super.nameOffset;
-    if (offset == 0 && unlinkedParam != null) {
-      if (isSynthetic ||
-          (unlinkedParam.name.isEmpty &&
-              unlinkedParam.kind != UnlinkedParamKind.named &&
-              enclosingElement is GenericFunctionTypeElement)) {
-        return -1;
+    if (offset == 0) {
+      if (_kernel != null) {
+        return _kernel.fileOffset;
+      }
+      if (unlinkedParam != null) {
+        if (isSynthetic ||
+            (unlinkedParam.name.isEmpty &&
+                unlinkedParam.kind != UnlinkedParamKind.named &&
+                enclosingElement is GenericFunctionTypeElement)) {
+          return -1;
+        }
+        return unlinkedParam.nameOffset;
       }
-      return unlinkedParam.nameOffset;
     }
     return offset;
   }

pkg/analyzer/test/src/summary/resynthesize_common.dart

@@ -9023,6 +9023,16 @@ class C {
 ''');
   }
 
+  test_parameter() async {
+    var library = await checkLibrary('void main(int p) {}');
+    checkElementText(
+        library,
+        r'''
+void main@5(int p@14) {}
+''',
+        withOffsets: true);
+  }
+
   test_parameter_checked() async {
     // Note: due to dartbug.com/27393, the keyword "checked" is identified by
     // its presence in a library called "meta".  If that bug is fixed, this test
@@ -10445,6 +10455,19 @@ dynamic v;
     }
   }
 
+  test_variable() async {
+    var library = await checkLibrary('int x = 0;');
+    checkElementText(
+        library,
+        r'''
+int x@4;
+synthetic int get x@4 {}
+synthetic void set x@4(int _x@4) {}
+''',
+        withOffsets: true,
+        withSyntheticAccessors: true);
+  }
+
   test_variable_const() async {
     var library = await checkLibrary('const int i = 0;');
     checkElementText(library, r'''