Fix up

Author: srujzs

dwds/CHANGELOG.md

@@ -1,6 +1,7 @@
 ## 24.4.0-wip
 
 - Added support for breakpoint registering on a hot reload with the DDC library bundle format using PausePostRequests.
+- `FrontendServerDdcLibraryBundleStrategy.hotReloadSourceUri` is now expected to also provide the reloaded modules.
 
 ## 24.3.11
 

dwds/lib/src/debugging/inspector.dart

@@ -740,7 +740,7 @@ class AppInspector implements AppInspectorInterface {
               .scripts;
       if (modifiedModuleReport != null) {
         // Invalidate any script caches that were computed for the now invalid
-        // libraries. They will get repopulated later.
+        // libraries. They will get repopulated below.
         for (final libraryUri in modifiedModuleReport.modifiedLibraries) {
           final libraryRef = await _libraryHelper.libraryRefFor(libraryUri);
           final libraryId = libraryRef?.id;

dwds/lib/src/debugging/libraries.dart

@@ -52,6 +52,8 @@ class LibraryHelper extends Domain {
     return _rootLib!;
   }
 
+  /// Removes any modified libraries from the cache and either eagerly or lazily
+  /// computes values for the reloaded libraries in the [modifiedModuleReport].
   void invalidate(ModifiedModuleReport modifiedModuleReport) {
     for (final library in modifiedModuleReport.modifiedLibraries) {
       // These will later be initialized by `libraryFor` if needed.

dwds/lib/src/debugging/metadata/provider.dart

@@ -76,19 +76,19 @@ class MetadataProvider {
     return true;
   }
 
-  /// A set of all libraries in the Dart application.
+  /// A list of all libraries in the Dart application.
   ///
   /// Example:
   ///
-  ///  {
+  ///  [
   ///     dart:web_gl,
   ///     dart:math,
   ///     org-dartlang-app:///web/main.dart
-  ///  }
+  ///  ]
   ///
-  Future<Set<String>> get libraries async {
+  Future<List<String>> get libraries async {
     await _initialize();
-    return _libraries;
+    return _libraries.toList();
   }
 
   /// A map of library uri to dart scripts.
@@ -226,9 +226,9 @@ class MetadataProvider {
   /// determines deleted and invalidated libraries and modules, invalidates them
   /// in any caches, and recomputes the necessary information.
   ///
-  /// Returns an [ModifiedModuleReport] that can be used to invalidate other
+  /// Returns a [ModifiedModuleReport] that can be used to invalidate other
   /// caches after a hot reload.
-  Future<ModifiedModuleReport> reinitializeAfterReload(
+  Future<ModifiedModuleReport> reinitializeAfterHotReload(
     Map<String, List> reloadedModulesToLibraries,
   ) async {
     final modules = (await _processMetadata(true))!;
@@ -265,7 +265,7 @@ class MetadataProvider {
       );
       _addMetadata(modules[module]!);
     }
-    // The libraries that were removed from the program or those that we
+    // The libraries that are removed from the program are those that we
     // invalidated but were never added again.
     final deletedLibraries =
         invalidatedLibraries
@@ -332,7 +332,7 @@ class AbsoluteImportUriException implements Exception {
 }
 
 /// Computed after a hot reload using
-/// [MetadataProvider.reinitializeAfterReload], represents the modules and
+/// [MetadataProvider.reinitializeAfterHotReload], represents the modules and
 /// libraries in the program that were deleted, reloaded, and therefore,
 /// modified.
 ///

dwds/lib/src/debugging/modules.dart

@@ -99,7 +99,8 @@ class Modules {
     final serverPath = await globalToolConfiguration.loadStrategy
         .serverPathForModule(entrypoint, module);
     // TODO(srujzs): We should wait until all scripts are parsed before
-    // accessing.
+    // accessing after a hot reload. See
+    // https://github.com/dart-lang/webdev/issues/2640.
     return chromePathToRuntimeScriptId[serverPath];
   }
 

dwds/lib/src/debugging/skip_list.dart

@@ -25,14 +25,13 @@ class SkipLists {
     if (modifiedModuleReport != null) {
       assert(entrypoint != null);
       for (final url in _urlToId.keys) {
-        if (url.isEmpty) continue;
-
         final dartUri = DartUri(url, _root);
         final serverPath = dartUri.serverPath;
         final module = await globalToolConfiguration.loadStrategy
             .moduleForServerPath(entrypoint!, serverPath);
         if (modifiedModuleReport.modifiedModules.contains(module)) {
           _idToList.remove(_urlToId[url]!);
+          _urlToId.remove(url);
         }
       }
     } else {
@@ -51,7 +50,6 @@ class SkipLists {
     String url,
     Set<Location> locations,
   ) {
-    _urlToId[url] = scriptId;
     if (_idToList.containsKey(scriptId)) return _idToList[scriptId]!;
 
     final sortedLocations =
@@ -82,7 +80,10 @@ class SkipLists {
     }
     ranges.add(_rangeFor(scriptId, startLine, startColumn, maxValue, maxValue));
 
-    _idToList[scriptId] = ranges;
+    if (url.isNotEmpty) {
+      _idToList[scriptId] = ranges;
+      _urlToId[url] = scriptId;
+    }
     return ranges;
   }
 

dwds/lib/src/loaders/strategy.dart

@@ -183,12 +183,12 @@ abstract class LoadStrategy {
     return Future.value();
   }
 
-  Future<ModifiedModuleReport> reinitializeEntrypointAfterReload(
+  Future<ModifiedModuleReport> reinitializeProviderAfterHotReload(
     String entrypoint,
     Map<String, List> reloadedModulesToLibraries,
   ) {
     final provider = _providers[entrypoint]!;
-    return provider.reinitializeAfterReload(reloadedModulesToLibraries);
+    return provider.reinitializeAfterHotReload(reloadedModulesToLibraries);
   }
 }
 

dwds/lib/src/services/chrome_proxy_service.dart

@@ -242,7 +242,7 @@ class ChromeProxyService implements VmServiceInterface {
   ) async {
     final entrypoint = inspector.appConnection.request.entrypointPath;
     final modifiedModuleReport = await globalToolConfiguration.loadStrategy
-        .reinitializeEntrypointAfterReload(entrypoint, reloadedModules);
+        .reinitializeProviderAfterHotReload(entrypoint, reloadedModules);
     await _initializeEntrypoint(entrypoint, modifiedModuleReport);
     await inspector.initialize(modifiedModuleReport);
   }
@@ -1211,13 +1211,13 @@ class ChromeProxyService implements VmServiceInterface {
 
     // Initiate a hot reload.
     _logger.info('Issuing \$dartHotReloadStartDwds request');
-    final reloadedModulesMap = await inspector.jsEvaluate(
+    final remoteObject = await inspector.jsEvaluate(
       '\$dartHotReloadStartDwds();',
       awaitPromise: true,
       returnByValue: true,
     );
-    final reloadedModules =
-        (reloadedModulesMap.value as Map).cast<String, List>();
+    final reloadedModulesToLibraries =
+        (remoteObject.value as Map).cast<String, List>();
 
     if (!pauseIsolatesOnStart) {
       // Finish hot reload immediately.
@@ -1252,7 +1252,7 @@ class ChromeProxyService implements VmServiceInterface {
     await pause(isolateId);
     await pausedEvent;
 
-    await _reinitializeForHotReload(reloadedModules);
+    await _reinitializeForHotReload(reloadedModulesToLibraries);
 
     // This lets the client know that we're ready for breakpoint management
     // and a resume.

dwds/test/metadata_test.dart

@@ -207,7 +207,8 @@ void main() {
       ],
     };
     final libraryToParts = <String, List<String>>{
-      'l1': ['org-dartlang-app:///web/l1_p1.dart'],
+      'org-dartlang-app:///web/l1.dart': ['org-dartlang-app:///web/l1_p1.dart'],
+      'org-dartlang-app:///web/l3.dart': ['org-dartlang-app:///web/l3_p1.dart'],
     };
     final assetReader = FakeAssetReader(
       metadata: createMetadataContents(moduleToLibraries, libraryToParts),
@@ -227,8 +228,9 @@ void main() {
       ],
     };
     final newLibraryToParts = <String, List<String>>{
-      'l1': ['org-dartlang-app:///web/l1_p1.dart'],
-      'l7': ['org-dartlang-app:///web/l7_p1.dart'],
+      'org-dartlang-app:///web/l2.dart': ['org-dartlang-app:///web/l1_p1.dart'],
+      'org-dartlang-app:///web/l3.dart': ['org-dartlang-app:///web/l3_p2.dart'],
+      'org-dartlang-app:///web/l7.dart': ['org-dartlang-app:///web/l7_p1.dart'],
     };
     final reloadedModulesToLibraries = <String, List<String>>{
       'm3': ['org-dartlang-app:///web/l3.dart'],
@@ -241,7 +243,7 @@ void main() {
       newModuleToLibraries,
       newLibraryToParts,
     );
-    final modifiedModuleReport = await provider.reinitializeAfterReload(
+    final modifiedModuleReport = await provider.reinitializeAfterHotReload(
       reloadedModulesToLibraries,
     );
     expect(modifiedModuleReport.deletedModules, ['m2']);