Added tests and updated version

Author: Anna Gringauze

dwds/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 13.1.1-dev
+- Add column information to breakpoints to allow precise breakpoint placement.
+
 ## 13.1.0
 - Update _fe_analyzer_shared to version ^38.0.0.
 

dwds/lib/src/debugging/debugger.dart

@@ -736,11 +736,8 @@ int _columnNumberFor(Breakpoint breakpoint) =>
 
 /// Returns the breakpoint ID for the provided Dart script ID and Dart line
 /// number.
-String breakpointIdFor(String scriptId, int line, int column) {
-  var id = 'bp/$scriptId#$line:$column';
-  print('breakpointIdFor: $scriptId, $line, $column: $id');
-  return id;
-}
+String breakpointIdFor(String scriptId, int line, int column) =>
+    'bp/$scriptId#$line:$column';
 
 /// Keeps track of the Dart and JS breakpoint Ids that correspond.
 class _Breakpoints extends Domain {
@@ -807,7 +804,12 @@ class _Breakpoints extends Domain {
       id: id,
       breakpointNumber: int.parse(createId()),
       resolved: true,
-      location: SourceLocation(script: dartScript, tokenPos: location.tokenPos),
+      location: SourceLocation(
+        script: dartScript,
+        tokenPos: location.tokenPos,
+        line: location.dartLocation.line,
+        column: location.dartLocation.column,
+      ),
       enabled: true,
     )..id = id;
     return breakpoint;

dwds/lib/src/debugging/location.dart

@@ -40,7 +40,7 @@ class Location {
     var dartColumn = entry.sourceColumn;
     var jsLine = lineEntry.line;
     var jsColumn = entry.column;
-    print('Location: $jsLine:$jsColumn');
+
     // lineEntry data is 0 based according to:
     // https://docs.google.com/document/d/1U1RGAehQwRypUTovF1KRlpiOFze0b-_2gc6fAH0KY0k
     return Location._(

dwds/lib/src/injected/client.js

@@ -1,6 +1,6 @@
 name: dwds
 # Every time this changes you need to run `dart run build_runner build`.
-version: 13.1.0
+version: 13.1.1-dev
 homepage: https://github.com/dart-lang/webdev/tree/master/dwds
 description: >-
   A service that proxies between the Chrome debug protocol and the Dart VM

dwds/lib/src/version.dart

@@ -74,6 +74,26 @@ void main() {
         await service.removeBreakpoint(isolate.id, bp.id);
       });
 
+      test('set breakpoint inside a JavaScript line succeeds', () async {
+        var line = await context.findBreakpointLine(
+            'printNestedObjectsMultiLine', isolate.id, mainScript);
+        var bp = await service.addBreakpointWithScriptUri(
+            isolate.id, mainScript.uri, line);
+
+        await stream.firstWhere(
+            (Event event) => event.kind == EventKind.kPauseBreakpoint);
+
+        expect(bp, isNotNull);
+        expect(
+            bp.location,
+            isA<SourceLocation>()
+                .having((loc) => loc.script, 'script', equals(mainScript))
+                .having((loc) => loc.line, 'line', equals(line)));
+
+        // Remove breakpoint so it doesn't impact other tests.
+        await service.removeBreakpoint(isolate.id, bp.id);
+      });
+
       test('set breakpoint again', () async {
         var line = await context.findBreakpointLine(
             'printLocal', isolate.id, mainScript);

dwds/pubspec.yaml

@@ -88,7 +88,7 @@ void main() {
 
         // Remove breakpoint so it doesn't impact other tests.
         await service.removeBreakpoint(isolate.id, bp.id);
-      }, solo: true);
+      });
 
       test('set breakpoint again', () async {
         var line = await context.findBreakpointLine(
@@ -104,6 +104,26 @@ void main() {
         // Remove breakpoint so it doesn't impact other tests.
         await service.removeBreakpoint(isolate.id, bp.id);
       });
+
+      test('set breakpoint inside a JavaScript line succeeds', () async {
+        var line = await context.findBreakpointLine(
+            'printNestedObjectsMultiLine', isolate.id, mainScript);
+        var bp = await service.addBreakpointWithScriptUri(
+            isolate.id, mainScript.uri, line);
+
+        await stream.firstWhere(
+            (Event event) => event.kind == EventKind.kPauseBreakpoint);
+
+        expect(bp, isNotNull);
+        expect(
+            bp.location,
+            isA<SourceLocation>()
+                .having((loc) => loc.script, 'script', equals(mainScript))
+                .having((loc) => loc.line, 'line', equals(line)));
+
+        // Remove breakpoint so it doesn't impact other tests.
+        await service.removeBreakpoint(isolate.id, bp.id);
+      });
     });
   });
 }

dwds/test/build_daemon_breakpoint_test.dart

@@ -40,6 +40,7 @@ void main() {
     printFromTestPackage();
     printCallExtension();
     printLoopVariable();
+    printNestedObjectsMultiLine();
   });
 
   document.body.appendText(concatenate('Program', ' is running!'));
@@ -99,10 +100,25 @@ Future<void> printDeferred() async {
   d.deferredPrintLocal();
 }
 
+void printNestedObjectsMultiLine() {
+  print(
+    EnclosingMainClass(
+      MainClass(0) // Breakpoint: printNestedObjectsMultiLine
+    ));
+}
+
 class MainClass {
   final int _field;
   MainClass(this._field);
 
   @override
   String toString() => '$_field';
 }
+
+class EnclosingMainClass {
+  final MainClass _field;
+  EnclosingMainClass(this._field);
+
+  @override
+  String toString() => '$_field';
+}

dwds/test/frontend_server_breakpoint_test.dart

@@ -40,6 +40,7 @@ void main() async {
     printCallExtension();
     printLoopVariable();
     printGeneric<int>(0);
+    printNestedObjectsMultiLine();
   });
 
   document.body?.appendText(concatenate('Program', ' is running!'));
@@ -108,10 +109,25 @@ Future<void> printDeferred() async {
   d.deferredPrintLocal();
 }
 
+void printNestedObjectsMultiLine() {
+  print(
+    EnclosingMainClass(
+      MainClass(0) // Breakpoint: printNestedObjectsMultiLine
+    ));
+}
+
 class MainClass {
   final int _field;
   MainClass(this._field);
 
   @override
   String toString() => '$_field';
 }
+
+class EnclosingMainClass {
+  final MainClass _field;
+  EnclosingMainClass(this._field);
+
+  @override
+  String toString() => '$_field';
+}