fix for breakpoints

Author: daimor

src/debug/debugSession.ts

@@ -205,12 +205,19 @@ export class ObjectScriptDebugSession extends LoggingDebugSession {
 
     const filePath = args.source.path;
     const fileUri = await convertClientPathToDebugger(args.source.path, this._namespace);
+    const [, fileName] = fileUri.match(/\|([^|]+)$/);
 
-    // const currentList = (await this._connection.sendBreakpointListCommand()).breakpoints.filter(breakpoint => {
-    //   if (breakpoint instanceof xdebug.LineBreakpoint) {
-    //     return breakpoint.fileUri === fileUri;
-    //   }
-    // });
+    const currentList = await this._connection.sendBreakpointListCommand();
+    currentList.breakpoints
+      .filter(breakpoint => {
+        if (breakpoint instanceof xdebug.LineBreakpoint) {
+          return breakpoint.fileUri === fileName;
+        }
+        return false;
+      })
+      .map(breakpoint => {
+        this._connection.sendBreakpointRemoveCommand(breakpoint);
+      });
 
     let xdebugBreakpoints: (xdebug.ConditionalBreakpoint | xdebug.ClassLineBreakpoint | xdebug.LineBreakpoint)[] = [];
     xdebugBreakpoints = await Promise.all(
@@ -230,6 +237,8 @@ export class ObjectScriptDebugSession extends LoggingDebugSession {
               }
             }
           });
+        } else if (filePath.endsWith("mac") || filePath.endsWith("int")) {
+          return new xdebug.RoutineLineBreakpoint(fileUri, line, "", line - 1);
         } else {
           return new xdebug.LineBreakpoint(fileUri, line);
         }
@@ -294,11 +303,12 @@ export class ObjectScriptDebugSession extends LoggingDebugSession {
               }
             });
           }
+          const place = `${stackFrame.method}+${stackFrame.methodOffset}`;
           const stackFrameId = this._stackFrameIdCounter++;
           this._stackFrames.set(stackFrameId, stackFrame);
           return {
             id: stackFrameId,
-            name: source.name,
+            name: place,
             source,
             line,
             column: 1,

src/debug/xdebugConnection.ts

@@ -212,6 +212,27 @@ export class ClassLineBreakpoint extends LineBreakpoint {
   }
 }
 
+export class RoutineLineBreakpoint extends LineBreakpoint {
+  public method: string;
+  public methodOffset: number;
+
+  /** contructs a line breakpoint for passing to sendSetBreakpointCommand */
+  public constructor(fileUri: string, line: number, method: string, methodOffset: number);
+  public constructor(...rest) {
+    if (typeof rest[0] === "object") {
+      const breakpointNode: Element = rest[0];
+      const connection: Connection = rest[1];
+      super(breakpointNode, connection);
+      this.line = parseInt(breakpointNode.getAttribute("lineno"), 10);
+      this.fileUri = breakpointNode.getAttribute("filename");
+    } else {
+      super(rest[0], rest[1]);
+      this.method = rest[2];
+      this.methodOffset = rest[3];
+    }
+  }
+}
+
 /** class for conditional breakpoints. Returned from a breakpoint_list or passed to sendBreakpointSetCommand */
 export class ConditionalBreakpoint extends Breakpoint {
   /** File URI */
@@ -701,6 +722,8 @@ export class Connection extends DbgpConnection {
       args += ` -f ${breakpoint.fileUri}`;
       if (breakpoint instanceof ClassLineBreakpoint) {
         args += ` -m ${breakpoint.method} -n ${breakpoint.methodOffset}`;
+      } else if (breakpoint instanceof RoutineLineBreakpoint) {
+        args += ` -n ${breakpoint.methodOffset}`;
       } else {
         args += ` -n ${breakpoint.line}`;
       }