Merge pull request microsoft#1591 from microsoft/dev/bemcmorr/arduino-cli-intellisense

benmcmorran · web-flow · commit 9a955328fe8f · 2023-02-15T09:47:39.000-08:00
Fix IntelliSense configuration for Arduino CLI
diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
@@ -656,7 +656,7 @@ export class ArduinoApp {
 
         // We always build verbosely but filter the output based on the settings
 
-        this._settings.useArduinoCli ? args.push("--verbose") : args.push("--verbose-build");
+        this._settings.useArduinoCli ? args.push("--verbose", "--no-color") : args.push("--verbose-build");
 
         if (verbose && !this._settings.useArduinoCli) {
             args.push("--verbose-upload");
@@ -757,16 +757,17 @@ export class ArduinoApp {
         const wrapLineCallback = (callback: (line: string) => void) => {
             let buffer = "";
             let startIndex = 0;
+            const eol = this.useArduinoCli() ? "\n" : os.EOL;
             return (data: string) => {
                 buffer += data;
                 while (true) {
-                    const pos = buffer.indexOf(os.EOL, startIndex);
+                    const pos = buffer.indexOf(eol, startIndex);
                     if (pos < 0) {
                         startIndex = buffer.length;
                         break;
                     }
-                    const line = buffer.substring(0, pos + os.EOL.length);
-                    buffer = buffer.substring(pos + os.EOL.length);
+                    const line = buffer.substring(0, pos + eol.length);
+                    buffer = buffer.substring(pos + eol.length);
                     startIndex = 0;
                     callback(line);
                 }
diff --git a/src/common/util.ts b/src/common/util.ts
@@ -246,7 +246,11 @@ export function spawn(
         }
 
         child.on("error", (error) => reject({ error }));
-        child.on("exit", (code) => {
+
+        // It's important to use use the "close" event instead of "exit" here.
+        // There could still be buffered data in stdout or stderr when the
+        // process exits that we haven't received yet.
+        child.on("close", (code) => {
             if (code === 0) {
                 resolve({ code });
             } else {
