Command inputs should be consistent with keybindings (microsoft#73034)

alexr00 · web-flow · commit d3dbf5660f46 · 2019-08-08T12:45:14.000+02:00
Fixes microsoft#72935
diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
@@ -306,7 +306,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		});
 
 		CommandsRegistry.registerCommand('workbench.action.tasks.reRunTask', (accessor, arg) => {
-			this.reRunTaskCommand(arg);
+			this.reRunTaskCommand();
 		});
 
 		CommandsRegistry.registerCommand('workbench.action.tasks.restartTask', (accessor, arg) => {
@@ -1810,7 +1810,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		});
 	}
 
-	private reRunTaskCommand(arg?: any): void {
+	private reRunTaskCommand(): void {
 		if (!this.canRunCommand()) {
 			return;
 		}
diff --git a/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts b/src/vs/workbench/services/configurationResolver/common/configurationResolver.ts
@@ -60,4 +60,4 @@ export interface CommandInputInfo {
 	args?: any;
 }
 
-export type ConfiguredInput = PromptStringInputInfo | PickStringInputInfo | CommandInputInfo;
+export type ConfiguredInput = PromptStringInputInfo | PickStringInputInfo | CommandInputInfo;
diff --git a/src/vs/workbench/services/configurationResolver/common/configurationResolverSchema.ts b/src/vs/workbench/services/configurationResolver/common/configurationResolverSchema.ts
@@ -102,8 +102,20 @@ export const inputsSchema: IJSONSchema = {
 								description: nls.localize('JsonSchema.input.command.command', "The command to execute for this input variable.")
 							},
 							args: {
-								type: 'object',
-								description: nls.localize('JsonSchema.input.command.args', "Optional arguments passed to the command.")
+								oneOf: [
+									{
+										type: 'object',
+										description: nls.localize('JsonSchema.input.command.args', "Optional arguments passed to the command.")
+									},
+									{
+										type: 'array',
+										description: nls.localize('JsonSchema.input.command.args', "Optional arguments passed to the command.")
+									},
+									{
+										type: 'string',
+										description: nls.localize('JsonSchema.input.command.args', "Optional arguments passed to the command.")
+									}
+								]
 							}
 						}
 					}

Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer`
`306`	`306`	`});`
`307`	`307`
`308`	`308`	`CommandsRegistry.registerCommand('workbench.action.tasks.reRunTask', (accessor, arg) => {`
`309`		`- this.reRunTaskCommand(arg);`
	`309`	`+ this.reRunTaskCommand();`
`310`	`310`	`});`
`311`	`311`
`312`	`312`	`CommandsRegistry.registerCommand('workbench.action.tasks.restartTask', (accessor, arg) => {`
`@@ -1810,7 +1810,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer`
`1810`	`1810`	`});`
`1811`	`1811`	`}`
`1812`	`1812`
`1813`		`- private reRunTaskCommand(arg?: any): void {`
	`1813`	`+ private reRunTaskCommand(): void {`
`1814`	`1814`	`if (!this.canRunCommand()) {`
`1815`	`1815`	`return;`
`1816`	`1816`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,4 +60,4 @@ export interface CommandInputInfo {`
`60`	`60`	`args?: any;`
`61`	`61`	`}`
`62`	`62`
`63`		`-export type ConfiguredInput = PromptStringInputInfo \| PickStringInputInfo \| CommandInputInfo;`
	`63`	`+export type ConfiguredInput = PromptStringInputInfo \| PickStringInputInfo \| CommandInputInfo;`