Merge pull request #428 from microsoft/dev/gcampbell/miDebuggerPath

update miDebuggerPath resolution

Author: gcampbell-msft

CONTRIBUTING.md

@@ -7,7 +7,7 @@
 * Run the following commands, in a terminal, from the Makefile Tools extension code base root folder:
       * `yarn install` will install the dependencies needed to build the extension.
       * **(optional)** `yarn global add vsce` will install `vsce` globally to create a VSIX package that you can install.
-* To compile source changes, run from terminal: 'yarn compile'.
+* To compile source changes, run from terminal: `yarn compile`.
       * This is also done automatically by VSCode when requesting to debug the extension via F5.
 * To build a vsix with your changes, run from terminal: 'vsce package'.
 * File an [issue](https://github.com/microsoft/vscode-makefile-tools/issues) and a [pull request](https://github.com/microsoft/vscode-makefile-tools/pulls) with the change and we will review it.

src/extension.ts

@@ -233,6 +233,8 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
         await launcher.runCurrentTarget();
     }));
 
+
+    /** Start of commands that shouldn't be exposed in package.json, they are used for command substitution in launch.json and tasks.json.  */
     context.subscriptions.push(vscode.commands.registerCommand('makefile.getLaunchTargetPath', () => {
         telemetry.logEvent("getLaunchTargetPath");
         return launcher.getLaunchTargetPath();
@@ -272,6 +274,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
         telemetry.logEvent("makeBaseDirectory");
         return configuration.makeBaseDirectory();
     }));
+    /** End of commands that shouldn't be exposed in package.json, they are used for command substitution in launch.json and tasks.json. */
 
     context.subscriptions.push(vscode.commands.registerCommand('makefile.configure', async () => {
         await make.configure(make.TriggeredBy.configure);

src/launch.ts

@@ -150,7 +150,8 @@ export class Launcher implements vscode.Disposable {
 
         // If the first chosen debugger is not installed, try the other one.
         if (guessMiDebuggerPath && guessMiMode) {
-            let debuggerPath: string = path.join(guessMiDebuggerPath, guessMiMode);
+            // if the guessMiDebuggerPath is already a file, then go with that. Otherwise, append the guessMiMode.
+            let debuggerPath: string = util.checkFileExistsSync(guessMiDebuggerPath) ? guessMiDebuggerPath : path.join(guessMiDebuggerPath, guessMiMode);
             if (process.platform === "win32") {
                 // On mingw a file is not found if the extension is not part of the path
                 debuggerPath = debuggerPath + ".exe";
@@ -173,7 +174,9 @@ export class Launcher implements vscode.Disposable {
             const cpptoolsExtension: vscode.Extension<any> | undefined = vscode.extensions.getExtension('ms-vscode.cpptools');
             miDebuggerPath = cpptoolsExtension ? path.join(cpptoolsExtension.extensionPath, "debugAdapters", "lldb-mi", "bin", "lldb-mi") : undefined;
         } else if (miDebuggerPath && miMode) {
-            miDebuggerPath = path.join(miDebuggerPath, miMode);
+            // if the miDebuggerPath is already a file, rather than a directory, go with it.
+            // Otherwise, append the MiMode. 
+            miDebuggerPath = util.checkFileExistsSync(miDebuggerPath) ? miDebuggerPath :  path.join(miDebuggerPath, miMode);
             if (process.platform === "win32") {
                 miDebuggerPath = miDebuggerPath + ".exe";
             }