Add support for conditional breakpoints. Fixed: #22

Author: ivanbuhov

.vscode/launch.json

@@ -7,7 +7,7 @@
             "request": "launch",
             "program": "${workspaceRoot}/out/webkit/webKitDebug.js",
 			"runtimeArgs": ["--nolazy"],
-            "stopOnEntry": true,
+            "stopOnEntry": false,
             "args": [ "--server=4712" ],
             "sourceMaps": true,
             "outDir": null,

nativescript/android/androidDebugConnection.ts

@@ -442,7 +442,7 @@ export class AndroidDebugConnection implements ns.INSDebugConnection {
         this._socket.close();
     }
 
-    public debugger_setBreakpointByUrl(url: string, lineNumber: number, columnNumber: number): Promise<WebKitProtocol.Debugger.SetBreakpointByUrlResponse> {
+    public debugger_setBreakpointByUrl(url: string, lineNumber: number, columnNumber: number, condition?: string): Promise<WebKitProtocol.Debugger.SetBreakpointByUrlResponse> {
         //throw new Error("Not implemented");
         //return this.sendMessage('Debugger.setBreakpointByUrl', <WebKitProtocol.Debugger.SetBreakpointByUrlParams>{ url, lineNumber, columnNumber });
 
@@ -451,7 +451,8 @@ export class AndroidDebugConnection implements ns.INSDebugConnection {
             type: 'script',
             target: that.inspectorUrlToV8Name(url),
             line: lineNumber,
-            column: columnNumber
+            column: columnNumber,
+            condition: condition
         };
 
         return this.request("setbreakpoint", requestParams)

nativescript/nativescript.ts

@@ -11,7 +11,7 @@ export interface INSDebugConnection {
 
     close(): void;
 
-    debugger_setBreakpointByUrl(url: string, lineNumber: number, columnNumber: number): Promise<WebKitProtocol.Debugger.SetBreakpointByUrlResponse>
+    debugger_setBreakpointByUrl(url: string, lineNumber: number, columnNumber: number, condition?: string): Promise<WebKitProtocol.Debugger.SetBreakpointByUrlResponse>
 
     debugger_removeBreakpoint(breakpointId: string): Promise<WebKitProtocol.Response>
 

webkit/webKitConnection.ts

@@ -171,11 +171,11 @@ export class WebKitConnection implements ns.INSDebugConnection {
     }
 
     public debugger_setBreakpoint(location: WebKitProtocol.Debugger.Location, condition?: string): Promise<WebKitProtocol.Debugger.SetBreakpointResponse> {
-        return this.sendMessage('Debugger.setBreakpoint', <WebKitProtocol.Debugger.SetBreakpointParams>{ location, condition });
+        return this.sendMessage('Debugger.setBreakpoint', <WebKitProtocol.Debugger.SetBreakpointParams>{ location, options: { condition: condition }});
     }
 
-    public debugger_setBreakpointByUrl(url: string, lineNumber: number, columnNumber: number): Promise<WebKitProtocol.Debugger.SetBreakpointByUrlResponse> {
-        return this.sendMessage('Debugger.setBreakpointByUrl', <WebKitProtocol.Debugger.SetBreakpointByUrlParams>{ url, lineNumber, columnNumber: 0 /* a columnNumber different from 0 confuses the debugger */ });
+    public debugger_setBreakpointByUrl(url: string, lineNumber: number, columnNumber: number, condition?: string): Promise<WebKitProtocol.Debugger.SetBreakpointByUrlResponse> {
+        return this.sendMessage('Debugger.setBreakpointByUrl', <WebKitProtocol.Debugger.SetBreakpointByUrlParams>{ url: url, lineNumber: lineNumber, columnNumber: 0 /* a columnNumber different from 0 confuses the debugger */, options: { condition: condition }});
     }
 
     public debugger_removeBreakpoint(breakpointId: string): Promise<WebKitProtocol.Response> {

webkit/webKitDebugAdapter.ts

@@ -354,7 +354,7 @@ export class WebKitDebugAdapter implements IDebugAdapter {
             // DebugProtocol sends all current breakpoints for the script. Clear all scripts for the breakpoint then add all of them
             const setBreakpointsPFailOnError = this._setBreakpointsRequestQ
                 .then(() => this._clearAllBreakpoints(targetScriptUrl))
-                .then(() => this._addBreakpoints(targetScriptUrl, args.lines, args.cols))
+                .then(() => this._addBreakpoints(targetScriptUrl, args))
                 .then(responses => ({ breakpoints: this._webkitBreakpointResponsesToODPBreakpoints(targetScriptUrl, responses, args.lines) }));
 
             const inDebug = typeof (<any>global).v8debug === 'object';
@@ -386,10 +386,10 @@ export class WebKitDebugAdapter implements IDebugAdapter {
         });
     }
 
-    private _addBreakpoints(url: string, lines: number[], cols?: number[]): Promise<WebKitProtocol.Debugger.SetBreakpointByUrlResponse[]> {
+    private _addBreakpoints(url: string, breakpoints: ISetBreakpointsArgs): Promise<WebKitProtocol.Debugger.SetBreakpointByUrlResponse[]> {
         // Call setBreakpoint for all breakpoints in the script simultaneously
-        const responsePs = lines
-            .map((lineNumber, i) => this._webKitConnection.debugger_setBreakpointByUrl(url, lineNumber, cols ? cols[i] : 0));
+        const responsePs = breakpoints.breakpoints
+            .map((b, i) => this._webKitConnection.debugger_setBreakpointByUrl(url, breakpoints.lines[i], breakpoints.cols ? breakpoints.cols[i] : 0, b.condition));
 
         // Join all setBreakpoint requests to a single promise
         return Promise.all(responsePs);

webkit/webKitProtocol.d.ts

@@ -65,24 +65,37 @@ declare namespace WebKitProtocol {
             columnNumber?: number;
         }
 
-        interface SetBreakpointParams {
-            location: Location;
+        interface BreakpointAction {
+            type: string; /* "log", "evaluate", "sound" or "probe" */
+            data?: string;
+            id?: number;
+        }
+
+        interface BreakpointOptions {
             condition?: string;
+            actions?: BreakpointAction[];
+            autoContinue?: boolean;
+            ignoreCount?: number;
         }
 
-        interface SetBreakpointResponse extends Response {
-            result: {
-                breakpointId: BreakpointId;
-                actualLocation: Location;
-            };
+        interface SetBreakpointParams {
+            location: Location;
+            options: BreakpointOptions;
         }
 
         interface SetBreakpointByUrlParams {
             url?: string;
             urlRegex?: string;
             lineNumber: number;
             columnNumber: number;
-            condition?: string;
+            options: BreakpointOptions;
+        }
+
+        interface SetBreakpointResponse extends Response {
+            result: {
+                breakpointId: BreakpointId;
+                actualLocation: Location;
+            };
         }
 
         interface SetBreakpointByUrlResponse extends Response {