Implemented latest feedback from #28235

microsoft · Jun 23, 2017 · 2ef8e48 · 2ef8e48
1 parent c9cf1f5
commit 2ef8e48
Show file tree

Hide file tree

Showing 21 changed files with 1,083 additions and 554 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -1,23 +1,14 @@
 {
-	"version": "0.1.0",
-	"windows": {
-		"command": ".\\node_modules\\.bin\\gulp"
-	},
-	"osx": {
-		"command": "./node_modules/.bin/gulp"
-	},
-	"linux": {
-		"command": "./node_modules/.bin/gulp"
-	},
-	"isShellCommand": true,
+	"version": "2.0.0",
 	"tasks": [
 		{
-			"taskName": "watch",
-			"args": [
-				"--no-color"
-			],
-			"isBuildCommand": true,
+			"customize": "vscode.npm.run watch",
+			"taskName": "Build VS Code",
+			"group": "build",
 			"isBackground": true,
+			"terminal": {
+				"reveal": "never"
+			},
 			"problemMatcher": {
 				"owner": "typescript",
 				"applyTo": "closedDocuments",
@@ -37,38 +28,34 @@
 			}
 		},
 		{
-			"taskName": "tslint",
-			"args": [],
-			"problemMatcher": {
-				"owner": "tslint",
-				"fileLocation": [
-					"relative",
-					"${workspaceRoot}"
-				],
-				"severity": "warning",
-				"pattern": {
-					"regexp": "(.*)\\[(\\d+),\\s(\\d+)\\]:\\s(.*)$", // (.*)\[(\d+), (\d+)\]: (.*)
-					"file": 1,
-					"line": 2,
-					"column": 3,
-					"message": 4
-				}
+			"customize": "gulp.tslint",
+			"taskName": "Run tslint",
+			"problemMatcher": ["$tslint4"]
+		},
+		{
+			"taskName": "Run tests",
+			"type": "shell",
+			"command": "./scripts/test.sh",
+			"windows": {
+				"command": ".\\scripts\\test.bat"
+			},
+			"group": "test",
+			"terminal": {
+				"echo": true,
+				"reveal": "always"
 			}
 		},
 		{
-			"taskName": "test",
-			"args": [
-				"--no-color"
-			],
-			"showOutput": "always",
-			"isTestCommand": true
+			"taskName": "Run Dev",
+			"type": "shell",
+			"command": "./scripts/code.sh",
+			"windows": {
+				"command": ".\\scripts\\code.bat"
+			}
 		},
 		{
-			"taskName": "electron",
-			"args": [
-				"--no-color"
-			],
-			"showOutput": "never"
+			"customize": "gulp.electron",
+			"taskName": "Download electron"
 		}
 	]
 }
diff --git a/extensions/grunt/package.json b/extensions/grunt/package.json
@@ -41,6 +41,22 @@
           "description": "%config.grunt.autoDetect%"
         }
       }
-    }
+    },
+    "taskTypes": [
+      {
+        "taskType": "grunt",
+        "required": ["task"],
+        "properties": {
+          "task": {
+            "type": "string",
+            "description": "The Grunt task to customize"
+          },
+          "file": {
+            "type": "string",
+            "description": "The Grunt file that provides the task. Can be omitted."
+          }
+        }
+      }
+    ]
   }
 }
diff --git a/extensions/grunt/src/main.ts b/extensions/grunt/src/main.ts
@@ -81,6 +81,11 @@ function getOutputChannel(): vscode.OutputChannel {
 	return _channel;
 }
 
