Fix breakpoints not hitting after changing a base in index.html. (#1556)

* Add screen field to DebuggerReady event

* Fix breakpoints not hitting after changing a base in index.html

* Updated changelog

* Updated changelog.

* Fix failing tests

* Try fix breakpoint setting problem for org-dartlang uris

* Fix finding dart location for js, remove adding root to absolute paths

* Removed printing and locaton fixes, updted version

* Address CR comments

Author: Anna Gringauze

dwds/CHANGELOG.md

@@ -1,4 +1,4 @@
-## 13.1.1-dev
+## 14.0.0-dev
 - Add column information to breakpoints to allow precise breakpoint placement.
 - Split SDK validation methods to allow validation of separate components.
 - Remove dependency on `package:_fe_analyzer_shared`.
@@ -8,6 +8,10 @@
     used.
   - Fix crash when using flutter tools with web server device.
   - Remove clearing all scripts on page load for extension debugger.
+- Fix breakpoints not hitting after changing a base in index.html.
+
+**Breaking changes:**
+- Add `basePath` parameter to `FrontendServerRequireStrategy`.
 
 ## 13.1.0
 - Update _fe_analyzer_shared to version ^38.0.0.

dwds/lib/src/injected/client.js

@@ -14,11 +14,13 @@ class FrontendServerRequireStrategyProvider {
   final ReloadConfiguration _configuration;
   final AssetReader _assetReader;
   final Future<Map<String, String>> Function() _digestsProvider;
+  final String _basePath;
 
   RequireStrategy _requireStrategy;
 
-  FrontendServerRequireStrategyProvider(
-      this._configuration, this._assetReader, this._digestsProvider);
+  FrontendServerRequireStrategyProvider(this._configuration, this._assetReader,
+      this._digestsProvider, String basePath)
+      : _basePath = basePathForServerUri(basePath);
 
   RequireStrategy get strategy => _requireStrategy ??= RequireStrategy(
         _configuration,
@@ -32,28 +34,35 @@ class FrontendServerRequireStrategyProvider {
         _assetReader,
       );
 
+  String _removeBasePath(String path) =>
+      path.startsWith(_basePath) ? path.substring(_basePath.length) : null;
+
+  String _addBasePath(String serverPath) => p.join(_basePath, serverPath);
+
   Future<Map<String, String>> _moduleProvider(
           MetadataProvider metadataProvider) async =>
       (await metadataProvider.moduleToModulePath).map((key, value) =>
           MapEntry(key, relativizePath(removeJsExtension(value))));
 
   Future<String> _moduleForServerPath(
-          MetadataProvider metadataProvider, String serverPath) async =>
-      (await metadataProvider.modulePathToModule)[serverPath];
+      MetadataProvider metadataProvider, String serverPath) async {
+    var modulePathToModule = await metadataProvider.modulePathToModule;
+    return modulePathToModule[_removeBasePath(serverPath)];
+  }
 
   Future<String> _serverPathForModule(
           MetadataProvider metadataProvider, String module) async =>
-      (await metadataProvider.moduleToModulePath)[module] ?? '';
+      _addBasePath((await metadataProvider.moduleToModulePath)[module] ?? '');
 
   Future<String> _sourceMapPathForModule(
       MetadataProvider metadataProvider, String module) async {
     var path = (await metadataProvider.moduleToSourceMap)[module] ?? '';
-    return relativizePath(path);
+    return _addBasePath(relativizePath(path));
   }
 
   String _serverPathForAppUri(String appUri) {
     if (appUri.startsWith('org-dartlang-app:')) {
-      return Uri.parse(appUri).path.substring(1);
+      return _addBasePath(Uri.parse(appUri).path.substring(1));
     }
     return null;
   }

dwds/lib/src/loaders/frontend_server_require.dart

@@ -11,6 +11,21 @@ import 'package:shelf/shelf.dart';
 
 import '../../dwds.dart';
 
+/// Find the path we are serving from the url.
+///
+/// Example:
+///   https://localhost/base/index.html => /base
+///   https://localhost/base => /base
+String basePathForServerUri(String url) {
+  if (url == null) return null;
+  var uri = Uri.parse(url);
+  var base = uri.path.endsWith('.html') ? p.dirname(uri.path) : uri.path;
+  if (base.isNotEmpty) {
+    base = base.startsWith('/') ? base : '/$base';
+  }
+  return base;
+}
+
 String relativizePath(String path) =>
     path.startsWith('/') ? path.substring(1) : path;
 

dwds/lib/src/loaders/require.dart

@@ -179,7 +179,8 @@ class ExpressionEvaluator {
           'Cannot find Dart location for JS location: '
           'url: $url, '
           'function: $functionName, '
-          'line: $jsLine');
+          'line: $jsLine, '
+          'column: $jsColumn');
     }
 
     var dartLocation = locationMap.dartLocation;

