From 77a480ca4938d97fa848ff3a364fef5d8dac0e68 Mon Sep 17 00:00:00 2001
From: Danny Tuppeny <danny@tuppeny.com>
Date: Tue, 25 Oct 2022 16:31:10 +0000
Subject: [PATCH] [analysis_server] Handle type arguments on named type
 references for initial Call Hierarchy item

Change-Id: I5e30c808ddda7ff7817f7be7dd0ecff9a725854c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/265501
Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
---
 .../computer/computer_lazy_type_hierarchy.dart | 16 ++++++++--------
 .../computer/type_hierarchy_computer_test.dart | 18 ++++++++++++++++++
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/pkg/analysis_server/lib/src/computer/computer_lazy_type_hierarchy.dart b/pkg/analysis_server/lib/src/computer/computer_lazy_type_hierarchy.dart
index 2ad21309f38..b290667296f 100644
--- a/pkg/analysis_server/lib/src/computer/computer_lazy_type_hierarchy.dart
+++ b/pkg/analysis_server/lib/src/computer/computer_lazy_type_hierarchy.dart
@@ -83,22 +83,22 @@ class DartLazyTypeHierarchyComputer {
   TypeHierarchyItem? findTarget(int offset) {
     final node = NodeLocator2(offset).searchWithin(_result.unit);
 
-    Element? element;
+    DartType? type;
 
     // Try named types.
-    final type = node?.thisOrAncestorOfType<NamedType>();
-    element = type?.name.staticElement;
+    type = node?.thisOrAncestorOfType<NamedType>()?.type;
 
-    if (element == null) {
+    if (type == null) {
       // Try enclosing class/mixins.
       final Declaration? declaration = node
           ?.thisOrAncestorMatching((node) => _isValidTargetDeclaration(node));
-      element = declaration?.declaredElement;
+      final element = declaration?.declaredElement;
+      if (element is InterfaceElement) {
+        type = element.thisType;
+      }
     }
 
-    return element is InterfaceElement
-        ? TypeHierarchyItem.forType(element.thisType)
-        : null;
+    return type is InterfaceType ? TypeHierarchyItem.forType(type) : null;
   }
 
   /// Locate the [Element] referenced by [location].
diff --git a/pkg/analysis_server/test/src/computer/type_hierarchy_computer_test.dart b/pkg/analysis_server/test/src/computer/type_hierarchy_computer_test.dart
index 5e9df760714..bdef622ffc5 100644
--- a/pkg/analysis_server/test/src/computer/type_hierarchy_computer_test.dart
+++ b/pkg/analysis_server/test/src/computer/type_hierarchy_computer_test.dart
@@ -728,4 +728,22 @@ int? b;
       ),
     );
   }
+
+  /// Ensure invocations directly on a type with type args retain those args.
+  Future<void> test_typeReference_generic() async {
+    final content = '''
+/*[0*/class /*[1*/MyClass1/*1]*/<T1, T2> {}/*0]*/
+MyCl^ass1<String, String>? a;
+    ''';
+
+    addTestSource(content);
+    await expectTarget(
+      _isItem(
+        'MyClass1<String, String>',
+        testFile,
+        codeRange: code.ranges[0].sourceRange,
+        nameRange: code.ranges[1].sourceRange,
+      ),
+    );
+  }
 }