Rename launch argument target to executable

As the target argument for launch configurations is an executable, let's name
it as such to avoid confusion.  The target argument is deprecated but kept for
backwards compatibility.

Author: esben

package.json

@@ -73,13 +73,17 @@
 				"configurationAttributes": {
 					"launch": {
 						"required": [
-							"target"
+							"executable"
 						],
 						"properties": {
-							"target": {
+							"executable": {
 								"type": "string",
 								"description": "Path of executable"
 							},
+							"target": {
+								"type": "string",
+								"description": "Path of executable (DEPRECATED use executable argument instead)"
+							},
 							"arguments": {
 								"type": "string",
 								"description": "Arguments to append after the executable. You can also use pipes."

src/backend/mi2/mi2.ts

@@ -50,9 +50,9 @@ export class MI2 extends EventEmitter implements IBackend {
 		}
 	}
 
-	load(cwd: string, target: string, procArgs: string, separateConsole: string): Thenable<any> {
-		if (!nativePath.isAbsolute(target))
-			target = nativePath.join(cwd, target);
+	load(cwd: string, executable: string, procArgs: string, separateConsole: string): Thenable<any> {
+		if (!nativePath.isAbsolute(executable))
+			executable = nativePath.join(cwd, executable);
 		return new Promise((resolve, reject) => {
 			this.isSSH = false;
 			const args = this.preargs.concat(this.extraargs || []);
@@ -61,7 +61,7 @@ export class MI2 extends EventEmitter implements IBackend {
 			this.process.stderr.on("data", this.stderr.bind(this));
 			this.process.on("exit", (() => { this.emit("quit"); }).bind(this));
 			this.process.on("error", ((err) => { this.emit("launcherror", err); }).bind(this));
-			const promises = this.initCommands(target, cwd);
+			const promises = this.initCommands(executable, cwd);
 			if (procArgs && procArgs.length)
 				promises.push(this.sendCommand("exec-arguments " + procArgs));
 			if (process.platform == "win32") {
@@ -181,20 +181,20 @@ export class MI2 extends EventEmitter implements IBackend {
 		});
 	}
 
-	protected initCommands(target: string, cwd: string, ssh: boolean = false, attach: boolean = false) {
+	protected initCommands(executable: string, cwd: string, ssh: boolean = false, attach: boolean = false) {
 		if (ssh) {
-			if (!path.isAbsolute(target))
-				target = path.join(cwd, target);
+			if (!path.isAbsolute(executable))
+				executable = path.join(cwd, executable);
 		} else {
-			if (!nativePath.isAbsolute(target))
-				target = nativePath.join(cwd, target);
+			if (!nativePath.isAbsolute(executable))
+				executable = nativePath.join(cwd, executable);
 		}
 		const cmds = [
 			this.sendCommand("gdb-set target-async on", true),
 			this.sendCommand("environment-directory \"" + escape(cwd) + "\"", true)
 		];
 		if (!attach)
-			cmds.push(this.sendCommand("file-exec-and-symbols \"" + escape(target) + "\""));
+			cmds.push(this.sendCommand("file-exec-and-symbols \"" + escape(executable) + "\""));
 		if (this.prettyPrint)
 			cmds.push(this.sendCommand("enable-pretty-printing"));
 

src/gdb.ts

@@ -6,6 +6,7 @@ import { SSHArguments, ValuesFormattingMode } from './backend/backend';
 
 export interface LaunchRequestArguments extends DebugProtocol.LaunchRequestArguments {
 	cwd: string;
+	executable: string;
 	target: string;
 	gdbpath: string;
 	env: any;
@@ -60,6 +61,8 @@ class GDBDebugSession extends MI2DebugSession {
 		this.setValuesFormattingMode(args.valuesFormatting);
 		this.miDebugger.printCalls = !!args.printCalls;
 		this.miDebugger.debugOutput = !!args.showDevDebugOutput;
+		if (args.executable == undefined)
+			args.executable = args.target; // legacy compatibility
 		if (args.ssh !== undefined) {
 			if (args.ssh.forwardX11 === undefined)
 				args.ssh.forwardX11 = true;
@@ -74,7 +77,7 @@ class GDBDebugSession extends MI2DebugSession {
 			this.isSSH = true;
 			this.trimCWD = args.cwd.replace(/\\/g, "/");
 			this.switchCWD = args.ssh.cwd;
-			this.miDebugger.ssh(args.ssh, args.ssh.cwd, args.target, args.arguments, args.terminal, false).then(() => {
+			this.miDebugger.ssh(args.ssh, args.ssh.cwd, args.executable, args.arguments, args.terminal, false).then(() => {
 				if (args.autorun)
 					args.autorun.forEach(command => {
 						this.miDebugger.sendUserInput(command);
@@ -94,7 +97,7 @@ class GDBDebugSession extends MI2DebugSession {
 				this.sendErrorResponse(response, 102, `Failed to SSH: ${err.toString()}`);
 			});
 		} else {
-			this.miDebugger.load(args.cwd, args.target, args.arguments, args.terminal).then(() => {
+			this.miDebugger.load(args.cwd, args.executable, args.arguments, args.terminal).then(() => {
 				if (args.autorun)
 					args.autorun.forEach(command => {
 						this.miDebugger.sendUserInput(command);