[PE] [linter] refine strict_top_level_inference reflective test detection

Change-Id: Ifac4d96e0d1340c31cf965c8076ed0acae018d53
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/412460
Commit-Queue: Brian Wilkerson <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>
Auto-Submit: Phil Quitslund <[email protected]>

Author: pq

pkg/linter/lib/src/rules/strict_top_level_inference.dart

@@ -214,7 +214,9 @@ class _Visitor extends SimpleAstVisitor<void> {
       );
       if (overriddenMember == null &&
           node.returnType == null &&
-          !container.isReflectiveTest) {
+          (!container.isReflectiveTest ||
+              (!node.name.lexeme.startsWith('test_') &&
+                  !node.name.lexeme.startsWith('solo_test_')))) {
         _report(node.name);
       }
       if (node.parameters case var parameters?) {

pkg/linter/test/rules/strict_top_level_inference_test.dart

@@ -24,6 +24,25 @@ class StrictTopLevelInferenceTest extends LintRuleTest {
   @override
   String get lintRule => LintNames.strict_top_level_inference;
 
+  void addReflectiveTestLoaderDep() {
+    // TODO(pq): share setup logic with unreachable_from_main_test
+    var testReflectiveLoaderPath = '$workspaceRootPath/test_reflective_loader';
+    var packageConfigBuilder = PackageConfigFileBuilder();
+    packageConfigBuilder.add(
+      name: 'test_reflective_loader',
+      rootPath: testReflectiveLoaderPath,
+    );
+    writeTestPackageConfig(packageConfigBuilder);
+    newFile('$testReflectiveLoaderPath/lib/test_reflective_loader.dart', r'''
+library test_reflective_loader;
+
+const Object reflectiveTest = _ReflectiveTest();
+class _ReflectiveTest {
+  const _ReflectiveTest();
+}
+''');
+  }
+
   test_constructorParameter_named() async {
     await assertDiagnostics(
       r'''
@@ -683,23 +702,35 @@ void f() {
 ''');
   }
 
-  test_reflectiveTest() async {
-    // TODO(pq): share setup logic with unreachable_from_main_test
-    var testReflectiveLoaderPath = '$workspaceRootPath/test_reflective_loader';
-    var packageConfigBuilder = PackageConfigFileBuilder();
-    packageConfigBuilder.add(
-      name: 'test_reflective_loader',
-      rootPath: testReflectiveLoaderPath,
+  test_reflectiveTest_nonTest() async {
+    addReflectiveTestLoaderDep();
+    await assertDiagnostics(
+      r'''
+import 'package:test_reflective_loader/test_reflective_loader.dart';
+
+@reflectiveTest
+class ReflectiveTest {
+  foo() {}
+}
+''',
+      [lint(111, 3)],
     );
-    writeTestPackageConfig(packageConfigBuilder);
-    newFile('$testReflectiveLoaderPath/lib/test_reflective_loader.dart', r'''
-library test_reflective_loader;
+  }
 
-const Object reflectiveTest = _ReflectiveTest();
-class _ReflectiveTest {
-  const _ReflectiveTest();
+  test_reflectiveTest_soloTest() async {
+    addReflectiveTestLoaderDep();
+    await assertNoDiagnostics(r'''
+import 'package:test_reflective_loader/test_reflective_loader.dart';
+
+@reflectiveTest
+class ReflectiveTest {
+  solo_test_foo() {}
 }
 ''');
+  }
+
+  test_reflectiveTest_test() async {
+    addReflectiveTestLoaderDep();
     await assertNoDiagnostics(r'''
 import 'package:test_reflective_loader/test_reflective_loader.dart';