Seanmcm/debug fixes

Extension/package.json

@@ -587,6 +587,11 @@
         "command": "C_Cpp.TakeSurvey",
         "title": "%c_cpp.command.takeSurvey.title%",
         "category": "C/C++"
+      },
+      {
+        "command": "C_Cpp.BuildAndDebugActiveFile",
+        "title": "%c_cpp.command.buildAndDebugActiveFile.title%",
+        "category": "C/C++"
       }
     ],
     "keybindings": [
@@ -1393,6 +1398,16 @@
           "when": "editorLangId == cpp",
           "command": "workbench.action.showAllSymbols",
           "group": "other@4"
+        },
+        {
+          "when": "editorLangId == cpp",
+          "command": "C_Cpp.BuildAndDebugActiveFile",
+          "group": "other@5"
+        },
+        {
+          "when": "editorLangId == c",
+          "command": "C_Cpp.BuildAndDebugActiveFile",
+          "group": "other@5"
         }
       ]
     },

Extension/src/Debugger/configurationProvider.ts

@@ -7,10 +7,9 @@ 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 { getBuildTasks, BuildTaskDefinition } from '../LanguageServer/extension';
 import * as util from '../common';
 import * as fs from 'fs';
-//import * as assert from 'assert';
 import * as Telemetry from '../telemetry';
 import { buildAndDebugActiveFileStr } from './extension';
 
@@ -57,9 +56,9 @@ export class QuickPickConfigurationProvider implements vscode.DebugConfiguration
 
         return vscode.window.showQuickPick(items, {placeHolder: "Select a configuration"}).then(async selection => {
             // Wrap in new Promise to make sure task kicks off before VS Code switches the active document to launch.json
-            return new Promise<vscode.DebugConfiguration[]>(async resolve => {
+            return new Promise<vscode.DebugConfiguration[]>(async (resolve, reject) => {
                 if (!selection) {
-                    return resolve([defaultConfig]); // User canceled it. Choose the default config?
+                    return reject([]); // User canceled it.
                 }
                 if (selection.label.indexOf(buildAndDebugActiveFileStr()) !== -1 && selection.configuration.preLaunchTask) {
                     try {
@@ -93,8 +92,8 @@ 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 | undefined, token?: vscode.CancellationToken): Promise<vscode.DebugConfiguration[]> {
-        let buildTasks: vscode.Task[]; // = await getBuildTasks(); // TODO
-        if (!buildTasks || buildTasks.length === 0) {
+        let buildTasks: vscode.Task[] = await getBuildTasks(); // TODO
+        if (buildTasks.length === 0 || this.type === DebuggerType.cppvsdbg) {
             return Promise.resolve(this.provider.getInitialConfigurations(this.type));
         }
         const defaultConfig: vscode.DebugConfiguration = this.provider.getInitialConfigurations(this.type).find(config => {
@@ -127,7 +126,7 @@ class CppConfigurationProvider implements vscode.DebugConfigurationProvider {
                 const suffix: string = suffixIndex === -1 ? "" : compilerName.substr(suffixIndex);
                 debuggerName = (platform === "darwin" ? "lldb" : "lldb-mi") + suffix;
             } else {
-                debuggerName = "gdb";
+                debuggerName = platform === "win32" ? "gdb.exe" : "gdb";
             }
 
             const debuggerPath: string = path.join(compilerDirname, debuggerName);

Extension/src/Debugger/extension.ts

@@ -7,7 +7,7 @@ import * as vscode from 'vscode';
 import * as os from 'os';
 import { AttachPicker, RemoteAttachPicker, AttachItemsProvider } from './attachToProcess';
 import { NativeAttachItemsProviderFactory } from './nativeAttach';
-import { /*QuickPickConfigurationProvider,*/ ConfigurationAssetProviderFactory, CppVsDbgConfigurationProvider, CppDbgConfigurationProvider, ConfigurationSnippetProvider, IConfigurationAssetProvider } from './configurationProvider';
+import { QuickPickConfigurationProvider, ConfigurationAssetProviderFactory, CppVsDbgConfigurationProvider, CppDbgConfigurationProvider, ConfigurationSnippetProvider, IConfigurationAssetProvider } from './configurationProvider';
 import { CppdbgDebugAdapterDescriptorFactory, CppvsdbgDebugAdapterDescriptorFactory } from './debugAdapterDescriptorFactory';
 import * as util from '../common';
 import * as Telemetry from '../telemetry';
@@ -35,7 +35,7 @@ export function initialize(context: vscode.ExtensionContext): void {
         disposables.push(vscode.debug.registerDebugConfigurationProvider('cppvsdbg', new CppVsDbgConfigurationProvider(configurationProvider)));
     }
     const provider: CppDbgConfigurationProvider = new CppDbgConfigurationProvider(configurationProvider);
-    disposables.push(vscode.debug.registerDebugConfigurationProvider('cppdbg', provider)); //new QuickPickConfigurationProvider(provider))); // TODO
+    disposables.push(vscode.debug.registerDebugConfigurationProvider('cppdbg', new QuickPickConfigurationProvider(provider))); // TODO
 
     disposables.push(vscode.commands.registerTextEditorCommand("C_Cpp.BuildAndDebugActiveFile", async (textEditor: vscode.TextEditor, edit: vscode.TextEditorEdit, ...args: any[]) => {
         const folder: vscode.WorkspaceFolder = vscode.workspace.getWorkspaceFolder(textEditor.document.uri);

Extension/src/common.ts

@@ -83,6 +83,8 @@ export async function ensureBuildTaskExists(taskName: string): Promise<void> {
         delete definition.compilerPath;
     }
 
+    rawTasksJson.version = "2.0.0";
+
     if (!rawTasksJson.tasks.find(task => { return task.label === selectedTask.definition.label; })) {
         rawTasksJson.tasks.push(selectedTask.definition);
     }