Merge branch 'main' into dev/gcampbell/Tooltips

.vscode/launch.json

@@ -9,7 +9,7 @@
       "runtimeExecutable": "${execPath}",
       "args": ["--extensionDevelopmentPath=${workspaceFolder}"],
       "sourceMaps": true,
-      "outFiles": ["${workspaceFolder}/**/*.js"],
+      "outFiles": ["${workspaceFolder}/dist/**/*.js"],
       "env": {
         "MAKEFILE_TOOLS_TESTING": "1",
         "WindowsSDKVersion": "12.3.45678.9\\",

CHANGELOG.md

@@ -12,6 +12,8 @@ Bug Fixes:
 - Fix issue where selecting "Default" from the configuration drop down doesn't update Makefile Project Outline [#585](https://github.com/microsoft/vscode-makefile-tools/issues/585)
 - Fix issue where CHS and CHT wasn't being localized on Linux. [#609](https://github.com/microsoft/vscode-makefile-tools/issues/609)
 - Ensure that tooltips for the project outline are reasonable and consistent. [#600](https://github.com/microsoft/vscode-makefile-tools/issues/600)
+- Fix issue where clicking out of quick pick wasn't closing quick pick. [#604](https://github.com/microsoft/vscode-makefile-tools/issues/604)
+- Fix issue where line endings were being added in the output which broke long compile commands from output of make.exe. [#545](https://github.com/microsoft/vscode-makefile-tools/issues/545)
 
 ## 0.9
 

src/configuration.ts

@@ -2315,12 +2315,7 @@ export async function setNewConfiguration(): Promise<void> {
 
   const items: string[] = prepareConfigurationsQuickPick();
 
-  let options: vscode.QuickPickOptions = {};
-  options.ignoreFocusOut = true; // so that the logger and the quick pick don't compete over focus
-  const chosen: string | undefined = await vscode.window.showQuickPick(
-    items,
-    options
-  );
+  const chosen: string | undefined = await vscode.window.showQuickPick(items);
 
   if (
     chosen &&
@@ -2438,9 +2433,6 @@ export async function selectTarget(): Promise<void> {
     }
   }
 
-  let options: vscode.QuickPickOptions = {};
-  options.ignoreFocusOut = true; // so that the logger and the quick pick don't compete over focus
-
   // Ensure "all" is always available as a target to select.
   // There are scenarios when "all" might not be present in the list of available targets,
   // for example when the extension is using a build log or dryrun cache of a previous state
@@ -2458,8 +2450,7 @@ export async function selectTarget(): Promise<void> {
   }
 
   const chosen: string | undefined = await vscode.window.showQuickPick(
-    buildTargets,
-    options
+    buildTargets
   );
 
   if (chosen && chosen !== getCurrentTarget()) {
@@ -2624,7 +2615,6 @@ export async function selectLaunchConfiguration(): Promise<void> {
   });
   launchTargetsNames = util.sortAndRemoveDuplicates(launchTargetsNames);
   let options: vscode.QuickPickOptions = {};
-  options.ignoreFocusOut = true; // so that the logger and the quick pick don't compete over focus
   if (launchTargets.length === 0) {
     options.placeHolder = "No launch targets identified";
   }

src/make.ts

@@ -334,12 +334,17 @@ export async function buildTarget(
   }
 
   configAndTarget = `"${configAndTarget}"`;
-  let popupStr: string = localize(
-    "make.popupStr",
-    "Building ${0} the current makefile configuration ${0}",
-    clean ? "clean " : "",
+  const cleanPopup: string = localize(
+    "make.clean.popup",
+    "Building clean the current makefile configuration {0}",
     configAndTarget
   );
+  const notCleanPopup: string = localize(
+    "make.not.clean.popup",
+    "Building the current makefile configuration {0}",
+    configAndTarget
+  );
+  let popupStr: string = clean ? cleanPopup : notCleanPopup;
 
   let cancelBuild: boolean = false; // when the build was cancelled by the user
 
@@ -723,7 +728,7 @@ export async function generateParseContent(
     let heartBeat: number = Date.now();
 
     let stdout: any = (result: string): void => {
-      const appendStr: string = `${result} ${lineEnding}`;
+      const appendStr: string = `${result}`;
       completeOutput += appendStr;
       fs.appendFileSync(dryrunFile, appendStr);