+interface GruntTaskIdentifier extends vscode.TaskIdentifier {
+	task: string;
+	file?: string;
+}
+
 async function getGruntTasks(): Promise<vscode.Task[]> {
 	let workspaceRoot = vscode.workspace.rootPath;
 	let emptyTasks: vscode.Task[] = [];
@@ -145,10 +150,13 @@ async function getGruntTasks(): Promise<vscode.Task[]> {
 						let matches = regExp.exec(line);
 						if (matches && matches.length === 2) {
 							let taskName = matches[1];
+							let identifier: GruntTaskIdentifier = {
+								type: 'grunt',
+								task: taskName
+							};
 							let task = taskName.indexOf(' ') === -1
-								? new vscode.ShellTask(taskName, `${command} ${taskName}`)
-								: new vscode.ShellTask(taskName, `${command} "${taskName}"`);
-							task.identifier = `grunt.${taskName}`;
+								? new vscode.ShellTask(identifier, taskName, `${command} ${taskName}`)
+								: new vscode.ShellTask(identifier, taskName, `${command} "${taskName}"`);
 							result.push(task);
 							let lowerCaseTaskName = taskName.toLowerCase();
 							if (lowerCaseTaskName === 'build') {

diff --git a/extensions/gulp/src/main.ts b/extensions/gulp/src/main.ts
@@ -81,6 +81,11 @@ function getOutputChannel(): vscode.OutputChannel {
 	return _channel;
 }
 
+interface GulpTaskIdentifier extends vscode.TaskIdentifier {
+	task: string;
+	file?: string;
+}
+
 async function getGulpTasks(): Promise<vscode.Task[]> {
 	let workspaceRoot = vscode.workspace.rootPath;
 	let emptyTasks: vscode.Task[] = [];
@@ -121,8 +126,11 @@ async function getGulpTasks(): Promise<vscode.Task[]> {
 				if (line.length === 0) {
 					continue;
 				}
-				let task = new vscode.ShellTask(line, `${gulpCommand} ${line}`);
-				task.identifier = `gulp.${line}`;
+				let identifier: GulpTaskIdentifier = {
+					type: 'gulp',
+					task: line
+				};
+				let task = new vscode.ShellTask(identifier, line, `${gulpCommand} ${line}`);
 				result.push(task);
 				let lowerCaseLine = line.toLowerCase();
 				if (lowerCaseLine === 'build') {

diff --git a/extensions/jake/package.json b/extensions/jake/package.json
@@ -41,6 +41,22 @@
           "description": "%config.jake.autoDetect%"
         }
       }
-    }
+    },
+    "taskTypes": [
+      {
+        "taskType": "jake",
+        "required": ["task"],
+        "properties": {
+          "task": {
+            "type": "string",
+            "description": "The Jake task to customize"
+          },
+          "file": {
+            "type": "string",
+            "description": "The Jake file that provides the task. Can be omitted."
+          }
+        }
+      }
+    ]
   }
 }
diff --git a/extensions/jake/src/main.ts b/extensions/jake/src/main.ts
@@ -81,6 +81,11 @@ function getOutputChannel(): vscode.OutputChannel {
 	return _channel;
 }
 
+interface JakeTaskIdentifier extends vscode.TaskIdentifier {
+	task: string;
+	file?: string;
+}
+
 async function getJakeTasks(): Promise<vscode.Task[]> {
 	let workspaceRoot = vscode.workspace.rootPath;
 	let emptyTasks: vscode.Task[] = [];
@@ -125,8 +130,11 @@ async function getJakeTasks(): Promise<vscode.Task[]> {
 				let matches = regExp.exec(line);
 				if (matches && matches.length === 2) {
 					let taskName = matches[1];
-					let task = new vscode.ShellTask(taskName, `${jakeCommand} ${taskName}`);
-					task.identifier = `jake.${taskName}`;
+					let identifier: JakeTaskIdentifier = {
+						type: 'jake',
+						task: taskName
+					};
+					let task = new vscode.ShellTask(identifier, taskName, `${jakeCommand} ${taskName}`);
 					result.push(task);
 					let lowerCaseLine = line.toLowerCase();
 					if (lowerCaseLine === 'build') {

diff --git a/extensions/npm/src/main.ts b/extensions/npm/src/main.ts
@@ -59,6 +59,12 @@ async function readFile(file: string): Promise<string> {
 	});
 }
 
+interface NpmTaskIdentifier extends vscode.TaskIdentifier {
+	script: string;
+	file?: string;
+}
+
+
 async function getNpmScriptsAsTasks(): Promise<vscode.Task[]> {
 	let workspaceRoot = vscode.workspace.rootPath;
 	let emptyTasks: vscode.Task[] = [];
@@ -81,7 +87,11 @@ async function getNpmScriptsAsTasks(): Promise<vscode.Task[]> {
 
 		const result: vscode.Task[] = [];
 		Object.keys(json.scripts).forEach(each => {
-			const task = new vscode.ShellTask(`run ${each}`, `npm run ${each}`);
+			const identifier: NpmTaskIdentifier = {
+				type: 'npm',
+				script: each
+			};
+			const task = new vscode.ShellTask(identifier, `run ${each}`, `npm run ${each}`);
 			const lowerCaseTaskName = each.toLowerCase();
 			if (lowerCaseTaskName === 'build') {
 				task.group = vscode.TaskGroup.Build;
@@ -91,7 +101,7 @@ async function getNpmScriptsAsTasks(): Promise<vscode.Task[]> {
 			result.push(task);
 		});
 		// add some 'well known' npm tasks
-		result.push(new vscode.ShellTask(`install`, `npm install`));
+		result.push(new vscode.ShellTask({ type: 'npm', script: 'install' } as NpmTaskIdentifier, `install`, `npm install`));
 		return Promise.resolve(result);
 	} catch (e) {
 		return Promise.resolve(emptyTasks);

diff --git a/extensions/typescript/src/features/taskProvider.ts b/extensions/typescript/src/features/taskProvider.ts
@@ -21,6 +21,11 @@ const exists = (file: string): Promise<boolean> =>
 		});
 	});
 
+
+interface TypeScriptTaskIdentifier extends vscode.TaskIdentifier {
+	configFile: string;
+}
+
 /**
  * Provides tasks for building `tsconfig.json` files in a project.
  */
@@ -48,7 +53,8 @@ class TscTaskProvider implements vscode.TaskProvider {
 
 		return projects.map(configFile => {
 			const configFileName = path.relative(rootPath, configFile);
-			const buildTask = new vscode.ShellTask(`build ${configFileName}`, `${command} -p "${configFile}"`, '$tsc');
+			const identifier: TypeScriptTaskIdentifier = { type: 'typescript', configFile: configFileName };
+			const buildTask = new vscode.ShellTask(identifier, `build ${configFileName}`, `${command} -p "${configFile}"`, '$tsc');
 			buildTask.source = 'tsc';
 			buildTask.group = vscode.TaskGroup.Build;
 			return buildTask;