analyzer: Expand BlazeWorkspacePackage.isInTestDirectory to include 'testing'

This changed definition is required for google3, in order to support
using `WorkspacePackage.isInTestDirectory` over the `inTestDir`
extension getter.

Then remove linter's export of the `inTestDir` extension method, and
instead rely on WorkspacePackage in lint rules.

Change-Id: I81fc6a27ca8f19f71a8b915edb3968d5d43262ac
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/431943
Commit-Queue: Samuel Rawlins <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>

Author: srawlins

pkg/analysis_server/lib/src/services/snippets/dart/test_definition.dart

@@ -43,11 +43,7 @@ class TestDefinition extends DartSnippetProducer with TestSnippetMixin {
 
   @override
   Future<bool> isValid() async {
-    if (!await super.isValid()) {
-      return false;
-    }
-
-    return isInTestDirectory;
+    return await super.isValid() && isInTestDirectory;
   }
 }
 

pkg/analyzer/lib/src/workspace/blaze.dart

@@ -628,7 +628,11 @@ class BlazeWorkspacePackage extends WorkspacePackageImpl {
 
   @override
   bool isInTestDirectory(File file) {
-    return root.getChildAssumingFolder('test').contains(file.path);
+    // If the package itself is a "testing" package, then [file] counts as being
+    // "in a test directory."
+    return root.shortName == 'testing' ||
+        root.path.contains('/testing/') ||
+        root.getChildAssumingFolder('test').contains(file.path);
   }
 
   @override

pkg/linter/lib/src/analyzer.dart

@@ -20,7 +20,6 @@ export 'package:analyzer/src/lint/linter.dart'
         MultiAnalysisRule,
         NodeLintRegistry;
 export 'package:analyzer/src/lint/pub.dart' show PSEntry, PubspecVisitor;
-export 'package:analyzer/src/utilities/extensions/ast.dart';
 export 'package:analyzer/src/workspace/pub.dart' show PubPackage;
 
 export 'lint_codes.dart';

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

@@ -937,8 +937,7 @@ class UseBuildContextSynchronously extends MultiAnalysisRule {
     NodeLintRegistry registry,
     LinterContext context,
   ) {
-    var unit = context.definingUnit.unit;
-    if (!unit.inTestDir) {
+    if (!context.isInTestDirectory) {
       var visitor = _Visitor(this);
       registry.addMethodInvocation(this, visitor);
       registry.addInstanceCreationExpression(this, visitor);

pkg/linter/lib/src/util/dart_type_utilities.dart

@@ -5,9 +5,9 @@
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
+import 'package:analyzer/dart/element/type_system.dart';
 import 'package:analyzer/src/dart/element/type.dart'; // ignore: implementation_imports
 
-import '../analyzer.dart' hide AstNodeNullableExtension;
 import '../ast.dart';
 import '../extensions.dart';
 

pkg/linter/tool/checks/rules/no_solo_tests.dart

@@ -29,7 +29,7 @@ class NoSoloTests extends LintRule {
     NodeLintRegistry registry,
     LinterContext context,
   ) {
-    if (context.definingUnit.unit.inTestDir) {
+    if (context.isInTestDirectory) {
       var visitor = _Visitor(this);
       registry.addMethodDeclaration(this, visitor);
     }

pkg/linter/tool/checks/rules/no_trailing_spaces.dart

@@ -28,7 +28,7 @@ class NoTrailingSpaces extends LintRule {
     NodeLintRegistry registry,
     LinterContext context,
   ) {
-    if (context.definingUnit.unit.inTestDir) {
+    if (context.isInTestDirectory) {
       var visitor = _Visitor(this);
       registry.addMethodInvocation(this, visitor);
     }