Update DartWorkflowTest to be package_config based

Author: parlough

third_party/src/main/java/com/jetbrains/lang/dart/util/PackageConfigFileUtil.java

@@ -15,15 +15,13 @@
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.io.OSAgnosticPathUtil;
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.openapi.vfs.VfsUtilCore;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.io.URLUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 public final class PackageConfigFileUtil {
@@ -129,8 +127,11 @@ public final class PackageConfigFileUtil {
    * ```
    */
   private static @Nullable Map<String, String> loadPackagesMapFromJson(@NotNull VirtualFile packageConfigJsonFile) {
-    String fileContentsStr = FileUtil.loadFileOrNull(packageConfigJsonFile.getPath());
-    if (fileContentsStr == null) {
+    final String fileContentsStr;
+    try {
+      fileContentsStr = StringUtil.convertLineSeparators(VfsUtilCore.loadText(packageConfigJsonFile));
+    }
+    catch (Exception e) {
       return null;
     }
 
@@ -171,62 +172,6 @@ public final class PackageConfigFileUtil {
     return null;
   }
 
-  public static @Nullable Map<String, String> getPackagesMap(final @NotNull VirtualFile dotPackagesFile) {
-    Pair<Long, Map<String, String>> data = dotPackagesFile.getUserData(MOD_STAMP_TO_PACKAGES_MAP);
-
-    final Long currentTimestamp = dotPackagesFile.getModificationCount();
-    final Long cachedTimestamp = Pair.getFirst(data);
-
-    if (cachedTimestamp == null || !cachedTimestamp.equals(currentTimestamp)) {
-      data = null;
-      dotPackagesFile.putUserData(MOD_STAMP_TO_PACKAGES_MAP, null);
-      final Map<String, String> packagesMap = loadPackagesMap(dotPackagesFile);
-
-      if (packagesMap != null) {
-        data = Pair.create(currentTimestamp, packagesMap);
-        dotPackagesFile.putUserData(MOD_STAMP_TO_PACKAGES_MAP, data);
-      }
-    }
-
-    return Pair.getSecond(data);
-  }
-
-  private static @Nullable Map<String, String> loadPackagesMap(@NotNull VirtualFile dotPackagesFile) {
-    try {
-      final List<String> lines;
-      if (ApplicationManager.getApplication().isUnitTestMode()) {
-        lines = StringUtil.split(new String(dotPackagesFile.contentsToByteArray(), StandardCharsets.UTF_8), "\n");
-      }
-      else {
-        lines = FileUtil.loadLines(dotPackagesFile.getPath(), "UTF-8");
-      }
-
-      final Map<String, String> result = new HashMap<>();
-
-      for (String line : lines) {
-        if (line.trim().isEmpty() || line.startsWith("#")) continue;
-
-        final int colonIndex = line.indexOf(':');
-        if (colonIndex > 0 && colonIndex < line.length() - 1) {
-          final String packageName = line.substring(0, colonIndex).trim();
-          final String encodedUri = line.substring(colonIndex + 1).trim();
-          // need to protect '+' chars because URLDecoder.decode replaces '+' with space
-          final String encodedUriWithoutPluses = StringUtil.replace(encodedUri, "+", "%2B");
-          final String uri = URLUtil.decode(encodedUriWithoutPluses);
-          final String packageUri = getAbsolutePackageRootPath(dotPackagesFile.getParent(), uri);
-          if (!packageName.isEmpty() && packageUri != null) {
-            result.put(packageName, packageUri);
-          }
-        }
-      }
-
-      return result;
-    }
-    catch (IOException e) {
-      return null;
-    }
-  }
-
   private static @Nullable String getAbsolutePackageRootPath(@NotNull VirtualFile baseDir, @NotNull String uri) {
     if (uri.startsWith("file:/")) {
       final String pathAfterSlashes = StringUtil.trimEnd(StringUtil.trimLeading(StringUtil.trimStart(uri, "file:/"), '/'), "/");

third_party/src/test/java/com/jetbrains/lang/dart/workflow/DartWorkflowTest.java

@@ -140,15 +140,34 @@ public void testDartUrlResolver() {
       name: NestedProject
       dependencies:
         RootProject:
-          path: ../""").getVirtualFile();
+          path: ../
+        SomePackage: any""").getVirtualFile();
     myFixture.addFileToProject("example/lib/src/nestedlib.dart", "");
     myFixture.addFileToProject("example/packages/NestedProject/nestedlib.dart", "");
     myFixture.addFileToProject("example/packages/RootProject/rootlib.dart", "");
     myFixture.addFileToProject("pub/global/cache/SomePackage/lib/somepack.dart", "");
-    myFixture.saveText(myFixture.addFileToProject("example/.packages", "").getVirtualFile(),
-                       "RootProject:../lib/\n" +
-                       "NestedProject:lib/\n" +
-                       "SomePackage:" + rootUrl + "/pub/global/cache/SomePackage/lib/");
+    myFixture.saveText(myFixture.addFileToProject("example/.dart_tool/package_config.json", "").getVirtualFile(),
+        String.format("""
+            {
+              "configVersion": 2,
+              "packages": [
+                {
+                  "name": "SomePackage",
+                  "rootUri": "%s",
+                  "packageUri": "lib/"
+                },
+                {
+                  "name": "RootProject",
+                  "rootUri": "../../",
+                  "packageUri": "lib/"
+                },
+                {
+                  "name": "NestedProject",
+                  "rootUri": "../",
+                  "packageUri": "lib/"
+                }
+              ]
+            }""", rootUrl + "/pub/global/cache/SomePackage"));
 
     DartUrlResolver resolver = DartUrlResolver.getInstance(getProject(), nestedPubspec);
     VirtualFile file;