Fixes microsoft#28139: Fix TS 2.4 Errors in extHostTask.ts

dbaeumer · dbaeumer · commit 9ca787d8ac91 · 2017-06-19T11:26:46.000+02:00
diff --git a/src/vs/workbench/api/node/extHostTask.ts b/src/vs/workbench/api/node/extHostTask.ts
@@ -252,7 +252,7 @@ namespace Strings {
 }
 
 namespace CommandOptions {
-	function isShellOptions(value: any): value is vscode.ShellTaskOptions {
+	function isShellConfiguration(value: any): value is { executable: string; shellArgs?: string[] } {
 		return value && typeof value.executable === 'string';
 	}
 	export function from(value: vscode.ShellTaskOptions | vscode.ProcessTaskOptions): TaskSystem.CommandOptions {
@@ -273,22 +273,22 @@ namespace CommandOptions {
 				}
 			});
 		}
-		if (isShellOptions(value)) {
+		if (isShellConfiguration(value)) {
 			result.shell = ShellConfiguration.from(value);
 		}
 		return result;
 	}
 }
 
 namespace ShellConfiguration {
-	export function from(value: { executable?: string, args?: string[] }): TaskSystem.ShellConfiguration {
+	export function from(value: { executable?: string, shellArgs?: string[] }): TaskSystem.ShellConfiguration {
 		if (value === void 0 || value === null || !value.executable) {
 			return undefined;
 		}
 
 		let result: TaskSystem.ShellConfiguration = {
 			executable: value.executable,
-			args: Strings.from(value.args)
+			args: Strings.from(value.shellArgs)
 		};
 		return result;
 	}

Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ namespace Strings {`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`namespace CommandOptions {`
`255`		`- function isShellOptions(value: any): value is vscode.ShellTaskOptions {`
	`255`	`+ function isShellConfiguration(value: any): value is { executable: string; shellArgs?: string[] } {`
`256`	`256`	`return value && typeof value.executable === 'string';`
`257`	`257`	`}`
`258`	`258`	`export function from(value: vscode.ShellTaskOptions \| vscode.ProcessTaskOptions): TaskSystem.CommandOptions {`
`@@ -273,22 +273,22 @@ namespace CommandOptions {`
`273`	`273`	`}`
`274`	`274`	`});`
`275`	`275`	`}`
`276`		`- if (isShellOptions(value)) {`
	`276`	`+ if (isShellConfiguration(value)) {`
`277`	`277`	`result.shell = ShellConfiguration.from(value);`
`278`	`278`	`}`
`279`	`279`	`return result;`
`280`	`280`	`}`
`281`	`281`	`}`
`282`	`282`
`283`	`283`	`namespace ShellConfiguration {`
`284`		`- export function from(value: { executable?: string, args?: string[] }): TaskSystem.ShellConfiguration {`
	`284`	`+ export function from(value: { executable?: string, shellArgs?: string[] }): TaskSystem.ShellConfiguration {`
`285`	`285`	`if (value === void 0 \|\| value === null \|\| !value.executable) {`
`286`	`286`	`return undefined;`
`287`	`287`	`}`
`288`	`288`
`289`	`289`	`let result: TaskSystem.ShellConfiguration = {`
`290`	`290`	`executable: value.executable,`
`291`		`- args: Strings.from(value.args)`
	`291`	`+ args: Strings.from(value.shellArgs)`
`292`	`292`	`};`
`293`	`293`	`return result;`
`294`	`294`	`}`