[DAS] Go to Super handles field declarations

Fixes: #60465
Change-Id: I8b9e0231d3e7f6e7d9b75fdcf6b16311d470a7fe
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/420120
Reviewed-by: Paul Berry <[email protected]>
Commit-Queue: Brian Wilkerson <[email protected]>
Commit-Queue: Paul Berry <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>
Auto-Submit: Felipe Morschel <[email protected]>

Author: FMorschel

pkg/analysis_server/lib/src/lsp/handlers/custom/handler_super.dart

@@ -64,8 +64,16 @@ class SuperHandler
 
   /// Returns whether [node] is something that can be considered to have a
   /// "super" (a class or a class member).
-  bool _canHaveSuper(AstNode node) =>
-      node is ClassDeclaration || node is ClassMember;
+  bool _canHaveSuper(AstNode node) {
+    AstNode? testNode = node;
+    if (testNode
+        case VariableDeclaration(parent: VariableDeclarationList list) ||
+            VariableDeclarationList list) {
+      // This says if the variable is a field or null if it isn't.
+      testNode = list.parent;
+    }
+    return testNode is ClassDeclaration || testNode is ClassMember;
+  }
 }
 
 class _SuperComputer {
@@ -96,7 +104,7 @@ class _SuperComputer {
 
     var inheritanceManager = session.inheritanceManager;
 
-    if (element is! ExecutableElement2) {
+    if (element is! ExecutableElement2 && element is! FieldElement2) {
       return null;
     }
 

pkg/analysis_server/lib/src/lsp/mapping.dart

@@ -32,7 +32,10 @@ import 'package:analyzer/source/source_range.dart' as server;
 import 'package:analyzer/src/dart/analysis/search.dart'
     as server
     show DeclarationKind;
+import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/error/codes.dart';
+import 'package:analyzer/src/utilities/extensions/string.dart'
+    show IntExtension;
 import 'package:analyzer_plugin/protocol/protocol_common.dart' as plugin;
 import 'package:analyzer_plugin/src/utilities/client_uri_converter.dart';
 import 'package:collection/collection.dart';
@@ -511,8 +514,19 @@ lsp.Location? fragmentToLocation(
   var libraryFragment = fragment.libraryFragment!;
   var sourcePath = libraryFragment.source.fullName;
 
-  var nameOffset = fragment.nameOffset2;
-  var nameLength = fragment.name2?.length;
+  int? nameOffset;
+  int? nameLength;
+  if (fragment case PropertyAccessorElementImpl(
+    :var isSynthetic,
+    :var nonSynthetic,
+  ) when isSynthetic) {
+    var element = nonSynthetic;
+    nameOffset = element.nameOffset.nullIfNegative;
+    nameLength = element.name?.length;
+  } else {
+    nameOffset = fragment.nameOffset2;
+    nameLength = fragment.name2?.length;
+  }
 
   // For unnamed constructors, use the type name as the target location.
   if (nameOffset == null && fragment is ConstructorFragment) {

pkg/analysis_server/test/lsp/super_test.dart

@@ -170,7 +170,76 @@ class B extends A {
     );
   }
 
-  Future<void> test_getter() async {
+  Future<void> test_field_field() async {
+    await verifyGoToSuper(
+      TestCode.parse('''
+class A {
+  String? [!foo!];
+}
+
+class B extends A {}
+
+class C extends B {
+  @override
+  String? fo^o;
+}
+'''),
+    );
+  }
+
+  Future<void> test_field_getter() async {
+    await verifyGoToSuper(
+      TestCode.parse('''
+class A {
+  String? get [!foo!] => null;
+}
+
+class B extends A {}
+
+class C extends B {
+  @override
+  String? fo^o;
+}
+'''),
+    );
+  }
+
+  @FailingTest(issue: 'https://github.com/dart-lang/sdk/issues/60469')
+  Future<void> test_field_setter() async {
+    await verifyGoToSuper(
+      TestCode.parse('''
+class A {
+  set [!foo!](String? value) {}
+}
+
+class B extends A {}
+
+class C extends B {
+  @override
+  String? fo^o;
+}
+'''),
+    );
+  }
+
+  Future<void> test_getter_field() async {
+    await verifyGoToSuper(
+      TestCode.parse('''
+class A {
+  String [!foo!] = '';
+}
+
+class B extends A {}
+
+class C extends B {
+  @override
+  String get fo^o => '';
+}
+'''),
+    );
+  }
+
+  Future<void> test_getter_getter() async {
     await verifyGoToSuper(
       TestCode.parse('''
 class A {
@@ -179,6 +248,24 @@ class A {
 
 class B extends A {}
 
+class C extends B {
+  @override
+  String get fo^o => '';
+}
+'''),
+    );
+  }
+
+  @FailingTest(issue: 'https://github.com/dart-lang/sdk/issues/60469')
+  Future<void> test_getter_setter() async {
+    await verifyGoToSuper(
+      TestCode.parse('''
+class A {
+  set [!foo!](String value) {}
+}
+
+class B extends A {}
+
 class C extends B {
   @override
   String get fo^o => '';
@@ -385,7 +472,42 @@ class C extends B {
     );
   }
 
-  Future<void> test_setter() async {
+  Future<void> test_setter_field() async {
+    await verifyGoToSuper(
+      TestCode.parse('''
+class A {
+  String [!foo!] = '';
+}
+
+class B extends A {}
+
+class C extends B {
+  @override
+  set fo^o(String value) {}
+}
+'''),
+    );
+  }
+
+  @FailingTest(issue: 'https://github.com/dart-lang/sdk/issues/60469')
+  Future<void> test_setter_getter() async {
+    await verifyGoToSuper(
+      TestCode.parse('''
+class A {
+  String get [!foo!] => '';
+}
+
+class B extends A {}
+
+class C extends B {
+  @override
+  set fo^o(String value) {}
+}
+'''),
+    );
+  }
+
+  Future<void> test_setter_setter() async {
     await verifyGoToSuper(
       TestCode.parse('''
 class A {