Fixes microsoft#27589: Inconsistent use of ProblemMatcher

dbaeumer · dbaeumer · commit a1fd514fa6c7 · 2017-05-30T22:39:34.000+02:00
diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
@@ -3610,11 +3610,6 @@ declare module 'vscode' {
 		export const Test: 'test';
 	}
 
-	/**
-	 * The ProblemMatchers type definition.
-	 */
-	export type ProblemMatchers = string | string[];
-
 	/**
 	 * A task that starts an external process.
 	 */
@@ -3625,19 +3620,23 @@ declare module 'vscode' {
 		 *
 		 * @param name the task's name. Is presented in the user interface.
 		 * @param process the process to start.
-		 * @param problemMatchers the problem matchers to use.
+		 * @param problemMatchers the names of problem matchers to use, like '$tsc'
+		 *  or '$eslint'. Problem matchers can be contributed by an extension using
+		 *  the `problemMatchers` extension point.
 		 */
-		constructor(name: string, process: string, problemMatchers?: ProblemMatchers);
+		constructor(name: string, process: string, problemMatchers?: string | string[]);
 
 		/**
 		 * Creates a process task.
 		 *
 		 * @param name the task's name. Is presented in the user interface.
 		 * @param process the process to start.
 		 * @param args arguments to be passed to the process.
-		 * @param problemMatchers the problem matchers to use.
+		 * @param problemMatchers the names of problem matchers to use, like '$tsc'
+		 *  or '$eslint'. Problem matchers can be contributed by an extension using
+		 *  the `problemMatchers` extension point.
 		 */
-		constructor(name: string, process: string, args: string[], problemMatchers?: ProblemMatchers);
+		constructor(name: string, process: string, args: string[], problemMatchers?: string | string[]);
 
 		/**
 		 * Creates a process task.
@@ -3646,9 +3645,11 @@ declare module 'vscode' {
 		 * @param process the process to start.
 		 * @param args arguments to be passed to the process.
 		 * @param options additional options for the started process.
-		 * @param problemMatchers the problem matchers to use.
+		 * @param problemMatchers the names of problem matchers to use, like '$tsc'
+		 *  or '$eslint'. Problem matchers can be contributed by an extension using
+		 *  the `problemMatchers` extension point.
 		 */
-		constructor(name: string, process: string, args: string[], options: ProcessTaskOptions, problemMatchers?: ProblemMatchers);
+		constructor(name: string, process: string, args: string[], options: ProcessTaskOptions, problemMatchers?: string | string[]);
 
 		/**
 		 * The task's name
@@ -3769,19 +3770,23 @@ declare module 'vscode' {
 		 *
 		 * @param name the task's name. Is presented in the user interface.
 		 * @param commandLine the command line to execute.
-		 * @param problemMatchers the problem matchers to use.
+		 * @param problemMatchers the names of problem matchers to use, like '$tsc'
+		 *  or '$eslint'. Problem matchers can be contributed by an extension using
+		 *  the `problemMatchers` extension point.
 		 */
-		constructor(name: string, commandLine: string, problemMatchers?: ProblemMatchers);
+		constructor(name: string, commandLine: string, problemMatchers?: string | string[]);
 
 		/**
 		 * Creates a shell task.
 		 *
 		 * @param name the task's name. Is presented in the user interface.
 		 * @param commandLine the command line to execute.
 		 * @param options additional options used when creating the shell.
-		 * @param problemMatchers the problem matchers to use.
+		 * @param problemMatchers the names of problem matchers to use, like '$tsc'
+		 *  or '$eslint'. Problem matchers can be contributed by an extension using
+		 *  the `problemMatchers` extension point.
 		 */
-		constructor(name: string, commandLine: string, options: ShellTaskOptions, problemMatchers?: ProblemMatchers);
+		constructor(name: string, commandLine: string, options: ShellTaskOptions, problemMatchers?: string | string[]);
 
 		/**
 		 * The task's name
diff --git a/src/vs/workbench/api/node/extHostTypes.ts b/src/vs/workbench/api/node/extHostTypes.ts
@@ -1186,15 +1186,15 @@ export class ProcessTask extends BaseTask {
 	private _args: string[];
 	private _options: vscode.ProcessTaskOptions;
 
-	constructor(name: string, process: string, args?: string[], problemMatchers?: vscode.ProblemMatchers);
-	constructor(name: string, process: string, args: string[] | undefined, options: vscode.ProcessTaskOptions, problemMatchers?: vscode.ProblemMatchers);
-	constructor(name: string, process: string, arg3?: string[], arg4?: vscode.ProcessTaskOptions | vscode.ProblemMatchers, arg5?: vscode.ProblemMatchers) {
+	constructor(name: string, process: string, args?: string[], problemMatchers?: string | string[]);
+	constructor(name: string, process: string, args: string[] | undefined, options: vscode.ProcessTaskOptions, problemMatchers?: string | string[]);
+	constructor(name: string, process: string, arg3?: string[], arg4?: vscode.ProcessTaskOptions | string | string[], arg5?: string | string[]) {
 		if (typeof process !== 'string') {
 			throw illegalArgument('process');
 		}
 		let args: string[];
 		let options: vscode.ProcessTaskOptions;
-		let problemMatchers: vscode.ProblemMatchers;
+		let problemMatchers: string | string[];
 
 		args = arg3 || [];
 		if (arg4) {
@@ -1252,9 +1252,9 @@ export class ShellTask extends BaseTask implements vscode.ShellTask {
 	private _commandLine: string;
 	private _options: vscode.ShellTaskOptions;
 
-	constructor(name: string, commandLine: string, problemMatchers?: vscode.ProblemMatchers);
-	constructor(name: string, commandLine: string, options: vscode.ShellTaskOptions, problemMatchers?: vscode.ProblemMatchers);
-	constructor(name: string, commandLine: string, optionsOrProblemMatchers?: vscode.ShellTaskOptions | vscode.ProblemMatchers, problemMatchers?: vscode.ProblemMatchers) {
+	constructor(name: string, commandLine: string, problemMatchers?: string | string[]);
+	constructor(name: string, commandLine: string, options: vscode.ShellTaskOptions, problemMatchers?: string | string[]);
+	constructor(name: string, commandLine: string, optionsOrProblemMatchers?: vscode.ShellTaskOptions | string | string[], problemMatchers?: string | string[]) {
 		if (typeof commandLine !== 'string') {
 			throw illegalArgument('commandLine');
 		}
