Simplify ConfigurationFilesMixin

Work towards #55660

This mixin has some members that can be made private, and some that
can be removed.

Removing a `macro` parameter also simplifies things.

Change-Id: Id3b5d33ff66dde0c763499ff183943d72901d395
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/429440
Reviewed-by: Keerti Parthasarathy <[email protected]>
Commit-Queue: Samuel Rawlins <[email protected]>

Author: srawlins

pkg/analysis_server/test/shared/shared_test_interface.dart

@@ -83,6 +83,5 @@ abstract interface class SharedTestInterface {
     bool meta = false,
     bool pedantic = false,
     bool vector_math = false,
-    bool macro = false,
   });
 }

pkg/analysis_server/test/support/configuration_files.dart

@@ -3,30 +3,24 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/file_system/file_system.dart';
-import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:analyzer/src/dart/analysis/experiments.dart';
 import 'package:analyzer/src/util/file_paths.dart' as file_paths;
 import 'package:analyzer/utilities/package_config_file_builder.dart';
 import 'package:analyzer_testing/mock_packages/mock_packages.dart';
-import 'package:analyzer_testing/package_root.dart' as package_root;
 import 'package:analyzer_testing/utilities/extensions/resource_provider.dart';
 
 /// A mixin adding functionality to write `.dart_tool/package_config.json`
 /// files along with mock packages to a [ResourceProvider].
 mixin ConfigurationFilesMixin on MockPackagesMixin {
-  String get latestLanguageVersion =>
-      '${ExperimentStatus.currentVersion.major}.'
-      '${ExperimentStatus.currentVersion.minor}';
-
-  String get testPackageLanguageVersion => latestLanguageVersion;
+  /// The Dart language version of the test package being used for testing.
+  String get testPackageLanguageVersion => _latestLanguageVersion;
 
   /// The path to the test package being used for testing.
   String get testPackageRootPath;
 
-  String convertPath(String fileName) => resourceProvider.convertPath(fileName);
-
-  String toUriStr(String filePath) =>
-      pathContext.toUri(convertPath(filePath)).toString();
+  String get _latestLanguageVersion =>
+      '${ExperimentStatus.currentVersion.major}.'
+      '${ExperimentStatus.currentVersion.minor}';
 
   /// Writes a package_config.json for the package at [projectFolderPath]. If
   /// [packageName] is not supplied, the last segment of [projectFolderPath] is
@@ -43,9 +37,8 @@ mixin ConfigurationFilesMixin on MockPackagesMixin {
     bool meta = false,
     bool pedantic = false,
     bool vector_math = false,
-    bool macro = false,
   }) {
-    projectFolderPath = convertPath(projectFolderPath);
+    projectFolderPath = resourceProvider.convertPath(projectFolderPath);
 
     if (config == null) {
       config = PackageConfigFileBuilder();
@@ -66,14 +59,11 @@ mixin ConfigurationFilesMixin on MockPackagesMixin {
     }
 
     if (flutter) {
-      {
-        var libFolder = addUI();
-        config.add(name: 'ui', rootPath: libFolder.parent.path);
-      }
-      {
-        var libFolder = addFlutter();
-        config.add(name: 'flutter', rootPath: libFolder.parent.path);
-      }
+      var uiLibFolder = addUI();
+      config.add(name: 'ui', rootPath: uiLibFolder.parent.path);
+
+      var flutterLibFolder = addFlutter();
+      config.add(name: 'flutter', rootPath: flutterLibFolder.parent.path);
     }
 
     if (flutter_test) {
@@ -91,30 +81,18 @@ mixin ConfigurationFilesMixin on MockPackagesMixin {
       config.add(name: 'vector_math', rootPath: libFolder.parent.path);
     }
 
-    if (macro) {
-      // TODO(dantup): This code may need to change/be removed depending on how
-      //  we ultimately reference the macro packages/libraries.
-      var physical = PhysicalResourceProvider.INSTANCE;
-      var packageRoot = physical.pathContext.normalize(
-        package_root.packageRoot,
-      );
-
-      for (var package in ['macros', '_macros']) {
-        var destination = resourceProvider.getFolder(
-          convertPath('$packagesRootPath/$package'),
-        );
-        physical
-            .getFolder(packageRoot)
-            .getChildAssumingFolder(package)
-            .copyTo(destination.parent);
-        config.add(name: package, rootPath: destination.path);
-      }
-    }
-
-    _newPackageConfigJsonFile(
-      projectFolderPath,
-      config.toContent(toUriStr: toUriStr),
+    var content = config.toContent(
+      toUriStr:
+          (p) => pathContext.toUri(resourceProvider.convertPath(p)).toString(),
     );
+
+    var projectFolder = resourceProvider.getFolder(projectFolderPath);
+    var dartToolFolder = projectFolder.getChildAssumingFolder(
+      file_paths.dotDartTool,
+    )..create();
+    dartToolFolder
+        .getChildAssumingFile(file_paths.packageConfigJson)
+        .writeAsStringSync(content);
   }
 
   /// Writes a package_config.json for the package under test (considered
@@ -127,7 +105,6 @@ mixin ConfigurationFilesMixin on MockPackagesMixin {
     bool meta = false,
     bool pedantic = false,
     bool vector_math = false,
-    bool macro = false,
   }) {
     writePackageConfig(
       testPackageRootPath,
@@ -139,20 +116,6 @@ mixin ConfigurationFilesMixin on MockPackagesMixin {
       meta: meta,
       pedantic: pedantic,
       vector_math: vector_math,
-      macro: macro,
-    );
-  }
-
-  File _newPackageConfigJsonFile(String packageRootPath, String content) {
-    var dartToolDirectoryPath = pathContext.join(
-      packageRootPath,
-      file_paths.dotDartTool,
-    );
-    var filePath = pathContext.join(
-      dartToolDirectoryPath,
-      file_paths.packageConfigJson,
     );
-    resourceProvider.getFolder(dartToolDirectoryPath).create();
-    return resourceProvider.getFile(filePath)..writeAsStringSync(content);
   }
 }

pkg/analyzer_testing/lib/mock_packages/mock_packages.dart

@@ -147,7 +147,7 @@ mixin MockPackagesMixin {
     return packageFolder.getChildAssumingFolder('lib');
   }
 
-  /// Add files of the given [packageName] to the [provider].
+  /// Adds files of the given [packageName] to the [resourceProvider].
   Folder _addFiles(String packageName) {
     var cachedFiles = _cachedFiles;
     if (cachedFiles == null) {