dwds/lib/src/services/expression_evaluator.dart

@@ -8,6 +8,7 @@ import 'package:logging/logging.dart';
 import 'package:package_config/package_config.dart';
 import 'package:path/path.dart' as p;
 
+import '../loaders/require.dart';
 import '../loaders/strategy.dart';
 import 'sdk_configuration.dart';
 
@@ -36,38 +37,48 @@ class DartUri {
   /// JS script. The dirname of that path should give us the missing prefix.
   factory DartUri(String uri, [String serverUri]) {
     var serverPath = globalLoadStrategy.serverPathForAppUri(uri);
-    if (serverPath != null) return DartUri._(serverPath);
+    if (serverPath != null) {
+      return DartUri._(serverPath);
+    }
     // TODO(annagrin): Support creating DartUris from `dart:` uris.
     // Issue: https://github.com/dart-lang/webdev/issues/1584
     if (uri.startsWith('package:')) {
       return DartUri._fromPackageUri(uri, serverUri: serverUri);
     }
-    if (uri.startsWith('file:')) return DartUri._fromFileUri(uri);
+    if (uri.startsWith('file:')) {
+      return DartUri._fromFileUri(uri, serverUri: serverUri);
+    }
     if (uri.startsWith('/packages/')) {
       return DartUri._fromRelativePath(uri, serverUri: serverUri);
     }
-    if (uri.startsWith('/')) return DartUri._fromRelativePath(uri);
+    if (uri.startsWith('/')) {
+      return DartUri._fromRelativePath(uri);
+    }
     if (uri.startsWith('http:') || uri.startsWith('https:')) {
       return DartUri(Uri.parse(uri).path);
     }
 
     throw FormatException('Unsupported URI form', uri);
   }
 
+  @override
+  String toString() => 'DartUri: $serverPath';
+
   /// Construct from a package: URI
   factory DartUri._fromPackageUri(String uri, {String serverUri}) {
+    var basePath = basePathForServerUri(serverUri);
     var packagePath = 'packages/${uri.substring("package:".length)}';
     if (serverUri != null) {
-      return DartUri._fromRelativePath(
-          p.url.join(_dirForServerUri(serverUri), packagePath));
+      var relativePath = p.url.join(basePath, packagePath);
+      return DartUri._fromRelativePath(relativePath);
     }
     return DartUri._(packagePath);
   }
 
   /// Construct from a file: URI
-  factory DartUri._fromFileUri(String uri) {
+  factory DartUri._fromFileUri(String uri, {String serverUri}) {
     var libraryName = _resolvedUriToUri[uri];
-    if (libraryName != null) return DartUri(libraryName);
+    if (libraryName != null) return DartUri(libraryName, serverUri);
     // This is not one of our recorded libraries.
     throw ArgumentError.value(uri, 'uri', 'Unknown library');
   }
@@ -78,8 +89,8 @@ class DartUri {
     uri = uri[0] == '/' ? uri.substring(1) : uri;
 
     if (serverUri != null) {
-      return DartUri._fromRelativePath(
-          p.url.join(_dirForServerUri(serverUri), uri));
+      var basePath = basePathForServerUri(serverUri);
+      return DartUri._fromRelativePath(p.url.join(basePath, uri));
     }
     return DartUri._(uri);
   }
@@ -179,9 +190,6 @@ class DartUri {
     }
   }
 
-  /// Returns the dirname for the server URI.
-  static String _dirForServerUri(String uri) => p.dirname(Uri.parse(uri).path);
-
   /// Load the .dart_tool/package_config.json file associated with the running
   /// application so we can resolve file URLs into package: URLs appropriately.
   static Future<void> _loadPackageConfig(Uri uri) async {

dwds/lib/src/utilities/dart_uri.dart

@@ -1,6 +1,6 @@
 name: dwds
 # Every time this changes you need to run `dart run build_runner build`.
-version: 13.1.1-dev
+version: 14.0.0-dev
 description: >-
   A service that proxies between the Chrome debug protocol and the Dart VM
   service protocol.

dwds/lib/src/version.dart

@@ -35,7 +35,7 @@ void main() {
     test('parses package : paths with root', () {
       var uri = DartUri(
           'package:path/path.dart', 'http://localhost:8080/foo/bar/blah');
-      expect(uri.serverPath, 'foo/bar/packages/path/path.dart');
+      expect(uri.serverPath, 'foo/bar/blah/packages/path/path.dart');
     });
 
     test('parses org-dartlang-app paths', () {