analyzer: simplify PackageConfigFileBuilder.toContent

This API did not exist (was not public) in analyzer 7.4.x, so is safe
to change in 8.0.0.

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

Author: srawlins

pkg/analysis_server/lib/src/plugin/plugin_manager.dart

@@ -887,9 +887,7 @@ class PluginManager {
         }
         packageConfigFile.writeAsStringSync(
           packageConfigBuilder.toContent(
-            toUriStr: (path) {
-              return resourceProvider.pathContext.toUri(path).toString();
-            },
+            pathContext: resourceProvider.pathContext,
           ),
         );
       } catch (exception) {

pkg/analysis_server/test/analysis/notification_errors_test.dart

@@ -175,7 +175,7 @@ analyzer:
     // Add the generated project into package_config.json.
     var config = PackageConfigFileBuilder();
     config.add(name: 'foo', rootPath: generatedProject);
-    newFile(configPath, config.toContent(toUriStr: toUriStr));
+    newFile(configPath, config.toContent(pathContext: pathContext));
 
     // Set up project that references the class prior to initial analysis.
     var generatedFile = newFile(generatedFilePath, 'class A {}');

pkg/analysis_server/test/analysis_server_test.dart

@@ -349,7 +349,7 @@ analyzer:
   }
 
   void writePackageConfig(String path, PackageConfigFileBuilder config) {
-    newFile(path, config.toContent(toUriStr: toUriStr));
+    newFile(path, config.toContent(pathContext: pathContext));
   }
 
   /// Creates a simple package named [name] with [content] in the file at

pkg/analysis_server/test/support/configuration_files.dart

@@ -91,10 +91,7 @@ mixin ConfigurationFilesMixin on MockPackagesMixin {
       config.add(name: 'vector_math', rootPath: libFolder.parent.path);
     }
 
-    var content = config.toContent(
-      toUriStr:
-          (p) => pathContext.toUri(resourceProvider.convertPath(p)).toString(),
-    );
+    var content = config.toContent(pathContext: pathContext);
 
     var projectFolder = resourceProvider.getFolder(projectFolderPath);
     var dartToolFolder = projectFolder.getChildAssumingFolder(

pkg/analyzer/api.txt

@@ -4862,7 +4862,7 @@ package:analyzer/utilities/package_config_file_builder.dart:
     new (constructor: PackageConfigFileBuilder Function())
     add (method: void Function({String? languageVersion, required String name, String packageUri, required String rootPath}))
     copy (method: PackageConfigFileBuilder Function())
-    toContent (method: String Function({required String Function(String) toUriStr}))
+    toContent (method: String Function({required Context pathContext}))
 package:analyzer/workspace/workspace.dart:
   WorkspacePackage (class extends Object):
     new (constructor: WorkspacePackage Function())

pkg/analyzer/lib/utilities/package_config_file_builder.dart

@@ -2,6 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+import 'package:path/path.dart' as path;
+
 /// Helper for building `.dart_tool/package_config.json` files.
 ///
 /// See accepted/future-releases/language-versioning/package-config-file-v2.md
@@ -41,7 +43,7 @@ class PackageConfigFileBuilder {
   }
 
   /// Returns the contents of the built package config file.
-  String toContent({required String Function(String) toUriStr}) {
+  String toContent({required path.Context pathContext}) {
     var buffer = StringBuffer();
 
     buffer.writeln('{');
@@ -59,7 +61,7 @@ class PackageConfigFileBuilder {
       prefix = ' ' * 6;
       buffer.writeln('$prefix"name": "${package.name}",');
 
-      var rootUri = toUriStr(package.rootPath);
+      var rootUri = pathContext.toUri(package.rootPath).toString();
       buffer.write('$prefix"rootUri": "$rootUri"');
 
       buffer.writeln(',');

pkg/analyzer/test/src/dart/analysis/context_locator_test.dart

@@ -1251,7 +1251,7 @@ ${getFolder(outPath).path}
         PackageConfigFileBuilder()..add(name: 'flutter', rootPath: flutterPath);
     var packagesFile = newPackageConfigJsonFile(
       rootFolder.path,
-      packageConfigFileBuilder.toContent(toUriStr: toUriStr),
+      packageConfigFileBuilder.toContent(pathContext: pathContext),
     );
 
     var roots = contextLocator.locateRoots(includedPaths: [rootFolder.path]);

pkg/analyzer/test/src/dart/resolution/context_collection_resolution.dart

@@ -344,7 +344,7 @@ class PubPackageResolutionTest extends ContextResolutionTest
     String directoryPath,
     PackageConfigFileBuilder config,
   ) {
-    var content = config.toContent(toUriStr: toUriStr);
+    var content = config.toContent(pathContext: pathContext);
     newPackageConfigJsonFile(directoryPath, content);
   }
 

pkg/analyzer/test/src/workspace/pub_test.dart

@@ -76,7 +76,7 @@ class PackageBuildFileUriResolverTest with ResourceProviderMixin {
     config.add(name: 'test', rootPath: convertPath(testPackageRootPath));
     newPackageConfigJsonFile(
       testPackageRootPath,
-      config.toContent(toUriStr: toUriStr),
+      config.toContent(pathContext: pathContext),
     );
 
     workspace =
@@ -230,7 +230,7 @@ class PackageBuildPackageUriResolverTest with ResourceProviderMixin {
     config.add(name: 'project', rootPath: '/workspace');
     newPackageConfigJsonFile(
       workspacePath,
-      config.toContent(toUriStr: toUriStr),
+      config.toContent(pathContext: pathContext),
     );
     workspace =
         PackageConfigWorkspace.find(
@@ -570,7 +570,7 @@ class PackageConfigWorkspaceTest with ResourceProviderMixin {
     for (var name in packageNames) {
       config.add(name: name, rootPath: convertPath('/packages/$name'));
     }
-    newPackageConfigJsonFile(root, config.toContent(toUriStr: toUriStr));
+    newPackageConfigJsonFile(root, config.toContent(pathContext: pathContext));
     return PackageConfigWorkspace.find(
       resourceProvider,
       Packages.empty,
@@ -610,7 +610,7 @@ class PubPackageTest extends WorkspacePackageTest {
     config.add(name: 'workspace', rootPath: '/workspace');
     newPackageConfigJsonFile(
       '/workspace',
-      config.toContent(toUriStr: toUriStr),
+      config.toContent(pathContext: pathContext),
     );
     workspace =
         PackageConfigWorkspace.find(
@@ -627,7 +627,7 @@ class PubPackageTest extends WorkspacePackageTest {
     config.add(name: 'foo', rootPath: fooPackageRootPath);
     newPackageConfigJsonFile(
       myPackageRootPath,
-      config.toContent(toUriStr: toUriStr),
+      config.toContent(pathContext: pathContext),
     );
     newFolder(myPackageGeneratedPath);
     myWorkspace =

pkg/analyzer_plugin/test/support/abstract_context.dart

@@ -116,7 +116,7 @@ class AbstractContextTest with MockPackagesMixin, ResourceProviderMixin {
   }
 
   void writePackageConfig(String path, PackageConfigFileBuilder config) {
-    newFile(path, config.toContent(toUriStr: toUriStr));
+    newFile(path, config.toContent(pathContext: pathContext));
   }
 
   /// Write an analysis options file based on the given arguments.