Task Provider Feature

Extension/package.json

@@ -11,7 +11,7 @@
   },
   "license": "SEE LICENSE IN LICENSE.txt",
   "engines": {
-    "vscode": "^1.44.0"
+    "vscode": "^1.49.0"
   },
   "bugs": {
     "url": "https://github.com/Microsoft/vscode-cpptools/issues",
@@ -42,6 +42,43 @@
   ],
   "main": "./dist/main",
   "contributes": {
+    "taskDefinitions": [
+      {
+        "type": "cppbuild",
+        "required": [
+          "command",
+          "label"
+        ],
+        "properties": {
+          "label": {
+            "type": "string",
+            "description": "%c_cpp.taskDefinitions.name.description%"
+          },
+          "command": {
+            "type": "string",
+            "description": "%c_cpp.taskDefinitions.command.description%"
+          },
+          "args": {
+            "type": "array",
+            "description": "%c_cpp.taskDefinitions.args.description%"
+          },
+          "options": {
+            "type": "object",
+            "description": "%c_cpp.taskDefinitions.options.description%",
+            "properties": {
+              "cwd": {
+                "type": "string",
+                "description": "%c_cpp.taskDefinitions.options.cwd.description%"
+              }
+            }
+          },
+          "detail": {
+            "type": "string",
+            "description": "%c_cpp.taskDefinitions.detail.description%"
+          }
+        }
+      }
+    ],
     "views": {
       "references-view": [
         {

Extension/package.nls.json

@@ -219,5 +219,11 @@
     "c_cpp.debuggers.symbolLoadInfo.description": "Explicit control of symbol loading.",
     "c_cpp.debuggers.symbolLoadInfo.loadAll.description": "If true, symbols for all libs will be loaded, otherwise no solib symbols will be loaded. Default value is true.",
     "c_cpp.debuggers.symbolLoadInfo.exceptionList.description": "List of filenames (wildcards allowed) separated by semicolons ';'. Modifies behavior of LoadAll. If LoadAll is true then don't load symbols for libs that match any name in the list. Otherwise only load symbols for libs that match. Example: \"foo.so;bar.so\"",
-    "c_cpp.debuggers.requireExactSource.description": "Optional flag to require current source code to match the pdb."
-}
+    "c_cpp.debuggers.requireExactSource.description": "Optional flag to require current source code to match the pdb.",
+    "c_cpp.taskDefinitions.name.description": "The name of the task",
+    "c_cpp.taskDefinitions.command.description": "The path to either a compiler or script that performs compilation",
+    "c_cpp.taskDefinitions.args.description": "Additional arguments to pass to the compiler or compilation script",
+    "c_cpp.taskDefinitions.options.description": "Additional command options",
+    "c_cpp.taskDefinitions.options.cwd.description": "The current working directory of the executed program or script. If omitted Code's current workspace root is used.",
+    "c_cpp.taskDefinitions.detail.description": "Additional details of the task"
+}

Extension/src/Debugger/configurationProvider.ts

@@ -7,11 +7,12 @@ import * as debugUtils from './utils';
 import * as os from 'os';
 import * as path from 'path';
 import * as vscode from 'vscode';
-import { getBuildTasks, BuildTaskDefinition } from '../LanguageServer/extension';
+import { CppBuildTaskDefinition} from '../LanguageServer/cppBuildTaskProvider';
 import * as util from '../common';
 import * as fs from 'fs';
 import * as Telemetry from '../telemetry';
 import { buildAndDebugActiveFileStr } from './extension';
+import { cppBuildTaskProvider} from '../LanguageServer/extension';
 import * as logger from '../logger';
 import * as nls from 'vscode-nls';
 
@@ -77,7 +78,7 @@ export class QuickPickConfigurationProvider implements vscode.DebugConfiguration
         }
         if (selection.label.indexOf(buildAndDebugActiveFileStr()) !== -1 && selection.configuration.preLaunchTask) {
             try {
-                await util.ensureBuildTaskExists(selection.configuration.preLaunchTask);
+                await cppBuildTaskProvider.ensureBuildTaskExists(selection.configuration.preLaunchTask);
                 await vscode.debug.startDebugging(folder, selection.configuration);
                 Telemetry.logDebuggerEvent("buildAndDebug", { "success": "true" });
             } catch (e) {
@@ -105,7 +106,7 @@ class CppConfigurationProvider implements vscode.DebugConfigurationProvider {
 	 * Returns a list of initial debug configurations based on contextual information, e.g. package.json or folder.
 	 */
     async provideDebugConfigurations(folder?: vscode.WorkspaceFolder, token?: vscode.CancellationToken): Promise<vscode.DebugConfiguration[]> {
-        let buildTasks: vscode.Task[] = await getBuildTasks(true, true);
+        let buildTasks: vscode.Task[] = await cppBuildTaskProvider.getTasks(true);
         if (buildTasks.length === 0) {
             return Promise.resolve(this.provider.getInitialConfigurations(this.type));
         }
@@ -133,9 +134,9 @@ class CppConfigurationProvider implements vscode.DebugConfigurationProvider {
         // Generate new configurations for each build task.
         // Generating a task is async, therefore we must *await* *all* map(task => config) Promises to resolve.
         const configs: vscode.DebugConfiguration[] = await Promise.all(buildTasks.map<Promise<vscode.DebugConfiguration>>(async task => {
-            const definition: BuildTaskDefinition = task.definition as BuildTaskDefinition;
-            const compilerName: string = path.basename(definition.compilerPath);
-
+            const definition: CppBuildTaskDefinition = task.definition as CppBuildTaskDefinition;
+            const compilerPath: string = definition.command;
+            const compilerName: string = path.basename(compilerPath);
             const newConfig: vscode.DebugConfiguration = {...defaultConfig}; // Copy enumerables and properties
 
             newConfig.name = compilerName + buildAndDebugActiveFileStr();
@@ -166,7 +167,7 @@ class CppConfigurationProvider implements vscode.DebugConfigurationProvider {
                         debuggerName += ".exe";
                     }
 
-                    const compilerDirname: string = path.dirname(definition.compilerPath);
+                    const compilerDirname: string = path.dirname(compilerPath);
                     const debuggerPath: string = path.join(compilerDirname, debuggerName);
                     fs.stat(debuggerPath, (err, stats: fs.Stats) => {
                         if (!err && stats && stats.isFile) {

Extension/src/Debugger/extension.ts

@@ -12,6 +12,7 @@ import { CppdbgDebugAdapterDescriptorFactory, CppvsdbgDebugAdapterDescriptorFact
 import * as util from '../common';
 import * as Telemetry from '../telemetry';
 import * as nls from 'vscode-nls';
+import { cppBuildTaskProvider } from '../LanguageServer/extension';
 
 nls.config({ messageFormat: nls.MessageFormat.bundle, bundleFormat: nls.BundleFormat.standalone })();
 const localize: nls.LocalizeFunc = nls.loadMessageBundle();
@@ -88,11 +89,11 @@ export function initialize(context: vscode.ExtensionContext): void {
             if (selection.configuration.preLaunchTask) {
                 if (folder) {
                     try {
-                        await util.ensureBuildTaskExists(selection.configuration.preLaunchTask);
+                        await cppBuildTaskProvider.ensureBuildTaskExists(selection.configuration.preLaunchTask);
                         Telemetry.logDebuggerEvent("buildAndDebug", { "success": "false" });
                     } catch (e) {
-                        if (e && e.message === util.failedToParseTasksJson) {
-                            vscode.window.showErrorMessage(util.failedToParseTasksJson);
+                        if (e && e.message === util.failedToParseJson) {
+                            vscode.window.showErrorMessage(util.failedToParseJson);
                         }
                         return Promise.resolve();
                     }
@@ -108,7 +109,7 @@ export function initialize(context: vscode.ExtensionContext): void {
 
             // Attempt to use the user's (possibly) modified configuration before using the generated one.
             try {
-                await util.ensureDebugConfigExists(selection.configuration.name);
+                await cppBuildTaskProvider.ensureDebugConfigExists(selection.configuration.name);
                 try {
                     await vscode.debug.startDebugging(folder, selection.configuration.name);
                     Telemetry.logDebuggerEvent("buildAndDebug", { "success": "true" });

Extension/src/LanguageServer/configurations.ts

@@ -18,7 +18,8 @@ import * as os from 'os';
 import escapeStringRegExp = require('escape-string-regexp');
 import * as jsonc from 'comment-json';
 import * as nls from 'vscode-nls';
-import which = require('which');
+import { setTimeout } from 'timers';
+import * as which from 'which';
 
 nls.config({ messageFormat: nls.MessageFormat.bundle, bundleFormat: nls.BundleFormat.standalone })();
 const localize: nls.LocalizeFunc = nls.loadMessageBundle();