make extra commands generic, use old version num

Author: Karl Smeltzer

package.json

@@ -9,7 +9,7 @@
 		"native",
 		"debug"
 	],
-	"version": "0.25.0",
+	"version": "0.24.0",
 	"publisher": "webfreak",
 	"icon": "images/icon.png",
 	"engines": {
@@ -259,6 +259,13 @@
 								"description": "Additional arguments to pass to GDB",
 								"default": []
 							},
+							"pathSubstitutions": {
+								"type": "object",
+								"description": "Help GDB find your source using path substitutions (GDB `substitute-path` variable",
+								"default": {
+									"<fromPath>": "<toPath>"
+								}
+							},
 							"cwd": {
 								"type": "string",
 								"description": "Path of project",
@@ -522,6 +529,13 @@
 								"description": "Additional arguments to pass to LLDB",
 								"default": []
 							},
+							"pathSubstitutions": {
+								"type": "object",
+								"description": "Help LLDB find your source using path substitutions (LLDB `target.source-map` variable",
+								"default": {
+									"<fromPath>": "<toPath>"
+								}
+							},
 							"valuesFormatting": {
 								"type": "string",
 								"description": "Set the way of showing variable values. 'disabled' - show value as is, 'parseText' - parse debuggers output text into structure, 'prettyPrinters' - enable debuggers custom pretty-printers if there are any",
@@ -662,6 +676,13 @@
 								"description": "Additional arguments to pass to LLDB",
 								"default": []
 							},
+							"pathSubstitutions": {
+								"type": "object",
+								"description": "Help LLDB find your source using path substitutions (LLDB `target.source-map` variable",
+								"default": {
+									"<fromPath>": "<toPath>"
+								}
+							},
 							"cwd": {
 								"type": "string",
 								"description": "Path of project",

src/backend/mi2/mi2.ts

@@ -27,7 +27,7 @@ function couldBeOutput(line: string) {
 const trace = false;
 
 export class MI2 extends EventEmitter implements IBackend {
-	constructor(public application: string, public preargs: string[], public extraargs: string[], procEnv: any, public pathSubstitutions: any = {}) {
+	constructor(public application: string, public preargs: string[], public extraargs: string[], procEnv: any, public extraCommands: string[] = []) {
 		super();
 
 		if (procEnv) {
@@ -197,10 +197,9 @@ export class MI2 extends EventEmitter implements IBackend {
 			cmds.push(this.sendCommand("file-exec-and-symbols \"" + escape(target) + "\""));
 		if (this.prettyPrint)
 			cmds.push(this.sendCommand("enable-pretty-printing"));
-		
-		for (const key in this.pathSubstitutions) {
-			cmds.push(this.sendCommand("gdb-set substitute-path " + key + " " + this.pathSubstitutions[key]));
-		};
+		for (let cmd of this.extraCommands) {
+			cmds.push(this.sendCommand(cmd));
+		}
 
 		return cmds;
 	}

src/gdb.ts

@@ -10,7 +10,7 @@ export interface LaunchRequestArguments extends DebugProtocol.LaunchRequestArgum
 	gdbpath: string;
 	env: any;
 	debugger_args: string[];
-	pathSubstitutions: any; 
+	pathSubstitutions: { [index: string]: string };
 	arguments: string;
 	terminal: string;
 	autorun: string[];
@@ -26,7 +26,7 @@ export interface AttachRequestArguments extends DebugProtocol.AttachRequestArgum
 	gdbpath: string;
 	env: any;
 	debugger_args: string[];
-	pathSubstitutions: any;
+	pathSubstitutions: { [index: string]: string };
 	executable: string;
 	remote: boolean;
 	autorun: string[];
@@ -50,7 +50,8 @@ class GDBDebugSession extends MI2DebugSession {
 	}
 
 	protected launchRequest(response: DebugProtocol.LaunchResponse, args: LaunchRequestArguments): void {
-		this.miDebugger = new MI2(args.gdbpath || "gdb", ["-q", "--interpreter=mi2"], args.debugger_args, args.env, args.pathSubstitutions);
+		this.miDebugger = new MI2(args.gdbpath || "gdb", ["-q", "--interpreter=mi2"], args.debugger_args, args.env);
+		this.setPathSubstitutions(args.pathSubstitutions);
 		this.initDebugger();
 		this.quit = false;
 		this.attached = false;
@@ -119,7 +120,8 @@ class GDBDebugSession extends MI2DebugSession {
 	}
 
 	protected attachRequest(response: DebugProtocol.AttachResponse, args: AttachRequestArguments): void {
-		this.miDebugger = new MI2(args.gdbpath || "gdb", ["-q", "--interpreter=mi2"], args.debugger_args, args.env, args.pathSubstitutions);
+		this.miDebugger = new MI2(args.gdbpath || "gdb", ["-q", "--interpreter=mi2"], args.debugger_args, args.env);
+		this.setPathSubstitutions(args.pathSubstitutions);
 		this.initDebugger();
 		this.quit = false;
 		this.attached = !args.remote;
@@ -179,6 +181,15 @@ class GDBDebugSession extends MI2DebugSession {
 			}
 		}
 	}
+
+	// Add extra commands for source file path substitution in GDB-specific syntax
+	protected setPathSubstitutions(substitutions: { [index: string]: string }): void {
+		if (substitutions) {
+			Object.keys(substitutions).forEach(source => {
+				this.miDebugger.extraCommands.push("gdb-set substitute-path " + source + " " + substitutions[source]);
+			})
+		}
+	}
 }
 
 DebugSession.run(GDBDebugSession);

src/lldb.ts

@@ -122,6 +122,15 @@ class LLDBDebugSession extends MI2DebugSession {
 			this.sendResponse(response);
 		});
 	}
+
+	// Add extra commands for source file path substitution in LLDB-specific syntax
+	protected setPathSubstitutions(substitutions: { [index: string]: string }): void {
+		if (substitutions) {
+			Object.keys(substitutions).forEach(source => {
+				this.miDebugger.extraCommands.push("settings set target.source-map " + source + " " + substitutions[source]);
+			})
+		}
+	}
 }
 
 DebugSession.run(LLDBDebugSession);