[DAS] Fixes static tearoff create method and type parameter use

Fixes: #60294
Change-Id: Ida570a50ed8e906e108201095b710200d6978263
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/417901
Reviewed-by: Samuel Rawlins <[email protected]>
Commit-Queue: Brian Wilkerson <[email protected]>
Auto-Submit: Felipe Morschel <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>

Author: FMorschel

pkg/analysis_server/lib/src/services/correction/dart/create_method_or_function.dart

@@ -55,6 +55,16 @@ class CreateMethodOrFunction extends ResolvedCorrectionProducer {
           isStatic = true;
           targetElement = element;
           argument = parent;
+        } else if (target
+            case SimpleIdentifier identifier ||
+                PrefixedIdentifier(:var identifier)) {
+          if (identifier.element case InterfaceElement element) {
+            isStatic = true;
+            targetElement = element;
+            argument = target.parent as Expression;
+          } else {
+            return;
+          }
         } else {
           return;
         }
@@ -160,6 +170,8 @@ class CreateMethodOrFunction extends ResolvedCorrectionProducer {
         builder.addLinkedEdit('NAME', (builder) {
           builder.write(name);
         });
+        // append type parameters
+        builder.writeTypeParameters(functionType.typeParameters);
         // append parameters
         builder.writeFormalParameters(functionType.formalParameters);
         if (functionType.returnType.isDartAsyncFuture) {

pkg/analysis_server/test/src/services/correction/fix/create_method_test.dart

@@ -1621,6 +1621,147 @@ extension E on String {
 void f() {
   E.m();
 }
+''');
+  }
+
+  Future<void> test_static_tearoff() async {
+    await resolveTestCode('''
+void f() async {
+  int _ = await g(C.foo);
+}
+
+Future<T> g<T>(Future<T> Function() foo) => foo();
+
+class C {
+}
+''');
+    await assertHasFix('''
+void f() async {
+  int _ = await g(C.foo);
+}
+
+Future<T> g<T>(Future<T> Function() foo) => foo();
+
+class C {
+  static Future<int> foo() async {
+  }
+}
+''');
+  }
+
+  Future<void> test_static_tearoff_prefixed_typeParameter() async {
+    await resolveTestCode('''
+import '' as self;
+
+void f() async {
+  await g(self.C.foo);
+}
+
+Future<T> g<T>(Future<S> Function<S>() foo) => foo();
+
+class C {
+}
+''');
+    await assertHasFix('''
+import '' as self;
+
+void f() async {
+  await g(self.C.foo);
+}
+
+Future<T> g<T>(Future<S> Function<S>() foo) => foo();
+
+class C {
+  static Future<S> foo<S>() async {
+  }
+}
+''');
+  }
+
+  Future<void> test_static_tearoff_prefixed_typeParameter_bound1() async {
+    await resolveTestCode('''
+import '' as self;
+
+void f() async {
+  await g(self.C.foo);
+}
+
+Future<T> g<T>(Future<S> Function<S extends num>() foo) => foo();
+
+class C {
+}
+''');
+    await assertHasFix('''
+import '' as self;
+
+void f() async {
+  await g(self.C.foo);
+}
+
+Future<T> g<T>(Future<S> Function<S extends num>() foo) => foo();
+
+class C {
+  static Future<S> foo<S extends num>() async {
+  }
+}
+''');
+  }
+
+  Future<void> test_static_tearoff_prefixed_typeParameter_bound2() async {
+    await resolveTestCode('''
+import '' as self;
+
+void f() async {
+  await g(self.C.foo);
+}
+
+Future<T> g<T extends num>(Future<S> Function<S extends T>() foo) => foo();
+
+class C {
+}
+''');
+    await assertHasFix('''
+import '' as self;
+
+void f() async {
+  await g(self.C.foo);
+}
+
+Future<T> g<T extends num>(Future<S> Function<S extends T>() foo) => foo();
+
+class C {
+  static Future<S> foo<S extends num>() async {
+  }
+}
+''');
+  }
+
+  Future<void> test_static_tearoff_prefixed_typeParameter_class() async {
+    await resolveTestCode('''
+import '' as self;
+
+void f() async {
+  await g(self.C.foo);
+}
+
+Future<T> g<T>(Future<S> Function<S>() foo) => foo();
+
+class C<S> {
+}
+''');
+    await assertHasFix('''
+import '' as self;
+
+void f() async {
+  await g(self.C.foo);
+}
+
+Future<T> g<T>(Future<S> Function<S>() foo) => foo();
+
+class C<S> {
+  static Future<S> foo<S>() async {
+  }
+}
 ''');
   }
 }