From ae0ebd43ee4eab1bd8be1043c352197522edb2bf Mon Sep 17 00:00:00 2001
From: Giulio <giulio@glgprograms.it>
Date: Tue, 8 Dec 2020 00:41:05 +0100
Subject: [PATCH 001/142] Option to use arduino-cli instead of Arduino IDE
 (#1017)

* Hardcoded Arduino-CLI commands for build and upload

* Added menu checkbox for Arduino CLI

- Upload with programmer is still not supported
- Must be created an arduino symlink pointing to arduino-cli

* If Arduino-CLI, check for arduino-cli instead of arduino.

Not yet supported on Windows or MacOS

* Typo

* Fixed CI requests

* Fixed CI requests

* Update src/common/sys/darwin.ts

MacOS patch for arduino-cli

Co-authored-by: Marc Lage-Vianna <MarcLV@users.noreply.github.com>

* Update src/common/sys/win32.ts

Windows patch for arduino-cli

Co-authored-by: Marc Lage-Vianna <MarcLV@users.noreply.github.com>

* Trigger

* add cli option in commandPath for win32

* add cli support to board and lib managers

* rename isArduinoCli to useArduinoCli

* adds support for uploading using programmer

* simplify getProgrammer

* add CLI upload

* Update src/arduino/arduino.ts

Co-authored-by: Jason Tranchida <jtranchida@gmail.com>

* refactor uploadUsingProgrammer

* fix output path for CLI upload

* Update package.json

* update cli option text, thanks @maddogjt

* update tests

Co-authored-by: giuliof <giulio@marchtop.localdomain>
Co-authored-by: Marc Lage-Vianna <MarcLV@users.noreply.github.com>
Co-authored-by: Adi Azulay <adazulay@microsoft.com>
Co-authored-by: Adi Azulay <azulayadi@gmail.com>
Co-authored-by: Jason Tranchida <jtranchida@gmail.com>
---
 package.json                     |  13 +++
 src/arduino/arduino.ts           | 161 +++++++++++++++----------------
 src/arduino/arduinoSettings.ts   |  10 +-
 src/arduino/programmerManager.ts |  34 ++++---
 src/arduino/vscodeSettings.ts    |   6 ++
 src/common/platform.ts           |   4 +-
 src/common/sys/darwin.ts         |   5 +-
 src/common/sys/linux.ts          |   4 +-
 src/common/sys/win32.ts          |   5 +-
 src/common/util.ts               |   7 ++
 src/extension.ts                 |  37 ++++++-
 test/extension.test.ts           |   2 +
 test/librarymanager.test.ts      |   2 +-
 13 files changed, 184 insertions(+), 106 deletions(-)

diff --git a/package.json b/package.json
index 0d526c16..20cf48a1 100644
--- a/package.json
+++ b/package.json
@@ -93,10 +93,18 @@
           "light": "images/ArduinoUpload_16.svg"
         }
       },
+      {
+        "command": "arduino.cliUpload",
+        "title": "Arduino CLI: Upload"
+      },
       {
         "command": "arduino.uploadUsingProgrammer",
         "title": "Arduino: Upload Using Programmer"
       },
+      {
+        "command": "arduino.cliUploadUsingProgrammer",
+        "title": "Arduino CLI: Upload Using Programmer"
+      },
       {
         "command": "arduino.selectProgrammer",
         "title": "Arduino: Select Programmer"
@@ -442,6 +450,11 @@
       "type": "object",
       "title": "Arduino configuration",
       "properties": {
+        "arduino.useArduinoCli": {
+          "type": "boolean",
+          "default": false,
+          "markdownDescription": "Use Arduino CLI installed instead of Arduino IDE. `#arduino.path#` must be set, as there is no default path for 'arduino-cli'. (Requires a restart after change)"
+        },
         "arduino.path": {
           "type": "string",
           "default": "",
diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 263a5069..5a59ca19 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -93,13 +93,23 @@ export class ArduinoApp {
         }
     }
 
-    public async upload() {
+    /**
+     * Upload code to selected board
+     * @param {bool} [compile=true] - Indicates whether to compile the code when using the CLI to upload
+     * @param {bool} [useProgrammer=false] - Indicate whether a specific programmer should be used
+     */
+    public async upload(compile: boolean = true, useProgrammer: boolean = false) {
         const dc = DeviceContext.getInstance();
         const boardDescriptor = this.getBoardBuildString();
         if (!boardDescriptor) {
             return;
         }
 
+        const selectProgrammer = useProgrammer ? this.getProgrammerString() : null;
+        if (useProgrammer && !selectProgrammer) {
+            return;
+        }
+
         if (!ArduinoWorkspace.rootPath) {
             vscode.window.showWarningMessage("Cannot find the sketch file.");
             return;
@@ -140,8 +150,25 @@ export class ArduinoApp {
             }
         }
 
+        if (!compile && !this.useArduinoCli()) {
+            arduinoChannel.error("This command is only availble when using the Arduino CLI");
+            return;
+        }
+
         const appPath = path.join(ArduinoWorkspace.rootPath, dc.sketch);
-        const args = ["--upload", "--board", boardDescriptor];
+        // TODO: add the --clean argument to the cli args when v 0.14 is released (this will clean up the build folder after uploading)
+        const args = (!compile && this.useArduinoCli()) ? ["upload", "-b", boardDescriptor] :
+                                                          this.useArduinoCli() ? ["compile", "--upload", "-b", boardDescriptor] :
+                                                                                 ["--upload", "--board", boardDescriptor];
+
+        if (useProgrammer) {
+            if (this.useArduinoCli()) {
+                args.push("--programmer", selectProgrammer)
+            } else {
+                args.push("--useprogrammer", "--pref", "programmer=" + selectProgrammer)
+            }
+        }
+
         if (dc.port) {
             args.push("--port", dc.port);
         }
@@ -149,7 +176,7 @@ export class ArduinoApp {
         if (VscodeSettings.getInstance().logLevel === "verbose") {
             args.push("--verbose");
         }
-        if (dc.output) {
+        if (dc.output && compile) {
             const outputPath = path.resolve(ArduinoWorkspace.rootPath, dc.output);
             const dirPath = path.dirname(outputPath);
             if (!util.directoryExistsSync(dirPath)) {
@@ -157,77 +184,13 @@ export class ArduinoApp {
                 return;
             }
 
-            args.push("--pref", `build.path=${outputPath}`);
-            arduinoChannel.info(`Please see the build logs in Output path: ${outputPath}`);
-        } else {
-            const msg = "Output path is not specified. Unable to reuse previously compiled files. Upload could be slow. See README.";
-            arduinoChannel.warning(msg);
-        }
-        await util.spawn(this._settings.commandPath, arduinoChannel.channel, args).then(async () => {
-            UsbDetector.getInstance().resumeListening();
-            if (needRestore) {
-                await serialMonitor.openSerialMonitor();
-            }
-            arduinoChannel.end(`Uploaded the sketch: ${dc.sketch}${os.EOL}`);
-        }, (reason) => {
-            arduinoChannel.error(`Exit with code=${reason.code}${os.EOL}`);
-        });
-    }
-
-    public async uploadUsingProgrammer() {
-        const dc = DeviceContext.getInstance();
-        const boardDescriptor = this.getBoardBuildString();
-        if (!boardDescriptor) {
-            return;
-        }
-
-        const selectProgrammer = this.getProgrammerString();
-        if (!selectProgrammer) {
-            return;
-        }
+            if (this.useArduinoCli()) {
+                args.push("--build-path", outputPath);
 
-        if (!ArduinoWorkspace.rootPath) {
-            vscode.window.showWarningMessage("Cannot find the sketch file.");
-            return;
-        }
-
-        if (!dc.sketch || !util.fileExistsSync(path.join(ArduinoWorkspace.rootPath, dc.sketch))) {
-            await this.getMainSketch(dc);
-        }
-        if (!dc.port) {
-            const choice = await vscode.window.showInformationMessage(
-                "Serial port is not specified. Do you want to select a serial port for uploading?",
-                "Yes", "No");
-            if (choice === "Yes") {
-                vscode.commands.executeCommand("arduino.selectSerialPort");
-            }
-            return;
-        }
-
-        arduinoChannel.show();
-        arduinoChannel.start(`Upload sketch - ${dc.sketch}`);
-
-        const serialMonitor = SerialMonitor.getInstance();
-
-        const needRestore = await serialMonitor.closeSerialMonitor(dc.port);
-        UsbDetector.getInstance().pauseListening();
-        await vscode.workspace.saveAll(false);
-
-        const appPath = path.join(ArduinoWorkspace.rootPath, dc.sketch);
-        const args = ["--upload", "--board", boardDescriptor, "--port", dc.port, "--useprogrammer",
-            "--pref", "programmer=" + selectProgrammer, appPath];
-        if (VscodeSettings.getInstance().logLevel === "verbose") {
-            args.push("--verbose");
-        }
-        if (dc.output) {
-            const outputPath = path.resolve(ArduinoWorkspace.rootPath, dc.output);
-            const dirPath = path.dirname(outputPath);
-            if (!util.directoryExistsSync(dirPath)) {
-                Logger.notifyUserError("InvalidOutPutPath", new Error(constants.messages.INVALID_OUTPUT_PATH + outputPath));
-                return;
+            } else {
+                args.push("--pref", `build.path=${outputPath}`);
             }
 
-            args.push("--pref", `build.path=${outputPath}`);
             arduinoChannel.info(`Please see the build logs in Output path: ${outputPath}`);
         } else {
             const msg = "Output path is not specified. Unable to reuse previously compiled files. Upload could be slow. See README.";
@@ -277,7 +240,7 @@ export class ArduinoApp {
         }
 
         const appPath = path.join(ArduinoWorkspace.rootPath, dc.sketch);
-        const args = ["--verify", "--board", boardDescriptor, appPath];
+        const args = this.useArduinoCli() ? ["compile", "-b", boardDescriptor, appPath] : ["--verify", "--board", boardDescriptor, appPath];
         if (VscodeSettings.getInstance().logLevel === "verbose") {
             args.push("--verbose");
         }
@@ -289,7 +252,13 @@ export class ArduinoApp {
                 return;
             }
 
-            args.push("--pref", `build.path=${outputPath}`);
+            if (this.useArduinoCli()) {
+                args.push("--build-path", outputPath);
+
+            } else {
+                args.push("--pref", `build.path=${outputPath}`);
+            }
+
             arduinoChannel.info(`Please see the build logs in Output path: ${outputPath}`);
         } else {
             const msg = "Output path is not specified. Unable to reuse previously compiled files. Verify could be slow. See README.";
@@ -495,9 +464,14 @@ export class ArduinoApp {
         }
     }
 
-    /**
-     * Install arduino board package based on package name and platform hardware architecture.
-     */
+     /**
+      * Installs arduino board package.
+      * (If using the aduino CLI this installs the corrosponding core.)
+      * @param {string} packageName - board vendor
+      * @param {string} arch - board architecture
+      * @param {string} version - version of board package or core to download
+      * @param {boolean} [showOutput=true] - show raw output from command
+      */
     public async installBoard(packageName: string, arch: string = "", version: string = "", showOutput: boolean = true) {
         arduinoChannel.show();
         const updatingIndex = packageName === "dummy" && !arch && !version;
@@ -505,23 +479,28 @@ export class ArduinoApp {
             arduinoChannel.start(`Update package index files...`);
         } else {
             try {
-                const packagePath = path.join(this._settings.packagePath, "packages", packageName);
+                const packagePath = path.join(this._settings.packagePath, "packages", packageName, arch);
                 if (util.directoryExistsSync(packagePath)) {
                     util.rmdirRecursivelySync(packagePath);
                 }
                 arduinoChannel.start(`Install package - ${packageName}...`);
             } catch (error) {
                 arduinoChannel.start(`Install package - ${packageName} failed under directory : ${error.path}${os.EOL}
-Please make sure the folder is not occupied by other procedures .`);
+                                      Please make sure the folder is not occupied by other procedures .`);
                 arduinoChannel.error(`Error message - ${error.message}${os.EOL}`);
                 arduinoChannel.error(`Exit with code=${error.code}${os.EOL}`);
                 return;
             }
         }
+        arduinoChannel.info(`${packageName}${arch && ":" + arch}${version && ":" + version}`);
         try {
-            await util.spawn(this._settings.commandPath,
-                showOutput ? arduinoChannel.channel : null,
-                ["--install-boards", `${packageName}${arch && ":" + arch}${version && ":" + version}`]);
+            this.useArduinoCli() ?
+                await util.spawn(this._settings.commandPath,
+                    showOutput ? arduinoChannel.channel : null,
+                    ["core", "install", `${packageName}${arch && ":" + arch}${version && "@" + version}`]) :
+                await util.spawn(this._settings.commandPath,
+                    showOutput ? arduinoChannel.channel : null,
+                    ["--install-boards", `${packageName}${arch && ":" + arch}${version && ":" + version}`]);
 
             if (updatingIndex) {
                 arduinoChannel.end("Updated package index files.");
@@ -548,6 +527,13 @@ Please make sure the folder is not occupied by other procedures .`);
         arduinoChannel.end(`Uninstalled board package - ${boardName}${os.EOL}`);
     }
 
+    /**
+     * Downloads or updates a library
+     * @param {string} libName - name of the library to download
+     * @param {string} version - version of library to download
+     * @param {boolean} [showOutput=true] - show raw output from command
+     */
+
     public async installLibrary(libName: string, version: string = "", showOutput: boolean = true) {
         arduinoChannel.show();
         const updatingIndex = (libName === "dummy" && !version);
@@ -557,6 +543,10 @@ Please make sure the folder is not occupied by other procedures .`);
             arduinoChannel.start(`Install library - ${libName}`);
         }
         try {
+            this.useArduinoCli() ?
+            await  util.spawn(this._settings.commandPath,
+                showOutput ? arduinoChannel.channel : null,
+                ["lib", "install", `${libName}${version && "@" + version}`]) :
             await util.spawn(this._settings.commandPath,
                 showOutput ? arduinoChannel.channel : null,
                 ["--install-library", `${libName}${version && ":" + version}`]);
@@ -769,6 +759,15 @@ Please make sure the folder is not occupied by other procedures .`);
         this._programmerManager = value;
     }
 
+    /**
+     * Checks if the arduino cli is being used
+     * @returns {bool} - true if arduino cli is being use
+     */
+    private useArduinoCli() {
+        return this._settings.useArduinoCli;
+        // return VscodeSettings.getInstance().useArduinoCli;
+    }
+
     private getProgrammerString(): string {
         const selectProgrammer = this.programmerManager.currentProgrammer;
         if (!selectProgrammer) {
diff --git a/src/arduino/arduinoSettings.ts b/src/arduino/arduinoSettings.ts
index 58419519..8d994d81 100644
--- a/src/arduino/arduinoSettings.ts
+++ b/src/arduino/arduinoSettings.ts
@@ -22,6 +22,7 @@ export interface IArduinoSettings {
     preferencePath: string;
     defaultBaudRate: number;
     preferences: Map<string, string>;
+    useArduinoCli: boolean;
     reloadPreferences(): void;
 }
 
@@ -38,18 +39,21 @@ export class ArduinoSettings implements IArduinoSettings {
 
     private _preferences: Map<string, string>;
 
+    private _useArduinoCli: boolean;
+
     public constructor() {
     }
 
     public async initialize() {
         const platform = os.platform();
         this._commandPath = VscodeSettings.getInstance().commandPath;
+        this._useArduinoCli = VscodeSettings.getInstance().useArduinoCli;
         await this.tryResolveArduinoPath();
         await this.tryGetDefaultBaudRate();
         if (platform === "win32") {
             await this.updateWindowsPath();
             if (this._commandPath === "") {
-                this._commandPath = "arduino_debug.exe";
+                this._useArduinoCli ? this._commandPath = "arduino-cli.exe" : this._commandPath = "arduino_debug.exe";
             }
         } else if (platform === "linux") {
             if (util.directoryExistsSync(path.join(this._arduinoPath, "portable"))) {
@@ -150,6 +154,10 @@ export class ArduinoSettings implements IArduinoSettings {
         return this._preferences;
     }
 
+    public get useArduinoCli() {
+        return this._useArduinoCli;
+    }
+
     public get defaultBaudRate() {
         return this._defaultBaudRate;
     }
diff --git a/src/arduino/programmerManager.ts b/src/arduino/programmerManager.ts
index a060f211..eee12725 100644
--- a/src/arduino/programmerManager.ts
+++ b/src/arduino/programmerManager.ts
@@ -58,46 +58,54 @@ export class ProgrammerManager {
         dc.programmer = chosen;
     }
 
+    /**
+     * Gets a specific programmer from the programmers list.
+     * If using the Arduino IDE, adds prefix "adruino:"
+     * @param {ProgrammerList} newProgrammer - a list of the available programmers
+     */
     public getProgrammer(newProgrammer: ProgrammerList) {
+        let prefix = "";
+        if (!this._settings.useArduinoCli) {
+            prefix = "arduino:"};
         switch (newProgrammer) {
             case ProgrammerList["AVR ISP"]:
-                this._programmervalue = "arduino:avrisp";
+                this._programmervalue = prefix + "avrisp";
                 break;
             case ProgrammerList["AVRISP mkII"]:
-                this._programmervalue = "arduino:avrispmkii";
+                this._programmervalue = prefix + "avrispmkii";
                 break;
             case ProgrammerList.USBtinyISP:
-                this._programmervalue = "arduino:usbtinyisp";
+                this._programmervalue = prefix + "usbtinyisp";
                 break;
             case ProgrammerList.ArduinoISP:
-                this._programmervalue = "arduino:arduinoisp";
+                this._programmervalue = prefix + "arduinoisp";
                 break;
             case ProgrammerList.USBasp:
-                this._programmervalue = "arduino:usbasp";
+                this._programmervalue = prefix + "usbasp";
                 break;
             case ProgrammerList["Parallel Programmer"]:
-                this._programmervalue = "arduino:parallel";
+                this._programmervalue = prefix + "parallel";
                 break;
             case ProgrammerList["Arduino as ISP"]:
-                this._programmervalue = "arduino:arduinoasisp";
+                this._programmervalue = prefix + "arduinoasisp";
                 break;
             case ProgrammerList["Arduino Gemma"]:
-                this._programmervalue = "arduino:usbGemma";
+                this._programmervalue = prefix + "usbGemma";
                 break;
             case ProgrammerList["BusPirate as ISP"]:
-                this._programmervalue = "arduino:buspirate";
+                this._programmervalue = prefix + "buspirate";
                 break;
             case ProgrammerList["Atmel STK500 development board"]:
-                this._programmervalue = "arduino:stk500";
+                this._programmervalue = prefix + "stk500";
                 break;
             case ProgrammerList["Atmel JTAGICE3 (ISP mode)"]:
-                this._programmervalue = "arduino:jtag3isp";
+                this._programmervalue = prefix + "jtag3isp";
                 break;
             case ProgrammerList["Atmel JTAGICE3 (JTAG mode)"]:
-                this._programmervalue = "arduino:jtag3";
+                this._programmervalue = prefix + "jtag3";
                 break;
             case ProgrammerList["Atmel-ICE (AVR)"]:
-                this._programmervalue = "arduino:atmel_ice";
+                this._programmervalue = prefix + "atmel_ice";
                 break;
             default:
                 break;
diff --git a/src/arduino/vscodeSettings.ts b/src/arduino/vscodeSettings.ts
index f66e268b..14726cd8 100644
--- a/src/arduino/vscodeSettings.ts
+++ b/src/arduino/vscodeSettings.ts
@@ -15,6 +15,7 @@ const configKeys = {
     IGNORE_BOARDS: "arduino.ignoreBoards",
     SKIP_HEADER_PROVIDER: "arduino.skipHeaderProvider",
     DEFAULT_BAUD_RATE: "arduino.defaultBaudRate",
+    USE_ARDUINO_CLI: "arduino.useArduinoCli",
 };
 
 export interface IVscodeSettings {
@@ -28,6 +29,7 @@ export interface IVscodeSettings {
     ignoreBoards: string[];
     skipHeaderProvider: boolean;
     defaultBaudRate: number;
+    useArduinoCli: boolean;
     updateAdditionalUrls(urls: string | string[]): void;
 }
 
@@ -83,6 +85,10 @@ export class VscodeSettings implements IVscodeSettings {
         return this.getConfigValue<number>(configKeys.DEFAULT_BAUD_RATE);
     }
 
+    public get useArduinoCli(): boolean {
+        return this.getConfigValue<boolean>(configKeys.USE_ARDUINO_CLI);
+    }
+
     public get skipHeaderProvider(): boolean {
         return this.getConfigValue<boolean>(configKeys.SKIP_HEADER_PROVIDER);
     }
diff --git a/src/common/platform.ts b/src/common/platform.ts
index aa17cadf..1675c8b0 100644
--- a/src/common/platform.ts
+++ b/src/common/platform.ts
@@ -14,8 +14,8 @@ export function resolveArduinoPath(): string {
     return internalSysLib.resolveArduinoPath();
 }
 
-export function validateArduinoPath(arduinoPath: string): boolean {
-    return internalSysLib.validateArduinoPath(arduinoPath);
+export function validateArduinoPath(arduinoPath: string, useArduinoCli = false): boolean {
+    return internalSysLib.validateArduinoPath(arduinoPath, useArduinoCli);
 }
 
 export function findFile(fileName: string, cwd: string): string {
diff --git a/src/common/sys/darwin.ts b/src/common/sys/darwin.ts
index 235aaf38..4d5c7e98 100644
--- a/src/common/sys/darwin.ts
+++ b/src/common/sys/darwin.ts
@@ -18,8 +18,9 @@ export function resolveArduinoPath(): string {
     return result || "";
 }
 
-export function validateArduinoPath(arduinoPath: string): boolean {
-    return fileExistsSync(path.join(resolveMacArduinoAppPath(arduinoPath), "/Contents/MacOS/Arduino"));
+export function validateArduinoPath(arduinoPath: string, useArduinoCli = false): boolean {
+    return fileExistsSync(path.join(resolveMacArduinoAppPath(arduinoPath), useArduinoCli ? "arduino-cli" : "/Contents/MacOS/Arduino"));
+
 }
 
 export function findFile(fileName: string, cwd: string): string {
diff --git a/src/common/sys/linux.ts b/src/common/sys/linux.ts
index 6c9189d7..fbb904b4 100644
--- a/src/common/sys/linux.ts
+++ b/src/common/sys/linux.ts
@@ -20,8 +20,8 @@ export function resolveArduinoPath(): string {
     return pathString || "";
 }
 
-export function validateArduinoPath(arduinoPath: string): boolean {
-    return fileExistsSync(path.join(arduinoPath, "arduino"));
+export function validateArduinoPath(arduinoPath: string, useArduinoCli = false): boolean {
+    return fileExistsSync(path.join(arduinoPath, useArduinoCli ? "arduino-cli" : "arduino"));
 }
 
 export function findFile(fileName: string, cwd: string): string {
diff --git a/src/common/sys/win32.ts b/src/common/sys/win32.ts
index dbbbaaac..ad237e27 100644
--- a/src/common/sys/win32.ts
+++ b/src/common/sys/win32.ts
@@ -27,8 +27,9 @@ export async function resolveArduinoPath() {
     return pathString;
 }
 
-export function validateArduinoPath(arduinoPath: string): boolean {
-    return fileExistsSync(path.join(arduinoPath, "arduino_debug.exe"));
+export function validateArduinoPath(arduinoPath: string, useArduinoCli = false): boolean {
+    return fileExistsSync(path.join(arduinoPath, useArduinoCli ? "arduino-cli.exe" : "arduino_debug.exe"));
+
 }
 
 export function findFile(fileName: string, cwd: string): string {
diff --git a/src/common/util.ts b/src/common/util.ts
index 2af4b83b..696c99ea 100644
--- a/src/common/util.ts
+++ b/src/common/util.ts
@@ -200,6 +200,13 @@ export function isArduinoFile(filePath): boolean {
     return fileExistsSync(filePath) && (path.extname(filePath) === ".ino" || path.extname(filePath) === ".pde");
 }
 
+/**
+ * Send a command to arduino
+ * @param {string} command - base command path (either Arduino IDE or CLI)
+ * @param {vscode.OutputChannel} outputChannel - output display channel
+ * @param {string[]} [args=[]] - arguments to pass to the command
+ * @param {any} [options={}] - options and flags for the arguments
+ */
 export function spawn(command: string, outputChannel: vscode.OutputChannel, args: string[] = [], options: any = {}): Thenable<object> {
     return new Promise((resolve, reject) => {
         const stdout = "";
diff --git a/src/extension.ts b/src/extension.ts
index c4112bd7..b6cf7a78 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -91,7 +91,9 @@ export async function activate(context: vscode.ExtensionContext) {
 
             const arduinoPath = arduinoContextModule.default.arduinoApp.settings.arduinoPath;
             const commandPath = arduinoContextModule.default.arduinoApp.settings.commandPath;
-            if (!arduinoPath || !validateArduinoPath(arduinoPath)) { // Pop up vscode User Settings page when cannot resolve arduino path.
+            const useArduinoCli = arduinoContextModule.default.arduinoApp.settings.useArduinoCli;
+            // Pop up vscode User Settings page when cannot resolve arduino path.
+            if (!arduinoPath || !validateArduinoPath(arduinoPath, useArduinoCli)) {
                 Logger.notifyUserError("InvalidArduinoPath", new Error(constants.messages.INVALID_ARDUINO_PATH));
                 vscode.commands.executeCommand("workbench.action.openGlobalSettings");
             } else if (!commandPath || !util.fileExistsSync(commandPath)) {
@@ -152,6 +154,24 @@ export async function activate(context: vscode.ExtensionContext) {
         return { board: arduinoContextModule.default.boardManager.currentBoard.name };
     });
 
+    registerArduinoCommand("arduino.cliUpload", async () => {
+        if (!status.compile) {
+            status.compile = "cliUpload";
+            try {
+                await vscode.window.withProgress({
+                    location: vscode.ProgressLocation.Window,
+                    title: "Arduino: Using CLI to upload...",
+                }, async () => {
+                    await arduinoContextModule.default.arduinoApp.upload(false);
+                });
+            } catch (ex) {
+            }
+            delete status.compile;
+        }
+    }, () => {
+        return { board: arduinoContextModule.default.boardManager.currentBoard.name };
+    });
+
     registerArduinoCommand("arduino.setSketchFile", async () => {
         const sketchFileName = deviceContext.sketch;
         const newSketchFileName = await vscode.window.showInputBox({
@@ -177,7 +197,20 @@ export async function activate(context: vscode.ExtensionContext) {
         if (!status.compile) {
             status.compile = "upload";
             try {
-                await arduinoContextModule.default.arduinoApp.uploadUsingProgrammer();
+                await arduinoContextModule.default.arduinoApp.upload(true, true);
+            } catch (ex) {
+            }
+            delete status.compile;
+        }
+    }, () => {
+        return { board: arduinoContextModule.default.boardManager.currentBoard.name };
+    });
+
+    registerArduinoCommand("arduino.cliUploadUsingProgrammer", async () => {
+        if (!status.compile) {
+            status.compile = "cliUpload";
+            try {
+                await arduinoContextModule.default.arduinoApp.upload(false, true);
             } catch (ex) {
             }
             delete status.compile;
diff --git a/test/extension.test.ts b/test/extension.test.ts
index e1a8de12..9c56fc41 100644
--- a/test/extension.test.ts
+++ b/test/extension.test.ts
@@ -55,6 +55,8 @@ suite("Arduino: Extension Tests", () => {
                     "arduino.loadPackages",
                     "arduino.installBoard",
                     "arduino.setSketchFile",
+                    "arduino.cliUpload",
+                    "arduino.cliUploadUsingProgrammer",
                 ];
 
                 const foundArduinoCommands = commands.filter((value) => {
diff --git a/test/librarymanager.test.ts b/test/librarymanager.test.ts
index 7e43af26..5ff5cc84 100644
--- a/test/librarymanager.test.ts
+++ b/test/librarymanager.test.ts
@@ -79,7 +79,7 @@ suite("Arduino: Library Manager.", () => {
                 if (util.directoryExistsSync(libPath)) {
                     done();
                 } else {
-                    done(new Error("AzureIoTHub library install failure, can't find library path :" + libPath));
+                    done(new Error("AzureIoTHub library install failure, can't find library path: " + libPath));
                 }
             });
 

From d6459d0b8cbfbbaabe55f85c18178344b232ed9b Mon Sep 17 00:00:00 2001
From: Jason Tranchida <jtranchida@gmail.com>
Date: Tue, 8 Dec 2020 13:19:45 -0800
Subject: [PATCH 002/142] Improved handling of programmer selection (#1118)

* Improved handling of programmer selection

- Selected programmer is now saved to and loaded from the arduino.json file
- Arduino.json is monitored for changes, and changing file will update selected programmer & ui
- Programmer selection UI now shows both the friendly name of the programmer, as well as the arduino name
- Minor fix to deviceContexts to fire change events after all states are modified
- Layed groundwork to support querying list of programmers for the current board from arduino toolchain

* fix dtr on serial open

* fix dtr on serial open

* fix linting

* pre release v0.3.4

* Add RTS signal on serial open, Add baudrates up to 2000000 (#1142)

* add buad rates up to 2M

* add rts signal on serial open and buad rate change

* add missing space in baud rate array

* Quick fix for Intellisense (#1144)

* add hardware tool path

* intellisense quick fix

* add hardware tool path

* intellisense quick fix

* fix typo

* pre release v0.3.4-rc2

* bump to v0.3.4

* Option to use arduino-cli instead of Arduino IDE (#1017)

* Hardcoded Arduino-CLI commands for build and upload

* Added menu checkbox for Arduino CLI

- Upload with programmer is still not supported
- Must be created an arduino symlink pointing to arduino-cli

* If Arduino-CLI, check for arduino-cli instead of arduino.

Not yet supported on Windows or MacOS

* Typo

* Fixed CI requests

* Fixed CI requests

* Update src/common/sys/darwin.ts

MacOS patch for arduino-cli

Co-authored-by: Marc Lage-Vianna <MarcLV@users.noreply.github.com>

* Update src/common/sys/win32.ts

Windows patch for arduino-cli

Co-authored-by: Marc Lage-Vianna <MarcLV@users.noreply.github.com>

* Trigger

* add cli option in commandPath for win32

* add cli support to board and lib managers

* rename isArduinoCli to useArduinoCli

* adds support for uploading using programmer

* simplify getProgrammer

* add CLI upload

* Update src/arduino/arduino.ts

Co-authored-by: Jason Tranchida <jtranchida@gmail.com>

* refactor uploadUsingProgrammer

* fix output path for CLI upload

* Update package.json

* update cli option text, thanks @maddogjt

* update tests

Co-authored-by: giuliof <giulio@marchtop.localdomain>
Co-authored-by: Marc Lage-Vianna <MarcLV@users.noreply.github.com>
Co-authored-by: Adi Azulay <adazulay@microsoft.com>
Co-authored-by: Adi Azulay <azulayadi@gmail.com>
Co-authored-by: Jason Tranchida <jtranchida@gmail.com>

* Improved handling of programmer selection

- Selected programmer is now saved to and loaded from the arduino.json file
- Arduino.json is monitored for changes, and changing file will update selected programmer & ui
- Programmer selection UI now shows both the friendly name of the programmer, as well as the arduino name
- Minor fix to deviceContexts to fire change events after all states are modified
- Layed groundwork to support querying list of programmers for the current board from arduino toolchain

* add cli suppport for programmers

* add documentation

Co-authored-by: Marc Goodner <robotdad@users.noreply.github.com>
Co-authored-by: Adi Azulay <adazulay@microsoft.com>
Co-authored-by: Giulio <giulio@glgprograms.it>
Co-authored-by: giuliof <giulio@marchtop.localdomain>
Co-authored-by: Marc Lage-Vianna <MarcLV@users.noreply.github.com>
Co-authored-by: Adi Azulay <azulayadi@gmail.com>
---
 package-lock.json                |   2 +-
 src/arduino/arduino.ts           |   2 +-
 src/arduino/programmerManager.ts | 135 ++++++++++++-------------------
 src/deviceContext.ts             |   6 +-
 4 files changed, 56 insertions(+), 89 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d72659ed..a7a49f3d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "vscode-arduino",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 5a59ca19..a4b9b1aa 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -165,7 +165,7 @@ export class ArduinoApp {
             if (this.useArduinoCli()) {
                 args.push("--programmer", selectProgrammer)
             } else {
-                args.push("--useprogrammer", "--pref", "programmer=" + selectProgrammer)
+                args.push("--useprogrammer", "--pref", "programmer=arduino:" + selectProgrammer)
             }
         }
 
diff --git a/src/arduino/programmerManager.ts b/src/arduino/programmerManager.ts
index eee12725..08d3a425 100644
--- a/src/arduino/programmerManager.ts
+++ b/src/arduino/programmerManager.ts
@@ -4,111 +4,78 @@ import { DeviceContext } from "../deviceContext";
 import { ArduinoApp } from "./arduino";
 import { IArduinoSettings } from "./arduinoSettings";
 
-export enum ProgrammerList {
-    "AVR ISP",
-    "AVRISP mkII",
-    "USBtinyISP",
-    "ArduinoISP",
-    "ArduinoISP.org",
-    "USBasp",
-    "Parallel Programmer",
-    "Arduino as ISP",
-    "Arduino Gemma",
-    "BusPirate as ISP",
-    "Atmel STK500 development board",
-    "Atmel JTAGICE3 (ISP mode)",
-    "Atmel JTAGICE3 (JTAG mode)",
-    "Atmel-ICE (AVR)",
-}
-
 export class ProgrammerManager {
-
-    private static _programmerManager: ProgrammerManager = null;
-
-    private _currentprogrammer: ProgrammerList;
-
     private _programmervalue: string;
 
     private _programmerStatusBar: vscode.StatusBarItem;
 
+    // Static list of 'available' programmers.  This should be repopulated by the currently selected board type.
+    private _availableProgrammers = {
+        avrisp: "AVR ISP",
+        avrispmkii: "AVRISP mkII",
+        usbtinyisp: "USBtinyISP",
+        arduinoisp: "ArduinoISP",
+        usbasp: "USBasp",
+        parallel: "Parallel Programmer",
+        arduinoasisp: "Arduino as ISP",
+        usbGemma: "Arduino Gemma",
+        buspirate: "BusPirate as ISP",
+        stk500: "Atmel STK500 development board",
+        jtag3isp: "Atmel JTAGICE3 (ISP mode)",
+        jtag3: "Atmel JTAGICE3 (JTAG mode)",
+        atmel_ice: "Atmel-ICE (AVR)",
+    };
+
     constructor(private _settings: IArduinoSettings, private _arduinoApp: ArduinoApp) {
-        this._programmerStatusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, constants.statusBarPriority.PROGRAMMER);
+        this._programmerStatusBar = vscode.window.createStatusBarItem(
+            vscode.StatusBarAlignment.Right,
+            constants.statusBarPriority.PROGRAMMER,
+        );
         this._programmerStatusBar.command = "arduino.selectProgrammer";
         this._programmerStatusBar.tooltip = "Select Programmer";
-        this._programmerStatusBar.text = "<Select Programmer>";
+        this.setProgrammerValue(DeviceContext.getInstance().programmer);
         this._programmerStatusBar.show();
+        DeviceContext.getInstance().onDidChange(() => {
+            this.setProgrammerValue(DeviceContext.getInstance().programmer);
+        });
     }
 
     public get currentProgrammer(): string {
         return this._programmervalue;
     }
 
+    /**
+     * Select a programmer from the list of available programmers
+     * Set the programmer value in device context
+     * List format: programmer_name:friendly_name
+     */
     public async selectProgrammer() {
-        const chosen: string | undefined = await vscode.window.showQuickPick(Object.keys(ProgrammerList)
-            .filter((key) => {
-                return !isNaN(Number(ProgrammerList[key]));
-            }), { placeHolder: "Select programmer" });
+        const selectionItems = Object.keys(this._availableProgrammers).map(
+            (programmer) => ({
+                label: this.getFriendlyName(programmer),
+                description: programmer,
+                programmer }));
+        const chosen = await vscode.window.showQuickPick(selectionItems, {
+            placeHolder: "Select programmer",
+        });
         if (!chosen) {
             return;
         }
-        this._currentprogrammer = ProgrammerList[chosen];
-        this.getProgrammer(this._currentprogrammer);
-        this._programmerStatusBar.text = chosen;
+
+        this.setProgrammerValue(chosen.programmer);
         const dc = DeviceContext.getInstance();
-        dc.programmer = chosen;
+        dc.programmer = chosen.programmer;
     }
 
-    /**
-     * Gets a specific programmer from the programmers list.
-     * If using the Arduino IDE, adds prefix "adruino:"
-     * @param {ProgrammerList} newProgrammer - a list of the available programmers
-     */
-    public getProgrammer(newProgrammer: ProgrammerList) {
-        let prefix = "";
-        if (!this._settings.useArduinoCli) {
-            prefix = "arduino:"};
-        switch (newProgrammer) {
-            case ProgrammerList["AVR ISP"]:
-                this._programmervalue = prefix + "avrisp";
-                break;
-            case ProgrammerList["AVRISP mkII"]:
-                this._programmervalue = prefix + "avrispmkii";
-                break;
-            case ProgrammerList.USBtinyISP:
-                this._programmervalue = prefix + "usbtinyisp";
-                break;
-            case ProgrammerList.ArduinoISP:
-                this._programmervalue = prefix + "arduinoisp";
-                break;
-            case ProgrammerList.USBasp:
-                this._programmervalue = prefix + "usbasp";
-                break;
-            case ProgrammerList["Parallel Programmer"]:
-                this._programmervalue = prefix + "parallel";
-                break;
-            case ProgrammerList["Arduino as ISP"]:
-                this._programmervalue = prefix + "arduinoasisp";
-                break;
-            case ProgrammerList["Arduino Gemma"]:
-                this._programmervalue = prefix + "usbGemma";
-                break;
-            case ProgrammerList["BusPirate as ISP"]:
-                this._programmervalue = prefix + "buspirate";
-                break;
-            case ProgrammerList["Atmel STK500 development board"]:
-                this._programmervalue = prefix + "stk500";
-                break;
-            case ProgrammerList["Atmel JTAGICE3 (ISP mode)"]:
-                this._programmervalue = prefix + "jtag3isp";
-                break;
-            case ProgrammerList["Atmel JTAGICE3 (JTAG mode)"]:
-                this._programmervalue = prefix + "jtag3";
-                break;
-            case ProgrammerList["Atmel-ICE (AVR)"]:
-                this._programmervalue = prefix + "atmel_ice";
-                break;
-            default:
-                break;
-        }
+    private setProgrammerValue(programmer: string | null) {
+        this._programmervalue = programmer;
+        this._programmerStatusBar.text = this._programmervalue
+            ? this.getFriendlyName(this._programmervalue)
+            : "<Select Programmer>";
+    }
+
+    private getFriendlyName(programmer: string): string {
+        const friendlyName = this._availableProgrammers[programmer];
+        return friendlyName ? friendlyName : programmer;
     }
 }
diff --git a/src/deviceContext.ts b/src/deviceContext.ts
index 2e7f18e3..5e24aea1 100644
--- a/src/deviceContext.ts
+++ b/src/deviceContext.ts
@@ -151,9 +151,9 @@ export class DeviceContext implements IDeviceContext, vscode.Disposable {
                         this._configuration = deviceConfigJson.configuration;
                         this._output = deviceConfigJson.output;
                         this._debugger = deviceConfigJson["debugger"];
-                        this._onDidChange.fire();
                         this._prebuild = deviceConfigJson.prebuild;
                         this._programmer = deviceConfigJson.programmer;
+                        this._onDidChange.fire();
                     } else {
                         Logger.notifyUserError("arduinoFileError", new Error(constants.messages.ARDUINO_FILE_ERROR));
                     }
@@ -164,9 +164,9 @@ export class DeviceContext implements IDeviceContext, vscode.Disposable {
                     this._configuration = null;
                     this._output = null;
                     this._debugger = null;
-                    this._onDidChange.fire();
                     this._prebuild = null;
                     this._programmer = null;
+                    this._onDidChange.fire();
                 }
                 return this;
             }, (reason) => {
@@ -182,9 +182,9 @@ export class DeviceContext implements IDeviceContext, vscode.Disposable {
                 this._configuration = null;
                 this._output = null;
                 this._debugger = null;
-                this._onDidChange.fire();
                 this._prebuild = null;
                 this._programmer = null;
+                this._onDidChange.fire();
 
                 return this;
             });

From ddb804feec82d53e456832543517676893b1ac29 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Sat, 8 Feb 2020 13:05:30 +0100
Subject: [PATCH 003/142] Fixed misspelled function name

---
 webpack.config.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webpack.config.js b/webpack.config.js
index 24ccd7b3..b18b814a 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -19,7 +19,7 @@ function getEntry() {
     fs.copySync(p, 'out/node_modules/' + mod);
   }
 
-  const list = getDependeciesFromNpm(mod);
+  const list = getDependenciesFromNpm(mod);
   const moduleList = list.filter((value, index, self) => {
     return self.indexOf(value) === index && unbundledModule.indexOf(value) === -1 && !/^@types\//.test(value);
   });
@@ -31,7 +31,7 @@ function getEntry() {
   return entry;
 }
 
-function getDependeciesFromNpm(mod) {
+function getDependenciesFromNpm(mod) {
   let list = [];
   const deps = mod.dependencies;
   if (!deps) {
@@ -39,7 +39,7 @@ function getDependeciesFromNpm(mod) {
   }
   for (const m of Object.keys(deps)) {
     list.push(m);
-    list = list.concat(getDependeciesFromNpm(deps[m]));
+    list = list.concat(getDependenciesFromNpm(deps[m]));
   }
   return list;
 }

From 2e490b5f4353f202d86f42bfc8e6a395666e7f96 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Fri, 7 Feb 2020 02:08:35 +0100
Subject: [PATCH 004/142] Fixed spelling.

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 20cf48a1..dd27fa3f 100644
--- a/package.json
+++ b/package.json
@@ -243,7 +243,7 @@
               },
               "targetArchitecture": {
                 "type": "string",
-                "description": "The architecture of the debuggee.",
+                "description": "The architecture of the debugger.",
                 "default": "arm"
               },
               "cwd": {

From 57f4aa4caf97c2f28348bc9df9990597e59363f5 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Sat, 22 Feb 2020 14:25:22 +0100
Subject: [PATCH 005/142] Fix @property

---
 src/arduino/package.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/arduino/package.ts b/src/arduino/package.ts
index 09e1144c..2966e68a 100644
--- a/src/arduino/package.ts
+++ b/src/arduino/package.ts
@@ -179,7 +179,7 @@ export interface IBoard {
 
     /**
      * Reference to the platform that contains this board.
-     * @prop {IPlatform}
+     * @property {IPlatform}
      */
     platform: IPlatform;
 

From 5daa2b1fed43722970328344aa1f7eafbb191015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Fri, 11 Dec 2020 18:13:55 +0100
Subject: [PATCH 006/142] Add missing return values

---
 src/arduino/arduino.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index a4b9b1aa..8053a2d5 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -211,12 +211,12 @@ export class ArduinoApp {
         const dc = DeviceContext.getInstance();
         const boardDescriptor = this.getBoardBuildString();
         if (!boardDescriptor) {
-            return;
+            return false;
         }
 
         if (!ArduinoWorkspace.rootPath) {
             vscode.window.showWarningMessage("Cannot find the sketch file.");
-            return;
+            return false;
         }
 
         if (!dc.sketch || !util.fileExistsSync(path.join(ArduinoWorkspace.rootPath, dc.sketch))) {
@@ -249,7 +249,7 @@ export class ArduinoApp {
             const dirPath = path.dirname(outputPath);
             if (!util.directoryExistsSync(dirPath)) {
                 Logger.notifyUserError("InvalidOutPutPath", new Error(constants.messages.INVALID_OUTPUT_PATH + outputPath));
-                return;
+                return false;
             }
 
             if (this.useArduinoCli()) {

From 48418e20193bdd20c694a287c3873981d7a90df0 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Sun, 23 Feb 2020 20:14:28 +0100
Subject: [PATCH 007/142] Removed unused import

---
 src/arduino/arduinoContentProvider.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/arduino/arduinoContentProvider.ts b/src/arduino/arduinoContentProvider.ts
index 6c893eb2..af0a0b1b 100644
--- a/src/arduino/arduinoContentProvider.ts
+++ b/src/arduino/arduinoContentProvider.ts
@@ -10,7 +10,6 @@ import * as Constants from "../common/constants";
 import * as JSONHelper from "../common/cycle";
 import * as Logger from "../logger/logger";
 import LocalWebServer from "./localWebServer";
-import { VscodeSettings } from "./vscodeSettings";
 
 export class ArduinoContentProvider implements vscode.TextDocumentContentProvider {
     private _webserver: LocalWebServer;

From 0291850c9b31b339e50faad8edbfb344157b5c3e Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Wed, 5 Feb 2020 16:28:45 +0100
Subject: [PATCH 008/142] Branch for the implementation of the automagical
 IntelliSense configuration

---
 BRANCHNOTES.md | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 BRANCHNOTES.md

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
new file mode 100644
index 00000000..eb7080ca
--- /dev/null
+++ b/BRANCHNOTES.md
@@ -0,0 +1,41 @@
+# IntelliSense Autoconfiguration Branch
+## Problem
+This branch more or less adresses [these](https://github.com/microsoft/vscode-arduino/issues?utf8=%E2%9C%93&q=intellisense+is%3Aopen) issues.
+
+It implements a parser which parses the output from Arduino's build process to generate a very precise `c_cpp_properties.json` which in turn hopefully renders any user interaction with this file obsolete
+
+## Branch Goals
+### Build Output Parser
+The parser which parses the relevant includes, defines, compiler paths and flags from Arduino's build output
+### `c_cpp_properties.json` Generator
+The generator takes the parser's output and transforms it into a valid `c_cpp_properties.json` file.
+
+### Configuration Flags
+Provide a configuration flag which allows the user to turn this feature off - this is useful for the cases in which this magic fails or the user has a very specific setup. Although this branch tries to eliminate most of the latter cases.
+
+### Status
+|      | Tasks   |
+|-----:|:--------|
+| **Build output parser**               | :heavy_check_mark: Basic parser working (not committed yet) |
+|                                       | :white_check_mark: Support for different boards             |
+|                                       | :white_check_mark: X-platform support                       |
+| **`c_cpp_properties.json` generator** | :white_check_mark: |
+| **Configuration flags**               | :white_check_mark: |
+| **Unit tests**                        | :white_check_mark: Basic parser |
+
+## Motivation
+I write a lot of code for Arduino, especially libraries. The Arduino IDE is not suited for more complex projects and I tried several alternatives. The old and dysfunctional Arduino CDT extension for eclipse somehow stalled (even if it was promising), Sloeber could be an option but the maintainer is disillusioned and the project is more or less dead. Platform IO IDE's license is very [restrictive](https://community.platformio.org/t/what-part-of-platformio-is-open-source-licenced/1447/2).
+
+Then remains vscode-arduino. It seems that it isn't completely dead - but almost. Most of the core functionality seems to work (I used it a few days now). But the biggest show stopper is the bad IntelliSense support.
+
+## Beer Money
+You can chip in some beer money to keep me motivated - this is really appreciated.
+
+[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=PVLCSRZHBJ28G&source=url)
+
+<!-- https://github.com/patharanordev/donate-in-git -->
+
+## Useful Links
+* [IntelliSense issues on vscode-arduino](https://github.com/microsoft/vscode-arduino/issues?utf8=%E2%9C%93&q=intellisense+is%3Aopen)
+* [`c_cpp_properties.json` reference](https://code.visualstudio.com/docs/cpp/c-cpp-properties-schema-reference)
+* [Interactive regex debugger](https://regex101.com/)

From 5debfb429d17ff16995440d14fcf544faa13d896 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Wed, 5 Feb 2020 21:33:16 +0100
Subject: [PATCH 009/142] Update documentation

* More documentation on this project
* Tried to identify most of the tasks
* Added beer money support option
---
 BRANCHNOTES.md | 73 ++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 68 insertions(+), 5 deletions(-)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index eb7080ca..b16fda5e 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -13,29 +13,92 @@ The generator takes the parser's output and transforms it into a valid `c_cpp_pr
 ### Configuration Flags
 Provide a configuration flag which allows the user to turn this feature off - this is useful for the cases in which this magic fails or the user has a very specific setup. Although this branch tries to eliminate most of the latter cases.
 
+### Global Tasks in vscode-arduino
+Places where `c_cpp_properties.json` gets altered (list in progress)
+```
+src/extension.ts
+  260, 53: arduinoContextModule.default.arduinoApp.tryToUpdateIncludePaths();
+src/arduino/arduino.ts
+  328, 12:     public tryToUpdateIncludePaths() {
+
+```
+
 ### Status
+
 |      | Tasks   |
 |-----:|:--------|
-| **Build output parser**               | :heavy_check_mark: Basic parser working (not committed yet) |
-|                                       | :white_check_mark: Support for different boards             |
-|                                       | :white_check_mark: X-platform support                       |
-| **`c_cpp_properties.json` generator** | :white_check_mark: |
+| **Build output parser**               | :heavy_check_mark: Basic parser working* |
+|                                       | :white_check_mark: Support for different boards |
+|                                       | :white_check_mark: X-platform support |
+| **`c_cpp_properties.json` generator** | :heavy_check_mark: Basic objects* |
+|                                       | :heavy_check_mark: Basic setting of parsing result* |
+|                                       | :heavy_check_mark: Basic file input*  |
+|                                       | :heavy_check_mark: Basic file output* |
+|                                       | :white_check_mark: Merging of parsing result and existing file content |
 | **Configuration flags**               | :white_check_mark: |
 | **Unit tests**                        | :white_check_mark: Basic parser |
+|                                       | :white_check_mark: JSON input |
+|                                       | :white_check_mark: JSON output |
+|                                       | :white_check_mark: Configuration merging |
+| **General**                           | :white_check_mark: Review and remove previous attempts messing with `c_cpp_properties.json` |
+* not committed to branch yet
 
 ## Motivation
 I write a lot of code for Arduino, especially libraries. The Arduino IDE is not suited for more complex projects and I tried several alternatives. The old and dysfunctional Arduino CDT extension for eclipse somehow stalled (even if it was promising), Sloeber could be an option but the maintainer is disillusioned and the project is more or less dead. Platform IO IDE's license is very [restrictive](https://community.platformio.org/t/what-part-of-platformio-is-open-source-licenced/1447/2).
 
 Then remains vscode-arduino. It seems that it isn't completely dead - but almost. Most of the core functionality seems to work (I used it a few days now). But the biggest show stopper is the bad IntelliSense support.
 
-## Beer Money
+## Beer Money :beers:
 You can chip in some beer money to keep me motivated - this is really appreciated.
 
 [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=PVLCSRZHBJ28G&source=url)
 
 <!-- https://github.com/patharanordev/donate-in-git -->
+I will list every supporter here, thanks!
+
+### Supporters
+5$ -> 1 :beer:
+1h coding -> 20$ -> 4 :beers:
+2020-02-04 Elektronik Workshop: 32 :beers: (8h coding)
+2020-02-05 Elektronik Workshop: 40 :beers: (10h coding)
+
+<!-- https://github.com/StylishThemes/GitHub-Dark/wiki/Emoji -->
 
 ## Useful Links
 * [IntelliSense issues on vscode-arduino](https://github.com/microsoft/vscode-arduino/issues?utf8=%E2%9C%93&q=intellisense+is%3Aopen)
 * [`c_cpp_properties.json` reference](https://code.visualstudio.com/docs/cpp/c-cpp-properties-schema-reference)
 * [Interactive regex debugger](https://regex101.com/)
+* [Git branch management](https://blog.scottlowe.org/2015/01/27/using-fork-branch-git-workflow/)
+
+## Future Work
+* Proper interactive serial terminal (this is the second major show stopper in my opinion)
+* Lots of redundant code
+  * e.g. "upload is a superset of "verify"
+  * general lack of modularity - the above is the result
+* It seems that this extension is pretty chaotic. Most probably some refactoring is necessary.
+
+----
+
+## Implementation
+
+### Settings
+Global user settings, on linux under `~/.config/Code/User/settings.json`, for instance:
+```json
+{
+    "arduino.additionalUrls": "",
+    "arduino.logLevel": "verbose",
+    "C_Cpp.default.cppStandard": "c++11",
+    "C_Cpp.default.cStandard": "c11",
+    "arduino.disableTestingOpen": true,
+    "workbench.editor.enablePreview": false
+}
+```
+Project settings in `.vscode/arduino.json`
+```
+{
+    "board": "arduino:avr:nano",
+    "configuration": "cpu=atmega328old",
+    "sketch": "examples/lcdpong-butenc/lcdpong-butenc.ino",
+    "port": "/dev/ttyUSB0"
+}
+```

From 82513e4b60899f43b966787aa24ff7dbde17d5ad Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Thu, 6 Feb 2020 01:06:03 +0100
Subject: [PATCH 010/142] More documentation update

* More investigations and documentation, especially on intrinsic/built-in compiler header include paths
---
 BRANCHNOTES.md                                | 48 ++++++++++++++++++-
 .../compilerinfo/avr-gcc_built_in_specs.txt   | 33 +++++++++++++
 .../xtensa-esp32-elf-gcc_built_in_specs.txt   | 32 +++++++++++++
 3 files changed, 112 insertions(+), 1 deletion(-)
 create mode 100644 doc/intellisense/compilerinfo/avr-gcc_built_in_specs.txt
 create mode 100644 doc/intellisense/compilerinfo/xtensa-esp32-elf-gcc_built_in_specs.txt

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index b16fda5e..b6afa023 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -1,6 +1,6 @@
 # IntelliSense Autoconfiguration Branch
 ## Problem
-This branch more or less adresses [these](https://github.com/microsoft/vscode-arduino/issues?utf8=%E2%9C%93&q=intellisense+is%3Aopen) issues.
+This branch more or less addresses [these](https://github.com/microsoft/vscode-arduino/issues?utf8=%E2%9C%93&q=intellisense+is%3Aopen) issues (about seven).
 
 It implements a parser which parses the output from Arduino's build process to generate a very precise `c_cpp_properties.json` which in turn hopefully renders any user interaction with this file obsolete
 
@@ -24,6 +24,7 @@ src/arduino/arduino.ts
 ```
 
 ### Status
+**2020-02-05** Currently I'm able to generate error free IntelliSense setups for AVR and ESP32 using the preliminary implementation. For ESP32 I just had to add the intrinsic compiler paths manually. A solution has to be found for these ... which there is, see [here](https://stackoverflow.com/a/6666338)
 
 |      | Tasks   |
 |-----:|:--------|
@@ -35,6 +36,7 @@ src/arduino/arduino.ts
 |                                       | :heavy_check_mark: Basic file input*  |
 |                                       | :heavy_check_mark: Basic file output* |
 |                                       | :white_check_mark: Merging of parsing result and existing file content |
+|                                       | :white_check_mark: Getting intrinsic gcc include paths (partly done)|
 | **Configuration flags**               | :white_check_mark: |
 | **Unit tests**                        | :white_check_mark: Basic parser |
 |                                       | :white_check_mark: JSON input |
@@ -81,6 +83,50 @@ I will list every supporter here, thanks!
 
 ## Implementation
 
+### `c_cpp_properties.json` Generator
+#### Intrinsic Include Paths
+Some include paths are built into gcc and don't have to be specified on the command line. This requires that we have to get them from the compiler.
+
+Just searching the compiler installation directory with something like
+```bash
+find  ~/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/ -name "include*"
+```
+won't do since not all include directories are named `include`. Fortunately gcc can be queried about its configuration ([source](https://stackoverflow.com/a/6666338)):
+```bash
+# generally for C++
+gcc -xc++ -E -v -
+# for esp32
+~/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/xtensa-esp32-elf-gcc -xc++ -E -v - < /dev/null 2>&1 | tee xtensa-esp32-elf-gcc_built_in_specs.txt
+# avr
+~/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/avr-gcc -xc++ -E -v - < /dev/null 2>&1 | tee avr-gcc_built_in_specs.txt
+```
+The result can be inspected here:
+* [xtensa-esp32-elf-gcc_built_in_specs.txt](doc/intellisense/compilerinfo/xtensa-esp32-elf-gcc_built_in_specs.txt)
+* [avr-gcc_built_in_specs.txt](doc/intellisense/compilerinfo/avr-gcc_built_in_specs.txt)
+To show the most interesting section in the output of the above commands, for ESP32:
+```
+#include "..." search starts here:
+#include <...> search starts here:
+ /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/../../../../xtensa-esp32-elf/include/c++/5.2.0
+ /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/../../../../xtensa-esp32-elf/include/c++/5.2.0/xtensa-esp32-elf
+ /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/../../../../xtensa-esp32-elf/include/c++/5.2.0/backward
+ /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/include
+ /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/include-fixed
+ /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/../../../../xtensa-esp32-elf/include
+ /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../xtensa-esp32-elf/sysroot/usr/include
+End of search list.
+```
+for AVR:
+```
+#include "..." search starts here:
+#include <...> search starts here:
+ /home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/include
+ /home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/include-fixed
+ /home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/../../../../avr/include
+End of search list.
+```
+As one can see with the ESP32-gcc not all include directories are named `include`. Parsing of this output is pretty trivial though.
+
 ### Settings
 Global user settings, on linux under `~/.config/Code/User/settings.json`, for instance:
 ```json
diff --git a/doc/intellisense/compilerinfo/avr-gcc_built_in_specs.txt b/doc/intellisense/compilerinfo/avr-gcc_built_in_specs.txt
new file mode 100644
index 00000000..950f0c06
--- /dev/null
+++ b/doc/intellisense/compilerinfo/avr-gcc_built_in_specs.txt
@@ -0,0 +1,33 @@
+Using built-in specs.
+Reading specs from /home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/device-specs/specs-avr2
+COLLECT_GCC=/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/avr-gcc
+Target: avr
+Configured with: ../gcc/configure --enable-fixed-point --enable-languages=c,c++ --prefix=/home/jenkins/workspace/avr-gcc-staging/label/debian7-x86_64/objdir --disable-nls --disable-libssp --disable-libada --disable-shared --with-avrlibc=yes --with-dwarf2 --disable-doc --target=avr
+Thread model: single
+gcc version 7.3.0 (GCC) 
+COLLECT_GCC_OPTIONS='-E' '-v' '-specs=device-specs/specs-avr2'
+ /home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../libexec/gcc/avr/7.3.0/cc1plus -E -quiet -v -iprefix /home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/ - -mn-flash=6 -mskip-bug -mn-flash=6 -mskip-bug -fno-rtti -fno-enforce-eh-specs -fno-exceptions
+ignoring nonexistent directory "/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/../../../../avr/include/c++/7.3.0"
+ignoring nonexistent directory "/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/../../../../avr/include/c++/7.3.0/avr"
+ignoring nonexistent directory "/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/../../../../avr/include/c++/7.3.0/backward"
+ignoring nonexistent directory "/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/../../../../avr/sys-include"
+ignoring nonexistent directory "/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/../../lib/gcc/avr/7.3.0/../../../../avr/include/c++/7.3.0"
+ignoring nonexistent directory "/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/../../lib/gcc/avr/7.3.0/../../../../avr/include/c++/7.3.0/avr"
+ignoring nonexistent directory "/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/../../lib/gcc/avr/7.3.0/../../../../avr/include/c++/7.3.0/backward"
+ignoring duplicate directory "/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/../../lib/gcc/avr/7.3.0/include"
+ignoring duplicate directory "/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/../../lib/gcc/avr/7.3.0/include-fixed"
+ignoring nonexistent directory "/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/../../lib/gcc/avr/7.3.0/../../../../avr/sys-include"
+ignoring duplicate directory "/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/../../lib/gcc/avr/7.3.0/../../../../avr/include"
+#include "..." search starts here:
+#include <...> search starts here:
+ /home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/include
+ /home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/include-fixed
+ /home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/../../../../avr/include
+End of search list.
+# 1 "<stdin>"
+# 1 "<built-in>"
+# 1 "<command-line>"
+# 1 "<stdin>"
+COMPILER_PATH=/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../libexec/gcc/avr/7.3.0/:/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../libexec/gcc/:/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/../../../../avr/bin/
+LIBRARY_PATH=/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/:/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/:/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/../../../../avr/lib/
+COLLECT_GCC_OPTIONS='-E' '-v' '-specs=device-specs/specs-avr2'
diff --git a/doc/intellisense/compilerinfo/xtensa-esp32-elf-gcc_built_in_specs.txt b/doc/intellisense/compilerinfo/xtensa-esp32-elf-gcc_built_in_specs.txt
new file mode 100644
index 00000000..7e39fe2e
--- /dev/null
+++ b/doc/intellisense/compilerinfo/xtensa-esp32-elf-gcc_built_in_specs.txt
@@ -0,0 +1,32 @@
+Using built-in specs.
+COLLECT_GCC=/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/xtensa-esp32-elf-gcc
+Target: xtensa-esp32-elf
+Configured with: /builds/idf/crosstool-NG/.build/src/gcc-5.2.0/configure --build=x86_64-build_pc-linux-gnu --host=x86_64-build_pc-linux-gnu --target=xtensa-esp32-elf --prefix=/builds/idf/crosstool-NG/builds/xtensa-esp32-elf --with-local-prefix=/builds/idf/crosstool-NG/builds/xtensa-esp32-elf/xtensa-esp32-elf/sysroot --with-sysroot=/builds/idf/crosstool-NG/builds/xtensa-esp32-elf/xtensa-esp32-elf/sysroot --with-newlib --enable-threads=no --disable-shared --with-pkgversion='crosstool-NG crosstool-ng-1.22.0-80-g6c4433a' --disable-__cxa_atexit --enable-cxx-flags='-fno-rtti -ffunction-sections' --with-gmp=/builds/idf/crosstool-NG/.build/xtensa-esp32-elf/buildtools --with-mpfr=/builds/idf/crosstool-NG/.build/xtensa-esp32-elf/buildtools --with-mpc=/builds/idf/crosstool-NG/.build/xtensa-esp32-elf/buildtools --with-isl=/builds/idf/crosstool-NG/.build/xtensa-esp32-elf/buildtools --with-cloog=/builds/idf/crosstool-NG/.build/xtensa-esp32-elf/buildtools --with-libelf=/builds/idf/crosstool-NG/.build/xtensa-esp32-elf/buildtools --enable-lto --enable-target-optspace --without-long-double-128 --disable-libgomp --disable-libmudflap --disable-libssp --disable-libquadmath --disable-libquadmath-support --disable-nls --enable-languages=c,c++ --disable-libstdcxx-verbose --enable-threads=posix --enable-gcov-custom-rtio
+Thread model: posix
+gcc version 5.2.0 (crosstool-NG crosstool-ng-1.22.0-80-g6c4433a) 
+COLLECT_GCC_OPTIONS='-E' '-v'
+ /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../libexec/gcc/xtensa-esp32-elf/5.2.0/cc1plus -E -quiet -v -iprefix /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/ -isysroot /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../xtensa-esp32-elf/sysroot -
+ignoring duplicate directory "/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/../../lib/gcc/xtensa-esp32-elf/5.2.0/../../../../xtensa-esp32-elf/include/c++/5.2.0"
+ignoring duplicate directory "/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/../../lib/gcc/xtensa-esp32-elf/5.2.0/../../../../xtensa-esp32-elf/include/c++/5.2.0/xtensa-esp32-elf"
+ignoring duplicate directory "/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/../../lib/gcc/xtensa-esp32-elf/5.2.0/../../../../xtensa-esp32-elf/include/c++/5.2.0/backward"
+ignoring duplicate directory "/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/../../lib/gcc/xtensa-esp32-elf/5.2.0/include"
+ignoring nonexistent directory "/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../xtensa-esp32-elf/sysroot/builds/idf/crosstool-NG/builds/xtensa-esp32-elf/xtensa-esp32-elf/sysroot/include"
+ignoring duplicate directory "/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/../../lib/gcc/xtensa-esp32-elf/5.2.0/include-fixed"
+ignoring duplicate directory "/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/../../lib/gcc/xtensa-esp32-elf/5.2.0/../../../../xtensa-esp32-elf/include"
+#include "..." search starts here:
+#include <...> search starts here:
+ /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/../../../../xtensa-esp32-elf/include/c++/5.2.0
+ /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/../../../../xtensa-esp32-elf/include/c++/5.2.0/xtensa-esp32-elf
+ /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/../../../../xtensa-esp32-elf/include/c++/5.2.0/backward
+ /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/include
+ /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/include-fixed
+ /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/../../../../xtensa-esp32-elf/include
+ /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../xtensa-esp32-elf/sysroot/usr/include
+End of search list.
+# 1 "<stdin>"
+# 1 "<built-in>"
+# 1 "<command-line>"
+# 1 "<stdin>"
+COMPILER_PATH=/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../libexec/gcc/xtensa-esp32-elf/5.2.0/:/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../libexec/gcc/:/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/../../../../xtensa-esp32-elf/bin/
+LIBRARY_PATH=/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/:/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/:/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/../../../../xtensa-esp32-elf/lib/:/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../xtensa-esp32-elf/sysroot/lib/:/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../xtensa-esp32-elf/sysroot/usr/lib/
+COLLECT_GCC_OPTIONS='-E' '-v'

From 16e861dff92570fcaca13690b7962b3e2a46397b Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Thu, 6 Feb 2020 21:48:34 +0100
Subject: [PATCH 011/142] Added IntelliSense compiler parsing engine code

* Added IntelliSense compiler parsing engine code
* First injection of the compiler command parser and IntelliSense auto-configuration. Currently injected into "verify" only.
* Updated branch documentation to reflect the current state of this project
---
 BRANCHNOTES.md              |  36 ++--
 src/arduino/arduino.ts      |  24 ++-
 src/arduino/intellisense.ts | 354 ++++++++++++++++++++++++++++++++++++
 src/common/util.ts          |  18 +-
 4 files changed, 416 insertions(+), 16 deletions(-)
 create mode 100644 src/arduino/intellisense.ts

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index b6afa023..7c0c283f 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -25,25 +25,31 @@ src/arduino/arduino.ts
 
 ### Status
 **2020-02-05** Currently I'm able to generate error free IntelliSense setups for AVR and ESP32 using the preliminary implementation. For ESP32 I just had to add the intrinsic compiler paths manually. A solution has to be found for these ... which there is, see [here](https://stackoverflow.com/a/6666338)
+**2020-02-06** Got it fully working (with built-in include directories) for AVR, ESP32, ESP8266. Rewrote the backend to facilitate writing of further parser engines in the future.
 
 |      | Tasks   |
 |-----:|:--------|
-| **Build output parser**               | :heavy_check_mark: Basic parser working* |
-|                                       | :white_check_mark: Support for different boards |
+| **Build output parser**               | :heavy_check_mark: Basic parser working |
+|                                       | :heavy_check_mark: Support for different boards (done for AVR, ESP32, ESP8266) -- The code has been designed such that it is easy to write/add new parser engines (for non gcc compilers for instance) |
+|                                       | :heavy_check_mark: Getting intrinsic gcc include paths |
+|                                       | :heavy_check_mark: Handling quoted arguments |
 |                                       | :white_check_mark: X-platform support |
-| **`c_cpp_properties.json` generator** | :heavy_check_mark: Basic objects* |
-|                                       | :heavy_check_mark: Basic setting of parsing result* |
-|                                       | :heavy_check_mark: Basic file input*  |
-|                                       | :heavy_check_mark: Basic file output* |
+| **`c_cpp_properties.json` generator** | :heavy_check_mark: Basic objects |
+|                                       | :heavy_check_mark: Basic setting of parsing result |
+|                                       | :heavy_check_mark: Basic file input  |
+|                                       | :heavy_check_mark: Basic file output |
 |                                       | :white_check_mark: Merging of parsing result and existing file content |
-|                                       | :white_check_mark: Getting intrinsic gcc include paths (partly done)|
+|                                       | :white_check_mark: Handling inexistent files and folders |
 | **Configuration flags**               | :white_check_mark: |
-| **Unit tests**                        | :white_check_mark: Basic parser |
+| **Unit tests**                        | :white_check_mark: Basic parser (known boards, match/no match)|
+|                                       | :white_check_mark: Querying of compiler built-in includes |
+|                                       | :white_check_mark: Throwing arbitrary data at parser engines |
 |                                       | :white_check_mark: JSON input |
 |                                       | :white_check_mark: JSON output |
 |                                       | :white_check_mark: Configuration merging |
 | **General**                           | :white_check_mark: Review and remove previous attempts messing with `c_cpp_properties.json` |
-* not committed to branch yet
+
+`*` not committed to branch yet
 
 ## Motivation
 I write a lot of code for Arduino, especially libraries. The Arduino IDE is not suited for more complex projects and I tried several alternatives. The old and dysfunctional Arduino CDT extension for eclipse somehow stalled (even if it was promising), Sloeber could be an option but the maintainer is disillusioned and the project is more or less dead. Platform IO IDE's license is very [restrictive](https://community.platformio.org/t/what-part-of-platformio-is-open-source-licenced/1447/2).
@@ -63,6 +69,7 @@ I will list every supporter here, thanks!
 1h coding -> 20$ -> 4 :beers:
 2020-02-04 Elektronik Workshop: 32 :beers: (8h coding)
 2020-02-05 Elektronik Workshop: 40 :beers: (10h coding)
+2020-02-06 Elektronik Workshop: 36 :beers: (9h coding)
 
 <!-- https://github.com/StylishThemes/GitHub-Dark/wiki/Emoji -->
 
@@ -83,7 +90,7 @@ I will list every supporter here, thanks!
 
 ## Implementation
 
-### `c_cpp_properties.json` Generator
+### Build Output Parser
 #### Intrinsic Include Paths
 Some include paths are built into gcc and don't have to be specified on the command line. This requires that we have to get them from the compiler.
 
@@ -96,9 +103,9 @@ won't do since not all include directories are named `include`. Fortunately gcc
 # generally for C++
 gcc -xc++ -E -v -
 # for esp32
-~/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/xtensa-esp32-elf-gcc -xc++ -E -v - < /dev/null 2>&1 | tee xtensa-esp32-elf-gcc_built_in_specs.txt
+~/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/xtensa-esp32-elf-gcc -xc++ -E -v - < /dev/null > xtensa-esp32-elf-gcc_built_in_specs.txt 2>&1
 # avr
-~/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/avr-gcc -xc++ -E -v - < /dev/null 2>&1 | tee avr-gcc_built_in_specs.txt
+~/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/avr-gcc -xc++ -E -v - < /dev/null > avr-gcc_built_in_specs.txt 2>&1
 ```
 The result can be inspected here:
 * [xtensa-esp32-elf-gcc_built_in_specs.txt](doc/intellisense/compilerinfo/xtensa-esp32-elf-gcc_built_in_specs.txt)
@@ -127,6 +134,9 @@ End of search list.
 ```
 As one can see with the ESP32-gcc not all include directories are named `include`. Parsing of this output is pretty trivial though.
 
+### `c_cpp_properties.json` Generator
+
+
 ### Settings
 Global user settings, on linux under `~/.config/Code/User/settings.json`, for instance:
 ```json
@@ -148,3 +158,5 @@ Project settings in `.vscode/arduino.json`
     "port": "/dev/ttyUSB0"
 }
 ```
+
+### Global Tasks in vscode-arduino
diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 8053a2d5..7f0c45fb 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -22,6 +22,7 @@ import { arduinoChannel } from "../common/outputChannel";
 import { ArduinoWorkspace } from "../common/workspace";
 import { SerialMonitor } from "../serialmonitor/serialMonitor";
 import { UsbDetector } from "../serialmonitor/usbDetector";
+import { CCppProperties, CompilerCmdParser, CompilerCmdParserEngineGcc } from "./intellisense";
 import { ProgrammerManager } from "./programmerManager";
 
 /**
@@ -268,7 +269,27 @@ export class ArduinoApp {
         arduinoChannel.show();
         // we need to return the result of verify
         try {
-            await util.spawn(this._settings.commandPath, arduinoChannel.channel, args);
+            const gccParserEngine = new CompilerCmdParserEngineGcc(dc.sketch);
+            const compilerParser = new CompilerCmdParser([gccParserEngine]);
+
+            await util.spawn(this._settings.commandPath,
+                             arduinoChannel.channel,
+                             args,
+                             undefined,
+                             compilerParser.callback);
+
+            // Write compiler command parser result to IntelliSense
+            // configuration file in case parsing was successful.
+            if (compilerParser.result) {
+                const cppPropsPath = path.join(ArduinoWorkspace.rootPath, constants.CPP_CONFIG_FILE);
+                const cppProps = new CCppProperties(cppPropsPath);
+                cppProps.merge(compilerParser.result);
+                cppProps.write();
+                arduinoChannel.info("IntelliSense configuration generated successfully.");
+            } else {
+                arduinoChannel.warning("Failed to generate IntelliSense configuration.");
+            }
+
             arduinoChannel.end(`Finished verify sketch - ${dc.sketch}${os.EOL}`);
             return true;
         } catch (reason) {
@@ -280,7 +301,6 @@ export class ArduinoApp {
             arduinoChannel.error(msg);
             return false;
         }
-
     }
 
     public tryToUpdateIncludePaths() {
diff --git a/src/arduino/intellisense.ts b/src/arduino/intellisense.ts
new file mode 100644
index 00000000..2a202b9c
--- /dev/null
+++ b/src/arduino/intellisense.ts
@@ -0,0 +1,354 @@
+ // tslint:disable: max-line-length
+/* Automatic IntelliSense setup through compiler command parsing.
+ *
+ *
+ * Some Arduino compiler commands from different board packages:
+ * AVR
+ * /home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/avr-g++ -c -g -Os -Wall -Wextra -std=gnu++11 -fpermissive -fno-exceptions -ffunction-sections -fdata-sections -fno-threadsafe-statics -Wno-error=narrowing -MMD -flto -mmcu=atmega328p -DF_CPU=16000000L -DARDUINO=10811 -DARDUINO_AVR_NANO -DARDUINO_ARCH_AVR -I/home/uli/.arduino15/packages/arduino/hardware/avr/1.8.2/cores/arduino -I/home/uli/.arduino15/packages/arduino/hardware/avr/1.8.2/variants/eightanaloginputs -I/home/uli/Projects/arduino/libraries/NewLiquidCrystal_lib -I/home/uli/Projects/arduino/libraries/LcdPong/src -I/home/uli/Projects/arduino/libraries/Encoder -I/home/uli/Projects/arduino/libraries/Button -I/home/uli/.arduino15/packages/arduino/hardware/avr/1.8.2/libraries/Wire/src /tmp/arduino_build_776874/sketch/lcdpong-butenc.ino.cpp -o /tmp/arduino_build_776874/sketch/lcdpong-butenc.ino.cpp.o
+ * ESP32
+ * /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/xtensa-esp32-elf-g++ -DESP_PLATFORM "-DMBEDTLS_CONFIG_FILE=\"mbedtls/esp_config.h\"" -DHAVE_CONFIG_H -DGCC_NOT_5_2_0=0 -DWITH_POSIX -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/config -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/app_trace -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/app_update -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/asio -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/bootloader_support -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/bt -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/coap -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/console -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/driver -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp-tls -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp32 -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp_adc_cal -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp_event -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp_http_client -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp_http_server -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp_https_ota -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp_ringbuf -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/ethernet -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/expat -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/fatfs -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/freemodbus -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/freertos -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/heap -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/idf_test -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/jsmn -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/json -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/libsodium -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/log -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/lwip -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/mbedtls -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/mdns -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/micro-ecc -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/mqtt -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/newlib -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/nghttp -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/nvs_flash -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/openssl -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/protobuf-c -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/protocomm -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/pthread -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/sdmmc -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/smartconfig_ack -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/soc -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/spi_flash -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/spiffs -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/tcp_transport -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/tcpip_adapter -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/ulp -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/vfs -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/wear_levelling -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/wifi_provisioning -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/wpa_supplicant -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/xtensa-debug-module -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp-face -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp32-camera -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp-face -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/fb_gfx -std=gnu++11 -Os -g3 -Wpointer-arith -fexceptions -fstack-protector -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -mlongcalls -nostdlib -Wall -Werror=all -Wextra -Wno-error=maybe-uninitialized -Wno-error=unused-function -Wno-error=unused-but-set-variable -Wno-error=unused-variable -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-missing-field-initializers -Wno-sign-compare -fno-rtti -MMD -c -DF_CPU=240000000L -DARDUINO=10811 -DARDUINO_ESP32_DEV -DARDUINO_ARCH_ESP32 "-DARDUINO_BOARD=\"ESP32_DEV\"" "-DARDUINO_VARIANT=\"doitESP32devkitV1\"" -DESP32 -DCORE_DEBUG_LEVEL=0 -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/cores/esp32 -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/variants/doitESP32devkitV1 -I/home/uli/Projects/arduino/libraries/NewLiquidCrystal_lib -I/home/uli/Projects/arduino/libraries/LcdPong/src -I/home/uli/Projects/arduino/libraries/Encoder -I/home/uli/Projects/arduino/libraries/Button -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/libraries/Wire/src /tmp/arduino_build_744383/sketch/lcdpong-butenc.ino.cpp -o /tmp/arduino_build_744383/sketch/lcdpong-butenc.ino.cpp.o
+ * ESP8266
+ * /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/xtensa-esp32-elf-g++ -DESP_PLATFORM "-DMBEDTLS_CONFIG_FILE=\"mbedtls/esp_config.h\"" -DHAVE_CONFIG_H -DGCC_NOT_5_2_0=0 -DWITH_POSIX -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/config -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/app_trace -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/app_update -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/asio -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/bootloader_support -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/bt -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/coap -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/console -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/driver -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp-tls -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp32 -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp_adc_cal -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp_event -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp_http_client -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp_http_server -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp_https_ota -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp_ringbuf -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/ethernet -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/expat -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/fatfs -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/freemodbus -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/freertos -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/heap -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/idf_test -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/jsmn -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/json -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/libsodium -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/log -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/lwip -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/mbedtls -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/mdns -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/micro-ecc -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/mqtt -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/newlib -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/nghttp -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/nvs_flash -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/openssl -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/protobuf-c -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/protocomm -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/pthread -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/sdmmc -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/smartconfig_ack -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/soc -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/spi_flash -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/spiffs -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/tcp_transport -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/tcpip_adapter -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/ulp -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/vfs -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/wear_levelling -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/wifi_provisioning -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/wpa_supplicant -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/xtensa-debug-module -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp-face -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp32-camera -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp-face -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/fb_gfx -std=gnu++11 -Os -g3 -Wpointer-arith -fexceptions -fstack-protector -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -mlongcalls -nostdlib -Wall -Werror=all -Wextra -Wno-error=maybe-uninitialized -Wno-error=unused-function -Wno-error=unused-but-set-variable -Wno-error=unused-variable -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-missing-field-initializers -Wno-sign-compare -fno-rtti -MMD -c -DF_CPU=240000000L -DARDUINO=10811 -DARDUINO_ESP32_DEV -DARDUINO_ARCH_ESP32 "-DARDUINO_BOARD=\"ESP32_DEV\"" "-DARDUINO_VARIANT=\"doitESP32devkitV1\"" -DESP32 -DCORE_DEBUG_LEVEL=0 -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/cores/esp32 -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/variants/doitESP32devkitV1 -I/home/uli/Projects/arduino/libraries/NewLiquidCrystal_lib -I/home/uli/Projects/arduino/libraries/LcdPong/src -I/home/uli/Projects/arduino/libraries/Encoder -I/home/uli/Projects/arduino/libraries/Button -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/libraries/Wire/src /tmp/arduino_build_470717/sketch/lcdpong-butenc.ino.cpp -o /tmp/arduino_build_470717/sketch/lcdpong-butenc.ino.cpp.o
+ */
+// tslint:enable: max-line-length
+
+import { spawnSync } from "child_process";
+import * as fs from "fs";
+import * as path from "path";
+
+/**
+ * Data structure carrying the output from a parsed compiler command.
+ * All compiler specific option prefixes are removed for includes and
+ * defines.
+ */
+export class CompilerCmdParserResult {
+    public includes: Array<string> = [];
+    public defines: Array<string> = [];
+    public options: Array<string> = [];
+    public compiler: string = "";
+    /** Dropped arguments like -c -Ox */
+    public trash: Array<string> = [];
+};
+
+export type CompilerCmdParserSearchType = string | RegExp;
+
+/**
+ * Base class for any compiler command parser engine.
+ * If someone needs to write an engine: this is the base class.
+ * For further inspiration take a look at the implementation of
+ * CompilerCmdParserEngineGcc.
+ */
+export abstract class CompilerCmdParserEngine {
+    /**
+     * This array should contain the patterns which should match on
+     * a valid compiler command line to identify the compiler command.
+     * To be set by the derived class.
+     */
+    protected _match: CompilerCmdParserSearchType[];
+    /**
+     * This array should contain the patterns which should _NOT_
+     * match on a valid compiler command line to identify the
+     * compiler command.
+     * To be set by the derived class.
+     */
+    protected _nomatch: CompilerCmdParserSearchType[];
+    /**
+     * This function checks if the command line matches the
+     * requirements given through _match and _nomatch and invokes
+     * the parse function in case of a match.
+     * @returns If match was found and parsing was successful
+     * it returns the result else undefined.
+     */
+    public match(line: string): CompilerCmdParserResult {
+        // check for regexes that must match
+        for (const re of this._match) {
+            if (line.search(re) === -1) {
+                return undefined;
+            }
+        }
+        // check for regexes that mustn't match
+        for (const re of this._nomatch) {
+            if (line.search(re) !== -1) {
+                return undefined;
+            }
+        }
+        return this.parse(line);
+    }
+
+    /**
+     * The parsing function of a matched compiler command line.
+     * If all conditions hold true (all _match are found and all _nomatch
+     * are not found), this parsing function is invoked.
+     *
+     * Here the derived class has to implement its parsing magic
+     * to extract the desired includes, defines, compiler flags
+     * and the compiler command.
+     *
+     * @param line A string containing a compiler command line candidate.
+     * @returns A valid parsing result in case parsing was successful
+     * and undefined in case it failed fatally.
+     */
+    protected abstract parse(line: string): CompilerCmdParserResult;
+}
+
+/**
+ * Compiler command parsing engine for gcc compilers.
+ */
+export class CompilerCmdParserEngineGcc
+    extends CompilerCmdParserEngine {
+    constructor(sketch: string) {
+        super();
+
+        // TODO: windows and osx variants
+
+        this._nomatch =
+        [
+            // make sure Arduino's not testing libraries
+            /-o\s\/dev\/null/,
+        ];
+        this._match =
+        [
+            // make sure we're running g++
+            /-g\+\+\s+/,
+            // make sure we're compiling
+            /\s+-c\s+/,
+            // check if we're compiling the main sketch
+            path.basename(sketch) + ".cpp.o",
+        ];
+    }
+    protected parse(line: string): CompilerCmdParserResult {
+        const result = new CompilerCmdParserResult();
+        const args = line.split(/\s+/);
+
+        for (let arg of args) {
+
+            // drop empty arguments
+            if (!arg.length) {
+                continue;
+            }
+
+            // unpack quoted elements like
+            //
+            //   "-DMBEDTLS_CONFIG_FILE=\"mbedtls/esp_config.h\""
+            //   "-DARDUINO_BOARD=\"ESP32_DEV\""
+            //   "-DARDUINO_VARIANT=\"doitESP32devkitV1\""
+            const packed = arg.match(/^"(.+)"$/);
+            if (packed) {
+                arg = packed[1];
+            }
+
+            // extract defines
+            const define = arg.match(/^-D(.+)/);
+            if (define) {
+                result.defines.push(define[1]);
+                continue;
+            }
+
+            // extract includes
+            const include = arg.match(/^-I(.+)/);
+            if (include) {
+                result.includes.push(include[1]);
+                continue;
+            }
+
+            // extract the compiler executable
+            const c = arg.match(/g\+\+$/);
+            if (c) {
+                result.compiler = arg;
+                continue;
+            }
+
+            // filter out option trash
+            const t = arg.match(/^-o|^-O|^-g|^-c|cpp(?:\.o){0,1}$/);
+            if (t) {
+                result.trash.push(arg);
+                continue;
+            }
+
+            // collect options
+            const o = arg.match(/^-/);
+            if (o) {
+                result.options.push(arg);
+                continue;
+            }
+
+            // collect the rest
+            result.trash.push(arg);
+        }
+
+        // Query compiler for intrinsic/built-in include paths
+        if (result.compiler.length > 0) {
+
+            // TODO: Windows
+
+            // Spawn synchronous child process and run bash command
+            // Source: https://stackoverflow.com/a/6666338
+            const compilerinfocmd = `${result.compiler} -xc++ -E -v - < /dev/null 2>&1`;
+            const child = spawnSync("bash", ["-c", compilerinfocmd], { encoding : "utf8" });
+
+            if (child.error || child.status !== 0) {
+                // TODO: report the execution failure
+            } else {
+                // Now we look for
+                //
+                //   #include "..." search starts here:
+                //   #include <...> search starts here:
+                //      ...(include directories list)...
+                //   End of search list.
+                //
+                // and extract the include directory list. Could be that some gcc
+                // even lists something under
+                //
+                //   #include "..." search starts here:
+                //
+                // but I havn't seen it so far.
+                const includeregex = /^#include\s+<\.\.\.>\ssearch\sstarts\shere\:$(.+)^End\sof\ssearch\slist\.$/ms;
+                const match = child.stdout.match(includeregex);
+                if (match) {
+                    // Split list by newlines. Should be platform independent
+                    let lines = match[1].split(/\s*(?:\r|\n)\s*/);
+                    // Filter out empty elements (in most cases only the last element)
+                    lines = lines.filter((val: string) => val !== "");
+                    // Add built-in includes to command line includes
+                    result.includes = [...result.includes, ...lines];
+                } else {
+                    // TODO: issue info that include section has not been found
+                }
+            }
+        }
+        return result;
+    }
+}
+
+/**
+ * A compiler command parser.
+ * Takes compiler commands line by line and tries to find the compile command
+ * for the main .ino sketch. From that it tries to extract all includes,
+ * defines, options and the compiler command itself.
+ *
+ * TODO: Make it more generic to support other compilers than gcc
+ */
+export class CompilerCmdParser {
+    private _result: CompilerCmdParserResult;
+    private _engines: CompilerCmdParserEngine[];
+
+    /**
+     * Create a compiler command parser.
+     * Sets up parsing operation.
+     * @param engines Parsing engines for different compilers
+     */
+    constructor(engines: CompilerCmdParserEngine[]) {
+        this._engines = engines;
+    }
+    /**
+     * Returns the parsing result.
+     * Returns undefined when the parser fails or when the
+     * parser didn't run.
+     */
+    get result(): CompilerCmdParserResult {
+        return this._result;
+    }
+    /**
+     * Takes a command line and tries to parse it.
+     *
+     * @param line Compiler command line candidate.
+     * @returns The parsing result if the command line was parsed
+     * successfully. It returns undefined if no match was found or
+     * parsing failed.
+     */
+    public parse(line: string): boolean {
+        for (const engine of this._engines) {
+            this._result = engine.match(line);
+            if (this._result) {
+                return true;
+            }
+        }
+        return false;
+    }
+    /**
+     * Returns a callback which can be passed on to other functions
+     * to call. For instance from stdout callbacks of child processes.
+     */
+    public get callback(): (line: string) => void {
+        return (line: string) => {
+            if (!this._result) {
+                this.parse(line);
+            }
+        }
+    }
+}
+
+/**
+ * Class representing the contents of the IntelliSense
+ * c_cpp_properties.json configuration file.
+ *
+ * @see https://code.visualstudio.com/docs/cpp/c-cpp-properties-schema-reference
+ */
+export class CCppPropertiesConfiguration {
+    public name: string             = "Arduino";
+    public compilerPath: string     = "";
+    public compilerArgs: string []  = [];
+    public intelliSenseMode: string = "gcc-x64"; // since we're using arduino's compiler
+    public includePath: string[]    = [];
+    public forcedInclude: string[]  = [];
+    public cStandard: string        = "c11";
+    public cppStandard: string      = "c++11";   // as of 1.8.11 arduino is on C++11
+    public defines: string[]        = [];
+
+    constructor(result: CompilerCmdParserResult) {
+        this.compilerPath = result.compiler;
+        this.compilerArgs = result.options;
+        this.includePath  = result.includes;
+        this.defines      = result.defines;
+    }
+}
+
+export class CCppPropertiesContent {
+    public configurations: Array<CCppPropertiesConfiguration>
+
+    constructor(result: CompilerCmdParserResult) {
+        this.configurations = [new CCppPropertiesConfiguration(result)];
+    }
+};
+
+export class CCppProperties {
+    public proppath: string;
+    public propFileContent: CCppPropertiesContent;
+
+    constructor(proppath: string) {
+        this.proppath = proppath;
+    }
+
+    public read() {
+        if (!fs.existsSync(this.proppath)) {
+            return;
+        }
+        const propFileContentPlain = fs.readFileSync(this.proppath, "utf8");
+
+        // NOTE: in JSON backslashes are escaped to \\\\
+
+        this.propFileContent = JSON.parse(propFileContentPlain) as CCppPropertiesContent;
+    }
+    public merge(result: CompilerCmdParserResult) {
+        const pc = new CCppPropertiesContent(result);
+
+        // TODO:
+        //  * merge with existing configuration if desired
+        //  * check if contents changed after merging
+        //
+
+        this.propFileContent = pc;
+    }
+
+    public write() {
+        // NOTE: in JSON backslashes are escaped to \\\\
+        // TODO:
+        //  * check if path exists, create if necessary
+        //  * write file only if modified
+
+        if (this.propFileContent) {
+            const content = JSON.stringify(this.propFileContent, null, 4);
+            fs.writeFileSync(this.proppath, content);
+        }
+    }
+}
diff --git a/src/common/util.ts b/src/common/util.ts
index 696c99ea..4344f5ad 100644
--- a/src/common/util.ts
+++ b/src/common/util.ts
@@ -200,14 +200,23 @@ export function isArduinoFile(filePath): boolean {
     return fileExistsSync(filePath) && (path.extname(filePath) === ".ino" || path.extname(filePath) === ".pde");
 }
 
+// TODO: remove output channel and just provide callback hooks for stdout and
+// stderr
 /**
  * Send a command to arduino
  * @param {string} command - base command path (either Arduino IDE or CLI)
  * @param {vscode.OutputChannel} outputChannel - output display channel
  * @param {string[]} [args=[]] - arguments to pass to the command
  * @param {any} [options={}] - options and flags for the arguments
+ * @param {(string) => {}} - callback for stdout text
  */
-export function spawn(command: string, outputChannel: vscode.OutputChannel, args: string[] = [], options: any = {}): Thenable<object> {
+export function spawn(
+    command: string,
+    outputChannel: vscode.OutputChannel,
+    args: string[] = [],
+    options: any = {},
+    stdoutCallback?: (s: string) => void,
+): Thenable<object> {
     return new Promise((resolve, reject) => {
         const stdout = "";
         const stderr = "";
@@ -228,7 +237,12 @@ export function spawn(command: string, outputChannel: vscode.OutputChannel, args
 
         if (outputChannel) {
             child.stdout.on("data", (data: Buffer) => {
-                outputChannel.append(decodeData(data, codepage));
+                const decoded = decodeData(data, codepage);
+                if (stdoutCallback) {
+                    stdoutCallback(decoded);
+                } else {
+                    outputChannel.append(decoded);
+                }
             });
             child.stderr.on("data", (data: Buffer) => {
                 outputChannel.append(decodeData(data, codepage));

From 79bd4762d825682665bc3735f085cba01934fb30 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Thu, 6 Feb 2020 23:29:32 +0100
Subject: [PATCH 012/142] Improved line splitting of built-in include parser
 after commenting on a pull request :)

---
 src/arduino/intellisense.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/arduino/intellisense.ts b/src/arduino/intellisense.ts
index 2a202b9c..706104e7 100644
--- a/src/arduino/intellisense.ts
+++ b/src/arduino/intellisense.ts
@@ -206,7 +206,7 @@ export class CompilerCmdParserEngineGcc
                 const match = child.stdout.match(includeregex);
                 if (match) {
                     // Split list by newlines. Should be platform independent
-                    let lines = match[1].split(/\s*(?:\r|\n)\s*/);
+                    let lines = match[1].split(/\s*(?:\r|\r\n|\n)\s*/);
                     // Filter out empty elements (in most cases only the last element)
                     lines = lines.filter((val: string) => val !== "");
                     // Add built-in includes to command line includes

From baaf069352eff3f8502e15ffdc0f7de906a3eb8d Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Thu, 6 Feb 2020 23:30:36 +0100
Subject: [PATCH 013/142] Pre-build command updates

* Moved pre-build command into separate member function to reduce code replication, better maintainablility and readability
* Added pre-build command to "upload using programmer" since it was (probably unintentional) missing there
---
 src/arduino/arduino.ts | 55 +++++++++++++++++++++++++++---------------
 1 file changed, 35 insertions(+), 20 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 7f0c45fb..a558a9cf 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -139,16 +139,8 @@ export class ArduinoApp {
         UsbDetector.getInstance().pauseListening();
         await vscode.workspace.saveAll(false);
 
-        if (dc.prebuild) {
-            arduinoChannel.info(`Run prebuild command: ${dc.prebuild}`);
-            const prebuildargs = dc.prebuild.split(" ");
-            const prebuildCommand = prebuildargs.shift();
-            try {
-                await util.spawn(prebuildCommand, arduinoChannel.channel, prebuildargs, { shell: true, cwd: ArduinoWorkspace.rootPath });
-            } catch (ex) {
-                arduinoChannel.error(`Run prebuild failed: \n${ex.error}`);
-                return;
-            }
+        if (!await this.runPreBuildCommand(dc)) {
+            return;
         }
 
         if (!compile && !this.useArduinoCli()) {
@@ -174,6 +166,10 @@ export class ArduinoApp {
             args.push("--port", dc.port);
         }
         args.push(appPath);
+        if (!await this.runPreBuildCommand(dc)) {
+            return;
+        }
+
         if (VscodeSettings.getInstance().logLevel === "verbose") {
             args.push("--verbose");
         }
@@ -228,16 +224,8 @@ export class ArduinoApp {
 
         arduinoChannel.start(`Verify sketch - ${dc.sketch}`);
 
-        if (dc.prebuild) {
-            arduinoChannel.info(`Run prebuild command: ${dc.prebuild}`);
-            const prebuildargs = dc.prebuild.split(" ");
-            const prebuildCommand = prebuildargs.shift();
-            try {
-                await util.spawn(prebuildCommand, arduinoChannel.channel, prebuildargs, { shell: true, cwd: ArduinoWorkspace.rootPath });
-            } catch (ex) {
-                arduinoChannel.error(`Run prebuild failed: \n${ex.error}`);
-                return;
-            }
+        if (!await this.runPreBuildCommand(dc)) {
+            return false;
         }
 
         const appPath = path.join(ArduinoWorkspace.rootPath, dc.sketch);
@@ -779,6 +767,33 @@ export class ArduinoApp {
         this._programmerManager = value;
     }
 
+    /**
+     * Runs the pre build command.
+     * Usually before one of
+     *  * verify
+     *  * upload
+     *  * upload using programmer
+     * @param dc Device context prepared during one of the above actions
+     * @returns True if successful, false on error.
+     */
+    protected async runPreBuildCommand(dc: DeviceContext): Promise<boolean> {
+        if (dc.prebuild) {
+            arduinoChannel.info(`Running pre-build command: ${dc.prebuild}`);
+            const prebuildargs = dc.prebuild.split(" ");
+            const prebuildCommand = prebuildargs.shift();
+            try {
+                await util.spawn(prebuildCommand,
+                                 arduinoChannel.channel,
+                                 prebuildargs,
+                                 { shell: true, cwd: ArduinoWorkspace.rootPath });
+            } catch (ex) {
+                arduinoChannel.error(`Running pre-build command failed: ${os.EOL}${ex.error}`);
+                return false;
+            }
+        }
+        return true;
+    }
+
     /**
      * Checks if the arduino cli is being used
      * @returns {bool} - true if arduino cli is being use

From bc2b29228ad7dd21682da335436095ca9d90d296 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Thu, 6 Feb 2020 23:34:40 +0100
Subject: [PATCH 014/142] Documentation updates

* Notes regarding settings
* Notes where to run the auto-generation
---
 BRANCHNOTES.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index 7c0c283f..e9a84633 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -48,6 +48,7 @@ src/arduino/arduino.ts
 |                                       | :white_check_mark: JSON output |
 |                                       | :white_check_mark: Configuration merging |
 | **General**                           | :white_check_mark: Review and remove previous attempts messing with `c_cpp_properties.json` |
+|                                       | :white_check_mark: Auto-run verify after setting a board to generate a valid `c_cpp_properties.json`, identify other occasions where this applies |
 
 `*` not committed to branch yet
 
@@ -150,7 +151,7 @@ Global user settings, on linux under `~/.config/Code/User/settings.json`, for in
 }
 ```
 Project settings in `.vscode/arduino.json`
-```
+```json
 {
     "board": "arduino:avr:nano",
     "configuration": "cpu=atmega328old",
@@ -158,5 +159,10 @@ Project settings in `.vscode/arduino.json`
     "port": "/dev/ttyUSB0"
 }
 ```
-
+The global settings are [here](src/arduino/vscodeSettings.ts)
+```ts
+if (VscodeSettings.getInstance().logLevel === "verbose") {
+    args.push("--verbose");
+}
+```
 ### Global Tasks in vscode-arduino

From 3da2f7600c6bcb9b4b66dcbfb6b82a23e9c9dd7f Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Fri, 7 Feb 2020 02:55:26 +0100
Subject: [PATCH 015/142] IntelliSense on/off configuration and compiler parser
 injection preparation

* Added a global configuration switch which allows the IntelliSense auto-configuration to be turned off
* Prepared the compiler parser code to be injected into "upload" and "upload using programmer" without overhead
* Updated branch documentation
---
 BRANCHNOTES.md                | 35 +++++++++++----------
 package.json                  |  5 +++
 src/arduino/arduino.ts        | 58 ++++++++++++++++++++++++++---------
 src/arduino/intellisense.ts   | 11 ++++++-
 src/arduino/vscodeSettings.ts |  6 ++++
 5 files changed, 83 insertions(+), 32 deletions(-)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index e9a84633..5f99989f 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -40,7 +40,9 @@ src/arduino/arduino.ts
 |                                       | :heavy_check_mark: Basic file output |
 |                                       | :white_check_mark: Merging of parsing result and existing file content |
 |                                       | :white_check_mark: Handling inexistent files and folders |
-| **Configuration flags**               | :white_check_mark: |
+| **Configuration flags**               | :heavy_check_mark: Disable flag for IntelliSense auto-config |
+|                                       | :white_check_mark: Perhaps a general IntelliSense flag `{off/manual, auto, oldstyle}` whereas the old can be removed at some point |
+|                                       | :white_check_mark: Fine grained IntelliSense control: Global en-/disable and project override. This is probably more useful since the most boards will hopefully work and for the very special cases the user can disable the feature for this single project but still can enjoy it within his regular projects. |
 | **Unit tests**                        | :white_check_mark: Basic parser (known boards, match/no match)|
 |                                       | :white_check_mark: Querying of compiler built-in includes |
 |                                       | :white_check_mark: Throwing arbitrary data at parser engines |
@@ -48,7 +50,7 @@ src/arduino/arduino.ts
 |                                       | :white_check_mark: JSON output |
 |                                       | :white_check_mark: Configuration merging |
 | **General**                           | :white_check_mark: Review and remove previous attempts messing with `c_cpp_properties.json` |
-|                                       | :white_check_mark: Auto-run verify after setting a board to generate a valid `c_cpp_properties.json`, identify other occasions where this applies |
+|                                       | :white_check_mark: Auto-run verify after setting a board to generate a valid `c_cpp_properties.json`, identify other occasions where this applies (usually when adding new libraries), hint the user to run *verify*? |
 
 `*` not committed to branch yet
 
@@ -139,30 +141,31 @@ As one can see with the ESP32-gcc not all include directories are named `include
 
 
 ### Settings
-Global user settings, on linux under `~/.config/Code/User/settings.json`, for instance:
+#### Global Settings
+Under linux at `~/.config/Code/User/settings.json`, for instance:
 ```json
 {
     "arduino.additionalUrls": "",
     "arduino.logLevel": "verbose",
-    "C_Cpp.default.cppStandard": "c++11",
-    "C_Cpp.default.cStandard": "c11",
     "arduino.disableTestingOpen": true,
     "workbench.editor.enablePreview": false
 }
 ```
-Project settings in `.vscode/arduino.json`
+Code: [src/arduino/arduinoSettings.ts](src/arduino/arduinoSettings.ts)
+Code: [src/arduino/vscodeSettings.ts](src/arduino/vscodeSettings.ts)
+Validator: [package.json](package.json)
+
+#### Project Settings
+Path in project `.vscode/arduino.json`
 ```json
 {
-    "board": "arduino:avr:nano",
-    "configuration": "cpu=atmega328old",
-    "sketch": "examples/lcdpong-butenc/lcdpong-butenc.ino",
-    "port": "/dev/ttyUSB0"
-}
-```
-The global settings are [here](src/arduino/vscodeSettings.ts)
-```ts
-if (VscodeSettings.getInstance().logLevel === "verbose") {
-    args.push("--verbose");
+  "board": "arduino:avr:nano",
+  "configuration": "cpu=atmega328old",
+  "sketch": "examples/lcdpong-butenc/lcdpong-butenc.ino",
+  "port": "/dev/ttyUSB0"
 }
 ```
+Code: [src/deviceContext.ts](src/deviceContext.ts)
+Validator: [misc/arduinoValidator.json](misc/arduinoValidator.json)
+
 ### Global Tasks in vscode-arduino
diff --git a/package.json b/package.json
index dd27fa3f..24b961ec 100644
--- a/package.json
+++ b/package.json
@@ -504,6 +504,11 @@
         "arduino.defaultBaudRate": {
           "type": "number",
           "default": 115200
+        },
+        "arduino.disableIntelliSenseAutoGen": {
+          "type": "boolean",
+          "default": false,
+          "description": "When disabled vscode-arduino will not auto-generate an IntelliSense configuration (i.e. c_cpp_properties.json) by analyzing the compiler output."
         }
       }
     },
diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index a558a9cf..6c70285f 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -255,29 +255,19 @@ export class ArduinoApp {
         }
 
         arduinoChannel.show();
-        // we need to return the result of verify
+
         try {
-            const gccParserEngine = new CompilerCmdParserEngineGcc(dc.sketch);
-            const compilerParser = new CompilerCmdParser([gccParserEngine]);
+            const compilerParserContext = this.makeCompilerParserContext(dc);
 
             await util.spawn(this._settings.commandPath,
                              arduinoChannel.channel,
                              args,
                              undefined,
-                             compilerParser.callback);
+                             compilerParserContext.callback);
 
-            // Write compiler command parser result to IntelliSense
-            // configuration file in case parsing was successful.
-            if (compilerParser.result) {
-                const cppPropsPath = path.join(ArduinoWorkspace.rootPath, constants.CPP_CONFIG_FILE);
-                const cppProps = new CCppProperties(cppPropsPath);
-                cppProps.merge(compilerParser.result);
-                cppProps.write();
-                arduinoChannel.info("IntelliSense configuration generated successfully.");
-            } else {
-                arduinoChannel.warning("Failed to generate IntelliSense configuration.");
+            if (compilerParserContext.conclude) {
+                compilerParserContext.conclude();
             }
-
             arduinoChannel.end(`Finished verify sketch - ${dc.sketch}${os.EOL}`);
             return true;
         } catch (reason) {
@@ -803,6 +793,44 @@ export class ArduinoApp {
         // return VscodeSettings.getInstance().useArduinoCli;
     }
 
+    /**
+     * Creates a context which is used for compiler command parsing
+     * during building (verify, upload, ...).
+     *
+     * This context makes sure that it can be used in those sections
+     * without having to check whether this feature is en- or disabled
+     * and keeps the calling context more readable.
+     *
+     * @param dc The device context of the caller.
+     */
+    private makeCompilerParserContext(dc: DeviceContext)
+        : { callback: (s: string) => void; conclude: () => void; } {
+        if (!VscodeSettings.getInstance().disableIntelliSenseAutoGen) {
+
+            // setup the parser with its engines
+            const gccParserEngine = new CompilerCmdParserEngineGcc(dc.sketch);
+            const compilerParser = new CompilerCmdParser([gccParserEngine]);
+
+            // set up the function to be called after parsing
+            const _conclude = () => {
+                const cppPropsPath = path.join(ArduinoWorkspace.rootPath, constants.CPP_CONFIG_FILE);
+                if (compilerParser.processResult(cppPropsPath)) {
+                    arduinoChannel.info("IntelliSense configuration generated successfully.");
+                } else {
+                    arduinoChannel.warning("Failed to generate IntelliSense configuration.");
+                }
+            };
+            return {
+                callback: compilerParser.callback,
+                conclude: _conclude,
+            };
+        }
+        return {
+            callback: undefined,
+            conclude: undefined,
+        }
+    };
+
     private getProgrammerString(): string {
         const selectProgrammer = this.programmerManager.currentProgrammer;
         if (!selectProgrammer) {
diff --git a/src/arduino/intellisense.ts b/src/arduino/intellisense.ts
index 706104e7..8b322056 100644
--- a/src/arduino/intellisense.ts
+++ b/src/arduino/intellisense.ts
@@ -26,7 +26,7 @@ export class CompilerCmdParserResult {
     public defines: Array<string> = [];
     public options: Array<string> = [];
     public compiler: string = "";
-    /** Dropped arguments like -c -Ox */
+    /** Dropped arguments like -c -Ox -o, the input and output file. */
     public trash: Array<string> = [];
 };
 
@@ -276,6 +276,15 @@ export class CompilerCmdParser {
             }
         }
     }
+    public processResult(configPath: string): boolean {
+        if (this._result) {
+            const cppProps = new CCppProperties(configPath);
+            cppProps.merge(this._result);
+            cppProps.write();
+            return true;
+        }
+        return false;
+    }
 }
 
 /**
diff --git a/src/arduino/vscodeSettings.ts b/src/arduino/vscodeSettings.ts
index 14726cd8..74f7bedb 100644
--- a/src/arduino/vscodeSettings.ts
+++ b/src/arduino/vscodeSettings.ts
@@ -16,6 +16,7 @@ const configKeys = {
     SKIP_HEADER_PROVIDER: "arduino.skipHeaderProvider",
     DEFAULT_BAUD_RATE: "arduino.defaultBaudRate",
     USE_ARDUINO_CLI: "arduino.useArduinoCli",
+    DISABLE_INTELLISENSE_AUTO_GEN: "arduino.disableIntelliSenseAutoGen",
 };
 
 export interface IVscodeSettings {
@@ -30,6 +31,7 @@ export interface IVscodeSettings {
     skipHeaderProvider: boolean;
     defaultBaudRate: number;
     useArduinoCli: boolean;
+    disableIntelliSenseAutoGen: boolean;
     updateAdditionalUrls(urls: string | string[]): void;
 }
 
@@ -93,6 +95,10 @@ export class VscodeSettings implements IVscodeSettings {
         return this.getConfigValue<boolean>(configKeys.SKIP_HEADER_PROVIDER);
     }
 
+    public get disableIntelliSenseAutoGen(): boolean {
+        return this.getConfigValue<boolean>(configKeys.DISABLE_INTELLISENSE_AUTO_GEN);
+    }
+
     public async updateAdditionalUrls(value) {
         await this.setConfigValue(configKeys.ADDITIONAL_URLS, value, true);
     }

From ce1b656c50a24362b69c3493817a746dfd97b280 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Fri, 7 Feb 2020 03:11:14 +0100
Subject: [PATCH 016/142] Added two more TODOs to branch documentation

---
 BRANCHNOTES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index 5f99989f..4c399fe9 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -51,6 +51,8 @@ src/arduino/arduino.ts
 |                                       | :white_check_mark: Configuration merging |
 | **General**                           | :white_check_mark: Review and remove previous attempts messing with `c_cpp_properties.json` |
 |                                       | :white_check_mark: Auto-run verify after setting a board to generate a valid `c_cpp_properties.json`, identify other occasions where this applies (usually when adding new libraries), hint the user to run *verify*? |
+|                                       | :white_check_mark: Document configuration settings in [README.md](README.md) |
+|                                       | :white_check_mark: Document features in [README.md](README.md) |
 
 `*` not committed to branch yet
 

From 59c78cb31382416a24a0b1b950f03d3e1ad5e318 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Fri, 7 Feb 2020 03:15:53 +0100
Subject: [PATCH 017/142] Added even more TODOs to branch documentation

---
 BRANCHNOTES.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index 4c399fe9..c1291a75 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -49,10 +49,12 @@ src/arduino/arduino.ts
 |                                       | :white_check_mark: JSON input |
 |                                       | :white_check_mark: JSON output |
 |                                       | :white_check_mark: Configuration merging |
+|                                       | :white_check_mark: Write configuration on change only |
 | **General**                           | :white_check_mark: Review and remove previous attempts messing with `c_cpp_properties.json` |
 |                                       | :white_check_mark: Auto-run verify after setting a board to generate a valid `c_cpp_properties.json`, identify other occasions where this applies (usually when adding new libraries), hint the user to run *verify*? |
 |                                       | :white_check_mark: Document configuration settings in [README.md](README.md) |
 |                                       | :white_check_mark: Document features in [README.md](README.md) |
+|                                       | :white_check_mark: Finally: go through my code and look for TODOs |
 
 `*` not committed to branch yet
 

From 4a91647ceeb469151f3960607fe616ca12f7629e Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Fri, 7 Feb 2020 03:19:09 +0100
Subject: [PATCH 018/142] Moved TODO in branch documentation

---
 BRANCHNOTES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index c1291a75..17b5712f 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -40,6 +40,7 @@ src/arduino/arduino.ts
 |                                       | :heavy_check_mark: Basic file output |
 |                                       | :white_check_mark: Merging of parsing result and existing file content |
 |                                       | :white_check_mark: Handling inexistent files and folders |
+|                                       | :white_check_mark: Write configuration on change only |
 | **Configuration flags**               | :heavy_check_mark: Disable flag for IntelliSense auto-config |
 |                                       | :white_check_mark: Perhaps a general IntelliSense flag `{off/manual, auto, oldstyle}` whereas the old can be removed at some point |
 |                                       | :white_check_mark: Fine grained IntelliSense control: Global en-/disable and project override. This is probably more useful since the most boards will hopefully work and for the very special cases the user can disable the feature for this single project but still can enjoy it within his regular projects. |
@@ -49,7 +50,6 @@ src/arduino/arduino.ts
 |                                       | :white_check_mark: JSON input |
 |                                       | :white_check_mark: JSON output |
 |                                       | :white_check_mark: Configuration merging |
-|                                       | :white_check_mark: Write configuration on change only |
 | **General**                           | :white_check_mark: Review and remove previous attempts messing with `c_cpp_properties.json` |
 |                                       | :white_check_mark: Auto-run verify after setting a board to generate a valid `c_cpp_properties.json`, identify other occasions where this applies (usually when adding new libraries), hint the user to run *verify*? |
 |                                       | :white_check_mark: Document configuration settings in [README.md](README.md) |

From d3372955031ce673c09b2d232bcb9cc51232d8c8 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Sat, 8 Feb 2020 03:10:06 +0100
Subject: [PATCH 019/142] Documenting ...

---
 BRANCHNOTES.md | 58 +++++++++++++++++++++++++++++++++-----------------
 1 file changed, 39 insertions(+), 19 deletions(-)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index 17b5712f..d7a81581 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -14,14 +14,6 @@ The generator takes the parser's output and transforms it into a valid `c_cpp_pr
 Provide a configuration flag which allows the user to turn this feature off - this is useful for the cases in which this magic fails or the user has a very specific setup. Although this branch tries to eliminate most of the latter cases.
 
 ### Global Tasks in vscode-arduino
-Places where `c_cpp_properties.json` gets altered (list in progress)
-```
-src/extension.ts
-  260, 53: arduinoContextModule.default.arduinoApp.tryToUpdateIncludePaths();
-src/arduino/arduino.ts
-  328, 12:     public tryToUpdateIncludePaths() {
-
-```
 
 ### Status
 **2020-02-05** Currently I'm able to generate error free IntelliSense setups for AVR and ESP32 using the preliminary implementation. For ESP32 I just had to add the intrinsic compiler paths manually. A solution has to be found for these ... which there is, see [here](https://stackoverflow.com/a/6666338)
@@ -41,19 +33,21 @@ src/arduino/arduino.ts
 |                                       | :white_check_mark: Merging of parsing result and existing file content |
 |                                       | :white_check_mark: Handling inexistent files and folders |
 |                                       | :white_check_mark: Write configuration on change only |
-| **Configuration flags**               | :heavy_check_mark: Disable flag for IntelliSense auto-config |
-|                                       | :white_check_mark: Perhaps a general IntelliSense flag `{off/manual, auto, oldstyle}` whereas the old can be removed at some point |
-|                                       | :white_check_mark: Fine grained IntelliSense control: Global en-/disable and project override. This is probably more useful since the most boards will hopefully work and for the very special cases the user can disable the feature for this single project but still can enjoy it within his regular projects. |
+|                                       | :white_check_mark: Option to backup old configurations? |
+| **Configuration flags**               | :heavy_check_mark: Provide global disable flag for IntelliSense auto-config |
+|                                       | :white_check_mark: Provide project specific override for the global flag - most users will likely use the default setup and disable auto-generation for very specific projects |
 | **Unit tests**                        | :white_check_mark: Basic parser (known boards, match/no match)|
 |                                       | :white_check_mark: Querying of compiler built-in includes |
 |                                       | :white_check_mark: Throwing arbitrary data at parser engines |
 |                                       | :white_check_mark: JSON input |
 |                                       | :white_check_mark: JSON output |
 |                                       | :white_check_mark: Configuration merging |
-| **General**                           | :white_check_mark: Review and remove previous attempts messing with `c_cpp_properties.json` |
-|                                       | :white_check_mark: Auto-run verify after setting a board to generate a valid `c_cpp_properties.json`, identify other occasions where this applies (usually when adding new libraries), hint the user to run *verify*? |
+| **General**                           | :white_check_mark: Review and remove previous attempts messing with `c_cpp_properties.json` or IntelliSense. (Partially done - documented in the [General Tasks](#General-Tasks) section |
+|                                       | :white_check_mark: Auto-run verify after setting a board to generate a valid `c_cpp_properties.json`, identify other occasions where this applies (usually when adding new libraries), hint the user to run *verify*? -> Good moment would be after the workbench initialization -> message in arduino channel |
 |                                       | :white_check_mark: Document configuration settings in [README.md](README.md) |
 |                                       | :white_check_mark: Document features in [README.md](README.md) |
+|                                       | :white_check_mark: How to handle compilation failure? Only set if more comprehensive |
+|                                       | :white_check_mark: Extract compiler command parser from vscode-arduino and [publish](https://itnext.io/step-by-step-building-and-publishing-an-npm-typescript-package-44fe7164964c) it as a separate package which will allow reusage and tests can be run without the heavy vscode-arduino rucksack |
 |                                       | :white_check_mark: Finally: go through my code and look for TODOs |
 
 `*` not committed to branch yet
@@ -85,27 +79,35 @@ I will list every supporter here, thanks!
 * [`c_cpp_properties.json` reference](https://code.visualstudio.com/docs/cpp/c-cpp-properties-schema-reference)
 * [Interactive regex debugger](https://regex101.com/)
 * [Git branch management](https://blog.scottlowe.org/2015/01/27/using-fork-branch-git-workflow/)
+* [Collapsible Markdown](https://gist.githubusercontent.com/joyrexus/16041f2426450e73f5df9391f7f7ae5f/raw/f774f242feff6bae4a5be7d6c71aa5df2e3fcb0e/README.md)
 
+## Issues Concerning this Project
+ * https://github.com/Microsoft/vscode-cpptools/issues/1750
+ * Problems with IntelliSense itself https://github.com/microsoft/vscode-cpptools/issues/1034
+ * Logging for IntelliSense https://code.visualstudio.com/docs/cpp/enable-logging-cpp
 ## Future Work
 * Proper interactive serial terminal (this is the second major show stopper in my opinion)
 * Lots of redundant code
   * e.g. "upload is a superset of "verify"
   * general lack of modularity - the above is the result
 * It seems that this extension is pretty chaotic. Most probably some refactoring is necessary.
-
+* Possibility to jump to compilation errors from compiler output and highlight compiler errors
 ----
 
 ## Implementation
+**Note** Check this vscode feature:
+```
+Configuration provider
+The ID of a VS Code extension that can provide IntelliSense configuration information for source files. For example, use the VS Code extension ID ms-vscode.cmake-tools to provide configuration information from the CMake Tools extension.
+```
 
 ### Build Output Parser
 #### Intrinsic Include Paths
-Some include paths are built into gcc and don't have to be specified on the command line. This requires that we have to get them from the compiler.
-
-Just searching the compiler installation directory with something like
+Some include paths are built into gcc and don't have to be specified on the command line. Just searching the compiler installation directory with something like
 ```bash
 find  ~/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/ -name "include*"
 ```
-won't do since not all include directories are named `include`. Fortunately gcc can be queried about its configuration ([source](https://stackoverflow.com/a/6666338)):
+won't do since not all include directories are named `include`. Fortunately gcc can be queried about its configuration ([source](https://stackoverflow.com/a/6666338)) -- built-in include paths are part of it:
 ```bash
 # generally for C++
 gcc -xc++ -E -v -
@@ -117,6 +119,7 @@ gcc -xc++ -E -v -
 The result can be inspected here:
 * [xtensa-esp32-elf-gcc_built_in_specs.txt](doc/intellisense/compilerinfo/xtensa-esp32-elf-gcc_built_in_specs.txt)
 * [avr-gcc_built_in_specs.txt](doc/intellisense/compilerinfo/avr-gcc_built_in_specs.txt)
+
 To show the most interesting section in the output of the above commands, for ESP32:
 ```
 #include "..." search starts here:
@@ -172,4 +175,21 @@ Path in project `.vscode/arduino.json`
 Code: [src/deviceContext.ts](src/deviceContext.ts)
 Validator: [misc/arduinoValidator.json](misc/arduinoValidator.json)
 
-### Global Tasks in vscode-arduino
+### General Tasks
+#### Removing existing Attempts which mess with c_cpp_properties.json or Intellisense
+
+Remove these as they are helpless attempts to get IntelliSense working:
+```ts
+//src/arduino/arduino.ts
+  tryToUpdateIncludePaths()
+  addLibPath(libraryPath: string)
+  getDefaultForcedIncludeFiles()
+  // parts in
+  openExample()
+
+  //probably not needed anymore:
+  getDefaultPackageLibPaths()
+
+```
+Remove this as this messes in an unpredictable and helpless way with Intellisense
+[src/langService/completionProvider.ts](src/langService/completionProvider.ts)

From 0865c97b571fa63c05d4b950453bb1c64b14728d Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Sat, 8 Feb 2020 12:28:25 +0100
Subject: [PATCH 020/142] Moved compiler parser to cocopa package for better
 testability and maintainability

---
 BRANCHNOTES.md              |   6 +-
 package-lock.json           |  45 ++++-
 package.json                |   5 +-
 src/arduino/arduino.ts      |   8 +-
 src/arduino/intellisense.ts | 363 ------------------------------------
 webpack.config.js           |  10 +
 6 files changed, 63 insertions(+), 374 deletions(-)
 delete mode 100644 src/arduino/intellisense.ts

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index d7a81581..0255d506 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -36,8 +36,8 @@ Provide a configuration flag which allows the user to turn this feature off - th
 |                                       | :white_check_mark: Option to backup old configurations? |
 | **Configuration flags**               | :heavy_check_mark: Provide global disable flag for IntelliSense auto-config |
 |                                       | :white_check_mark: Provide project specific override for the global flag - most users will likely use the default setup and disable auto-generation for very specific projects |
-| **Unit tests**                        | :white_check_mark: Basic parser (known boards, match/no match)|
-|                                       | :white_check_mark: Querying of compiler built-in includes |
+| **Unit tests**                        | :heavy_check_mark: Basic parser (known boards, match/no match)|
+|                                       | :heavy_check_mark: Querying of compiler built-in includes (Note: to be changed to generic compiler such that Arduino is not necessary for unit testing) |
 |                                       | :white_check_mark: Throwing arbitrary data at parser engines |
 |                                       | :white_check_mark: JSON input |
 |                                       | :white_check_mark: JSON output |
@@ -47,7 +47,7 @@ Provide a configuration flag which allows the user to turn this feature off - th
 |                                       | :white_check_mark: Document configuration settings in [README.md](README.md) |
 |                                       | :white_check_mark: Document features in [README.md](README.md) |
 |                                       | :white_check_mark: How to handle compilation failure? Only set if more comprehensive |
-|                                       | :white_check_mark: Extract compiler command parser from vscode-arduino and [publish](https://itnext.io/step-by-step-building-and-publishing-an-npm-typescript-package-44fe7164964c) it as a separate package which will allow reusage and tests can be run without the heavy vscode-arduino rucksack |
+|                                       | :heavy_check_mark: Extract compiler command parser from vscode-arduino and [publish](https://itnext.io/step-by-step-building-and-publishing-an-npm-typescript-package-44fe7164964c) it as a separate package which will allow reusage and easy testing without heavy vscode-arduino rucksack. Done, see [cocopa](https://www.npmjs.com/package/cocopa) |
 |                                       | :white_check_mark: Finally: go through my code and look for TODOs |
 
 `*` not committed to branch yet
diff --git a/package-lock.json b/package-lock.json
index a7a49f3d..69660e47 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1410,6 +1410,11 @@
       "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
       "dev": true
     },
+    "child_process": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/child_process/-/child_process-1.0.2.tgz",
+      "integrity": "sha1-sffn/HPSXn/R1FWtyU4UODAYK1o="
+    },
     "chokidar": {
       "version": "2.1.8",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
@@ -1556,6 +1561,16 @@
         "semver": "^5.4.1"
       }
     },
+    "cocopa": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/cocopa/-/cocopa-0.0.3.tgz",
+      "integrity": "sha512-zFHtJcwkobUCNkeBwxyftvsQ4Ev1jJS1NX78hfBF1/T8V5f820WlNRGZx2mlBWoNV4uAFxARVgjRZfoEHT1D6A==",
+      "requires": {
+        "child_process": "^1.0.2",
+        "fs": "0.0.1-security",
+        "path": "^0.12.7"
+      }
+    },
     "code-point-at": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
@@ -3243,6 +3258,11 @@
         "readable-stream": "^2.0.0"
       }
     },
+    "fs": {
+      "version": "0.0.1-security",
+      "resolved": "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz",
+      "integrity": "sha1-invTcYa23d84E/I4WLV+yq9eQdQ="
+    },
     "fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
@@ -6791,6 +6811,25 @@
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
       "dev": true
     },
+    "path": {
+      "version": "0.12.7",
+      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
+      "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=",
+      "requires": {
+        "process": "^0.11.1",
+        "util": "^0.10.3"
+      },
+      "dependencies": {
+        "util": {
+          "version": "0.10.4",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+          "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+          "requires": {
+            "inherits": "2.0.3"
+          }
+        }
+      }
+    },
     "path-browserify": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
@@ -8538,9 +8577,9 @@
       }
     },
     "typescript": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
-      "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
+      "version": "3.9.7",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz",
+      "integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==",
       "dev": true
     },
     "unc-path-regex": {
diff --git a/package.json b/package.json
index 24b961ec..490cab30 100644
--- a/package.json
+++ b/package.json
@@ -588,15 +588,18 @@
     "plugin-error": "^1.0.1",
     "tslint": "^5.20.1",
     "typemoq": "^1.6.0",
-    "typescript": "^2.2.1",
+    "typescript": "^3.7.5",
     "vscode-test": "^1.4.0",
     "webpack": "^4.44.1"
   },
   "dependencies": {
     "body-parser": "^1.16.1",
+    "child_process": "^1.0.2",
+    "cocopa": "0.0.3",
     "compare-versions": "^3.4.0",
     "eventemitter2": "^4.1.0",
     "express": "^4.14.1",
+    "fs": "0.0.1-security",
     "glob": "^7.1.1",
     "iconv-lite": "^0.4.18",
     "impor": "^0.1.1",
diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 6c70285f..6cac39ea 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
+import * as ccp from "cocopa";
 import * as fs from "fs";
 import * as glob from "glob";
 import * as os from "os";
@@ -22,7 +23,6 @@ import { arduinoChannel } from "../common/outputChannel";
 import { ArduinoWorkspace } from "../common/workspace";
 import { SerialMonitor } from "../serialmonitor/serialMonitor";
 import { UsbDetector } from "../serialmonitor/usbDetector";
-import { CCppProperties, CompilerCmdParser, CompilerCmdParserEngineGcc } from "./intellisense";
 import { ProgrammerManager } from "./programmerManager";
 
 /**
@@ -808,8 +808,8 @@ export class ArduinoApp {
         if (!VscodeSettings.getInstance().disableIntelliSenseAutoGen) {
 
             // setup the parser with its engines
-            const gccParserEngine = new CompilerCmdParserEngineGcc(dc.sketch);
-            const compilerParser = new CompilerCmdParser([gccParserEngine]);
+            const gccParserEngine = new ccp.ParserGcc(dc.sketch);
+            const compilerParser = new ccp.Runner([gccParserEngine]);
 
             // set up the function to be called after parsing
             const _conclude = () => {
@@ -821,7 +821,7 @@ export class ArduinoApp {
                 }
             };
             return {
-                callback: compilerParser.callback,
+                callback: compilerParser.callback(),
                 conclude: _conclude,
             };
         }
diff --git a/src/arduino/intellisense.ts b/src/arduino/intellisense.ts
deleted file mode 100644
index 8b322056..00000000
--- a/src/arduino/intellisense.ts
+++ /dev/null
@@ -1,363 +0,0 @@
- // tslint:disable: max-line-length
-/* Automatic IntelliSense setup through compiler command parsing.
- *
- *
- * Some Arduino compiler commands from different board packages:
- * AVR
- * /home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/avr-g++ -c -g -Os -Wall -Wextra -std=gnu++11 -fpermissive -fno-exceptions -ffunction-sections -fdata-sections -fno-threadsafe-statics -Wno-error=narrowing -MMD -flto -mmcu=atmega328p -DF_CPU=16000000L -DARDUINO=10811 -DARDUINO_AVR_NANO -DARDUINO_ARCH_AVR -I/home/uli/.arduino15/packages/arduino/hardware/avr/1.8.2/cores/arduino -I/home/uli/.arduino15/packages/arduino/hardware/avr/1.8.2/variants/eightanaloginputs -I/home/uli/Projects/arduino/libraries/NewLiquidCrystal_lib -I/home/uli/Projects/arduino/libraries/LcdPong/src -I/home/uli/Projects/arduino/libraries/Encoder -I/home/uli/Projects/arduino/libraries/Button -I/home/uli/.arduino15/packages/arduino/hardware/avr/1.8.2/libraries/Wire/src /tmp/arduino_build_776874/sketch/lcdpong-butenc.ino.cpp -o /tmp/arduino_build_776874/sketch/lcdpong-butenc.ino.cpp.o
- * ESP32
- * /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/xtensa-esp32-elf-g++ -DESP_PLATFORM "-DMBEDTLS_CONFIG_FILE=\"mbedtls/esp_config.h\"" -DHAVE_CONFIG_H -DGCC_NOT_5_2_0=0 -DWITH_POSIX -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/config -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/app_trace -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/app_update -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/asio -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/bootloader_support -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/bt -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/coap -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/console -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/driver -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp-tls -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp32 -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp_adc_cal -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp_event -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp_http_client -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp_http_server -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp_https_ota -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp_ringbuf -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/ethernet -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/expat -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/fatfs -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/freemodbus -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/freertos -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/heap -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/idf_test -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/jsmn -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/json -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/libsodium -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/log -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/lwip -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/mbedtls -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/mdns -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/micro-ecc -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/mqtt -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/newlib -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/nghttp -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/nvs_flash -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/openssl -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/protobuf-c -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/protocomm -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/pthread -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/sdmmc -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/smartconfig_ack -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/soc -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/spi_flash -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/spiffs -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/tcp_transport -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/tcpip_adapter -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/ulp -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/vfs -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/wear_levelling -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/wifi_provisioning -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/wpa_supplicant -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/xtensa-debug-module -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp-face -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp32-camera -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp-face -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/fb_gfx -std=gnu++11 -Os -g3 -Wpointer-arith -fexceptions -fstack-protector -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -mlongcalls -nostdlib -Wall -Werror=all -Wextra -Wno-error=maybe-uninitialized -Wno-error=unused-function -Wno-error=unused-but-set-variable -Wno-error=unused-variable -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-missing-field-initializers -Wno-sign-compare -fno-rtti -MMD -c -DF_CPU=240000000L -DARDUINO=10811 -DARDUINO_ESP32_DEV -DARDUINO_ARCH_ESP32 "-DARDUINO_BOARD=\"ESP32_DEV\"" "-DARDUINO_VARIANT=\"doitESP32devkitV1\"" -DESP32 -DCORE_DEBUG_LEVEL=0 -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/cores/esp32 -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/variants/doitESP32devkitV1 -I/home/uli/Projects/arduino/libraries/NewLiquidCrystal_lib -I/home/uli/Projects/arduino/libraries/LcdPong/src -I/home/uli/Projects/arduino/libraries/Encoder -I/home/uli/Projects/arduino/libraries/Button -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/libraries/Wire/src /tmp/arduino_build_744383/sketch/lcdpong-butenc.ino.cpp -o /tmp/arduino_build_744383/sketch/lcdpong-butenc.ino.cpp.o
- * ESP8266
- * /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/xtensa-esp32-elf-g++ -DESP_PLATFORM "-DMBEDTLS_CONFIG_FILE=\"mbedtls/esp_config.h\"" -DHAVE_CONFIG_H -DGCC_NOT_5_2_0=0 -DWITH_POSIX -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/config -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/app_trace -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/app_update -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/asio -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/bootloader_support -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/bt -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/coap -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/console -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/driver -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp-tls -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp32 -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp_adc_cal -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp_event -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp_http_client -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp_http_server -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp_https_ota -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp_ringbuf -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/ethernet -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/expat -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/fatfs -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/freemodbus -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/freertos -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/heap -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/idf_test -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/jsmn -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/json -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/libsodium -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/log -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/lwip -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/mbedtls -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/mdns -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/micro-ecc -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/mqtt -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/newlib -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/nghttp -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/nvs_flash -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/openssl -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/protobuf-c -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/protocomm -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/pthread -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/sdmmc -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/smartconfig_ack -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/soc -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/spi_flash -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/spiffs -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/tcp_transport -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/tcpip_adapter -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/ulp -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/vfs -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/wear_levelling -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/wifi_provisioning -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/wpa_supplicant -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/xtensa-debug-module -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp-face -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp32-camera -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/esp-face -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/tools/sdk/include/fb_gfx -std=gnu++11 -Os -g3 -Wpointer-arith -fexceptions -fstack-protector -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -mlongcalls -nostdlib -Wall -Werror=all -Wextra -Wno-error=maybe-uninitialized -Wno-error=unused-function -Wno-error=unused-but-set-variable -Wno-error=unused-variable -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-unused-but-set-parameter -Wno-missing-field-initializers -Wno-sign-compare -fno-rtti -MMD -c -DF_CPU=240000000L -DARDUINO=10811 -DARDUINO_ESP32_DEV -DARDUINO_ARCH_ESP32 "-DARDUINO_BOARD=\"ESP32_DEV\"" "-DARDUINO_VARIANT=\"doitESP32devkitV1\"" -DESP32 -DCORE_DEBUG_LEVEL=0 -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/cores/esp32 -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/variants/doitESP32devkitV1 -I/home/uli/Projects/arduino/libraries/NewLiquidCrystal_lib -I/home/uli/Projects/arduino/libraries/LcdPong/src -I/home/uli/Projects/arduino/libraries/Encoder -I/home/uli/Projects/arduino/libraries/Button -I/home/uli/.arduino15/packages/esp32/hardware/esp32/1.0.4/libraries/Wire/src /tmp/arduino_build_470717/sketch/lcdpong-butenc.ino.cpp -o /tmp/arduino_build_470717/sketch/lcdpong-butenc.ino.cpp.o
- */
-// tslint:enable: max-line-length
-
-import { spawnSync } from "child_process";
-import * as fs from "fs";
-import * as path from "path";
-
-/**
- * Data structure carrying the output from a parsed compiler command.
- * All compiler specific option prefixes are removed for includes and
- * defines.
- */
-export class CompilerCmdParserResult {
-    public includes: Array<string> = [];
-    public defines: Array<string> = [];
-    public options: Array<string> = [];
-    public compiler: string = "";
-    /** Dropped arguments like -c -Ox -o, the input and output file. */
-    public trash: Array<string> = [];
-};
-
-export type CompilerCmdParserSearchType = string | RegExp;
-
-/**
- * Base class for any compiler command parser engine.
- * If someone needs to write an engine: this is the base class.
- * For further inspiration take a look at the implementation of
- * CompilerCmdParserEngineGcc.
- */
-export abstract class CompilerCmdParserEngine {
-    /**
-     * This array should contain the patterns which should match on
-     * a valid compiler command line to identify the compiler command.
-     * To be set by the derived class.
-     */
-    protected _match: CompilerCmdParserSearchType[];
-    /**
-     * This array should contain the patterns which should _NOT_
-     * match on a valid compiler command line to identify the
-     * compiler command.
-     * To be set by the derived class.
-     */
-    protected _nomatch: CompilerCmdParserSearchType[];
-    /**
-     * This function checks if the command line matches the
-     * requirements given through _match and _nomatch and invokes
-     * the parse function in case of a match.
-     * @returns If match was found and parsing was successful
-     * it returns the result else undefined.
-     */
-    public match(line: string): CompilerCmdParserResult {
-        // check for regexes that must match
-        for (const re of this._match) {
-            if (line.search(re) === -1) {
-                return undefined;
-            }
-        }
-        // check for regexes that mustn't match
-        for (const re of this._nomatch) {
-            if (line.search(re) !== -1) {
-                return undefined;
-            }
-        }
-        return this.parse(line);
-    }
-
-    /**
-     * The parsing function of a matched compiler command line.
-     * If all conditions hold true (all _match are found and all _nomatch
-     * are not found), this parsing function is invoked.
-     *
-     * Here the derived class has to implement its parsing magic
-     * to extract the desired includes, defines, compiler flags
-     * and the compiler command.
-     *
-     * @param line A string containing a compiler command line candidate.
-     * @returns A valid parsing result in case parsing was successful
-     * and undefined in case it failed fatally.
-     */
-    protected abstract parse(line: string): CompilerCmdParserResult;
-}
-
-/**
- * Compiler command parsing engine for gcc compilers.
- */
-export class CompilerCmdParserEngineGcc
-    extends CompilerCmdParserEngine {
-    constructor(sketch: string) {
-        super();
-
-        // TODO: windows and osx variants
-
-        this._nomatch =
-        [
-            // make sure Arduino's not testing libraries
-            /-o\s\/dev\/null/,
-        ];
-        this._match =
-        [
-            // make sure we're running g++
-            /-g\+\+\s+/,
-            // make sure we're compiling
-            /\s+-c\s+/,
-            // check if we're compiling the main sketch
-            path.basename(sketch) + ".cpp.o",
-        ];
-    }
-    protected parse(line: string): CompilerCmdParserResult {
-        const result = new CompilerCmdParserResult();
-        const args = line.split(/\s+/);
-
-        for (let arg of args) {
-
-            // drop empty arguments
-            if (!arg.length) {
-                continue;
-            }
-
-            // unpack quoted elements like
-            //
-            //   "-DMBEDTLS_CONFIG_FILE=\"mbedtls/esp_config.h\""
-            //   "-DARDUINO_BOARD=\"ESP32_DEV\""
-            //   "-DARDUINO_VARIANT=\"doitESP32devkitV1\""
-            const packed = arg.match(/^"(.+)"$/);
-            if (packed) {
-                arg = packed[1];
-            }
-
-            // extract defines
-            const define = arg.match(/^-D(.+)/);
-            if (define) {
-                result.defines.push(define[1]);
-                continue;
-            }
-
-            // extract includes
-            const include = arg.match(/^-I(.+)/);
-            if (include) {
-                result.includes.push(include[1]);
-                continue;
-            }
-
-            // extract the compiler executable
-            const c = arg.match(/g\+\+$/);
-            if (c) {
-                result.compiler = arg;
-                continue;
-            }
-
-            // filter out option trash
-            const t = arg.match(/^-o|^-O|^-g|^-c|cpp(?:\.o){0,1}$/);
-            if (t) {
-                result.trash.push(arg);
-                continue;
-            }
-
-            // collect options
-            const o = arg.match(/^-/);
-            if (o) {
-                result.options.push(arg);
-                continue;
-            }
-
-            // collect the rest
-            result.trash.push(arg);
-        }
-
-        // Query compiler for intrinsic/built-in include paths
-        if (result.compiler.length > 0) {
-
-            // TODO: Windows
-
-            // Spawn synchronous child process and run bash command
-            // Source: https://stackoverflow.com/a/6666338
-            const compilerinfocmd = `${result.compiler} -xc++ -E -v - < /dev/null 2>&1`;
-            const child = spawnSync("bash", ["-c", compilerinfocmd], { encoding : "utf8" });
-
-            if (child.error || child.status !== 0) {
-                // TODO: report the execution failure
-            } else {
-                // Now we look for
-                //
-                //   #include "..." search starts here:
-                //   #include <...> search starts here:
-                //      ...(include directories list)...
-                //   End of search list.
-                //
-                // and extract the include directory list. Could be that some gcc
-                // even lists something under
-                //
-                //   #include "..." search starts here:
-                //
-                // but I havn't seen it so far.
-                const includeregex = /^#include\s+<\.\.\.>\ssearch\sstarts\shere\:$(.+)^End\sof\ssearch\slist\.$/ms;
-                const match = child.stdout.match(includeregex);
-                if (match) {
-                    // Split list by newlines. Should be platform independent
-                    let lines = match[1].split(/\s*(?:\r|\r\n|\n)\s*/);
-                    // Filter out empty elements (in most cases only the last element)
-                    lines = lines.filter((val: string) => val !== "");
-                    // Add built-in includes to command line includes
-                    result.includes = [...result.includes, ...lines];
-                } else {
-                    // TODO: issue info that include section has not been found
-                }
-            }
-        }
-        return result;
-    }
-}
-
-/**
- * A compiler command parser.
- * Takes compiler commands line by line and tries to find the compile command
- * for the main .ino sketch. From that it tries to extract all includes,
- * defines, options and the compiler command itself.
- *
- * TODO: Make it more generic to support other compilers than gcc
- */
-export class CompilerCmdParser {
-    private _result: CompilerCmdParserResult;
-    private _engines: CompilerCmdParserEngine[];
-
-    /**
-     * Create a compiler command parser.
-     * Sets up parsing operation.
-     * @param engines Parsing engines for different compilers
-     */
-    constructor(engines: CompilerCmdParserEngine[]) {
-        this._engines = engines;
-    }
-    /**
-     * Returns the parsing result.
-     * Returns undefined when the parser fails or when the
-     * parser didn't run.
-     */
-    get result(): CompilerCmdParserResult {
-        return this._result;
-    }
-    /**
-     * Takes a command line and tries to parse it.
-     *
-     * @param line Compiler command line candidate.
-     * @returns The parsing result if the command line was parsed
-     * successfully. It returns undefined if no match was found or
-     * parsing failed.
-     */
-    public parse(line: string): boolean {
-        for (const engine of this._engines) {
-            this._result = engine.match(line);
-            if (this._result) {
-                return true;
-            }
-        }
-        return false;
-    }
-    /**
-     * Returns a callback which can be passed on to other functions
-     * to call. For instance from stdout callbacks of child processes.
-     */
-    public get callback(): (line: string) => void {
-        return (line: string) => {
-            if (!this._result) {
-                this.parse(line);
-            }
-        }
-    }
-    public processResult(configPath: string): boolean {
-        if (this._result) {
-            const cppProps = new CCppProperties(configPath);
-            cppProps.merge(this._result);
-            cppProps.write();
-            return true;
-        }
-        return false;
-    }
-}
-
-/**
- * Class representing the contents of the IntelliSense
- * c_cpp_properties.json configuration file.
- *
- * @see https://code.visualstudio.com/docs/cpp/c-cpp-properties-schema-reference
- */
-export class CCppPropertiesConfiguration {
-    public name: string             = "Arduino";
-    public compilerPath: string     = "";
-    public compilerArgs: string []  = [];
-    public intelliSenseMode: string = "gcc-x64"; // since we're using arduino's compiler
-    public includePath: string[]    = [];
-    public forcedInclude: string[]  = [];
-    public cStandard: string        = "c11";
-    public cppStandard: string      = "c++11";   // as of 1.8.11 arduino is on C++11
-    public defines: string[]        = [];
-
-    constructor(result: CompilerCmdParserResult) {
-        this.compilerPath = result.compiler;
-        this.compilerArgs = result.options;
-        this.includePath  = result.includes;
-        this.defines      = result.defines;
-    }
-}
-
-export class CCppPropertiesContent {
-    public configurations: Array<CCppPropertiesConfiguration>
-
-    constructor(result: CompilerCmdParserResult) {
-        this.configurations = [new CCppPropertiesConfiguration(result)];
-    }
-};
-
-export class CCppProperties {
-    public proppath: string;
-    public propFileContent: CCppPropertiesContent;
-
-    constructor(proppath: string) {
-        this.proppath = proppath;
-    }
-
-    public read() {
-        if (!fs.existsSync(this.proppath)) {
-            return;
-        }
-        const propFileContentPlain = fs.readFileSync(this.proppath, "utf8");
-
-        // NOTE: in JSON backslashes are escaped to \\\\
-
-        this.propFileContent = JSON.parse(propFileContentPlain) as CCppPropertiesContent;
-    }
-    public merge(result: CompilerCmdParserResult) {
-        const pc = new CCppPropertiesContent(result);
-
-        // TODO:
-        //  * merge with existing configuration if desired
-        //  * check if contents changed after merging
-        //
-
-        this.propFileContent = pc;
-    }
-
-    public write() {
-        // NOTE: in JSON backslashes are escaped to \\\\
-        // TODO:
-        //  * check if path exists, create if necessary
-        //  * write file only if modified
-
-        if (this.propFileContent) {
-            const content = JSON.stringify(this.propFileContent, null, 4);
-            fs.writeFileSync(this.proppath, content);
-        }
-    }
-}
diff --git a/webpack.config.js b/webpack.config.js
index b18b814a..66cab632 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -21,6 +21,16 @@ function getEntry() {
 
   const list = getDependenciesFromNpm(mod);
   const moduleList = list.filter((value, index, self) => {
+    /* Earlier versions of cocopa contains incorrect nodejs dependencies. Remove this workaround after updating to version v0.0.7.
+     * Resulted in webpack errors like:
+     *    Unhandled rejection Error in plugin "webpack"
+     *    Message:
+     *    ["Entry module not found: Error: Can't resolve './node_modules/child_process' in ...
+     *    ... "Entry module not found: Error: Can't resolve './node_modules/fs' in ...
+     */
+    if (value === "fs" || value === "child_process") {
+      return false;
+    }
     return self.indexOf(value) === index && unbundledModule.indexOf(value) === -1 && !/^@types\//.test(value);
   });
 

From f28dd7e8d1a4fe16fda2ffd37465a420f5e090ce Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Sat, 8 Feb 2020 13:08:59 +0100
Subject: [PATCH 021/142] Updated earned :beers:

---
 BRANCHNOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index 0255d506..7903847f 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -71,6 +71,7 @@ I will list every supporter here, thanks!
 2020-02-04 Elektronik Workshop: 32 :beers: (8h coding)
 2020-02-05 Elektronik Workshop: 40 :beers: (10h coding)
 2020-02-06 Elektronik Workshop: 36 :beers: (9h coding)
+2020-02-07 Elektronik Workshop: 48 :beers: (12h coding)
 
 <!-- https://github.com/StylishThemes/GitHub-Dark/wiki/Emoji -->
 

From 819d2f1b470c329d05e7427760778605738f3bce Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Sat, 8 Feb 2020 16:12:58 +0100
Subject: [PATCH 022/142] Added IntelliSense setup auto-generation project
 (sketch-context) configuration flag which can override the global flag

---
 BRANCHNOTES.md             | 17 ++++++++++++-----
 README.md                  | 12 +++++++++++-
 misc/arduinoValidator.json | 12 +++++++++++-
 src/arduino/arduino.ts     |  7 ++++++-
 src/deviceContext.ts       | 20 ++++++++++++++++++++
 5 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index 7903847f..789d191e 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -18,6 +18,8 @@ Provide a configuration flag which allows the user to turn this feature off - th
 ### Status
 **2020-02-05** Currently I'm able to generate error free IntelliSense setups for AVR and ESP32 using the preliminary implementation. For ESP32 I just had to add the intrinsic compiler paths manually. A solution has to be found for these ... which there is, see [here](https://stackoverflow.com/a/6666338)
 **2020-02-06** Got it fully working (with built-in include directories) for AVR, ESP32, ESP8266. Rewrote the backend to facilitate writing of further parser engines in the future.
+**2020-02-07** Wrote compiler command parser npm package [cocopa](https://www.npmjs.com/package/cocopa) and began writing a test framework for it. Added a global configuration switch which allows the IntelliSense configuration generation to be turned off.
+**2020-02-08** Integrated `cocopa` into vscode-arduino. Added project configuration flag which can override the global flag in both ways (forced off, forced on). Made code tslint compliant. Began some documentation in [README.md](README.md)
 
 |      | Tasks   |
 |-----:|:--------|
@@ -35,7 +37,7 @@ Provide a configuration flag which allows the user to turn this feature off - th
 |                                       | :white_check_mark: Write configuration on change only |
 |                                       | :white_check_mark: Option to backup old configurations? |
 | **Configuration flags**               | :heavy_check_mark: Provide global disable flag for IntelliSense auto-config |
-|                                       | :white_check_mark: Provide project specific override for the global flag - most users will likely use the default setup and disable auto-generation for very specific projects |
+|                                       | :heavy_check_mark: Provide project specific override for the global flag - most users will likely use the default setup and disable auto-generation for very specific projects |
 | **Unit tests**                        | :heavy_check_mark: Basic parser (known boards, match/no match)|
 |                                       | :heavy_check_mark: Querying of compiler built-in includes (Note: to be changed to generic compiler such that Arduino is not necessary for unit testing) |
 |                                       | :white_check_mark: Throwing arbitrary data at parser engines |
@@ -43,9 +45,9 @@ Provide a configuration flag which allows the user to turn this feature off - th
 |                                       | :white_check_mark: JSON output |
 |                                       | :white_check_mark: Configuration merging |
 | **General**                           | :white_check_mark: Review and remove previous attempts messing with `c_cpp_properties.json` or IntelliSense. (Partially done - documented in the [General Tasks](#General-Tasks) section |
-|                                       | :white_check_mark: Auto-run verify after setting a board to generate a valid `c_cpp_properties.json`, identify other occasions where this applies (usually when adding new libraries), hint the user to run *verify*? -> Good moment would be after the workbench initialization -> message in arduino channel |
-|                                       | :white_check_mark: Document configuration settings in [README.md](README.md) |
-|                                       | :white_check_mark: Document features in [README.md](README.md) |
+|                                       | :white_check_mark: Auto-run verify after a) *setting a board* b) *changing the sketch*. We have to generate a valid `c_cpp_properties.json` to keep IntelliSense working in such situations. Identify other occasions where this applies (usually when adding new libraries), hint the user to run *verify*? -> Good moment would be after the workbench initialization -> message in arduino channel |
+|                                       | :heavy_check_mark: Document configuration settings in [README.md](README.md) |
+|                                       | :white_check_mark: Document features in [README.md](README.md) (partially done) |
 |                                       | :white_check_mark: How to handle compilation failure? Only set if more comprehensive |
 |                                       | :heavy_check_mark: Extract compiler command parser from vscode-arduino and [publish](https://itnext.io/step-by-step-building-and-publishing-an-npm-typescript-package-44fe7164964c) it as a separate package which will allow reusage and easy testing without heavy vscode-arduino rucksack. Done, see [cocopa](https://www.npmjs.com/package/cocopa) |
 |                                       | :white_check_mark: Finally: go through my code and look for TODOs |
@@ -67,7 +69,7 @@ I will list every supporter here, thanks!
 
 ### Supporters
 5$ -> 1 :beer:
-1h coding -> 20$ -> 4 :beers:
+1h coding -> 20$ -> 4 :beers: (very moderate wage though)
 2020-02-04 Elektronik Workshop: 32 :beers: (8h coding)
 2020-02-05 Elektronik Workshop: 40 :beers: (10h coding)
 2020-02-06 Elektronik Workshop: 36 :beers: (9h coding)
@@ -194,3 +196,8 @@ Remove these as they are helpless attempts to get IntelliSense working:
 ```
 Remove this as this messes in an unpredictable and helpless way with Intellisense
 [src/langService/completionProvider.ts](src/langService/completionProvider.ts)
+
+Remove this folder as this is not necessary when Intellisense works properly:
+```
+syntaxes/
+```
diff --git a/README.md b/README.md
index 30f60388..068eba6e 100644
--- a/README.md
+++ b/README.md
@@ -67,6 +67,7 @@ This extension provides several commands in the Command Palette (<kbd>F1</kbd> o
 | `arduino.disableTestingOpen` | Enable/disable automatic sending of a test message to the serial port for checking the open status. The default value is `false` (a test message will be sent). |
 | `arduino.skipHeaderProvider` | Enable/disable the extension providing completion items for headers. This functionality is included in newer versions of the C++ extension. The default value is `false`.|
 | `arduino.defaultBaudRate` | Default baud rate for the serial port monitor. The default value is 115200. Supported values are 300, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 74880, 115200, 230400 and 250000 |
+| `arduino.disableIntelliSenseAutoGen` | When `true` vscode-arduino will not auto-generate an IntelliSense configuration (i.e. `.vscode/c_cpp_properties.json`) by analyzing Arduino's compiler output. |
 
 The following Visual Studio Code settings are available for the Arduino extension. These can be set in global user preferences <kbd>Ctrl</kbd> + <kbd>,</kbd> or workspace settings (`.vscode/settings.json`). The latter overrides the former.
 
@@ -98,7 +99,8 @@ The following settings are as per sketch settings of the Arduino extension. You
     "board": "adafruit:samd:adafruit_feather_m0",
     "output": "../build",
     "debugger": "jlink",
-    "prebuild": "bash prebuild.sh"
+    "prebuild": "bash prebuild.sh",
+    "disableIntelliSenseAutoGen": "global"
 }
 ```
 - `sketch` - The main sketch file name of Arduino.
@@ -107,6 +109,14 @@ The following settings are as per sketch settings of the Arduino extension. You
 - `output` - Arduino build output path. If not set, Arduino will create a new temporary output folder each time, which means it cannot reuse the intermediate result of the previous build leading to long verify/upload time, so it is recommended to set the field. Arduino requires that the output path should not be the workspace itself or in a subfolder of the workspace, otherwise, it may not work correctly. By default, this option is not set. It's worth noting that the contents of this file could be deleted during the build process, so pick (or create) a directory that will not store files you want to keep.
 - `debugger` - The short name of the debugger that will be used when the board itself does not have a debugger and there is more than one debugger available. You can find the list of debuggers [here](https://github.com/Microsoft/vscode-arduino/blob/master/misc/debuggerUsbMapping.json). By default, this option is not set.
 - `prebuild` - External command before building the sketch file. You should only set one `prebuild` command. `command1 && command2` does not work. If you need to run multiple commands before the build, then create a script.
+- `disableIntelliSenseAutoGen` - Override the global auto-generation of the IntelliSense configuration (i.e. `.vscode/c_cpp_properties.json`). Three options are available:
+  - `"global"`: Use the global settings (default)
+  - `"disable"`: Disable the auto-generation even if globally enabled
+  - `"enable"`: Enable the auto-generation even if globally disabled
+
+## IntelliSense
+vscode-arduino auto-configures IntelliSense by default. vscode-arduino analyzes Arduino's compiler output during verify and generates the corresponding configuration file at `.vscode/c_cpp_properties.json` and tries as hard as possible to keep things up to date, e.g. running verify when switching the board or the sketch.
+It doesn't makes sense though to run verify repeatedly. Therefore if the workspace reports problems (for instance after adding new includes to a new library) run *verify* such that IntelliSense knows of the new include directories (since the Arduino-backend performs the library resolution externally).
 
 ## Debugging Arduino Code <sup>preview</sup>
 Before you start to debug your Arduino code, please read [this document](https://code.visualstudio.com/docs/editor/debugging) to learn about the basic mechanisms of debugging in Visual Studio Code. Also see [debugging for C++ in VSCode](https://code.visualstudio.com/docs/languages/cpp#_debugging) for further reference.
diff --git a/misc/arduinoValidator.json b/misc/arduinoValidator.json
index 73baff4f..48362cb1 100644
--- a/misc/arduinoValidator.json
+++ b/misc/arduinoValidator.json
@@ -32,6 +32,16 @@
             "description": "Arduino Debugger Settings",
             "type": "string",
             "minLength": 1
+        },
+        "disableIntelliSenseAutoGen": {
+            "description": "Disable/enable the automatic generation of the IntelliSense configuration file (c_cpp_properties.json) for this project (overrides the global setting). When set to \"global\" the global extension settings will be used.",
+            "type": "string",
+            "default": "global",
+            "enum": [
+                "global",
+                "disable",
+                "enable"
+            ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 6cac39ea..d8ca187f 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -805,7 +805,12 @@ export class ArduinoApp {
      */
     private makeCompilerParserContext(dc: DeviceContext)
         : { callback: (s: string) => void; conclude: () => void; } {
-        if (!VscodeSettings.getInstance().disableIntelliSenseAutoGen) {
+
+        const globalDisable = VscodeSettings.getInstance().disableIntelliSenseAutoGen;
+        const project = dc.disableIntelliSenseAutoGen;
+
+        if (project !== "disable" && !globalDisable ||
+            project === "enable") {
 
             // setup the parser with its engines
             const gccParserEngine = new ccp.ParserGcc(dc.sketch);
diff --git a/src/deviceContext.ts b/src/deviceContext.ts
index 5e24aea1..3c0daf6e 100644
--- a/src/deviceContext.ts
+++ b/src/deviceContext.ts
@@ -57,6 +57,11 @@ export interface IDeviceContext {
      */
     configuration: string;
 
+    /**
+     * IntelliSense configuration auto-generation project override.
+     */
+    disableIntelliSenseAutoGen: string;
+
     onDidChange: vscode.Event<void>;
 
     initialize(): void;
@@ -82,6 +87,8 @@ export class DeviceContext implements IDeviceContext, vscode.Disposable {
 
     private _debugger: string;
 
+    private _disableIntelliSenseAutoGen: string;
+
     private _configuration: string;
 
     private _extensionPath: string;
@@ -151,6 +158,7 @@ export class DeviceContext implements IDeviceContext, vscode.Disposable {
                         this._configuration = deviceConfigJson.configuration;
                         this._output = deviceConfigJson.output;
                         this._debugger = deviceConfigJson["debugger"];
+                        this._disableIntelliSenseAutoGen = deviceConfigJson.disableIntelliSenseAutoGen;
                         this._prebuild = deviceConfigJson.prebuild;
                         this._programmer = deviceConfigJson.programmer;
                         this._onDidChange.fire();
@@ -164,6 +172,7 @@ export class DeviceContext implements IDeviceContext, vscode.Disposable {
                     this._configuration = null;
                     this._output = null;
                     this._debugger = null;
+                    this._disableIntelliSenseAutoGen = null;
                     this._prebuild = null;
                     this._programmer = null;
                     this._onDidChange.fire();
@@ -182,6 +191,7 @@ export class DeviceContext implements IDeviceContext, vscode.Disposable {
                 this._configuration = null;
                 this._output = null;
                 this._debugger = null;
+                this._disableIntelliSenseAutoGen = null;
                 this._prebuild = null;
                 this._programmer = null;
                 this._onDidChange.fire();
@@ -217,6 +227,7 @@ export class DeviceContext implements IDeviceContext, vscode.Disposable {
         deviceConfigJson.board = this.board;
         deviceConfigJson.output = this.output;
         deviceConfigJson["debugger"] = this.debugger_;
+        deviceConfigJson.disableIntelliSenseAutoGen = this.disableIntelliSenseAutoGen;
         deviceConfigJson.configuration = this.configuration;
         deviceConfigJson.programmer = this.programmer;
 
@@ -282,6 +293,15 @@ export class DeviceContext implements IDeviceContext, vscode.Disposable {
         this.saveContext();
     }
 
+    public get disableIntelliSenseAutoGen() {
+        return this._disableIntelliSenseAutoGen;
+    }
+
+    public set disableIntelliSenseAutoGen(value: string) {
+        this._disableIntelliSenseAutoGen = value;
+        this.saveContext();
+    }
+
     public get configuration() {
         return this._configuration;
     }

From bb2ce83e97d82d69c532cc7abbaa8a9a92aaa04d Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Sat, 8 Feb 2020 16:29:08 +0100
Subject: [PATCH 023/142] Try to generate IntelliSense configuration even when
 the compilation fails

---
 BRANCHNOTES.md         |  9 ++++++---
 src/arduino/arduino.ts | 21 ++++++++++++---------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index 789d191e..ebf2865b 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -48,16 +48,19 @@ Provide a configuration flag which allows the user to turn this feature off - th
 |                                       | :white_check_mark: Auto-run verify after a) *setting a board* b) *changing the sketch*. We have to generate a valid `c_cpp_properties.json` to keep IntelliSense working in such situations. Identify other occasions where this applies (usually when adding new libraries), hint the user to run *verify*? -> Good moment would be after the workbench initialization -> message in arduino channel |
 |                                       | :heavy_check_mark: Document configuration settings in [README.md](README.md) |
 |                                       | :white_check_mark: Document features in [README.md](README.md) (partially done) |
-|                                       | :white_check_mark: How to handle compilation failure? Only set if more comprehensive |
+|                                       | :heavy_check_mark: Try to auto-generate even if verify (i.e. compilation) fails |
 |                                       | :heavy_check_mark: Extract compiler command parser from vscode-arduino and [publish](https://itnext.io/step-by-step-building-and-publishing-an-npm-typescript-package-44fe7164964c) it as a separate package which will allow reusage and easy testing without heavy vscode-arduino rucksack. Done, see [cocopa](https://www.npmjs.com/package/cocopa) |
 |                                       | :white_check_mark: Finally: go through my code and look for TODOs |
 
 `*` not committed to branch yet
 
 ## Motivation
-I write a lot of code for Arduino, especially libraries. The Arduino IDE is not suited for more complex projects and I tried several alternatives. The old and dysfunctional Arduino CDT extension for eclipse somehow stalled (even if it was promising), Sloeber could be an option but the maintainer is disillusioned and the project is more or less dead. Platform IO IDE's license is very [restrictive](https://community.platformio.org/t/what-part-of-platformio-is-open-source-licenced/1447/2).
+I write a lot of code for Arduino, especially libraries. The Arduino IDE is not suited for more complex projects and I tried several alternatives:
+* The old and dysfunctional Arduino CDT extension for eclipse somehow stalled (even if it was promising)
+* Sloeber could be an option but the maintainer is disillusioned and the project is more or less dead. Furthermore Eclipse is pretty heavy and less accessible to beginners
+* Platform IO IDE's license is very [restrictive](https://community.platformio.org/t/what-part-of-platformio-is-open-source-licenced/1447/2).
 
-Then remains vscode-arduino. It seems that it isn't completely dead - but almost. Most of the core functionality seems to work (I used it a few days now). But the biggest show stopper is the bad IntelliSense support.
+Then remains vscode-arduino. It seems that it isn't completely dead - but almost. Most of the core functionality seems to work (I used it a few days now). But the biggest show stopper is the bad IntelliSense support -- which I'll address here now.
 
 ## Beer Money :beers:
 You can chip in some beer money to keep me motivated - this is really appreciated.
diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index d8ca187f..b2794207 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -256,20 +256,17 @@ export class ArduinoApp {
 
         arduinoChannel.show();
 
-        try {
-            const compilerParserContext = this.makeCompilerParserContext(dc);
+        let verifyResult: boolean;
+        const compilerParserContext = this.makeCompilerParserContext(dc);
 
+        try {
             await util.spawn(this._settings.commandPath,
                              arduinoChannel.channel,
                              args,
                              undefined,
                              compilerParserContext.callback);
-
-            if (compilerParserContext.conclude) {
-                compilerParserContext.conclude();
-            }
-            arduinoChannel.end(`Finished verify sketch - ${dc.sketch}${os.EOL}`);
-            return true;
+            arduinoChannel.end(`Finished verifying sketch - ${dc.sketch}${os.EOL}`);
+            verifyResult = true;
         } catch (reason) {
             const msg = reason.code ?
                 `Exit with code=${reason.code}${os.EOL}` :
@@ -277,8 +274,14 @@ export class ArduinoApp {
                     reason.message :
                     JSON.stringify(reason);
             arduinoChannel.error(msg);
-            return false;
+            verifyResult = false;
+        }
+
+        if (compilerParserContext.conclude) {
+            compilerParserContext.conclude();
         }
+
+        return verifyResult;
     }
 
     public tryToUpdateIncludePaths() {

From dd3254dd5b1025a8840c993841720e6b0bb23f68 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Sun, 9 Feb 2020 04:24:52 +0100
Subject: [PATCH 024/142] Incorporated the latest progress from cocopa
 development

---
 BRANCHNOTES.md         |  2 +-
 package-lock.json      |  6 +++---
 package.json           |  2 +-
 src/arduino/arduino.ts | 20 +++++++++++++++++---
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index ebf2865b..92cc2926 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -19,7 +19,7 @@ Provide a configuration flag which allows the user to turn this feature off - th
 **2020-02-05** Currently I'm able to generate error free IntelliSense setups for AVR and ESP32 using the preliminary implementation. For ESP32 I just had to add the intrinsic compiler paths manually. A solution has to be found for these ... which there is, see [here](https://stackoverflow.com/a/6666338)
 **2020-02-06** Got it fully working (with built-in include directories) for AVR, ESP32, ESP8266. Rewrote the backend to facilitate writing of further parser engines in the future.
 **2020-02-07** Wrote compiler command parser npm package [cocopa](https://www.npmjs.com/package/cocopa) and began writing a test framework for it. Added a global configuration switch which allows the IntelliSense configuration generation to be turned off.
-**2020-02-08** Integrated `cocopa` into vscode-arduino. Added project configuration flag which can override the global flag in both ways (forced off, forced on). Made code tslint compliant. Began some documentation in [README.md](README.md)
+**2020-02-08** Integrated `cocopa` into vscode-arduino. Added project configuration flag which can override the global flag in both ways (forced off, forced on). Made code tslint compliant. Began some documentation in [README.md](README.md). vscode-arduino now tries to generate an IntelliSense configuration even if compilation (verify) should fail. vscode-arduino now tries to generate a IntelliSense configuration even if Arduino's verify failed (if the main sketch compilation was invoked before anything failed)
 
 |      | Tasks   |
 |-----:|:--------|
diff --git a/package-lock.json b/package-lock.json
index 69660e47..973ebc60 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1562,9 +1562,9 @@
       }
     },
     "cocopa": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/cocopa/-/cocopa-0.0.3.tgz",
-      "integrity": "sha512-zFHtJcwkobUCNkeBwxyftvsQ4Ev1jJS1NX78hfBF1/T8V5f820WlNRGZx2mlBWoNV4uAFxARVgjRZfoEHT1D6A==",
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/cocopa/-/cocopa-0.0.4.tgz",
+      "integrity": "sha512-qqxiNxHMaCoz/sfh9fo7kEEH8j9BlQVu2FbPifRbYnZjYAQNBMhEqdxW6wZSKEQQWVp//ksJtTo3wlXol7EqZg==",
       "requires": {
         "child_process": "^1.0.2",
         "fs": "0.0.1-security",
diff --git a/package.json b/package.json
index 490cab30..93ca5f82 100644
--- a/package.json
+++ b/package.json
@@ -595,7 +595,7 @@
   "dependencies": {
     "body-parser": "^1.16.1",
     "child_process": "^1.0.2",
-    "cocopa": "0.0.3",
+    "cocopa": "0.0.4",
     "compare-versions": "^3.4.0",
     "eventemitter2": "^4.1.0",
     "express": "^4.14.1",
diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index b2794207..d9e0603b 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -815,9 +815,8 @@ export class ArduinoApp {
         if (project !== "disable" && !globalDisable ||
             project === "enable") {
 
-            // setup the parser with its engines
-            const gccParserEngine = new ccp.ParserGcc(dc.sketch);
-            const compilerParser = new ccp.Runner([gccParserEngine]);
+            const parserEngines = this.makeCompilerParserEngines(dc);
+            const compilerParser = new ccp.Runner(parserEngines);
 
             // set up the function to be called after parsing
             const _conclude = () => {
@@ -839,6 +838,21 @@ export class ArduinoApp {
         }
     };
 
+    private makeCompilerParserEngines(dc: DeviceContext) {
+        const matchPattern = [
+            // trigger parser when compiling the main sketch
+            ` ${path.basename(dc.sketch)}.cpp.o`,
+        ];
+        const dontMatchPattern = [
+            // make sure Arduino's not testing libraries
+            /-o\s\/dev\/null/,
+        ];
+
+        // setup the parser with its engines
+        const gccParserEngine = new ccp.ParserGcc(matchPattern, dontMatchPattern);
+        return [gccParserEngine];
+    }
+
     private getProgrammerString(): string {
         const selectProgrammer = this.programmerManager.currentProgrammer;
         if (!selectProgrammer) {

From 39c3f798008108282c10c3a82abc7e1569ca3488 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Sun, 9 Feb 2020 11:51:43 +0100
Subject: [PATCH 025/142] Fix issue 771

* Fixes the line splitting regex as outlined in https://github.com/microsoft/vscode-arduino/pull/771
* Removed a redundand condition
---
 src/arduino/board.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/arduino/board.ts b/src/arduino/board.ts
index 39908022..88c1b6c8 100644
--- a/src/arduino/board.ts
+++ b/src/arduino/board.ts
@@ -8,7 +8,7 @@ export function parseBoardDescriptor(boardDescriptor: string, plat: IPlatform):
     const boardLineRegex = /([^\.]+)\.(\S+)=(.+)/;
 
     const result = new Map<string, IBoard>();
-    const lines = boardDescriptor.split(/[\r|\r\n|\n]/);
+    const lines = boardDescriptor.split(/(?:\r|\r\n|\n)/);
     const menuMap = new Map<string, string>();
 
     lines.forEach((line) => {
@@ -18,7 +18,7 @@ export function parseBoardDescriptor(boardDescriptor: string, plat: IPlatform):
         }
 
         const match = boardLineRegex.exec(line);
-        if (match && match.length > 3) {
+        if (match) {
             if (line.startsWith("menu.")) {
                 menuMap.set(match[2], match[3]);
                 return;

From d87402d021b997a97b6062a43546baf8a58a64fa Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Sun, 9 Feb 2020 13:23:48 +0100
Subject: [PATCH 026/142] Fix regression and improve regex matching

* Fixed regression introduced with adaptions to latest version of cocopa
* Made compile command regex match more stringent
---
 src/arduino/arduino.ts | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index d9e0603b..99e1bf5f 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -838,14 +838,24 @@ export class ArduinoApp {
         }
     };
 
+    /**
+     *
+     * @param dc
+     */
     private makeCompilerParserEngines(dc: DeviceContext) {
+
+        let sketch = path.basename(dc.sketch);
+        const dotcpp = sketch.endsWith(".ino") ? ".cpp" : "";
+        sketch = `-o\\s+\\S*${ccp.regExEscape(sketch)}${dotcpp}\\.o`;
+
         const matchPattern = [
             // trigger parser when compiling the main sketch
-            ` ${path.basename(dc.sketch)}.cpp.o`,
+            RegExp(sketch),
         ];
+
         const dontMatchPattern = [
             // make sure Arduino's not testing libraries
-            /-o\s\/dev\/null/,
+            /-o\s+\/dev\/null/,
         ];
 
         // setup the parser with its engines

From 3cba4121b1cf38f7148fd6ae8f36d8b36a73f0ad Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Sun, 9 Feb 2020 16:40:00 +0100
Subject: [PATCH 027/142] Notes about serial monitor

* Added more serial monitor ideas from [John Lonergan](https://github.com/microsoft/vscode-arduino/issues/463#issuecomment-583853833)
* Added some ideas how to implement a better serial monitor
---
 BRANCHNOTES.md | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index 92cc2926..ab0584aa 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -44,15 +44,17 @@ Provide a configuration flag which allows the user to turn this feature off - th
 |                                       | :white_check_mark: JSON input |
 |                                       | :white_check_mark: JSON output |
 |                                       | :white_check_mark: Configuration merging |
+|                                       | :white_check_mark: Test with cpp sketches |
 | **General**                           | :white_check_mark: Review and remove previous attempts messing with `c_cpp_properties.json` or IntelliSense. (Partially done - documented in the [General Tasks](#General-Tasks) section |
-|                                       | :white_check_mark: Auto-run verify after a) *setting a board* b) *changing the sketch*. We have to generate a valid `c_cpp_properties.json` to keep IntelliSense working in such situations. Identify other occasions where this applies (usually when adding new libraries), hint the user to run *verify*? -> Good moment would be after the workbench initialization -> message in arduino channel |
+|                                       | :white_check_mark: Auto-run verify after a) *setting a board* b) *changing the sketch* c) *workbench initialized and no `c_cpp_properties.json` has been found*. We have to generate a valid `c_cpp_properties.json` to keep IntelliSense working in such situations. Identify other occasions where this applies (usually when adding new libraries), hint the user to run *verify*? -> Good moment would be after the workbench initialization -> message in arduino channel |
 |                                       | :heavy_check_mark: Document configuration settings in [README.md](README.md) |
 |                                       | :white_check_mark: Document features in [README.md](README.md) (partially done) |
 |                                       | :heavy_check_mark: Try to auto-generate even if verify (i.e. compilation) fails |
 |                                       | :heavy_check_mark: Extract compiler command parser from vscode-arduino and [publish](https://itnext.io/step-by-step-building-and-publishing-an-npm-typescript-package-44fe7164964c) it as a separate package which will allow reusage and easy testing without heavy vscode-arduino rucksack. Done, see [cocopa](https://www.npmjs.com/package/cocopa) |
 |                                       | :white_check_mark: Finally: go through my code and look for TODOs |
 
-`*` not committed to branch yet
+`*` not committed to branch yet  
+`>` most of the actual parsing and configuration generation is part of [cocopa](https://github.com/elektronikworkshop/cocopa/) ([here](https://www.npmjs.com/package/cocopa)'s the npm package)
 
 ## Motivation
 I write a lot of code for Arduino, especially libraries. The Arduino IDE is not suited for more complex projects and I tried several alternatives:
@@ -93,6 +95,25 @@ I will list every supporter here, thanks!
  * Logging for IntelliSense https://code.visualstudio.com/docs/cpp/enable-logging-cpp
 ## Future Work
 * Proper interactive serial terminal (this is the second major show stopper in my opinion)
+  * Command history option
+  * From https://github.com/microsoft/vscode-arduino/issues/463#issuecomment-583846263 and following:
+    * allow input on the serial monitor in a convenient way - ie just type and hit return, just like the Arduino IDE
+    * have the serial monitor window NOT keep turning off autoscroll (there is a separate ticket for this)
+    * have the option of the serial monitor and/or compile window auto clear each time the sketch is compiled
+    * Plus there is the annoying default where the compile runs in verbose mode and we have to manually edit config files to turn off the trace output
+    * Plus plus... Is there a way to automatically select the right serial port?
+    * Oh and one more. I want the serial output and perhaps compile windows to be undocked or at least I want them to sit to the right of my code window but they seem rigidly stuck at the bottom of the screen.
+    * And I would probably prioritize ease of use over better editing/intelligence.
+  * Being able to set baud rate within monitor
+  * Possible implementation hooks
+    * run node program in native terminal and connect it to extension
+      * https://github.com/serialport/node-serialport
+        * [General](https://serialport.io/docs/guide-about)
+        * [CLI](https://serialport.io/docs/guide-cli)
+        * [API](https://serialport.io/docs/guide-usage)
+    * write a [debugger extension](https://code.visualstudio.com/api/extension-guides/debugger-extension) with a [mock](https://github.com/Microsoft/vscode-mock-debug) which communicates with the serial
+
+Plus plus... Is there a way to automatically select the right serial port?
 * Lots of redundant code
   * e.g. "upload is a superset of "verify"
   * general lack of modularity - the above is the result

From 67281ae618dfc7036749c8a0b48135d0f29daa68 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Sun, 9 Feb 2020 18:25:01 +0100
Subject: [PATCH 028/142] Moved arduino specifics from cocopa to vscode-arduino

---
 package-lock.json      |  6 +++---
 package.json           |  2 +-
 src/arduino/arduino.ts | 33 ++++++++++++++++++++++++++-------
 3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 973ebc60..708aba1a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1562,9 +1562,9 @@
       }
     },
     "cocopa": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/cocopa/-/cocopa-0.0.4.tgz",
-      "integrity": "sha512-qqxiNxHMaCoz/sfh9fo7kEEH8j9BlQVu2FbPifRbYnZjYAQNBMhEqdxW6wZSKEQQWVp//ksJtTo3wlXol7EqZg==",
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/cocopa/-/cocopa-0.0.5.tgz",
+      "integrity": "sha512-vRmACP2rPKk9irEYXD2x50G0G1tm1OIf6M9Cw+rBR1QwR9oNImxsDwiHek94MJ59w2KN13BF5WJk/P1yFpSFOw==",
       "requires": {
         "child_process": "^1.0.2",
         "fs": "0.0.1-security",
diff --git a/package.json b/package.json
index 93ca5f82..e6094647 100644
--- a/package.json
+++ b/package.json
@@ -595,7 +595,7 @@
   "dependencies": {
     "body-parser": "^1.16.1",
     "child_process": "^1.0.2",
-    "cocopa": "0.0.4",
+    "cocopa": "0.0.5",
     "compare-versions": "^3.4.0",
     "eventemitter2": "^4.1.0",
     "express": "^4.14.1",
diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 99e1bf5f..a839c725 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -815,20 +815,35 @@ export class ArduinoApp {
         if (project !== "disable" && !globalDisable ||
             project === "enable") {
 
-            const parserEngines = this.makeCompilerParserEngines(dc);
-            const compilerParser = new ccp.Runner(parserEngines);
+            const engines = this.makeCompilerParserEngines(dc);
+            const runner = new ccp.Runner(engines);
 
             // set up the function to be called after parsing
             const _conclude = () => {
-                const cppPropsPath = path.join(ArduinoWorkspace.rootPath, constants.CPP_CONFIG_FILE);
-                if (compilerParser.processResult(cppPropsPath)) {
-                    arduinoChannel.info("IntelliSense configuration generated successfully.");
-                } else {
+                if (!runner.result) {
                     arduinoChannel.warning("Failed to generate IntelliSense configuration.");
+                    return;
+                }
+                const pPath = path.join(ArduinoWorkspace.rootPath, constants.CPP_CONFIG_FILE);
+                // TODO: check what kind of result we've got: gcc or other architecture:
+                //  and instantiate content accordingly (to be implemented within cocopa)
+                const content = new ccp.CCppPropertiesContentResult(runner.result,
+                                                                    "Arduino",
+                                                                    ccp.CCppPropertiesISMode.Gcc_X64,
+                                                                    ccp.CCppPropertiesCStandard.C11,
+                                                                    // as of 1.8.11 arduino is on C++11
+                                                                    ccp.CCppPropertiesCppStandard.Cpp11);
+                const prop = new ccp.CCppProperties();
+                prop.read(pPath);
+                prop.merge(content);
+                if (prop.write(pPath)) {
+                    arduinoChannel.info("IntelliSense configuration updated.");
+                } else {
+                    arduinoChannel.info("IntelliSense configuration already up to date.");
                 }
             };
             return {
-                callback: compilerParser.callback(),
+                callback: runner.callback(),
                 conclude: _conclude,
             };
         }
@@ -849,6 +864,10 @@ export class ArduinoApp {
         sketch = `-o\\s+\\S*${ccp.regExEscape(sketch)}${dotcpp}\\.o`;
 
         const matchPattern = [
+            // make sure we're running g++
+            /(?:^|-)g\+\+\s+/,
+            // make sure we're compiling
+            /\s+-c\s+/,
             // trigger parser when compiling the main sketch
             RegExp(sketch),
         ];

From 40bb52df5ab3a5fc89cd3933204308817f13e76a Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Mon, 10 Feb 2020 02:26:03 +0100
Subject: [PATCH 029/142] Merge c_cpp_properties results with existing
 configuration

* More unit testing within cocopa.
* Implemented c_cpp_properties merging -> compiler analysis results are merged into existing configuration and will preserve configurations of different name than the vscode-studio default configuration name (currently "Arduino"). This opens up the possibility for users to write their own configurations without having to disable the autogeneration.
* Implemented "write on change" - `c_cpp_properties.json` will only be written if a new configuration has been detected.
---
 BRANCHNOTES.md         | 18 +++++++++---------
 package-lock.json      |  6 +++---
 package.json           |  2 +-
 src/arduino/arduino.ts |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index ab0584aa..a3bc85ce 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -20,6 +20,8 @@ Provide a configuration flag which allows the user to turn this feature off - th
 **2020-02-06** Got it fully working (with built-in include directories) for AVR, ESP32, ESP8266. Rewrote the backend to facilitate writing of further parser engines in the future.
 **2020-02-07** Wrote compiler command parser npm package [cocopa](https://www.npmjs.com/package/cocopa) and began writing a test framework for it. Added a global configuration switch which allows the IntelliSense configuration generation to be turned off.
 **2020-02-08** Integrated `cocopa` into vscode-arduino. Added project configuration flag which can override the global flag in both ways (forced off, forced on). Made code tslint compliant. Began some documentation in [README.md](README.md). vscode-arduino now tries to generate an IntelliSense configuration even if compilation (verify) should fail. vscode-arduino now tries to generate a IntelliSense configuration even if Arduino's verify failed (if the main sketch compilation was invoked before anything failed)
+**2020-02-09** Moved vscode-arduino specific from cocopa over (to keep cocopa as generic as possible). More unit testing within cocopa. Some research regarding future serial monitor implementation. Implemented c_cpp_properties merging -> compiler analysis results are merged into existing configuration and will preserve configurations of different name than the vscode-studio default configuration name (currently "Arduino"). This opens up the possibility for users to write their own configurations without having to disable the autogeneration. Implemented "write on change" - `c_cpp_properties.json` will only be written if a new configuration has been detected. Now loads of tests have to be written for cocopa.
+
 
 |      | Tasks   |
 |-----:|:--------|
@@ -32,18 +34,14 @@ Provide a configuration flag which allows the user to turn this feature off - th
 |                                       | :heavy_check_mark: Basic setting of parsing result |
 |                                       | :heavy_check_mark: Basic file input  |
 |                                       | :heavy_check_mark: Basic file output |
-|                                       | :white_check_mark: Merging of parsing result and existing file content |
-|                                       | :white_check_mark: Handling inexistent files and folders |
-|                                       | :white_check_mark: Write configuration on change only |
+|                                       | :heavy_check_mark: Merging of parsing result and existing file content |
+|                                       | :heavy_check_mark: Handling inexistent files and folders |
+|                                       | :heavy_check_mark: Write configuration on change only |
 |                                       | :white_check_mark: Option to backup old configurations? |
 | **Configuration flags**               | :heavy_check_mark: Provide global disable flag for IntelliSense auto-config |
 |                                       | :heavy_check_mark: Provide project specific override for the global flag - most users will likely use the default setup and disable auto-generation for very specific projects |
 | **Unit tests**                        | :heavy_check_mark: Basic parser (known boards, match/no match)|
-|                                       | :heavy_check_mark: Querying of compiler built-in includes (Note: to be changed to generic compiler such that Arduino is not necessary for unit testing) |
-|                                       | :white_check_mark: Throwing arbitrary data at parser engines |
-|                                       | :white_check_mark: JSON input |
-|                                       | :white_check_mark: JSON output |
-|                                       | :white_check_mark: Configuration merging |
+|                                       | :white_check_mark: All unit tests in cocopa |
 |                                       | :white_check_mark: Test with cpp sketches |
 | **General**                           | :white_check_mark: Review and remove previous attempts messing with `c_cpp_properties.json` or IntelliSense. (Partially done - documented in the [General Tasks](#General-Tasks) section |
 |                                       | :white_check_mark: Auto-run verify after a) *setting a board* b) *changing the sketch* c) *workbench initialized and no `c_cpp_properties.json` has been found*. We have to generate a valid `c_cpp_properties.json` to keep IntelliSense working in such situations. Identify other occasions where this applies (usually when adding new libraries), hint the user to run *verify*? -> Good moment would be after the workbench initialization -> message in arduino channel |
@@ -53,7 +51,7 @@ Provide a configuration flag which allows the user to turn this feature off - th
 |                                       | :heavy_check_mark: Extract compiler command parser from vscode-arduino and [publish](https://itnext.io/step-by-step-building-and-publishing-an-npm-typescript-package-44fe7164964c) it as a separate package which will allow reusage and easy testing without heavy vscode-arduino rucksack. Done, see [cocopa](https://www.npmjs.com/package/cocopa) |
 |                                       | :white_check_mark: Finally: go through my code and look for TODOs |
 
-`*` not committed to branch yet  
+`*` not committed to branch yet
 `>` most of the actual parsing and configuration generation is part of [cocopa](https://github.com/elektronikworkshop/cocopa/) ([here](https://www.npmjs.com/package/cocopa)'s the npm package)
 
 ## Motivation
@@ -79,6 +77,8 @@ I will list every supporter here, thanks!
 2020-02-05 Elektronik Workshop: 40 :beers: (10h coding)
 2020-02-06 Elektronik Workshop: 36 :beers: (9h coding)
 2020-02-07 Elektronik Workshop: 48 :beers: (12h coding)
+2020-02-08 Elektronik Workshop: 52 :beers: (13h coding)
+2020-02-09 Elektronik Workshop: 40 :beers: (10h coding)
 
 <!-- https://github.com/StylishThemes/GitHub-Dark/wiki/Emoji -->
 
diff --git a/package-lock.json b/package-lock.json
index 708aba1a..3fbb2e87 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1562,9 +1562,9 @@
       }
     },
     "cocopa": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/cocopa/-/cocopa-0.0.5.tgz",
-      "integrity": "sha512-vRmACP2rPKk9irEYXD2x50G0G1tm1OIf6M9Cw+rBR1QwR9oNImxsDwiHek94MJ59w2KN13BF5WJk/P1yFpSFOw==",
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/cocopa/-/cocopa-0.0.6.tgz",
+      "integrity": "sha512-iRMDGthPTi0yhQRq2n+ZqL0zuuY08JVa5UFSkQbTb1BLBDhH4fmG/uEo6xLT91+clTZCkTocAS05xDquJo8kwQ==",
       "requires": {
         "child_process": "^1.0.2",
         "fs": "0.0.1-security",
diff --git a/package.json b/package.json
index e6094647..4aedf4f9 100644
--- a/package.json
+++ b/package.json
@@ -595,7 +595,7 @@
   "dependencies": {
     "body-parser": "^1.16.1",
     "child_process": "^1.0.2",
-    "cocopa": "0.0.5",
+    "cocopa": "0.0.6",
     "compare-versions": "^3.4.0",
     "eventemitter2": "^4.1.0",
     "express": "^4.14.1",
diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index a839c725..c8af33ce 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -835,7 +835,7 @@ export class ArduinoApp {
                                                                     ccp.CCppPropertiesCppStandard.Cpp11);
                 const prop = new ccp.CCppProperties();
                 prop.read(pPath);
-                prop.merge(content);
+                prop.merge(content, ccp.CCppPropertiesMergeMode.ReplaceSameNames);
                 if (prop.write(pPath)) {
                     arduinoChannel.info("IntelliSense configuration updated.");
                 } else {

From 4f6565c60725b44bdd9cfbffb1d2403bc69f7546 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Mon, 10 Feb 2020 02:33:24 +0100
Subject: [PATCH 030/142] Minor documentation rub

---
 BRANCHNOTES.md | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index a3bc85ce..788e4e17 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -97,11 +97,11 @@ I will list every supporter here, thanks!
 * Proper interactive serial terminal (this is the second major show stopper in my opinion)
   * Command history option
   * From https://github.com/microsoft/vscode-arduino/issues/463#issuecomment-583846263 and following:
-    * allow input on the serial monitor in a convenient way - ie just type and hit return, just like the Arduino IDE
-    * have the serial monitor window NOT keep turning off autoscroll (there is a separate ticket for this)
-    * have the option of the serial monitor and/or compile window auto clear each time the sketch is compiled
-    * Plus there is the annoying default where the compile runs in verbose mode and we have to manually edit config files to turn off the trace output
-    * Plus plus... Is there a way to automatically select the right serial port?
+    * Allow input on the serial monitor in a convenient way - ie just type and hit return, just like the Arduino IDE
+    * Have the serial monitor window NOT keep turning off autoscroll (there is a separate ticket for this)
+    * Have the option of the serial monitor and/or compile window auto clear each time the sketch is compiled
+    * There is the annoying default where the compile runs in verbose mode and we have to manually edit config files to turn off the trace output
+    * Is there a way to automatically select the right serial port?
     * Oh and one more. I want the serial output and perhaps compile windows to be undocked or at least I want them to sit to the right of my code window but they seem rigidly stuck at the bottom of the screen.
     * And I would probably prioritize ease of use over better editing/intelligence.
   * Being able to set baud rate within monitor
@@ -112,8 +112,6 @@ I will list every supporter here, thanks!
         * [CLI](https://serialport.io/docs/guide-cli)
         * [API](https://serialport.io/docs/guide-usage)
     * write a [debugger extension](https://code.visualstudio.com/api/extension-guides/debugger-extension) with a [mock](https://github.com/Microsoft/vscode-mock-debug) which communicates with the serial
-
-Plus plus... Is there a way to automatically select the right serial port?
 * Lots of redundant code
   * e.g. "upload is a superset of "verify"
   * general lack of modularity - the above is the result

From 6a42d3f3d94dd44cda9f647bf17af4a552e909e6 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Mon, 10 Feb 2020 05:17:19 +0100
Subject: [PATCH 031/142] Moved intellisense function to a separate file

---
 BRANCHNOTES.md              |   3 +
 package-lock.json           | 118 +++++++++++++++++++++---------------
 package.json                |   7 +--
 src/arduino/arduino.ts      |  90 +--------------------------
 src/arduino/intellisense.ts |  98 ++++++++++++++++++++++++++++++
 webpack.config.js           |  10 ---
 6 files changed, 175 insertions(+), 151 deletions(-)
 create mode 100644 src/arduino/intellisense.ts

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index 788e4e17..80877b96 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -49,6 +49,7 @@ Provide a configuration flag which allows the user to turn this feature off - th
 |                                       | :white_check_mark: Document features in [README.md](README.md) (partially done) |
 |                                       | :heavy_check_mark: Try to auto-generate even if verify (i.e. compilation) fails |
 |                                       | :heavy_check_mark: Extract compiler command parser from vscode-arduino and [publish](https://itnext.io/step-by-step-building-and-publishing-an-npm-typescript-package-44fe7164964c) it as a separate package which will allow reusage and easy testing without heavy vscode-arduino rucksack. Done, see [cocopa](https://www.npmjs.com/package/cocopa) |
+|                                       | :white_check_mark: Parser only works when arduino is set to `verbose`, since this is the only way we get the compiler invocation command. This has to be fixed. |
 |                                       | :white_check_mark: Finally: go through my code and look for TODOs |
 
 `*` not committed to branch yet
@@ -79,6 +80,7 @@ I will list every supporter here, thanks!
 2020-02-07 Elektronik Workshop: 48 :beers: (12h coding)
 2020-02-08 Elektronik Workshop: 52 :beers: (13h coding)
 2020-02-09 Elektronik Workshop: 40 :beers: (10h coding)
+2020-02-10 Elektronik Workshop: 32 :beers: (8h coding)
 
 <!-- https://github.com/StylishThemes/GitHub-Dark/wiki/Emoji -->
 
@@ -88,6 +90,7 @@ I will list every supporter here, thanks!
 * [Interactive regex debugger](https://regex101.com/)
 * [Git branch management](https://blog.scottlowe.org/2015/01/27/using-fork-branch-git-workflow/)
 * [Collapsible Markdown](https://gist.githubusercontent.com/joyrexus/16041f2426450e73f5df9391f7f7ae5f/raw/f774f242feff6bae4a5be7d6c71aa5df2e3fcb0e/README.md)
+* [Arduino CLI manpage](https://github.com/arduino/Arduino/blob/master/build/shared/manpage.adoc)
 
 ## Issues Concerning this Project
  * https://github.com/Microsoft/vscode-cpptools/issues/1750
diff --git a/package-lock.json b/package-lock.json
index 3fbb2e87..9c9bab37 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -480,15 +480,15 @@
       }
     },
     "ajv": {
-      "version": "6.12.4",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz",
-      "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==",
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
       "dev": true,
       "requires": {
-        "fast-deep-equal": "^3.1.1",
+        "co": "^4.6.0",
+        "fast-deep-equal": "^1.0.0",
         "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
+        "json-schema-traverse": "^0.3.0"
       }
     },
     "ajv-errors": {
@@ -1410,11 +1410,6 @@
       "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
       "dev": true
     },
-    "child_process": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/child_process/-/child_process-1.0.2.tgz",
-      "integrity": "sha1-sffn/HPSXn/R1FWtyU4UODAYK1o="
-    },
     "chokidar": {
       "version": "2.1.8",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
@@ -1561,15 +1556,16 @@
         "semver": "^5.4.1"
       }
     },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+      "dev": true
+    },
     "cocopa": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/cocopa/-/cocopa-0.0.6.tgz",
-      "integrity": "sha512-iRMDGthPTi0yhQRq2n+ZqL0zuuY08JVa5UFSkQbTb1BLBDhH4fmG/uEo6xLT91+clTZCkTocAS05xDquJo8kwQ==",
-      "requires": {
-        "child_process": "^1.0.2",
-        "fs": "0.0.1-security",
-        "path": "^0.12.7"
-      }
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/cocopa/-/cocopa-0.0.7.tgz",
+      "integrity": "sha512-L/BaneLuO56MCjAkbzUFRRZhKf0P37LY+3JClzV/poVQTEDHxS8KWa8Rw5IpCFOdZiGitQvy6r1L/5I/TJt9nA=="
     },
     "code-point-at": {
       "version": "1.1.0",
@@ -2439,6 +2435,18 @@
         "v8-compile-cache": "^2.0.3"
       },
       "dependencies": {
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
         "ansi-regex": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
@@ -2454,6 +2462,12 @@
             "ms": "^2.1.1"
           }
         },
+        "fast-deep-equal": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+          "dev": true
+        },
         "glob-parent": {
           "version": "5.1.1",
           "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
@@ -2469,6 +2483,12 @@
           "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
           "dev": true
         },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -2954,9 +2974,9 @@
       }
     },
     "fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+      "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
       "dev": true
     },
     "fast-json-stable-stringify": {
@@ -3258,11 +3278,6 @@
         "readable-stream": "^2.0.0"
       }
     },
-    "fs": {
-      "version": "0.0.1-security",
-      "resolved": "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz",
-      "integrity": "sha1-invTcYa23d84E/I4WLV+yq9eQdQ="
-    },
     "fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
@@ -5487,9 +5502,9 @@
       "dev": true
     },
     "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
       "dev": true
     },
     "json-stable-stringify-without-jsonify": {
@@ -6811,25 +6826,6 @@
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
       "dev": true
     },
-    "path": {
-      "version": "0.12.7",
-      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
-      "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=",
-      "requires": {
-        "process": "^0.11.1",
-        "util": "^0.10.3"
-      },
-      "dependencies": {
-        "util": {
-          "version": "0.10.4",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
-          "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
-          "requires": {
-            "inherits": "2.0.3"
-          }
-        }
-      }
-    },
     "path-browserify": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
@@ -8169,6 +8165,18 @@
         "string-width": "^3.0.0"
       },
       "dependencies": {
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
         "ansi-regex": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
@@ -8181,12 +8189,24 @@
           "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
           "dev": true
         },
+        "fast-deep-equal": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+          "dev": true
+        },
         "is-fullwidth-code-point": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
           "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
           "dev": true
         },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
         "string-width": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
diff --git a/package.json b/package.json
index 4aedf4f9..292c447c 100644
--- a/package.json
+++ b/package.json
@@ -564,10 +564,11 @@
   "devDependencies": {
     "@types/compare-versions": "^3.0.0",
     "@types/mocha": "^5.2.7",
-    "@types/node": "^6.0.40",
+    "@types/node": "^6.14.9",
     "@types/vscode": "^1.43.0",
     "@types/winreg": "^1.2.30",
     "acorn": "^7.4.0",
+    "ajv": "^5.0.0",
     "del": "^2.2.2",
     "eslint": "^6.8.0",
     "eslint-config-standard": "^10.2.1",
@@ -594,12 +595,10 @@
   },
   "dependencies": {
     "body-parser": "^1.16.1",
-    "child_process": "^1.0.2",
-    "cocopa": "0.0.6",
+    "cocopa": "^0.0.7",
     "compare-versions": "^3.4.0",
     "eventemitter2": "^4.1.0",
     "express": "^4.14.1",
-    "fs": "0.0.1-security",
     "glob": "^7.1.1",
     "iconv-lite": "^0.4.18",
     "impor": "^0.1.1",
diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index c8af33ce..b6ca1059 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-import * as ccp from "cocopa";
 import * as fs from "fs";
 import * as glob from "glob";
 import * as os from "os";
@@ -23,6 +22,7 @@ import { arduinoChannel } from "../common/outputChannel";
 import { ArduinoWorkspace } from "../common/workspace";
 import { SerialMonitor } from "../serialmonitor/serialMonitor";
 import { UsbDetector } from "../serialmonitor/usbDetector";
+import { makeCompilerParserContext } from "./intellisense";
 import { ProgrammerManager } from "./programmerManager";
 
 /**
@@ -257,7 +257,7 @@ export class ArduinoApp {
         arduinoChannel.show();
 
         let verifyResult: boolean;
-        const compilerParserContext = this.makeCompilerParserContext(dc);
+        const compilerParserContext = makeCompilerParserContext(dc);
 
         try {
             await util.spawn(this._settings.commandPath,
@@ -796,92 +796,6 @@ export class ArduinoApp {
         // return VscodeSettings.getInstance().useArduinoCli;
     }
 
-    /**
-     * Creates a context which is used for compiler command parsing
-     * during building (verify, upload, ...).
-     *
-     * This context makes sure that it can be used in those sections
-     * without having to check whether this feature is en- or disabled
-     * and keeps the calling context more readable.
-     *
-     * @param dc The device context of the caller.
-     */
-    private makeCompilerParserContext(dc: DeviceContext)
-        : { callback: (s: string) => void; conclude: () => void; } {
-
-        const globalDisable = VscodeSettings.getInstance().disableIntelliSenseAutoGen;
-        const project = dc.disableIntelliSenseAutoGen;
-
-        if (project !== "disable" && !globalDisable ||
-            project === "enable") {
-
-            const engines = this.makeCompilerParserEngines(dc);
-            const runner = new ccp.Runner(engines);
-
-            // set up the function to be called after parsing
-            const _conclude = () => {
-                if (!runner.result) {
-                    arduinoChannel.warning("Failed to generate IntelliSense configuration.");
-                    return;
-                }
-                const pPath = path.join(ArduinoWorkspace.rootPath, constants.CPP_CONFIG_FILE);
-                // TODO: check what kind of result we've got: gcc or other architecture:
-                //  and instantiate content accordingly (to be implemented within cocopa)
-                const content = new ccp.CCppPropertiesContentResult(runner.result,
-                                                                    "Arduino",
-                                                                    ccp.CCppPropertiesISMode.Gcc_X64,
-                                                                    ccp.CCppPropertiesCStandard.C11,
-                                                                    // as of 1.8.11 arduino is on C++11
-                                                                    ccp.CCppPropertiesCppStandard.Cpp11);
-                const prop = new ccp.CCppProperties();
-                prop.read(pPath);
-                prop.merge(content, ccp.CCppPropertiesMergeMode.ReplaceSameNames);
-                if (prop.write(pPath)) {
-                    arduinoChannel.info("IntelliSense configuration updated.");
-                } else {
-                    arduinoChannel.info("IntelliSense configuration already up to date.");
-                }
-            };
-            return {
-                callback: runner.callback(),
-                conclude: _conclude,
-            };
-        }
-        return {
-            callback: undefined,
-            conclude: undefined,
-        }
-    };
-
-    /**
-     *
-     * @param dc
-     */
-    private makeCompilerParserEngines(dc: DeviceContext) {
-
-        let sketch = path.basename(dc.sketch);
-        const dotcpp = sketch.endsWith(".ino") ? ".cpp" : "";
-        sketch = `-o\\s+\\S*${ccp.regExEscape(sketch)}${dotcpp}\\.o`;
-
-        const matchPattern = [
-            // make sure we're running g++
-            /(?:^|-)g\+\+\s+/,
-            // make sure we're compiling
-            /\s+-c\s+/,
-            // trigger parser when compiling the main sketch
-            RegExp(sketch),
-        ];
-
-        const dontMatchPattern = [
-            // make sure Arduino's not testing libraries
-            /-o\s+\/dev\/null/,
-        ];
-
-        // setup the parser with its engines
-        const gccParserEngine = new ccp.ParserGcc(matchPattern, dontMatchPattern);
-        return [gccParserEngine];
-    }
-
     private getProgrammerString(): string {
         const selectProgrammer = this.programmerManager.currentProgrammer;
         if (!selectProgrammer) {
diff --git a/src/arduino/intellisense.ts b/src/arduino/intellisense.ts
new file mode 100644
index 00000000..7663241d
--- /dev/null
+++ b/src/arduino/intellisense.ts
@@ -0,0 +1,98 @@
+import * as ccp from "cocopa";
+import * as path from "path";
+import * as constants from "../common/constants";
+import { arduinoChannel } from "../common/outputChannel";
+import { ArduinoWorkspace } from "../common/workspace";
+import { DeviceContext } from "../deviceContext";
+import { VscodeSettings } from "./vscodeSettings";
+
+/**
+ * Creates a context which is used for compiler command parsing
+ * during building (verify, upload, ...).
+ *
+ * This context makes sure that it can be used in those sections
+ * without having to check whether this feature is en- or disabled
+ * and keeps the calling context more readable.
+ *
+ * @param dc The device context of the caller.
+ */
+export function makeCompilerParserContext(dc: DeviceContext)
+    : { callback: (s: string) => void; conclude: () => void; } {
+
+    const globalDisable = VscodeSettings.getInstance().disableIntelliSenseAutoGen;
+    const project = dc.disableIntelliSenseAutoGen;
+
+    if (project !== "disable" && !globalDisable ||
+        project === "enable") {
+
+        const engines = makeCompilerParserEngines(dc);
+        const runner = new ccp.Runner(engines);
+
+        // set up the function to be called after parsing
+        const _conclude = () => {
+            if (!runner.result) {
+                arduinoChannel.warning("Failed to generate IntelliSense configuration.");
+                return;
+            }
+            const pPath = path.join(ArduinoWorkspace.rootPath, constants.CPP_CONFIG_FILE);
+            // TODO: check what kind of result we've got: gcc or other architecture:
+            //  and instantiate content accordingly (to be implemented within cocopa)
+            const content = new ccp.CCppPropertiesContentResult(runner.result,
+                                                                "Arduino",
+                                                                ccp.CCppPropertiesISMode.Gcc_X64,
+                                                                ccp.CCppPropertiesCStandard.C11,
+                                                                // as of 1.8.11 arduino is on C++11
+                                                                ccp.CCppPropertiesCppStandard.Cpp11);
+            try {
+                const prop = new ccp.CCppProperties();
+                prop.read(pPath);
+                prop.merge(content, ccp.CCppPropertiesMergeMode.ReplaceSameNames);
+                if (prop.write(pPath)) {
+                    arduinoChannel.info("IntelliSense configuration updated.");
+                } else {
+                    arduinoChannel.info("IntelliSense configuration already up to date.");
+                }
+            } catch (e) {
+                // tslint:disable-next-line: no-console
+                console.log(e);
+            }
+        };
+        return {
+            callback: runner.callback(),
+            conclude: _conclude,
+        }
+    }
+    return {
+        callback: undefined,
+        conclude: undefined,
+    }
+};
+
+/**
+ *
+ * @param dc
+ */
+function makeCompilerParserEngines(dc: DeviceContext) {
+
+    let sketch = path.basename(dc.sketch);
+    const dotcpp = sketch.endsWith(".ino") ? ".cpp" : "";
+    sketch = `-o\\s+\\S*${ccp.regExEscape(sketch)}${dotcpp}\\.o`;
+
+    const matchPattern = [
+        // make sure we're running g++
+        /(?:^|-)g\+\+\s+/,
+        // make sure we're compiling
+        /\s+-c\s+/,
+        // trigger parser when compiling the main sketch
+        RegExp(sketch),
+    ];
+
+    const dontMatchPattern = [
+        // make sure Arduino's not testing libraries
+        /-o\s+\/dev\/null/,
+    ];
+
+    // setup the parser with its engines
+    const gccParserEngine = new ccp.ParserGcc(matchPattern, dontMatchPattern);
+    return [gccParserEngine];
+}
diff --git a/webpack.config.js b/webpack.config.js
index 66cab632..b18b814a 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -21,16 +21,6 @@ function getEntry() {
 
   const list = getDependenciesFromNpm(mod);
   const moduleList = list.filter((value, index, self) => {
-    /* Earlier versions of cocopa contains incorrect nodejs dependencies. Remove this workaround after updating to version v0.0.7.
-     * Resulted in webpack errors like:
-     *    Unhandled rejection Error in plugin "webpack"
-     *    Message:
-     *    ["Entry module not found: Error: Can't resolve './node_modules/child_process' in ...
-     *    ... "Entry module not found: Error: Can't resolve './node_modules/fs' in ...
-     */
-    if (value === "fs" || value === "child_process") {
-      return false;
-    }
     return self.indexOf(value) === index && unbundledModule.indexOf(value) === -1 && !/^@types\//.test(value);
   });
 

From e80a338642eb54bf2eb08f64167ec2a7ffcf584e Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Wed, 12 Feb 2020 17:00:26 +0100
Subject: [PATCH 032/142] Added instructions how to run development code

---
 BRANCHNOTES.md | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index 80877b96..137e1659 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -122,6 +122,63 @@ I will list every supporter here, thanks!
 * Possibility to jump to compilation errors from compiler output and highlight compiler errors
 ----
 
+## How to beta test cutting edge code from the repo
+
+*I wrote the follwing for @iFreilicht, if anyone has some additional findings please let me know to keep this documentation up to date*
+
+that's the reason I embarked on this project. Great if you'd like to help out - this comes in really handy. Getting the stuff rock solid is one of my central objectives and testing is one cornerstones here.
+
+Currently my work is at the following state:
+* Parsing works
+* Enable/disable via global or project flags
+* You can have personal configurations which aren't overwritten
+
+But I'm not fully there yet. Things which are yet to be done are:
+
+* Move the parser/configuration-generator out of the "verify" code, since it requires the build to be run with `--verbose` flag enabled which most probably few like (except for me :) I always switch on all warnings and set it to verbose).
+  This is something I can implement pretty fast
+* I have not removed the original "IntelliSense configurator" which ruins the `c_cpp_properties.json` every now and then but that's one of my next tasks as well. And you can simply delete the file as you can re-generate the perfect version with my analyzer/generator by simply verifying your sketch 
+* My development system runs on Ubuntu-GNU/linux and I haven't done any work for Windows yet but that's one of the next steps. The chances that it works on OSX "out of the box" are pretty good
+
+To run the development version clone my [repository](https://github.com/elektronikworkshop/vscode-arduino) and checkout the `intellisense-autoconfig` branch
+
+The following steps requires you to have `git`, `vscode`, `npm` and `nodejs` at recent versions. On my Ubuntu system I don't use the versions supplied by my package manager (`apt`) as they are usually pretty outdated - I usually install `nodejs` and `npm` from their respective/official websites. If you're on Windows you'll have to be a bit more patient since I haven't set up a virtual machine yet for testing and Windows is definitely not my domain. But I'll document the setup process as soon as I'll get to it.
+
+```bash
+git clone https://github.com/elektronikworkshop/vscode-arduino
+cd vscode-arduino
+# switch to the feature branch (not necessary probably because this branch is set to default)
+git checkout intellisense-autoconfig
+# check if you're on the right branch
+git status
+# install module dependencies
+npm install
+# install gulp builder globally to make it available to the path (requires relaunching your shell)
+npm install -g gulp
+# to make sure that gulp is actually working type
+gulp --tasks
+# if not -> configure your $PATH and open a new terminal to make sure it's added, then
+# open vscode
+code .
+```
+Making sure that gulp  is on your `$PATH` is essential. As long this isn't the case the following steps must not be carried out.
+
+Then hit F5 to debug or select it from the *Debug* menu. vscode will then complain that there's *No task defined* and you let it generate the configuration for you by clicking the button *Configure Task*. After configuring the tasks debug (`F5`) or build (`Ctrl + Shift + B`) should work.
+
+As soon as you've got it up and running (`F5` spawns a new window), just navigate to your Arduino project. Configure in the vscode-arduino global settings the build output to `verbose` and run verify (`Ctrl + Alt + R`) as you know it. This will then generate a fresh `c_cpp_properties.json`. As long as I haven't removed the generator from the current maintainers you'll have to regenerate it as soon as you see those double asterisk-paths like `whatever/path/**` - if I get to it today, I'll give it a try and will remove/disable it for testing. You can then pull my changes in by running
+```bash
+git pull
+```
+from within your terminal inside vscode (and your `vscode-arduino` folder).
+
+Different IntelliSense configurations can be selected in vscode in the lower right. The configuration my branch generates is called *Arduino* as depicted here:
+
+![74001156-cfce8280-496a-11ea-9b9d-7d30c83765c1](https://user-images.githubusercontent.com/21954933/74351237-2696ea80-4db7-11ea-9f7a-1bfc652ad5f5.png)
+
+Sometimes IntelliSense has problems within the extension host (which you're running when launching it with `F5`) and fails to resolve some header paths. This is a problem of vscode and not the extension. Then just restart. The extension host is a bit buggy if you ask me, so I hope I can provide some development snapshots in the future which will render all the steps above superfluous and let you run the latest development version with your regular vscode.
+
+----
+
 ## Implementation
 **Note** Check this vscode feature:
 ```

From 4341261e91981a2687beb70b8583277a8b5d5e7e Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Wed, 12 Feb 2020 17:53:28 +0100
Subject: [PATCH 033/142] More on beta testing, added link to chat room

---
 BRANCHNOTES.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index 137e1659..69a5ce03 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -124,8 +124,17 @@ I will list every supporter here, thanks!
 
 ## How to beta test cutting edge code from the repo
 
+For development and testing of this fork/branch I've set up a dedicated chat room:  
+
+[![Gitter](https://badges.gitter.im/vscode-arduino-ew-fork/community.svg)](https://gitter.im/vscode-arduino-ew-fork/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)  
+
+**Note:** the topic is strictly development and testing of this feature enhancement branch. It's not a place where you can ask for help on your Arduino problems. There are dedicated forums for that and I'll delete any question of this type.
+
+
 *I wrote the follwing for @iFreilicht, if anyone has some additional findings please let me know to keep this documentation up to date*
 
+ > I'd love to try this out and give feedback. It would be a huge quality of life improvement if this was to work. Could you point me to a resource that helps me install your version of the extension?
+
 that's the reason I embarked on this project. Great if you'd like to help out - this comes in really handy. Getting the stuff rock solid is one of my central objectives and testing is one cornerstones here.
 
 Currently my work is at the following state:

From 56c963420f33222f2cba49d33ab15ef601cb3571 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Wed, 12 Feb 2020 18:12:43 +0100
Subject: [PATCH 034/142] Note how to run vscode without having gulp on your
 user path

---
 BRANCHNOTES.md | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index 69a5ce03..3eb4bae2 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -163,6 +163,7 @@ git status
 # install module dependencies
 npm install
 # install gulp builder globally to make it available to the path (requires relaunching your shell)
+# there's another option below, see ./launchcode.sh
 npm install -g gulp
 # to make sure that gulp is actually working type
 gulp --tasks
@@ -172,7 +173,18 @@ code .
 ```
 Making sure that gulp  is on your `$PATH` is essential. As long this isn't the case the following steps must not be carried out.
 
-Then hit F5 to debug or select it from the *Debug* menu. vscode will then complain that there's *No task defined* and you let it generate the configuration for you by clicking the button *Configure Task*. After configuring the tasks debug (`F5`) or build (`Ctrl + Shift + B`) should work.
+Another option to launch code with gulp on your path is (within bash or similar)
+```bash
+# create launch script
+echo "PATH=./node_modules/.bin:$PATH code ." > launchcode
+# make it executable
+chmod +x launchcode
+# now you can launch vscode like this
+./launchcode
+```
+This way you don't have to install gulp globally anymore (no `npm install -g gulp`). The path to the vscode dependency module binary is set as temporary environment variable when launching vscode.
+
+When everything's fine and vscode running, hit F5 to debug or select it from the *Debug* menu. vscode will then complain that there's *No task defined* and you let it generate the configuration for you by clicking the button *Configure Task*. After configuring the tasks debug (`F5`) or build (`Ctrl + Shift + B`) should work.
 
 As soon as you've got it up and running (`F5` spawns a new window), just navigate to your Arduino project. Configure in the vscode-arduino global settings the build output to `verbose` and run verify (`Ctrl + Alt + R`) as you know it. This will then generate a fresh `c_cpp_properties.json`. As long as I haven't removed the generator from the current maintainers you'll have to regenerate it as soon as you see those double asterisk-paths like `whatever/path/**` - if I get to it today, I'll give it a try and will remove/disable it for testing. You can then pull my changes in by running
 ```bash

From 5945d8dd0c1aa4552769b84b018adab84c285404 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Sat, 15 Feb 2020 12:47:31 +0100
Subject: [PATCH 035/142] Updated beer money log

---
 BRANCHNOTES.md | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index 3eb4bae2..6de2f022 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -81,6 +81,9 @@ I will list every supporter here, thanks!
 2020-02-08 Elektronik Workshop: 52 :beers: (13h coding)
 2020-02-09 Elektronik Workshop: 40 :beers: (10h coding)
 2020-02-10 Elektronik Workshop: 32 :beers: (8h coding)
+2020-02-11 Elektronik Workshop: 16 :beers: (4h coding)
+2020-02-12 Elektronik Workshop: 32 :beers: (8h coding)
+2020-02-15 T.D.: 4 :beers: (20$ - Thanks a lot!)
 
 <!-- https://github.com/StylishThemes/GitHub-Dark/wiki/Emoji -->
 
@@ -91,6 +94,8 @@ I will list every supporter here, thanks!
 * [Git branch management](https://blog.scottlowe.org/2015/01/27/using-fork-branch-git-workflow/)
 * [Collapsible Markdown](https://gist.githubusercontent.com/joyrexus/16041f2426450e73f5df9391f7f7ae5f/raw/f774f242feff6bae4a5be7d6c71aa5df2e3fcb0e/README.md)
 * [Arduino CLI manpage](https://github.com/arduino/Arduino/blob/master/build/shared/manpage.adoc)
+* [Install extensions from file](https://vscode-docs.readthedocs.io/en/stable/extensions/install-extension/)
+* [Publish extensions](https://code.visualstudio.com/api/working-with-extensions/publishing-extension)
 
 ## Issues Concerning this Project
  * https://github.com/Microsoft/vscode-cpptools/issues/1750
@@ -124,9 +129,9 @@ I will list every supporter here, thanks!
 
 ## How to beta test cutting edge code from the repo
 
-For development and testing of this fork/branch I've set up a dedicated chat room:  
+For development and testing of this fork/branch I've set up a dedicated chat room:
 
-[![Gitter](https://badges.gitter.im/vscode-arduino-ew-fork/community.svg)](https://gitter.im/vscode-arduino-ew-fork/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)  
+[![Gitter](https://badges.gitter.im/vscode-arduino-ew-fork/community.svg)](https://gitter.im/vscode-arduino-ew-fork/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 **Note:** the topic is strictly development and testing of this feature enhancement branch. It's not a place where you can ask for help on your Arduino problems. There are dedicated forums for that and I'll delete any question of this type.
 
@@ -146,7 +151,7 @@ But I'm not fully there yet. Things which are yet to be done are:
 
 * Move the parser/configuration-generator out of the "verify" code, since it requires the build to be run with `--verbose` flag enabled which most probably few like (except for me :) I always switch on all warnings and set it to verbose).
   This is something I can implement pretty fast
-* I have not removed the original "IntelliSense configurator" which ruins the `c_cpp_properties.json` every now and then but that's one of my next tasks as well. And you can simply delete the file as you can re-generate the perfect version with my analyzer/generator by simply verifying your sketch 
+* I have not removed the original "IntelliSense configurator" which ruins the `c_cpp_properties.json` every now and then but that's one of my next tasks as well. And you can simply delete the file as you can re-generate the perfect version with my analyzer/generator by simply verifying your sketch
 * My development system runs on Ubuntu-GNU/linux and I haven't done any work for Windows yet but that's one of the next steps. The chances that it works on OSX "out of the box" are pretty good
 
 To run the development version clone my [repository](https://github.com/elektronikworkshop/vscode-arduino) and checkout the `intellisense-autoconfig` branch

From a5d4695d5201dfea5e7e69c67ba1318cbc07332a Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Sat, 15 Feb 2020 20:49:13 +0100
Subject: [PATCH 036/142] Updated branch notes -- documented changes not
 committed though.

---
 BRANCHNOTES.md | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index 6de2f022..a5713e73 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -14,15 +14,28 @@ The generator takes the parser's output and transforms it into a valid `c_cpp_pr
 Provide a configuration flag which allows the user to turn this feature off - this is useful for the cases in which this magic fails or the user has a very specific setup. Although this branch tries to eliminate most of the latter cases.
 
 ### Global Tasks in vscode-arduino
+See table below.
+
+### Branch Log
+**2020 02 05** Currently I'm able to generate error free IntelliSense setups for AVR and ESP32 using the preliminary implementation. For ESP32 I just had to add the intrinsic compiler paths manually. A solution has to be found for these ... which there is, see [here](https://stackoverflow.com/a/6666338)
+**2020 02 06** Got it fully working (with built-in include directories) for AVR, ESP32, ESP8266. Rewrote the backend to facilitate writing of further parser engines in the future.
+**2020 02 07** Wrote compiler command parser npm package [cocopa](https://www.npmjs.com/package/cocopa) and began writing a test framework for it. Added a global configuration switch which allows the IntelliSense configuration generation to be turned off.
+**2020 02 08** Integrated `cocopa` into vscode-arduino. Added project configuration flag which can override the global flag in both ways (forced off, forced on). Made code tslint compliant. Began some documentation in [README.md](README.md). vscode-arduino now tries to generate an IntelliSense configuration even if compilation (verify) should fail. vscode-arduino now tries to generate a IntelliSense configuration even if Arduino's verify failed (if the main sketch compilation was invoked before anything failed)
+**2020 02 09** Moved vscode-arduino specific from cocopa over (to keep cocopa as generic as possible). More unit testing within cocopa. Some research regarding future serial monitor implementation. Implemented c_cpp_properties merging -> compiler analysis results are merged into existing configuration and will preserve configurations of different name than the vscode-studio default configuration name (currently "Arduino"). This opens up the possibility for users to write their own configurations without having to disable the autogeneration. Implemented "write on change" - `c_cpp_properties.json` will only be written if a new configuration has been detected. Now loads of tests have to be written for cocopa.
+**2020 02 10-12** Worked primarily on cocopa and test cases, fixed some npm and build errors on vscode-arduino within my setup.
+**2020 02 15** Merged `upload` `uploadUsingProgrammer` and `verify` into a single function since they shared mostly the same code
+* Better readability
+* Better maintainability
+* Less code redundancy -> less code -> less bugs
+* Keeps the calls to the Arduino build CLI at a single location
+
+During merging I found some bugs within those functions - mainly due to the above problem. The most notable were:
+* The serial monitor state wasn't restored when something went wrong
+* In one of the `upload` functions the original authors forgot to invoke the "pre build command"
+* Error message formatting was fixed within `verify` only
+* No consistent return values within `verify` (when it bailed out early it returned `void`)
 
 ### Status
-**2020-02-05** Currently I'm able to generate error free IntelliSense setups for AVR and ESP32 using the preliminary implementation. For ESP32 I just had to add the intrinsic compiler paths manually. A solution has to be found for these ... which there is, see [here](https://stackoverflow.com/a/6666338)
-**2020-02-06** Got it fully working (with built-in include directories) for AVR, ESP32, ESP8266. Rewrote the backend to facilitate writing of further parser engines in the future.
-**2020-02-07** Wrote compiler command parser npm package [cocopa](https://www.npmjs.com/package/cocopa) and began writing a test framework for it. Added a global configuration switch which allows the IntelliSense configuration generation to be turned off.
-**2020-02-08** Integrated `cocopa` into vscode-arduino. Added project configuration flag which can override the global flag in both ways (forced off, forced on). Made code tslint compliant. Began some documentation in [README.md](README.md). vscode-arduino now tries to generate an IntelliSense configuration even if compilation (verify) should fail. vscode-arduino now tries to generate a IntelliSense configuration even if Arduino's verify failed (if the main sketch compilation was invoked before anything failed)
-**2020-02-09** Moved vscode-arduino specific from cocopa over (to keep cocopa as generic as possible). More unit testing within cocopa. Some research regarding future serial monitor implementation. Implemented c_cpp_properties merging -> compiler analysis results are merged into existing configuration and will preserve configurations of different name than the vscode-studio default configuration name (currently "Arduino"). This opens up the possibility for users to write their own configurations without having to disable the autogeneration. Implemented "write on change" - `c_cpp_properties.json` will only be written if a new configuration has been detected. Now loads of tests have to be written for cocopa.
-
-
 |      | Tasks   |
 |-----:|:--------|
 | **Build output parser**               | :heavy_check_mark: Basic parser working |
@@ -44,12 +57,13 @@ Provide a configuration flag which allows the user to turn this feature off - th
 |                                       | :white_check_mark: All unit tests in cocopa |
 |                                       | :white_check_mark: Test with cpp sketches |
 | **General**                           | :white_check_mark: Review and remove previous attempts messing with `c_cpp_properties.json` or IntelliSense. (Partially done - documented in the [General Tasks](#General-Tasks) section |
-|                                       | :white_check_mark: Auto-run verify after a) *setting a board* b) *changing the sketch* c) *workbench initialized and no `c_cpp_properties.json` has been found*. We have to generate a valid `c_cpp_properties.json` to keep IntelliSense working in such situations. Identify other occasions where this applies (usually when adding new libraries), hint the user to run *verify*? -> Good moment would be after the workbench initialization -> message in arduino channel |
+|                                       | :white_check_mark: Auto-run verify after a) *setting a board* b) *changing the sketch* c) *workbench initialized and no `c_cpp_properties.json` has been found*. We have to generate a valid `c_cpp_properties.json` to keep IntelliSense working in such situations. Identify other occasions where this applies (usually when adding new libraries), hint the user to run *Arduino: Rebuild IntelliSense Configuration*? -> Good moment would be after the workbench initialization -> message in arduino channel |
 |                                       | :heavy_check_mark: Document configuration settings in [README.md](README.md) |
 |                                       | :white_check_mark: Document features in [README.md](README.md) (partially done) |
 |                                       | :heavy_check_mark: Try to auto-generate even if verify (i.e. compilation) fails |
 |                                       | :heavy_check_mark: Extract compiler command parser from vscode-arduino and [publish](https://itnext.io/step-by-step-building-and-publishing-an-npm-typescript-package-44fe7164964c) it as a separate package which will allow reusage and easy testing without heavy vscode-arduino rucksack. Done, see [cocopa](https://www.npmjs.com/package/cocopa) |
-|                                       | :white_check_mark: Parser only works when arduino is set to `verbose`, since this is the only way we get the compiler invocation command. This has to be fixed. |
+|                                       | :heavy_check_mark: Parser only works when arduino is set to `verbose`, since this is the only way we get the compiler invocation command - this has to be fixed (done, see next item) |
+|                                       | :heavy_check_mark: Implement a *Rebuild IntelliSense Configuration* command which runs verify verbosely internally and therefore allows us to find and parse the compiler command |
 |                                       | :white_check_mark: Finally: go through my code and look for TODOs |
 
 `*` not committed to branch yet
@@ -84,6 +98,7 @@ I will list every supporter here, thanks!
 2020-02-11 Elektronik Workshop: 16 :beers: (4h coding)
 2020-02-12 Elektronik Workshop: 32 :beers: (8h coding)
 2020-02-15 T.D.: 4 :beers: (20$ - Thanks a lot!)
+2020-02-15 Elektronik Workshop: 28 :beers: (7h coding)
 
 <!-- https://github.com/StylishThemes/GitHub-Dark/wiki/Emoji -->
 

From e4c13d022f966f34490688dc6e73bcf8d8c87056 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Tue, 8 Dec 2020 22:24:21 +0100
Subject: [PATCH 037/142] Rename Logger to logger

---
 src/arduino/arduino.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index b6ca1059..5beac3aa 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -9,7 +9,7 @@ import * as vscode from "vscode";
 
 import * as constants from "../common/constants";
 import * as util from "../common/util";
-import * as Logger from "../logger/logger";
+import * as logger from "../logger/logger";
 
 import { DeviceContext } from "../deviceContext";
 import { IArduinoSettings } from "./arduinoSettings";
@@ -177,7 +177,7 @@ export class ArduinoApp {
             const outputPath = path.resolve(ArduinoWorkspace.rootPath, dc.output);
             const dirPath = path.dirname(outputPath);
             if (!util.directoryExistsSync(dirPath)) {
-                Logger.notifyUserError("InvalidOutPutPath", new Error(constants.messages.INVALID_OUTPUT_PATH + outputPath));
+                logger.notifyUserError("InvalidOutPutPath", new Error(constants.messages.INVALID_OUTPUT_PATH + outputPath));
                 return;
             }
 
@@ -237,7 +237,7 @@ export class ArduinoApp {
             const outputPath = path.resolve(ArduinoWorkspace.rootPath, output || dc.output);
             const dirPath = path.dirname(outputPath);
             if (!util.directoryExistsSync(dirPath)) {
-                Logger.notifyUserError("InvalidOutPutPath", new Error(constants.messages.INVALID_OUTPUT_PATH + outputPath));
+                logger.notifyUserError("InvalidOutPutPath", new Error(constants.messages.INVALID_OUTPUT_PATH + outputPath));
                 return false;
             }
 
@@ -382,7 +382,7 @@ export class ArduinoApp {
             deviceContext = util.tryParseJSON(fs.readFileSync(configFilePath, "utf8"));
         }
         if (!deviceContext) {
-            Logger.notifyAndThrowUserError("arduinoFileError", new Error(constants.messages.ARDUINO_FILE_ERROR));
+            logger.notifyAndThrowUserError("arduinoFileError", new Error(constants.messages.ARDUINO_FILE_ERROR));
         }
 
         deviceContext.configurations = deviceContext.configurations || [];
@@ -799,7 +799,7 @@ export class ArduinoApp {
     private getProgrammerString(): string {
         const selectProgrammer = this.programmerManager.currentProgrammer;
         if (!selectProgrammer) {
-            Logger.notifyUserError("getProgrammerString", new Error(constants.messages.NO_PROGRAMMMER_SELECTED));
+            logger.notifyUserError("getProgrammerString", new Error(constants.messages.NO_PROGRAMMMER_SELECTED));
             return;
         }
         return selectProgrammer;
@@ -808,7 +808,7 @@ export class ArduinoApp {
     private getBoardBuildString(): string {
         const selectedBoard = this.boardManager.currentBoard;
         if (!selectedBoard) {
-            Logger.notifyUserError("getBoardBuildString", new Error(constants.messages.NO_BOARD_SELECTED));
+            logger.notifyUserError("getBoardBuildString", new Error(constants.messages.NO_BOARD_SELECTED));
             return;
         }
         return selectedBoard.getBuildConfig();

From dd308accb7bd38228b6165c91f4b6ccd06121be6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Tue, 8 Dec 2020 22:40:05 +0100
Subject: [PATCH 038/142] Rename verifyResult to success

---
 src/arduino/arduino.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 5beac3aa..4c008baf 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -256,7 +256,7 @@ export class ArduinoApp {
 
         arduinoChannel.show();
 
-        let verifyResult: boolean;
+        let success = false;
         const compilerParserContext = makeCompilerParserContext(dc);
 
         try {
@@ -266,7 +266,7 @@ export class ArduinoApp {
                              undefined,
                              compilerParserContext.callback);
             arduinoChannel.end(`Finished verifying sketch - ${dc.sketch}${os.EOL}`);
-            verifyResult = true;
+            success = true;
         } catch (reason) {
             const msg = reason.code ?
                 `Exit with code=${reason.code}${os.EOL}` :
@@ -274,14 +274,13 @@ export class ArduinoApp {
                     reason.message :
                     JSON.stringify(reason);
             arduinoChannel.error(msg);
-            verifyResult = false;
         }
 
         if (compilerParserContext.conclude) {
             compilerParserContext.conclude();
         }
 
-        return verifyResult;
+        return success;
     }
 
     public tryToUpdateIncludePaths() {

From 3879639377d7948b385a1ffb7038021769b58e6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Thu, 10 Dec 2020 20:21:12 +0100
Subject: [PATCH 039/142] Move args variable till top of upload,
 uploadUsingProgrammer and verify

---
 src/arduino/arduino.ts | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 4c008baf..35a099c2 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -101,10 +101,14 @@ export class ArduinoApp {
      */
     public async upload(compile: boolean = true, useProgrammer: boolean = false) {
         const dc = DeviceContext.getInstance();
+        const args: string[] = [];
         const boardDescriptor = this.getBoardBuildString();
         if (!boardDescriptor) {
             return;
         }
+        if (!this.useArduinoCli()) {
+            args.push("--board", boardDescriptor);
+        }
 
         const selectProgrammer = useProgrammer ? this.getProgrammerString() : null;
         if (useProgrammer && !selectProgrammer) {
@@ -149,10 +153,17 @@ export class ArduinoApp {
         }
 
         const appPath = path.join(ArduinoWorkspace.rootPath, dc.sketch);
-        // TODO: add the --clean argument to the cli args when v 0.14 is released (this will clean up the build folder after uploading)
-        const args = (!compile && this.useArduinoCli()) ? ["upload", "-b", boardDescriptor] :
-                                                          this.useArduinoCli() ? ["compile", "--upload", "-b", boardDescriptor] :
-                                                                                 ["--upload", "--board", boardDescriptor];
+        if (!this.useArduinoCli()) {
+            args.push("--upload");
+        } else {
+            // TODO: add the --clean argument to the cli args when v 0.14 is released (this will clean up the build folder after uploading)
+            if (compile) {
+                args.push("compile", "--upload");
+            } else {
+                args.push("upload");
+            }
+            args.push("-b", boardDescriptor);
+        }
 
         if (useProgrammer) {
             if (this.useArduinoCli()) {
@@ -206,10 +217,14 @@ export class ArduinoApp {
 
     public async verify(output: string = "") {
         const dc = DeviceContext.getInstance();
+        const args: string[] = [];
         const boardDescriptor = this.getBoardBuildString();
         if (!boardDescriptor) {
             return false;
         }
+        if (!this.useArduinoCli()) {
+            args.push("--board", boardDescriptor);
+        }
 
         if (!ArduinoWorkspace.rootPath) {
             vscode.window.showWarningMessage("Cannot find the sketch file.");
@@ -229,7 +244,14 @@ export class ArduinoApp {
         }
 
         const appPath = path.join(ArduinoWorkspace.rootPath, dc.sketch);
-        const args = this.useArduinoCli() ? ["compile", "-b", boardDescriptor, appPath] : ["--verify", "--board", boardDescriptor, appPath];
+
+        if (!this.useArduinoCli()) {
+            args.push("--verify");
+        } else {
+            args.push("compile", "-b", boardDescriptor);
+        }
+
+        args.push(appPath);
         if (VscodeSettings.getInstance().logLevel === "verbose") {
             args.push("--verbose");
         }

From a6968e07dd1ce1c782c192f540851c5d2ed8b3ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Thu, 10 Dec 2020 20:45:53 +0100
Subject: [PATCH 040/142] Introduce verbose variable

---
 src/arduino/arduino.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 35a099c2..e638e7f6 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -181,7 +181,8 @@ export class ArduinoApp {
             return;
         }
 
-        if (VscodeSettings.getInstance().logLevel === "verbose") {
+        const verbose = VscodeSettings.getInstance().logLevel === "verbose";
+        if (verbose) {
             args.push("--verbose");
         }
         if (dc.output && compile) {
@@ -252,7 +253,8 @@ export class ArduinoApp {
         }
 
         args.push(appPath);
-        if (VscodeSettings.getInstance().logLevel === "verbose") {
+        const verbose = VscodeSettings.getInstance().logLevel === "verbose";
+        if (verbose) {
             args.push("--verbose");
         }
         if (output || dc.output) {

From b28f574dde43c89160d49377ba902d83bb96a170 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Thu, 10 Dec 2020 20:59:19 +0100
Subject: [PATCH 041/142] Unify util.spawn invocation

---
 src/arduino/arduino.ts | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index e638e7f6..9725e10d 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -205,7 +205,11 @@ export class ArduinoApp {
             const msg = "Output path is not specified. Unable to reuse previously compiled files. Upload could be slow. See README.";
             arduinoChannel.warning(msg);
         }
-        await util.spawn(this._settings.commandPath, arduinoChannel.channel, args).then(async () => {
+        await util.spawn(
+            this._settings.commandPath,
+            arduinoChannel.channel,
+            args,
+        ).then(async () => {
             UsbDetector.getInstance().resumeListening();
             if (needRestore) {
                 await serialMonitor.openSerialMonitor();
@@ -283,22 +287,23 @@ export class ArduinoApp {
         let success = false;
         const compilerParserContext = makeCompilerParserContext(dc);
 
-        try {
-            await util.spawn(this._settings.commandPath,
-                             arduinoChannel.channel,
-                             args,
-                             undefined,
-                             compilerParserContext.callback);
+        await util.spawn(
+            this._settings.commandPath,
+            arduinoChannel.channel,
+            args,
+            undefined,
+            compilerParserContext.callback,
+        ).then(() => {
             arduinoChannel.end(`Finished verifying sketch - ${dc.sketch}${os.EOL}`);
             success = true;
-        } catch (reason) {
+        }, (reason) => {
             const msg = reason.code ?
                 `Exit with code=${reason.code}${os.EOL}` :
                 reason.message ?
                     reason.message :
                     JSON.stringify(reason);
             arduinoChannel.error(msg);
-        }
+        });
 
         if (compilerParserContext.conclude) {
             compilerParserContext.conclude();

From 0678c9af5bed34465c389b9491541245aa955869 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Thu, 10 Dec 2020 21:09:50 +0100
Subject: [PATCH 042/142] Unify exit error message

---
 src/arduino/arduino.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 9725e10d..300afbe2 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -216,7 +216,12 @@ export class ArduinoApp {
             }
             arduinoChannel.end(`Uploaded the sketch: ${dc.sketch}${os.EOL}`);
         }, (reason) => {
-            arduinoChannel.error(`Exit with code=${reason.code}${os.EOL}`);
+            const msg = reason.code ?
+                `Exit with code=${reason.code}${os.EOL}` :
+                reason.message ?
+                    reason.message :
+                    JSON.stringify(reason);
+            arduinoChannel.error(msg);
         });
     }
 

From 990c1a16a4da489cd1b7c6a00ae337d09d4e8b6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Thu, 10 Dec 2020 21:36:40 +0100
Subject: [PATCH 043/142] Add cleanup expression

---
 src/arduino/arduino.ts | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 300afbe2..c14092bb 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -137,10 +137,6 @@ export class ArduinoApp {
         arduinoChannel.show();
         arduinoChannel.start(`Upload sketch - ${dc.sketch}`);
 
-        const serialMonitor = SerialMonitor.getInstance();
-
-        const needRestore = await serialMonitor.closeSerialMonitor(dc.port);
-        UsbDetector.getInstance().pauseListening();
         await vscode.workspace.saveAll(false);
 
         if (!await this.runPreBuildCommand(dc)) {
@@ -205,17 +201,28 @@ export class ArduinoApp {
             const msg = "Output path is not specified. Unable to reuse previously compiled files. Upload could be slow. See README.";
             arduinoChannel.warning(msg);
         }
+
+        // stop serial monitor when everything is prepared and good
+        // what makes restoring of its previous state easier
+        const restoreSerialMonitor = await SerialMonitor.getInstance().closeSerialMonitor(dc.port);
+        UsbDetector.getInstance().pauseListening();
+
+        const cleanup = async () => {
+            UsbDetector.getInstance().resumeListening();
+            if (restoreSerialMonitor) {
+                await SerialMonitor.getInstance().openSerialMonitor();
+            }
+        }
+
         await util.spawn(
             this._settings.commandPath,
             arduinoChannel.channel,
             args,
         ).then(async () => {
-            UsbDetector.getInstance().resumeListening();
-            if (needRestore) {
-                await serialMonitor.openSerialMonitor();
-            }
+            await cleanup();
             arduinoChannel.end(`Uploaded the sketch: ${dc.sketch}${os.EOL}`);
-        }, (reason) => {
+        }, async (reason) => {
+            await cleanup();
             const msg = reason.code ?
                 `Exit with code=${reason.code}${os.EOL}` :
                 reason.message ?
@@ -292,16 +299,22 @@ export class ArduinoApp {
         let success = false;
         const compilerParserContext = makeCompilerParserContext(dc);
 
+        const cleanup = async () => {
+            await Promise.resolve();
+        }
+
         await util.spawn(
             this._settings.commandPath,
             arduinoChannel.channel,
             args,
             undefined,
             compilerParserContext.callback,
-        ).then(() => {
+        ).then(async () => {
+            await cleanup();
             arduinoChannel.end(`Finished verifying sketch - ${dc.sketch}${os.EOL}`);
             success = true;
-        }, (reason) => {
+        }, async (reason) => {
+            await cleanup();
             const msg = reason.code ?
                 `Exit with code=${reason.code}${os.EOL}` :
                 reason.message ?

From 82270144542ed9620de7bb524f35f7b995300a30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Thu, 10 Dec 2020 21:52:59 +0100
Subject: [PATCH 044/142] Add selectSerial expression

---
 src/arduino/arduino.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index c14092bb..498e5382 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -124,13 +124,17 @@ export class ArduinoApp {
             await this.getMainSketch(dc);
         }
 
-        if ((!dc.configuration || !/upload_method=[^=,]*st[^,]*link/i.test(dc.configuration)) && !dc.port) {
+        const selectSerial = async () => {
             const choice = await vscode.window.showInformationMessage(
                 "Serial port is not specified. Do you want to select a serial port for uploading?",
                 "Yes", "No");
             if (choice === "Yes") {
                 vscode.commands.executeCommand("arduino.selectSerialPort");
             }
+        }
+
+        if ((!dc.configuration || !/upload_method=[^=,]*st[^,]*link/i.test(dc.configuration)) && !dc.port) {
+            await selectSerial();
             return;
         }
 

From 88bed5e34ef42caa251507649ea5f57618567b27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Thu, 10 Dec 2020 21:57:40 +0100
Subject: [PATCH 045/142] Inline and move appPath later

---
 src/arduino/arduino.ts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 498e5382..7df8f722 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -152,7 +152,6 @@ export class ArduinoApp {
             return;
         }
 
-        const appPath = path.join(ArduinoWorkspace.rootPath, dc.sketch);
         if (!this.useArduinoCli()) {
             args.push("--upload");
         } else {
@@ -176,7 +175,7 @@ export class ArduinoApp {
         if (dc.port) {
             args.push("--port", dc.port);
         }
-        args.push(appPath);
+
         if (!await this.runPreBuildCommand(dc)) {
             return;
         }
@@ -211,6 +210,9 @@ export class ArduinoApp {
         const restoreSerialMonitor = await SerialMonitor.getInstance().closeSerialMonitor(dc.port);
         UsbDetector.getInstance().pauseListening();
 
+        // Push sketch as last argument
+        args.push(path.join(ArduinoWorkspace.rootPath, dc.sketch));
+
         const cleanup = async () => {
             UsbDetector.getInstance().resumeListening();
             if (restoreSerialMonitor) {
@@ -264,15 +266,12 @@ export class ArduinoApp {
             return false;
         }
 
-        const appPath = path.join(ArduinoWorkspace.rootPath, dc.sketch);
-
         if (!this.useArduinoCli()) {
             args.push("--verify");
         } else {
             args.push("compile", "-b", boardDescriptor);
         }
 
-        args.push(appPath);
         const verbose = VscodeSettings.getInstance().logLevel === "verbose";
         if (verbose) {
             args.push("--verbose");
@@ -303,6 +302,9 @@ export class ArduinoApp {
         let success = false;
         const compilerParserContext = makeCompilerParserContext(dc);
 
+        // Push sketch as last argument
+        args.push(path.join(ArduinoWorkspace.rootPath, dc.sketch));
+
         const cleanup = async () => {
             await Promise.resolve();
         }

From e03dc382a5a74c36236275d4d54ced439acfaada Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Thu, 10 Dec 2020 22:26:39 +0100
Subject: [PATCH 046/142] Move arg buildup earlier in functions

---
 src/arduino/arduino.ts | 43 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 7df8f722..75e4581a 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -138,15 +138,6 @@ export class ArduinoApp {
             return;
         }
 
-        arduinoChannel.show();
-        arduinoChannel.start(`Upload sketch - ${dc.sketch}`);
-
-        await vscode.workspace.saveAll(false);
-
-        if (!await this.runPreBuildCommand(dc)) {
-            return;
-        }
-
         if (!compile && !this.useArduinoCli()) {
             arduinoChannel.error("This command is only availble when using the Arduino CLI");
             return;
@@ -176,14 +167,20 @@ export class ArduinoApp {
             args.push("--port", dc.port);
         }
 
-        if (!await this.runPreBuildCommand(dc)) {
-            return;
-        }
-
         const verbose = VscodeSettings.getInstance().logLevel === "verbose";
         if (verbose) {
             args.push("--verbose");
         }
+
+        await vscode.workspace.saveAll(false);
+
+        arduinoChannel.show();
+        arduinoChannel.start(`Upload sketch - ${dc.sketch}`);
+
+        if (!await this.runPreBuildCommand(dc)) {
+            return;
+        }
+
         if (dc.output && compile) {
             const outputPath = path.resolve(ArduinoWorkspace.rootPath, dc.output);
             const dirPath = path.dirname(outputPath);
@@ -258,14 +255,6 @@ export class ArduinoApp {
             await this.getMainSketch(dc);
         }
 
-        await vscode.workspace.saveAll(false);
-
-        arduinoChannel.start(`Verify sketch - ${dc.sketch}`);
-
-        if (!await this.runPreBuildCommand(dc)) {
-            return false;
-        }
-
         if (!this.useArduinoCli()) {
             args.push("--verify");
         } else {
@@ -276,6 +265,16 @@ export class ArduinoApp {
         if (verbose) {
             args.push("--verbose");
         }
+
+        await vscode.workspace.saveAll(false);
+
+        arduinoChannel.show();
+        arduinoChannel.start(`Verify sketch - ${dc.sketch}`);
+
+        if (!await this.runPreBuildCommand(dc)) {
+            return false;
+        }
+
         if (output || dc.output) {
             const outputPath = path.resolve(ArduinoWorkspace.rootPath, output || dc.output);
             const dirPath = path.dirname(outputPath);
@@ -297,8 +296,6 @@ export class ArduinoApp {
             arduinoChannel.warning(msg);
         }
 
-        arduinoChannel.show();
-
         let success = false;
         const compilerParserContext = makeCompilerParserContext(dc);
 

From cd9365b34ac84049a9082742eff2ccd2d11d044e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Thu, 10 Dec 2020 23:00:46 +0100
Subject: [PATCH 047/142] Move selectProgrammer down

---
 src/arduino/arduino.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 75e4581a..c17e67f5 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -110,11 +110,6 @@ export class ArduinoApp {
             args.push("--board", boardDescriptor);
         }
 
-        const selectProgrammer = useProgrammer ? this.getProgrammerString() : null;
-        if (useProgrammer && !selectProgrammer) {
-            return;
-        }
-
         if (!ArduinoWorkspace.rootPath) {
             vscode.window.showWarningMessage("Cannot find the sketch file.");
             return;
@@ -133,6 +128,11 @@ export class ArduinoApp {
             }
         }
 
+        const selectProgrammer = useProgrammer ? this.getProgrammerString() : null;
+        if (useProgrammer && !selectProgrammer) {
+            return;
+        }
+
         if ((!dc.configuration || !/upload_method=[^=,]*st[^,]*link/i.test(dc.configuration)) && !dc.port) {
             await selectSerial();
             return;

From 86719a36a65a9c93116a5fe325de68180bb604b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Tue, 5 Jan 2021 23:03:58 +0100
Subject: [PATCH 048/142] Spelling correction

---
 src/arduino/arduino.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index c17e67f5..09978b60 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -139,7 +139,7 @@ export class ArduinoApp {
         }
 
         if (!compile && !this.useArduinoCli()) {
-            arduinoChannel.error("This command is only availble when using the Arduino CLI");
+            arduinoChannel.error("This command is only available when using the Arduino CLI");
             return;
         }
 

From 76c74cf99520c0236d988e0be9c5ca695bde2afa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Thu, 10 Dec 2020 23:26:46 +0100
Subject: [PATCH 049/142] Add buildMode argument to upload and
 uploadUsingProgrammer

---
 src/arduino/arduino.ts | 82 ++++++++++++++++++++++++------------------
 src/extension.ts       |  9 ++---
 2 files changed, 52 insertions(+), 39 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 09978b60..c81bc6a7 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -25,6 +25,11 @@ import { UsbDetector } from "../serialmonitor/usbDetector";
 import { makeCompilerParserContext } from "./intellisense";
 import { ProgrammerManager } from "./programmerManager";
 
+export enum BuildMode {
+    Upload = "Uploading",
+    UploadProgrammer = "Uploading (programmer)",
+};
+
 /**
  * Represent an Arduino application based on the official Arduino IDE.
  */
@@ -99,9 +104,10 @@ export class ArduinoApp {
      * @param {bool} [compile=true] - Indicates whether to compile the code when using the CLI to upload
      * @param {bool} [useProgrammer=false] - Indicate whether a specific programmer should be used
      */
-    public async upload(compile: boolean = true, useProgrammer: boolean = false) {
+    public async upload(buildMode: BuildMode, compile: boolean = true, useProgrammer: boolean = false) {
         const dc = DeviceContext.getInstance();
         const args: string[] = [];
+        let restoreSerialMonitor: boolean = false;
         const boardDescriptor = this.getBoardBuildString();
         if (!boardDescriptor) {
             return;
@@ -133,38 +139,40 @@ export class ArduinoApp {
             return;
         }
 
-        if ((!dc.configuration || !/upload_method=[^=,]*st[^,]*link/i.test(dc.configuration)) && !dc.port) {
-            await selectSerial();
-            return;
-        }
+        if (buildMode === BuildMode.Upload) {
+            if ((!dc.configuration || !/upload_method=[^=,]*st[^,]*link/i.test(dc.configuration)) && !dc.port) {
+                await selectSerial();
+                return;
+            }
 
-        if (!compile && !this.useArduinoCli()) {
-            arduinoChannel.error("This command is only available when using the Arduino CLI");
-            return;
-        }
+            if (!compile && !this.useArduinoCli()) {
+                arduinoChannel.error("This command is only available when using the Arduino CLI");
+                return;
+            }
 
-        if (!this.useArduinoCli()) {
-            args.push("--upload");
-        } else {
-            // TODO: add the --clean argument to the cli args when v 0.14 is released (this will clean up the build folder after uploading)
-            if (compile) {
-                args.push("compile", "--upload");
+            if (!this.useArduinoCli()) {
+                args.push("--upload");
             } else {
-                args.push("upload");
+                // TODO: add the --clean argument to the cli args when v 0.14 is released (this will clean up the build folder after uploading)
+                if (compile) {
+                    args.push("compile", "--upload");
+                } else {
+                    args.push("upload");
+                }
+                args.push("-b", boardDescriptor);
             }
-            args.push("-b", boardDescriptor);
-        }
 
-        if (useProgrammer) {
-            if (this.useArduinoCli()) {
-                args.push("--programmer", selectProgrammer)
-            } else {
-                args.push("--useprogrammer", "--pref", "programmer=arduino:" + selectProgrammer)
+            if (useProgrammer) {
+                if (this.useArduinoCli()) {
+                    args.push("--programmer", selectProgrammer)
+                } else {
+                    args.push("--useprogrammer", "--pref", "programmer=arduino:" + selectProgrammer)
+                }
             }
-        }
 
-        if (dc.port) {
-            args.push("--port", dc.port);
+            if (dc.port) {
+                args.push("--port", dc.port);
+            }
         }
 
         const verbose = VscodeSettings.getInstance().logLevel === "verbose";
@@ -175,7 +183,7 @@ export class ArduinoApp {
         await vscode.workspace.saveAll(false);
 
         arduinoChannel.show();
-        arduinoChannel.start(`Upload sketch - ${dc.sketch}`);
+        arduinoChannel.start(`${buildMode} sketch '${dc.sketch}'`);
 
         if (!await this.runPreBuildCommand(dc)) {
             return;
@@ -204,16 +212,20 @@ export class ArduinoApp {
 
         // stop serial monitor when everything is prepared and good
         // what makes restoring of its previous state easier
-        const restoreSerialMonitor = await SerialMonitor.getInstance().closeSerialMonitor(dc.port);
-        UsbDetector.getInstance().pauseListening();
+        if (buildMode === BuildMode.Upload || buildMode === BuildMode.UploadProgrammer) {
+            restoreSerialMonitor = await SerialMonitor.getInstance().closeSerialMonitor(dc.port);
+            UsbDetector.getInstance().pauseListening();
+        }
 
         // Push sketch as last argument
         args.push(path.join(ArduinoWorkspace.rootPath, dc.sketch));
 
         const cleanup = async () => {
-            UsbDetector.getInstance().resumeListening();
-            if (restoreSerialMonitor) {
-                await SerialMonitor.getInstance().openSerialMonitor();
+            if (buildMode === BuildMode.Upload || buildMode === BuildMode.UploadProgrammer) {
+                UsbDetector.getInstance().resumeListening();
+                if (restoreSerialMonitor) {
+                    await SerialMonitor.getInstance().openSerialMonitor();
+                }
             }
         }
 
@@ -223,15 +235,15 @@ export class ArduinoApp {
             args,
         ).then(async () => {
             await cleanup();
-            arduinoChannel.end(`Uploaded the sketch: ${dc.sketch}${os.EOL}`);
+            arduinoChannel.end(`${buildMode} sketch '${dc.sketch}'${os.EOL}`);
         }, async (reason) => {
             await cleanup();
             const msg = reason.code ?
-                `Exit with code=${reason.code}${os.EOL}` :
+                `Exit with code=${reason.code}` :
                 reason.message ?
                     reason.message :
                     JSON.stringify(reason);
-            arduinoChannel.error(msg);
+            arduinoChannel.error(`${buildMode} sketch '${dc.sketch}': ${msg}${os.EOL}`);
         });
     }
 
diff --git a/src/extension.ts b/src/extension.ts
index b6cf7a78..722a5f2e 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -27,6 +27,7 @@ const completionProviderModule = impor("./langService/completionProvider") as ty
 import * as Logger from "./logger/logger";
 const nsatModule =
     impor("./nsat") as typeof import ("./nsat");
+import { BuildMode } from "./arduino/arduino";
 import { SerialMonitor } from "./serialmonitor/serialMonitor";
 const usbDetectorModule = impor("./serialmonitor/usbDetector") as typeof import ("./serialmonitor/usbDetector");
 
@@ -144,7 +145,7 @@ export async function activate(context: vscode.ExtensionContext) {
                     location: vscode.ProgressLocation.Window,
                     title: "Arduino: Uploading...",
                 }, async () => {
-                    await arduinoContextModule.default.arduinoApp.upload();
+                    await arduinoContextModule.default.arduinoApp.upload(BuildMode.Upload);
                 });
             } catch (ex) {
             }
@@ -162,7 +163,7 @@ export async function activate(context: vscode.ExtensionContext) {
                     location: vscode.ProgressLocation.Window,
                     title: "Arduino: Using CLI to upload...",
                 }, async () => {
-                    await arduinoContextModule.default.arduinoApp.upload(false);
+                    await arduinoContextModule.default.arduinoApp.upload(BuildMode.Upload, false);
                 });
             } catch (ex) {
             }
@@ -197,7 +198,7 @@ export async function activate(context: vscode.ExtensionContext) {
         if (!status.compile) {
             status.compile = "upload";
             try {
-                await arduinoContextModule.default.arduinoApp.upload(true, true);
+                await arduinoContextModule.default.arduinoApp.upload(BuildMode.UploadProgrammer, true, true);
             } catch (ex) {
             }
             delete status.compile;
@@ -210,7 +211,7 @@ export async function activate(context: vscode.ExtensionContext) {
         if (!status.compile) {
             status.compile = "cliUpload";
             try {
-                await arduinoContextModule.default.arduinoApp.upload(false, true);
+                await arduinoContextModule.default.arduinoApp.upload(BuildMode.UploadProgrammer, false, true);
             } catch (ex) {
             }
             delete status.compile;

From a14f777f7d8cdf6b394e678b33ec7d4f3a7ca394 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Thu, 10 Dec 2020 23:36:46 +0100
Subject: [PATCH 050/142] Make upload and uploadUsingProgrammer identical

---
 src/arduino/arduino.ts | 50 +++++++++++++++++++++++++++++++-----------
 src/extension.ts       |  4 ++--
 2 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index c81bc6a7..2c4cc8a6 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -101,10 +101,13 @@ export class ArduinoApp {
 
     /**
      * Upload code to selected board
+     * @param {BuildMode} buildMode Build mode.
+     *  * BuildMode.Upload: Compile and upload
+     *  * BuildMode.UploadProgrammer: Compile and upload using the user
+     *     selectable programmer
      * @param {bool} [compile=true] - Indicates whether to compile the code when using the CLI to upload
-     * @param {bool} [useProgrammer=false] - Indicate whether a specific programmer should be used
      */
-    public async upload(buildMode: BuildMode, compile: boolean = true, useProgrammer: boolean = false) {
+    public async upload(buildMode: BuildMode, compile: boolean = true) {
         const dc = DeviceContext.getInstance();
         const args: string[] = [];
         let restoreSerialMonitor: boolean = false;
@@ -134,11 +137,6 @@ export class ArduinoApp {
             }
         }
 
-        const selectProgrammer = useProgrammer ? this.getProgrammerString() : null;
-        if (useProgrammer && !selectProgrammer) {
-            return;
-        }
-
         if (buildMode === BuildMode.Upload) {
             if ((!dc.configuration || !/upload_method=[^=,]*st[^,]*link/i.test(dc.configuration)) && !dc.port) {
                 await selectSerial();
@@ -162,17 +160,43 @@ export class ArduinoApp {
                 args.push("-b", boardDescriptor);
             }
 
-            if (useProgrammer) {
-                if (this.useArduinoCli()) {
-                    args.push("--programmer", selectProgrammer)
+            if (dc.port) {
+                args.push("--port", dc.port);
+            }
+        } else if (buildMode === BuildMode.UploadProgrammer) {
+            const programmer = this.getProgrammerString();
+            if (!programmer) {
+                return;
+            }
+            if (!dc.port) {
+                await selectSerial();
+                return;
+            }
+
+            if (!compile && !this.useArduinoCli()) {
+                arduinoChannel.error("This command is only available when using the Arduino CLI");
+                return;
+            }
+
+            if (!this.useArduinoCli()) {
+                args.push("--upload");
+            } else {
+                // TODO: add the --clean argument to the cli args when v 0.14 is released (this will clean up the build folder after uploading)
+                if (compile) {
+                    args.push("compile", "--upload");
                 } else {
-                    args.push("--useprogrammer", "--pref", "programmer=arduino:" + selectProgrammer)
+                    args.push("upload");
                 }
+                args.push("-b", boardDescriptor);
             }
 
-            if (dc.port) {
-                args.push("--port", dc.port);
+            if (this.useArduinoCli()) {
+                args.push("--programmer", programmer)
+            } else {
+                args.push("--useprogrammer", "--pref", "programmer=arduino:" + programmer)
             }
+
+            args.push("--port", dc.port);
         }
 
         const verbose = VscodeSettings.getInstance().logLevel === "verbose";
diff --git a/src/extension.ts b/src/extension.ts
index 722a5f2e..c09f099d 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -198,7 +198,7 @@ export async function activate(context: vscode.ExtensionContext) {
         if (!status.compile) {
             status.compile = "upload";
             try {
-                await arduinoContextModule.default.arduinoApp.upload(BuildMode.UploadProgrammer, true, true);
+                await arduinoContextModule.default.arduinoApp.upload(BuildMode.UploadProgrammer, true);
             } catch (ex) {
             }
             delete status.compile;
@@ -211,7 +211,7 @@ export async function activate(context: vscode.ExtensionContext) {
         if (!status.compile) {
             status.compile = "cliUpload";
             try {
-                await arduinoContextModule.default.arduinoApp.upload(BuildMode.UploadProgrammer, false, true);
+                await arduinoContextModule.default.arduinoApp.upload(BuildMode.UploadProgrammer, false);
             } catch (ex) {
             }
             delete status.compile;

From e4a70b02b1c600b47acb9df468dfdcda6704ec4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Thu, 10 Dec 2020 23:39:12 +0100
Subject: [PATCH 051/142] Merge upload and uploadUsingProgrammer into one build
 function

---
 src/arduino/arduino.ts | 2 +-
 src/extension.ts       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 2c4cc8a6..463f2201 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -107,7 +107,7 @@ export class ArduinoApp {
      *     selectable programmer
      * @param {bool} [compile=true] - Indicates whether to compile the code when using the CLI to upload
      */
-    public async upload(buildMode: BuildMode, compile: boolean = true) {
+    public async build(buildMode: BuildMode, compile: boolean = true) {
         const dc = DeviceContext.getInstance();
         const args: string[] = [];
         let restoreSerialMonitor: boolean = false;
diff --git a/src/extension.ts b/src/extension.ts
index c09f099d..d59c9a1b 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -145,7 +145,7 @@ export async function activate(context: vscode.ExtensionContext) {
                     location: vscode.ProgressLocation.Window,
                     title: "Arduino: Uploading...",
                 }, async () => {
-                    await arduinoContextModule.default.arduinoApp.upload(BuildMode.Upload);
+                    await arduinoContextModule.default.arduinoApp.build(BuildMode.Upload);
                 });
             } catch (ex) {
             }
@@ -163,7 +163,7 @@ export async function activate(context: vscode.ExtensionContext) {
                     location: vscode.ProgressLocation.Window,
                     title: "Arduino: Using CLI to upload...",
                 }, async () => {
-                    await arduinoContextModule.default.arduinoApp.upload(BuildMode.Upload, false);
+                    await arduinoContextModule.default.arduinoApp.build(BuildMode.Upload, false);
                 });
             } catch (ex) {
             }
@@ -198,7 +198,7 @@ export async function activate(context: vscode.ExtensionContext) {
         if (!status.compile) {
             status.compile = "upload";
             try {
-                await arduinoContextModule.default.arduinoApp.upload(BuildMode.UploadProgrammer, true);
+                await arduinoContextModule.default.arduinoApp.build(BuildMode.UploadProgrammer, true);
             } catch (ex) {
             }
             delete status.compile;
@@ -211,7 +211,7 @@ export async function activate(context: vscode.ExtensionContext) {
         if (!status.compile) {
             status.compile = "cliUpload";
             try {
-                await arduinoContextModule.default.arduinoApp.upload(BuildMode.UploadProgrammer, false);
+                await arduinoContextModule.default.arduinoApp.build(BuildMode.UploadProgrammer, false);
             } catch (ex) {
             }
             delete status.compile;

From 4aa7ddcac2ceae01059b6f368d0d2e5572d746d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Thu, 10 Dec 2020 23:52:29 +0100
Subject: [PATCH 052/142] Add buildMode argument to verify

---
 src/arduino/arduino.ts             | 21 ++++++++++++---------
 src/debug/configurationProvider.ts |  4 ++--
 src/extension.ts                   |  2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 463f2201..5d72c187 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -26,6 +26,7 @@ import { makeCompilerParserContext } from "./intellisense";
 import { ProgrammerManager } from "./programmerManager";
 
 export enum BuildMode {
+    Verify = "Verifying",
     Upload = "Uploading",
     UploadProgrammer = "Uploading (programmer)",
 };
@@ -271,7 +272,7 @@ export class ArduinoApp {
         });
     }
 
-    public async verify(output: string = "") {
+    public async verify(buildMode: BuildMode, output: string = "") {
         const dc = DeviceContext.getInstance();
         const args: string[] = [];
         const boardDescriptor = this.getBoardBuildString();
@@ -291,10 +292,12 @@ export class ArduinoApp {
             await this.getMainSketch(dc);
         }
 
-        if (!this.useArduinoCli()) {
-            args.push("--verify");
-        } else {
-            args.push("compile", "-b", boardDescriptor);
+        if (buildMode === BuildMode.Verify) {
+            if (!this.useArduinoCli()) {
+                args.push("--verify");
+            } else {
+                args.push("compile", "-b", boardDescriptor);
+            }
         }
 
         const verbose = VscodeSettings.getInstance().logLevel === "verbose";
@@ -305,7 +308,7 @@ export class ArduinoApp {
         await vscode.workspace.saveAll(false);
 
         arduinoChannel.show();
-        arduinoChannel.start(`Verify sketch - ${dc.sketch}`);
+        arduinoChannel.start(`${buildMode} sketch '${dc.sketch}'`);
 
         if (!await this.runPreBuildCommand(dc)) {
             return false;
@@ -350,16 +353,16 @@ export class ArduinoApp {
             compilerParserContext.callback,
         ).then(async () => {
             await cleanup();
-            arduinoChannel.end(`Finished verifying sketch - ${dc.sketch}${os.EOL}`);
+            arduinoChannel.end(`${buildMode} sketch '${dc.sketch}'${os.EOL}`);
             success = true;
         }, async (reason) => {
             await cleanup();
             const msg = reason.code ?
-                `Exit with code=${reason.code}${os.EOL}` :
+                `Exit with code=${reason.code}` :
                 reason.message ?
                     reason.message :
                     JSON.stringify(reason);
-            arduinoChannel.error(msg);
+            arduinoChannel.error(`${buildMode} sketch '${dc.sketch}': ${msg}${os.EOL}`);
         });
 
         if (compilerParserContext.conclude) {
diff --git a/src/debug/configurationProvider.ts b/src/debug/configurationProvider.ts
index c08546f2..315378db 100644
--- a/src/debug/configurationProvider.ts
+++ b/src/debug/configurationProvider.ts
@@ -4,7 +4,7 @@
 import * as path from "path";
 import * as vscode from "vscode";
 
-import { ArduinoApp } from "../arduino/arduino";
+import { ArduinoApp, BuildMode } from "../arduino/arduino";
 import ArduinoActivator from "../arduinoActivator";
 import ArduinoContext from "../arduinoContext";
 
@@ -136,7 +136,7 @@ export class ArduinoDebugConfigurationProvider implements vscode.DebugConfigurat
             config.program = path.join(ArduinoWorkspace.rootPath, outputFolder, `${path.basename(dc.sketch)}.elf`);
 
             // always compile elf to make sure debug the right elf
-            if (!await ArduinoContext.arduinoApp.verify(outputFolder)) {
+            if (!await ArduinoContext.arduinoApp.verify(BuildMode.Verify, outputFolder)) {
                 vscode.window.showErrorMessage("Failure to verify the program, please check output for details.");
                 return false;
             }
diff --git a/src/extension.ts b/src/extension.ts
index d59c9a1b..c7b904f5 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -124,7 +124,7 @@ export async function activate(context: vscode.ExtensionContext) {
                     location: vscode.ProgressLocation.Window,
                     title: "Arduino: Verifying...",
                 }, async () => {
-                    await arduinoContextModule.default.arduinoApp.verify();
+                    await arduinoContextModule.default.arduinoApp.verify(BuildMode.Verify);
                 });
             } catch (ex) {
             }

From 335d80aafcd42cea7e063f19c4e6b87e4e1c9733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Fri, 11 Dec 2020 00:10:17 +0100
Subject: [PATCH 053/142] Add stdoutCallback expression

---
 src/arduino/arduino.ts | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 5d72c187..9ef01568 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -254,10 +254,18 @@ export class ArduinoApp {
             }
         }
 
+        // TODO: Get rid of spawn's channel parameter and just support
+        // stdout and stderr callbacks
+        const stdoutCallback = (line: string) => {
+            arduinoChannel.channel.append(line);
+        }
+
         await util.spawn(
             this._settings.commandPath,
             arduinoChannel.channel,
             args,
+            undefined,
+            stdoutCallback,
         ).then(async () => {
             await cleanup();
             arduinoChannel.end(`${buildMode} sketch '${dc.sketch}'${os.EOL}`);
@@ -345,12 +353,18 @@ export class ArduinoApp {
             await Promise.resolve();
         }
 
+        // TODO: Get rid of spawn's channel parameter and just support
+        // stdout and stderr callbacks
+        const stdoutCallback = (line: string) => {
+            arduinoChannel.channel.append(line);
+        }
+
         await util.spawn(
             this._settings.commandPath,
             arduinoChannel.channel,
             args,
             undefined,
-            compilerParserContext.callback,
+            stdoutCallback,
         ).then(async () => {
             await cleanup();
             arduinoChannel.end(`${buildMode} sketch '${dc.sketch}'${os.EOL}`);

From 0b2b77ac34cc7dc78dc56b03a70d02581b3dbdb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Fri, 11 Dec 2020 00:27:21 +0100
Subject: [PATCH 054/142] Rename output to buildDir

---
 src/arduino/arduino.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 9ef01568..484e6c2b 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -280,7 +280,7 @@ export class ArduinoApp {
         });
     }
 
-    public async verify(buildMode: BuildMode, output: string = "") {
+    public async verify(buildMode: BuildMode, buildDir: string = "") {
         const dc = DeviceContext.getInstance();
         const args: string[] = [];
         const boardDescriptor = this.getBoardBuildString();
@@ -322,8 +322,8 @@ export class ArduinoApp {
             return false;
         }
 
-        if (output || dc.output) {
-            const outputPath = path.resolve(ArduinoWorkspace.rootPath, output || dc.output);
+        if (buildDir || dc.output) {
+            const outputPath = path.resolve(ArduinoWorkspace.rootPath, buildDir || dc.output);
             const dirPath = path.dirname(outputPath);
             if (!util.directoryExistsSync(dirPath)) {
                 logger.notifyUserError("InvalidOutPutPath", new Error(constants.messages.INVALID_OUTPUT_PATH + outputPath));

From fef2db0447df7a6a20c4cc68fceecc33688862a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Fri, 11 Dec 2020 18:07:15 +0100
Subject: [PATCH 055/142] Use cocopa and add Analyze build mode

---
 src/arduino/arduino.ts      |  36 +++++++++---
 src/arduino/intellisense.ts | 106 +++++++++++++++++++++---------------
 2 files changed, 88 insertions(+), 54 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 484e6c2b..8027b750 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -15,6 +15,7 @@ import { DeviceContext } from "../deviceContext";
 import { IArduinoSettings } from "./arduinoSettings";
 import { BoardManager } from "./boardManager";
 import { ExampleManager } from "./exampleManager";
+import { ICoCoPaContext, isCompilerParserEnabled, makeCompilerParserContext } from "./intellisense";
 import { LibraryManager } from "./libraryManager";
 import { VscodeSettings } from "./vscodeSettings";
 
@@ -22,11 +23,11 @@ import { arduinoChannel } from "../common/outputChannel";
 import { ArduinoWorkspace } from "../common/workspace";
 import { SerialMonitor } from "../serialmonitor/serialMonitor";
 import { UsbDetector } from "../serialmonitor/usbDetector";
-import { makeCompilerParserContext } from "./intellisense";
 import { ProgrammerManager } from "./programmerManager";
 
 export enum BuildMode {
     Verify = "Verifying",
+    Analyze = "Analyzing",
     Upload = "Uploading",
     UploadProgrammer = "Uploading (programmer)",
 };
@@ -283,6 +284,8 @@ export class ArduinoApp {
     public async verify(buildMode: BuildMode, buildDir: string = "") {
         const dc = DeviceContext.getInstance();
         const args: string[] = [];
+        let cocopa: ICoCoPaContext;
+
         const boardDescriptor = this.getBoardBuildString();
         if (!boardDescriptor) {
             return false;
@@ -300,7 +303,17 @@ export class ArduinoApp {
             await this.getMainSketch(dc);
         }
 
-        if (buildMode === BuildMode.Verify) {
+        if (buildMode === BuildMode.Analyze) {
+            if (!isCompilerParserEnabled()) {
+                return false;
+            }
+            cocopa = makeCompilerParserContext(dc);
+            if (!this.useArduinoCli()) {
+                args.push("--verify", "--verbose");
+            } else {
+                args.push("compile", "--verbose", "-b", boardDescriptor);
+            }
+        } else {
             if (!this.useArduinoCli()) {
                 args.push("--verify");
             } else {
@@ -309,7 +322,7 @@ export class ArduinoApp {
         }
 
         const verbose = VscodeSettings.getInstance().logLevel === "verbose";
-        if (verbose) {
+        if (buildMode !== BuildMode.Analyze && verbose) {
             args.push("--verbose");
         }
 
@@ -344,19 +357,28 @@ export class ArduinoApp {
         }
 
         let success = false;
-        const compilerParserContext = makeCompilerParserContext(dc);
 
         // Push sketch as last argument
         args.push(path.join(ArduinoWorkspace.rootPath, dc.sketch));
 
         const cleanup = async () => {
+            if (cocopa) {
+                cocopa.conclude();
+            }
             await Promise.resolve();
         }
 
         // TODO: Get rid of spawn's channel parameter and just support
         // stdout and stderr callbacks
         const stdoutCallback = (line: string) => {
-            arduinoChannel.channel.append(line);
+            if (cocopa) {
+                cocopa.callback(line);
+                if (verbose) {
+                    arduinoChannel.channel.append(line);
+                }
+            } else {
+                arduinoChannel.channel.append(line);
+            }
         }
 
         await util.spawn(
@@ -379,10 +401,6 @@ export class ArduinoApp {
             arduinoChannel.error(`${buildMode} sketch '${dc.sketch}': ${msg}${os.EOL}`);
         });
 
-        if (compilerParserContext.conclude) {
-            compilerParserContext.conclude();
-        }
-
         return success;
     }
 
diff --git a/src/arduino/intellisense.ts b/src/arduino/intellisense.ts
index 7663241d..ad98a0ef 100644
--- a/src/arduino/intellisense.ts
+++ b/src/arduino/intellisense.ts
@@ -1,11 +1,33 @@
 import * as ccp from "cocopa";
 import * as path from "path";
+
 import * as constants from "../common/constants";
 import { arduinoChannel } from "../common/outputChannel";
 import { ArduinoWorkspace } from "../common/workspace";
 import { DeviceContext } from "../deviceContext";
+
 import { VscodeSettings } from "./vscodeSettings";
 
+export interface ICoCoPaContext {
+    callback: (s: string) => void;
+    conclude: () => void;
+};
+
+/**
+ * Returns true if the combination of global enable/disable and project
+ * specific override enable the auto-generation of the IntelliSense
+ * configuration.
+ */
+export function isCompilerParserEnabled(dc?: DeviceContext) {
+    if (!dc) {
+        dc = DeviceContext.getInstance();
+    }
+    const globalDisable = VscodeSettings.getInstance().disableIntelliSenseAutoGen;
+    const projectSetting = dc.disableIntelliSenseAutoGen;
+    return projectSetting !== "disable" && !globalDisable ||
+           projectSetting === "enable";
+}
+
 /**
  * Creates a context which is used for compiler command parsing
  * during building (verify, upload, ...).
@@ -16,61 +38,55 @@ import { VscodeSettings } from "./vscodeSettings";
  *
  * @param dc The device context of the caller.
  */
-export function makeCompilerParserContext(dc: DeviceContext)
-    : { callback: (s: string) => void; conclude: () => void; } {
-
-    const globalDisable = VscodeSettings.getInstance().disableIntelliSenseAutoGen;
-    const project = dc.disableIntelliSenseAutoGen;
-
-    if (project !== "disable" && !globalDisable ||
-        project === "enable") {
+export function makeCompilerParserContext(dc: DeviceContext): ICoCoPaContext {
 
-        const engines = makeCompilerParserEngines(dc);
-        const runner = new ccp.Runner(engines);
+    const engines = makeCompilerParserEngines(dc);
+    const runner = new ccp.Runner(engines);
 
-        // set up the function to be called after parsing
-        const _conclude = () => {
-            if (!runner.result) {
-                arduinoChannel.warning("Failed to generate IntelliSense configuration.");
-                return;
-            }
-            const pPath = path.join(ArduinoWorkspace.rootPath, constants.CPP_CONFIG_FILE);
-            // TODO: check what kind of result we've got: gcc or other architecture:
-            //  and instantiate content accordingly (to be implemented within cocopa)
-            const content = new ccp.CCppPropertiesContentResult(runner.result,
-                                                                "Arduino",
-                                                                ccp.CCppPropertiesISMode.Gcc_X64,
-                                                                ccp.CCppPropertiesCStandard.C11,
-                                                                // as of 1.8.11 arduino is on C++11
-                                                                ccp.CCppPropertiesCppStandard.Cpp11);
-            try {
-                const prop = new ccp.CCppProperties();
-                prop.read(pPath);
-                prop.merge(content, ccp.CCppPropertiesMergeMode.ReplaceSameNames);
-                if (prop.write(pPath)) {
-                    arduinoChannel.info("IntelliSense configuration updated.");
-                } else {
-                    arduinoChannel.info("IntelliSense configuration already up to date.");
-                }
-            } catch (e) {
-                // tslint:disable-next-line: no-console
-                console.log(e);
+    // Set up the callback to be called after parsing
+    const _conclude = () => {
+        if (!runner.result) {
+            arduinoChannel.warning("Failed to generate IntelliSense configuration.");
+            return;
+        }
+        const pPath = path.join(ArduinoWorkspace.rootPath, constants.CPP_CONFIG_FILE);
+        // TODO: check what kind of result we've got: gcc or other architecture:
+        //  and instantiate content accordingly (to be implemented within cocopa)
+        const content = new ccp.CCppPropertiesContentResult(runner.result,
+                                                            "Arduino",
+                                                            ccp.CCppPropertiesISMode.Gcc_X64,
+                                                            ccp.CCppPropertiesCStandard.C11,
+                                                            // as of 1.8.11 arduino is on C++11
+                                                            ccp.CCppPropertiesCppStandard.Cpp11);
+        try {
+            const prop = new ccp.CCppProperties();
+            prop.read(pPath);
+            prop.merge(content, ccp.CCppPropertiesMergeMode.ReplaceSameNames);
+            if (prop.write(pPath)) {
+                arduinoChannel.info("IntelliSense configuration updated.");
+            } else {
+                arduinoChannel.info("IntelliSense configuration already up to date.");
             }
-        };
-        return {
-            callback: runner.callback(),
-            conclude: _conclude,
+        } catch (e) {
+            const estr = JSON.stringify(e);
+            arduinoChannel.error(`Failed to read or write IntelliSense configuration: ${estr}`);
         }
-    }
+    };
     return {
-        callback: undefined,
-        conclude: undefined,
+        callback: runner.callback(),
+        conclude: _conclude,
     }
 };
 
 /**
+ * Assembles compiler parser engines which then will be used to find the main
+ * sketch's compile command and parse the infomation from it required for
+ * assembling an IntelliSense configuration from it.
+ *
+ * It could return multiple engines for different compilers or - if necessary -
+ * return specialized engines based on the current board architecture.
  *
- * @param dc
+ * @param dc Current device context used to generate the engines.
  */
 function makeCompilerParserEngines(dc: DeviceContext) {
 

From 2039739b749095e5324ce3e63e8d0f2a44e9320e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Fri, 11 Dec 2020 22:53:33 +0100
Subject: [PATCH 056/142] Make build return boolean

---
 src/arduino/arduino.ts | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 8027b750..d7507227 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -115,7 +115,7 @@ export class ArduinoApp {
         let restoreSerialMonitor: boolean = false;
         const boardDescriptor = this.getBoardBuildString();
         if (!boardDescriptor) {
-            return;
+            return false;
         }
         if (!this.useArduinoCli()) {
             args.push("--board", boardDescriptor);
@@ -123,7 +123,7 @@ export class ArduinoApp {
 
         if (!ArduinoWorkspace.rootPath) {
             vscode.window.showWarningMessage("Cannot find the sketch file.");
-            return;
+            return false;
         }
 
         if (!dc.sketch || !util.fileExistsSync(path.join(ArduinoWorkspace.rootPath, dc.sketch))) {
@@ -142,12 +142,12 @@ export class ArduinoApp {
         if (buildMode === BuildMode.Upload) {
             if ((!dc.configuration || !/upload_method=[^=,]*st[^,]*link/i.test(dc.configuration)) && !dc.port) {
                 await selectSerial();
-                return;
+                return false;
             }
 
             if (!compile && !this.useArduinoCli()) {
                 arduinoChannel.error("This command is only available when using the Arduino CLI");
-                return;
+                return false;
             }
 
             if (!this.useArduinoCli()) {
@@ -168,16 +168,16 @@ export class ArduinoApp {
         } else if (buildMode === BuildMode.UploadProgrammer) {
             const programmer = this.getProgrammerString();
             if (!programmer) {
-                return;
+                return false;
             }
             if (!dc.port) {
                 await selectSerial();
-                return;
+                return false;
             }
 
             if (!compile && !this.useArduinoCli()) {
                 arduinoChannel.error("This command is only available when using the Arduino CLI");
-                return;
+                return false;
             }
 
             if (!this.useArduinoCli()) {
@@ -212,7 +212,7 @@ export class ArduinoApp {
         arduinoChannel.start(`${buildMode} sketch '${dc.sketch}'`);
 
         if (!await this.runPreBuildCommand(dc)) {
-            return;
+            return false;
         }
 
         if (dc.output && compile) {
@@ -220,7 +220,7 @@ export class ArduinoApp {
             const dirPath = path.dirname(outputPath);
             if (!util.directoryExistsSync(dirPath)) {
                 logger.notifyUserError("InvalidOutPutPath", new Error(constants.messages.INVALID_OUTPUT_PATH + outputPath));
-                return;
+                return false;
             }
 
             if (this.useArduinoCli()) {
@@ -243,6 +243,8 @@ export class ArduinoApp {
             UsbDetector.getInstance().pauseListening();
         }
 
+        let success = false;
+
         // Push sketch as last argument
         args.push(path.join(ArduinoWorkspace.rootPath, dc.sketch));
 
@@ -270,6 +272,7 @@ export class ArduinoApp {
         ).then(async () => {
             await cleanup();
             arduinoChannel.end(`${buildMode} sketch '${dc.sketch}'${os.EOL}`);
+            success = true;
         }, async (reason) => {
             await cleanup();
             const msg = reason.code ?
@@ -279,6 +282,7 @@ export class ArduinoApp {
                     JSON.stringify(reason);
             arduinoChannel.error(`${buildMode} sketch '${dc.sketch}': ${msg}${os.EOL}`);
         });
+        return success;
     }
 
     public async verify(buildMode: BuildMode, buildDir: string = "") {

From 2a2db50081b24750b7e84f8bed80b28429c08092 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Fri, 11 Dec 2020 23:12:03 +0100
Subject: [PATCH 057/142] Make build and verify identical

---
 src/arduino/arduino.ts | 138 +++++++++++++++++++++++++++++++++++++----
 src/extension.ts       |   2 +-
 2 files changed, 126 insertions(+), 14 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index d7507227..612a53ba 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -109,10 +109,12 @@ export class ArduinoApp {
      *     selectable programmer
      * @param {bool} [compile=true] - Indicates whether to compile the code when using the CLI to upload
      */
-    public async build(buildMode: BuildMode, compile: boolean = true) {
+    public async build(buildMode: BuildMode, compile: boolean, buildDir?: string): Promise<boolean> {
         const dc = DeviceContext.getInstance();
         const args: string[] = [];
         let restoreSerialMonitor: boolean = false;
+        let cocopa: ICoCoPaContext;
+
         const boardDescriptor = this.getBoardBuildString();
         if (!boardDescriptor) {
             return false;
@@ -199,10 +201,26 @@ export class ArduinoApp {
             }
 
             args.push("--port", dc.port);
+        } else if (buildMode === BuildMode.Analyze) {
+            if (!isCompilerParserEnabled()) {
+                return false;
+            }
+            cocopa = makeCompilerParserContext(dc);
+            if (!this.useArduinoCli()) {
+                args.push("--verify", "--verbose");
+            } else {
+                args.push("compile", "--verbose", "-b", boardDescriptor);
+            }
+        } else {
+            if (!this.useArduinoCli()) {
+                args.push("--verify");
+            } else {
+                args.push("compile", "-b", boardDescriptor);
+            }
         }
 
         const verbose = VscodeSettings.getInstance().logLevel === "verbose";
-        if (verbose) {
+        if (buildMode !== BuildMode.Analyze && verbose) {
             args.push("--verbose");
         }
 
@@ -215,8 +233,8 @@ export class ArduinoApp {
             return false;
         }
 
-        if (dc.output && compile) {
-            const outputPath = path.resolve(ArduinoWorkspace.rootPath, dc.output);
+        if ((buildDir || dc.output) && compile) {
+            const outputPath = path.resolve(ArduinoWorkspace.rootPath, buildDir || dc.output);
             const dirPath = path.dirname(outputPath);
             if (!util.directoryExistsSync(dirPath)) {
                 logger.notifyUserError("InvalidOutPutPath", new Error(constants.messages.INVALID_OUTPUT_PATH + outputPath));
@@ -230,9 +248,9 @@ export class ArduinoApp {
                 args.push("--pref", `build.path=${outputPath}`);
             }
 
-            arduinoChannel.info(`Please see the build logs in Output path: ${outputPath}`);
+            arduinoChannel.info(`Please see the build logs in output path: ${outputPath}`);
         } else {
-            const msg = "Output path is not specified. Unable to reuse previously compiled files. Upload could be slow. See README.";
+            const msg = "Output path is not specified. Unable to reuse previously compiled files. Build will be slower. See README.";
             arduinoChannel.warning(msg);
         }
 
@@ -249,6 +267,9 @@ export class ArduinoApp {
         args.push(path.join(ArduinoWorkspace.rootPath, dc.sketch));
 
         const cleanup = async () => {
+            if (cocopa) {
+                cocopa.conclude();
+            }
             if (buildMode === BuildMode.Upload || buildMode === BuildMode.UploadProgrammer) {
                 UsbDetector.getInstance().resumeListening();
                 if (restoreSerialMonitor) {
@@ -260,7 +281,14 @@ export class ArduinoApp {
         // TODO: Get rid of spawn's channel parameter and just support
         // stdout and stderr callbacks
         const stdoutCallback = (line: string) => {
-            arduinoChannel.channel.append(line);
+            if (cocopa) {
+                cocopa.callback(line);
+                if (verbose) {
+                    arduinoChannel.channel.append(line);
+                }
+            } else {
+                arduinoChannel.channel.append(line);
+            }
         }
 
         await util.spawn(
@@ -282,12 +310,15 @@ export class ArduinoApp {
                     JSON.stringify(reason);
             arduinoChannel.error(`${buildMode} sketch '${dc.sketch}': ${msg}${os.EOL}`);
         });
+
         return success;
     }
 
-    public async verify(buildMode: BuildMode, buildDir: string = "") {
+    public async verify(buildMode: BuildMode, buildDir?: string): Promise<boolean> {
+        const compile = true;
         const dc = DeviceContext.getInstance();
         const args: string[] = [];
+        let restoreSerialMonitor: boolean = false;
         let cocopa: ICoCoPaContext;
 
         const boardDescriptor = this.getBoardBuildString();
@@ -307,7 +338,76 @@ export class ArduinoApp {
             await this.getMainSketch(dc);
         }
 
-        if (buildMode === BuildMode.Analyze) {
+        const selectSerial = async () => {
+            const choice = await vscode.window.showInformationMessage(
+                "Serial port is not specified. Do you want to select a serial port for uploading?",
+                "Yes", "No");
+            if (choice === "Yes") {
+                vscode.commands.executeCommand("arduino.selectSerialPort");
+            }
+        }
+
+        if (buildMode === BuildMode.Upload) {
+            if ((!dc.configuration || !/upload_method=[^=,]*st[^,]*link/i.test(dc.configuration)) && !dc.port) {
+                await selectSerial();
+                return false;
+            }
+
+            if (!compile && !this.useArduinoCli()) {
+                arduinoChannel.error("This command is only available when using the Arduino CLI");
+                return;
+            }
+
+            if (!this.useArduinoCli()) {
+                args.push("--upload");
+            } else {
+                // TODO: add the --clean argument to the cli args when v 0.14 is released (this will clean up the build folder after uploading)
+                if (compile) {
+                    args.push("compile", "--upload");
+                } else {
+                    args.push("upload");
+                }
+                args.push("-b", boardDescriptor);
+            }
+
+            if (dc.port) {
+                args.push("--port", dc.port);
+            }
+        } else if (buildMode === BuildMode.UploadProgrammer) {
+            const programmer = this.getProgrammerString();
+            if (!programmer) {
+                return false;
+            }
+            if (!dc.port) {
+                await selectSerial();
+                return false;
+            }
+
+            if (!compile && !this.useArduinoCli()) {
+                arduinoChannel.error("This command is only available when using the Arduino CLI");
+                return;
+            }
+
+            if (!this.useArduinoCli()) {
+                args.push("--upload");
+            } else {
+                // TODO: add the --clean argument to the cli args when v 0.14 is released (this will clean up the build folder after uploading)
+                if (compile) {
+                    args.push("compile", "--upload");
+                } else {
+                    args.push("upload");
+                }
+                args.push("-b", boardDescriptor);
+            }
+
+            if (this.useArduinoCli()) {
+                args.push("--programmer", programmer)
+            } else {
+                args.push("--useprogrammer", "--pref", "programmer=arduino:" + programmer)
+            }
+
+            args.push("--port", dc.port);
+        } else if (buildMode === BuildMode.Analyze) {
             if (!isCompilerParserEnabled()) {
                 return false;
             }
@@ -339,7 +439,7 @@ export class ArduinoApp {
             return false;
         }
 
-        if (buildDir || dc.output) {
+        if ((buildDir || dc.output) && compile) {
             const outputPath = path.resolve(ArduinoWorkspace.rootPath, buildDir || dc.output);
             const dirPath = path.dirname(outputPath);
             if (!util.directoryExistsSync(dirPath)) {
@@ -354,12 +454,19 @@ export class ArduinoApp {
                 args.push("--pref", `build.path=${outputPath}`);
             }
 
-            arduinoChannel.info(`Please see the build logs in Output path: ${outputPath}`);
+            arduinoChannel.info(`Please see the build logs in output path: ${outputPath}`);
         } else {
-            const msg = "Output path is not specified. Unable to reuse previously compiled files. Verify could be slow. See README.";
+            const msg = "Output path is not specified. Unable to reuse previously compiled files. Build will be slower. See README.";
             arduinoChannel.warning(msg);
         }
 
+        // stop serial monitor when everything is prepared and good
+        // what makes restoring of its previous state easier
+        if (buildMode === BuildMode.Upload || buildMode === BuildMode.UploadProgrammer) {
+            restoreSerialMonitor = await SerialMonitor.getInstance().closeSerialMonitor(dc.port);
+            UsbDetector.getInstance().pauseListening();
+        }
+
         let success = false;
 
         // Push sketch as last argument
@@ -369,7 +476,12 @@ export class ArduinoApp {
             if (cocopa) {
                 cocopa.conclude();
             }
-            await Promise.resolve();
+            if (buildMode === BuildMode.Upload || buildMode === BuildMode.UploadProgrammer) {
+                UsbDetector.getInstance().resumeListening();
+                if (restoreSerialMonitor) {
+                    await SerialMonitor.getInstance().openSerialMonitor();
+                }
+            }
         }
 
         // TODO: Get rid of spawn's channel parameter and just support
diff --git a/src/extension.ts b/src/extension.ts
index c7b904f5..eb7bd209 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -145,7 +145,7 @@ export async function activate(context: vscode.ExtensionContext) {
                     location: vscode.ProgressLocation.Window,
                     title: "Arduino: Uploading...",
                 }, async () => {
-                    await arduinoContextModule.default.arduinoApp.build(BuildMode.Upload);
+                    await arduinoContextModule.default.arduinoApp.build(BuildMode.Upload, true);
                 });
             } catch (ex) {
             }

From 216e1b8ec2a7a748b388bb8ffe2fdd226539204f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Fri, 11 Dec 2020 23:14:26 +0100
Subject: [PATCH 058/142] Merge build and verify

---
 src/arduino/arduino.ts             | 221 ++---------------------------
 src/debug/configurationProvider.ts |   2 +-
 src/extension.ts                   |   2 +-
 3 files changed, 11 insertions(+), 214 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 612a53ba..5263b533 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -102,12 +102,15 @@ export class ArduinoApp {
     }
 
     /**
-     * Upload code to selected board
-     * @param {BuildMode} buildMode Build mode.
-     *  * BuildMode.Upload: Compile and upload
-     *  * BuildMode.UploadProgrammer: Compile and upload using the user
-     *     selectable programmer
-     * @param {bool} [compile=true] - Indicates whether to compile the code when using the CLI to upload
+     * Runs the arduino builder to build/compile and - if necessary - upload
+     * the current sketch.
+     * @param buildMode Build mode. BuildMode.Upload: Compile and upload,
+     * BuildMode.UploadProgrammer: Compile and upload using the user selectable
+     * programmer, BuildMode.Analyze: Compile, analyze the output and generate
+     * IntelliSense configuration from it, BuildMode.Verify: Just compile.
+     * @param {bool} compile - Indicates whether to compile the code when using the CLI to upload
+     * @param buildDir Override the build directory set by the project settings
+     * with the given directory.
      */
     public async build(buildMode: BuildMode, compile: boolean, buildDir?: string): Promise<boolean> {
         const dc = DeviceContext.getInstance();
@@ -314,212 +317,6 @@ export class ArduinoApp {
         return success;
     }
 
-    public async verify(buildMode: BuildMode, buildDir?: string): Promise<boolean> {
-        const compile = true;
-        const dc = DeviceContext.getInstance();
-        const args: string[] = [];
-        let restoreSerialMonitor: boolean = false;
-        let cocopa: ICoCoPaContext;
-
-        const boardDescriptor = this.getBoardBuildString();
-        if (!boardDescriptor) {
-            return false;
-        }
-        if (!this.useArduinoCli()) {
-            args.push("--board", boardDescriptor);
-        }
-
-        if (!ArduinoWorkspace.rootPath) {
-            vscode.window.showWarningMessage("Cannot find the sketch file.");
-            return false;
-        }
-
-        if (!dc.sketch || !util.fileExistsSync(path.join(ArduinoWorkspace.rootPath, dc.sketch))) {
-            await this.getMainSketch(dc);
-        }
-
-        const selectSerial = async () => {
-            const choice = await vscode.window.showInformationMessage(
-                "Serial port is not specified. Do you want to select a serial port for uploading?",
-                "Yes", "No");
-            if (choice === "Yes") {
-                vscode.commands.executeCommand("arduino.selectSerialPort");
-            }
-        }
-
-        if (buildMode === BuildMode.Upload) {
-            if ((!dc.configuration || !/upload_method=[^=,]*st[^,]*link/i.test(dc.configuration)) && !dc.port) {
-                await selectSerial();
-                return false;
-            }
-
-            if (!compile && !this.useArduinoCli()) {
-                arduinoChannel.error("This command is only available when using the Arduino CLI");
-                return;
-            }
-
-            if (!this.useArduinoCli()) {
-                args.push("--upload");
-            } else {
-                // TODO: add the --clean argument to the cli args when v 0.14 is released (this will clean up the build folder after uploading)
-                if (compile) {
-                    args.push("compile", "--upload");
-                } else {
-                    args.push("upload");
-                }
-                args.push("-b", boardDescriptor);
-            }
-
-            if (dc.port) {
-                args.push("--port", dc.port);
-            }
-        } else if (buildMode === BuildMode.UploadProgrammer) {
-            const programmer = this.getProgrammerString();
-            if (!programmer) {
-                return false;
-            }
-            if (!dc.port) {
-                await selectSerial();
-                return false;
-            }
-
-            if (!compile && !this.useArduinoCli()) {
-                arduinoChannel.error("This command is only available when using the Arduino CLI");
-                return;
-            }
-
-            if (!this.useArduinoCli()) {
-                args.push("--upload");
-            } else {
-                // TODO: add the --clean argument to the cli args when v 0.14 is released (this will clean up the build folder after uploading)
-                if (compile) {
-                    args.push("compile", "--upload");
-                } else {
-                    args.push("upload");
-                }
-                args.push("-b", boardDescriptor);
-            }
-
-            if (this.useArduinoCli()) {
-                args.push("--programmer", programmer)
-            } else {
-                args.push("--useprogrammer", "--pref", "programmer=arduino:" + programmer)
-            }
-
-            args.push("--port", dc.port);
-        } else if (buildMode === BuildMode.Analyze) {
-            if (!isCompilerParserEnabled()) {
-                return false;
-            }
-            cocopa = makeCompilerParserContext(dc);
-            if (!this.useArduinoCli()) {
-                args.push("--verify", "--verbose");
-            } else {
-                args.push("compile", "--verbose", "-b", boardDescriptor);
-            }
-        } else {
-            if (!this.useArduinoCli()) {
-                args.push("--verify");
-            } else {
-                args.push("compile", "-b", boardDescriptor);
-            }
-        }
-
-        const verbose = VscodeSettings.getInstance().logLevel === "verbose";
-        if (buildMode !== BuildMode.Analyze && verbose) {
-            args.push("--verbose");
-        }
-
-        await vscode.workspace.saveAll(false);
-
-        arduinoChannel.show();
-        arduinoChannel.start(`${buildMode} sketch '${dc.sketch}'`);
-
-        if (!await this.runPreBuildCommand(dc)) {
-            return false;
-        }
-
-        if ((buildDir || dc.output) && compile) {
-            const outputPath = path.resolve(ArduinoWorkspace.rootPath, buildDir || dc.output);
-            const dirPath = path.dirname(outputPath);
-            if (!util.directoryExistsSync(dirPath)) {
-                logger.notifyUserError("InvalidOutPutPath", new Error(constants.messages.INVALID_OUTPUT_PATH + outputPath));
-                return false;
-            }
-
-            if (this.useArduinoCli()) {
-                args.push("--build-path", outputPath);
-
-            } else {
-                args.push("--pref", `build.path=${outputPath}`);
-            }
-
-            arduinoChannel.info(`Please see the build logs in output path: ${outputPath}`);
-        } else {
-            const msg = "Output path is not specified. Unable to reuse previously compiled files. Build will be slower. See README.";
-            arduinoChannel.warning(msg);
-        }
-
-        // stop serial monitor when everything is prepared and good
-        // what makes restoring of its previous state easier
-        if (buildMode === BuildMode.Upload || buildMode === BuildMode.UploadProgrammer) {
-            restoreSerialMonitor = await SerialMonitor.getInstance().closeSerialMonitor(dc.port);
-            UsbDetector.getInstance().pauseListening();
-        }
-
-        let success = false;
-
-        // Push sketch as last argument
-        args.push(path.join(ArduinoWorkspace.rootPath, dc.sketch));
-
-        const cleanup = async () => {
-            if (cocopa) {
-                cocopa.conclude();
-            }
-            if (buildMode === BuildMode.Upload || buildMode === BuildMode.UploadProgrammer) {
-                UsbDetector.getInstance().resumeListening();
-                if (restoreSerialMonitor) {
-                    await SerialMonitor.getInstance().openSerialMonitor();
-                }
-            }
-        }
-
-        // TODO: Get rid of spawn's channel parameter and just support
-        // stdout and stderr callbacks
-        const stdoutCallback = (line: string) => {
-            if (cocopa) {
-                cocopa.callback(line);
-                if (verbose) {
-                    arduinoChannel.channel.append(line);
-                }
-            } else {
-                arduinoChannel.channel.append(line);
-            }
-        }
-
-        await util.spawn(
-            this._settings.commandPath,
-            arduinoChannel.channel,
-            args,
-            undefined,
-            stdoutCallback,
-        ).then(async () => {
-            await cleanup();
-            arduinoChannel.end(`${buildMode} sketch '${dc.sketch}'${os.EOL}`);
-            success = true;
-        }, async (reason) => {
-            await cleanup();
-            const msg = reason.code ?
-                `Exit with code=${reason.code}` :
-                reason.message ?
-                    reason.message :
-                    JSON.stringify(reason);
-            arduinoChannel.error(`${buildMode} sketch '${dc.sketch}': ${msg}${os.EOL}`);
-        });
-
-        return success;
-    }
-
     public tryToUpdateIncludePaths() {
         const configFilePath = path.join(ArduinoWorkspace.rootPath, constants.CPP_CONFIG_FILE);
         if (!fs.existsSync(configFilePath)) {
diff --git a/src/debug/configurationProvider.ts b/src/debug/configurationProvider.ts
index 315378db..51c5368c 100644
--- a/src/debug/configurationProvider.ts
+++ b/src/debug/configurationProvider.ts
@@ -136,7 +136,7 @@ export class ArduinoDebugConfigurationProvider implements vscode.DebugConfigurat
             config.program = path.join(ArduinoWorkspace.rootPath, outputFolder, `${path.basename(dc.sketch)}.elf`);
 
             // always compile elf to make sure debug the right elf
-            if (!await ArduinoContext.arduinoApp.verify(BuildMode.Verify, outputFolder)) {
+            if (!await ArduinoContext.arduinoApp.build(BuildMode.Verify, true, outputFolder)) {
                 vscode.window.showErrorMessage("Failure to verify the program, please check output for details.");
                 return false;
             }
diff --git a/src/extension.ts b/src/extension.ts
index eb7bd209..5e3b1545 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -124,7 +124,7 @@ export async function activate(context: vscode.ExtensionContext) {
                     location: vscode.ProgressLocation.Window,
                     title: "Arduino: Verifying...",
                 }, async () => {
-                    await arduinoContextModule.default.arduinoApp.verify(BuildMode.Verify);
+                    await arduinoContextModule.default.arduinoApp.build(BuildMode.Verify, true);
                 });
             } catch (ex) {
             }

From f914a4b3270e7d3c3e6f256e3b5cca471bc36ce5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Fri, 11 Dec 2020 23:18:01 +0100
Subject: [PATCH 059/142] Add arduino.rebuildIntelliSenseConfig

---
 README.md                          |  9 +++++++++
 package.json                       | 10 ++++++++++
 src/debug/configurationProvider.ts |  2 +-
 src/extension.ts                   | 22 ++++++++++++++++++++--
 test/extension.test.ts             |  1 +
 5 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 068eba6e..a1e084a3 100644
--- a/README.md
+++ b/README.md
@@ -50,10 +50,12 @@ This extension provides several commands in the Command Palette (<kbd>F1</kbd> o
 - **Arduino: Upload**: Build sketch and upload to Arduino board.
 - **Arduino: Upload Using Programmer**: Upload using an external programmer.
 - **Arduino: Verify**: Build sketch.
+- **Arduino: Rebuild IntelliSense Configuration**: Forced/manual rebuild of the IntelliSense configuration. The extension analyzes Arduino's build output and sets the Intellisense include paths, defines, compiler arguments accordingly.
 
 ## Keybindings
 - **Arduino: Upload** <kbd>Alt</kbd> + <kbd>Cmd</kbd> + <kbd>U</kbd> *or* <kbd>Alt</kbd> + <kbd>Ctrl</kbd> + <kbd>U</kbd>
 - **Arduino: Verify** <kbd>Alt</kbd> + <kbd>Cmd</kbd> + <kbd>R</kbd> *or* <kbd>Alt</kbd> + <kbd>Ctrl</kbd> + <kbd>R</kbd>
+- **Arduino: Rebuild IntelliSense Configuration** <kbd>Alt</kbd> + <kbd>Cmd</kbd> + <kbd>I</kbd> *or* <kbd>Alt</kbd> + <kbd>Ctrl</kbd> + <kbd>I</kbd>
 
 ## Options
 | Option | Description |
@@ -115,9 +117,16 @@ The following settings are as per sketch settings of the Arduino extension. You
   - `"enable"`: Enable the auto-generation even if globally disabled
 
 ## IntelliSense
+*TODO: Rewrite this section*
 vscode-arduino auto-configures IntelliSense by default. vscode-arduino analyzes Arduino's compiler output during verify and generates the corresponding configuration file at `.vscode/c_cpp_properties.json` and tries as hard as possible to keep things up to date, e.g. running verify when switching the board or the sketch.
 It doesn't makes sense though to run verify repeatedly. Therefore if the workspace reports problems (for instance after adding new includes to a new library) run *verify* such that IntelliSense knows of the new include directories (since the Arduino-backend performs the library resolution externally).
 
+TODO: Note about configuration selection in lower right.
+
+Manual rebuild: **Ardino: Rebuild IntelliSense Configuration**,
+Keybindings: **Arduino: Rebuild IntelliSense Configuration** <kbd>Alt</kbd> + <kbd>Cmd</kbd> + <kbd>I</kbd> *or* <kbd>Alt</kbd> + <kbd>Ctrl</kbd> + <kbd>I</kbd>
+
+
 ## Debugging Arduino Code <sup>preview</sup>
 Before you start to debug your Arduino code, please read [this document](https://code.visualstudio.com/docs/editor/debugging) to learn about the basic mechanisms of debugging in Visual Studio Code. Also see [debugging for C++ in VSCode](https://code.visualstudio.com/docs/languages/cpp#_debugging) for further reference.
 
diff --git a/package.json b/package.json
index 292c447c..b846d0fa 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
     "onCommand:arduino.verify",
     "onCommand:arduino.upload",
     "onCommand:arduino.uploadUsingProgrammer",
+    "onCommand:arduino.rebuildIntelliSenseConfig",
     "onCommand:arduino.selectProgrammer",
     "onCommand:arduino.selectSerialPort",
     "onCommand:arduino.changeBaudRate",
@@ -105,6 +106,10 @@
         "command": "arduino.cliUploadUsingProgrammer",
         "title": "Arduino CLI: Upload Using Programmer"
       },
+      {
+        "command": "arduino.rebuildIntelliSenseConfig",
+        "title": "Arduino: Rebuild IntelliSense Configuration"
+      },
       {
         "command": "arduino.selectProgrammer",
         "title": "Arduino: Select Programmer"
@@ -444,6 +449,11 @@
         "command": "arduino.upload",
         "key": "ctrl+alt+u",
         "mac": "cmd+alt+u"
+      },
+      {
+        "command": "arduino.rebuildIntelliSenseConfig",
+        "key": "ctrl+alt+i",
+        "mac": "cmd+alt+i"
       }
     ],
     "configuration": {
diff --git a/src/debug/configurationProvider.ts b/src/debug/configurationProvider.ts
index 51c5368c..19588160 100644
--- a/src/debug/configurationProvider.ts
+++ b/src/debug/configurationProvider.ts
@@ -137,7 +137,7 @@ export class ArduinoDebugConfigurationProvider implements vscode.DebugConfigurat
 
             // always compile elf to make sure debug the right elf
             if (!await ArduinoContext.arduinoApp.build(BuildMode.Verify, true, outputFolder)) {
-                vscode.window.showErrorMessage("Failure to verify the program, please check output for details.");
+                vscode.window.showErrorMessage("Failed to verify the program, please check the output for details.");
                 return false;
             }
 
diff --git a/src/extension.ts b/src/extension.ts
index 5e3b1545..5f461a4c 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -44,8 +44,8 @@ export async function activate(context: vscode.ExtensionContext) {
         const workingFile = path.normalize(openEditor.document.fileName);
         const workspaceFolder = (vscode.workspace && ArduinoWorkspace.rootPath) || "";
         if (!workspaceFolder || workingFile.indexOf(path.normalize(workspaceFolder)) < 0) {
-            vscode.window.showWarningMessage(`The working file "${workingFile}" is not under the workspace folder, ` +
-                "the arduino extension might not work appropriately.");
+            vscode.window.showWarningMessage(`The open file "${workingFile}" is not inside the workspace folder, ` +
+                "the arduino extension might not work properly.");
         }
     }
     const vscodeSettings = VscodeSettings.getInstance();
@@ -197,6 +197,9 @@ export async function activate(context: vscode.ExtensionContext) {
     registerArduinoCommand("arduino.uploadUsingProgrammer", async () => {
         if (!status.compile) {
             status.compile = "upload";
+            // TODO: no progress indicator
+            //       and: exceptions should be handled within build
+            //            function
             try {
                 await arduinoContextModule.default.arduinoApp.build(BuildMode.UploadProgrammer, true);
             } catch (ex) {
@@ -220,6 +223,21 @@ export async function activate(context: vscode.ExtensionContext) {
         return { board: arduinoContextModule.default.boardManager.currentBoard.name };
     });
 
+    registerArduinoCommand("arduino.rebuildIntelliSenseConfig", async () => {
+        if (!status.compile) {
+            status.compile = "intellisenserebuild";
+            await vscode.window.withProgress({
+                location: vscode.ProgressLocation.Window,
+                title: "Arduino: Rebuilding IS Configuration...",
+            }, async () => {
+                await arduinoContextModule.default.arduinoApp.build(BuildMode.Analyze, true);
+            });
+            delete status.compile;
+        }
+    }, () => {
+        return { board: arduinoContextModule.default.boardManager.currentBoard.name };
+    });
+
     registerArduinoCommand("arduino.selectProgrammer", async () => {
         if (!status.compile) {
             status.compile = "upload";
diff --git a/test/extension.test.ts b/test/extension.test.ts
index 9c56fc41..566fb6b1 100644
--- a/test/extension.test.ts
+++ b/test/extension.test.ts
@@ -37,6 +37,7 @@ suite("Arduino: Extension Tests", () => {
                     "arduino.verify",
                     "arduino.upload",
                     "arduino.uploadUsingProgrammer",
+                    "arduino.rebuildIntelliSenseConfig",
                     "arduino.selectProgrammer",
                     "arduino.showBoardManager",
                     "arduino.showLibraryManager",

From 3418458f72f0df6b79c42bb806491f8497f02a2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Fri, 11 Dec 2020 23:25:51 +0100
Subject: [PATCH 060/142] Fix whitespace

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a1e084a3..a7dda5ae 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,7 @@ This extension provides several commands in the Command Palette (<kbd>F1</kbd> o
 | `arduino.commandPath` | Path to an executable (or script) relative to `arduino.path`. The default value is `arduino_debug.exe` for windows,`Contents/MacOS/Arduino` for Mac and `arduino` for Linux, You also can use a custom launch script to run Arduino by modifying this setting. (Requires a restart after change) Example: `run-arduino.bat` for Windows, `Contents/MacOS/run-arduino.sh` for Mac and `bin/run-arduino.sh` for Linux. |
 | `arduino.additionalUrls` | Additional Boards Manager URLs for 3rd party packages. You can have multiple URLs in one string with a comma(`,`) as separator, or have a string array. The default value is empty. |
 | `arduino.logLevel` | CLI output log level. Could be info or verbose. The default value is `"info"`. |
-| `arduino.allowPDEFiletype` | Allow the VSCode Arduino extension to open .pde files from pre-1.0.0 versions of Ardiuno. Note that this will break Processing code. Default value is `false`. | 
+| `arduino.allowPDEFiletype` | Allow the VSCode Arduino extension to open .pde files from pre-1.0.0 versions of Ardiuno. Note that this will break Processing code. Default value is `false`. |
 | `arduino.enableUSBDetection` | Enable/disable USB detection from the VSCode Arduino extension. The default value is `true`. When your device is plugged in to your computer, it will pop up a message "`Detected board ****, Would you like to switch to this board type`". After clicking the `Yes` button, it will automatically detect which serial port (COM) is connected a USB device. If your device does not support this feature, please provide us with the PID/VID of your device; the code format is defined in `misc/usbmapping.json`.To learn more about how to list the vid/pid, use the following tools: https://github.com/EmergingTechnologyAdvisors/node-serialport `npm install -g serialport` `serialport-list -f jsonline`|
 | `arduino.disableTestingOpen` | Enable/disable automatic sending of a test message to the serial port for checking the open status. The default value is `false` (a test message will be sent). |
 | `arduino.skipHeaderProvider` | Enable/disable the extension providing completion items for headers. This functionality is included in newer versions of the C++ extension. The default value is `false`.|
@@ -78,7 +78,7 @@ The following Visual Studio Code settings are available for the Arduino extensio
     "arduino.path": "C:/Program Files (x86)/Arduino",
     "arduino.commandPath": "arduino_debug.exe",
     "arduino.logLevel": "info",
-    "arduino.allowPDEFiletype": false, 
+    "arduino.allowPDEFiletype": false,
     "arduino.enableUSBDetection": true,
     "arduino.disableTestingOpen": false,
     "arduino.skipHeaderProvider": false,

From 41bcd445013571bdf824a7d6b1d8d0cf22ec61dd Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Mon, 17 Feb 2020 16:38:12 +0100
Subject: [PATCH 061/142] Disabled and marked all previous implementations of
 IntelliSense support for later removal using `IS-REMOVE`

---
 BRANCHNOTES.md                        | 20 ++++++++++++++++++++
 package.json                          |  1 -
 src/arduino/arduino.ts                | 21 ++++++++++++++++++---
 src/arduino/arduinoContentProvider.ts |  3 ++-
 src/arduino/boardManager.ts           |  3 ++-
 src/common/util.ts                    |  1 +
 src/extension.ts                      |  6 ++++--
 src/langService/completionProvider.ts | 23 ++++++++++++++++++++++-
 test/boardmanager.test.ts             |  3 ++-
 test/commands.test.ts                 |  3 +++
 test/extension.test.ts                |  4 +++-
 11 files changed, 77 insertions(+), 11 deletions(-)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index a5713e73..62ffff05 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -35,6 +35,8 @@ During merging I found some bugs within those functions - mainly due to the abov
 * Error message formatting was fixed within `verify` only
 * No consistent return values within `verify` (when it bailed out early it returned `void`)
 
+**2020 02 17** Disabled and marked all previous implementations of IntelliSense support for later removal.
+
 ### Status
 |      | Tasks   |
 |-----:|:--------|
@@ -99,6 +101,7 @@ I will list every supporter here, thanks!
 2020-02-12 Elektronik Workshop: 32 :beers: (8h coding)
 2020-02-15 T.D.: 4 :beers: (20$ - Thanks a lot!)
 2020-02-15 Elektronik Workshop: 28 :beers: (7h coding)
+2020-02-16 Elektronik Workshop: x :beers: (xh coding)
 
 <!-- https://github.com/StylishThemes/GitHub-Dark/wiki/Emoji -->
 
@@ -116,6 +119,7 @@ I will list every supporter here, thanks!
  * https://github.com/Microsoft/vscode-cpptools/issues/1750
  * Problems with IntelliSense itself https://github.com/microsoft/vscode-cpptools/issues/1034
  * Logging for IntelliSense https://code.visualstudio.com/docs/cpp/enable-logging-cpp
+
 ## Future Work
 * Proper interactive serial terminal (this is the second major show stopper in my opinion)
   * Command history option
@@ -140,6 +144,22 @@ I will list every supporter here, thanks!
   * general lack of modularity - the above is the result
 * It seems that this extension is pretty chaotic. Most probably some refactoring is necessary.
 * Possibility to jump to compilation errors from compiler output and highlight compiler errors
+
+## Non-categorized Notes
+### Integrate upstream changes into fork
+```bash
+git remote add upstream https://github.com/microsoft/vscode-arduino.git
+git remote -v
+git fetch upstream
+# make sure your working directory is clean, then
+git checkout master
+git merge upstream/master
+git push origin master
+# to pull the changes into you feature branch:
+git checkout intellisense-autoconfig
+git merge master
+git push origin intellisense-autoconfig
+```
 ----
 
 ## How to beta test cutting edge code from the repo
diff --git a/package.json b/package.json
index b846d0fa..0d39907c 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,6 @@
     "onCommand:arduino.selectProgrammer",
     "onCommand:arduino.selectSerialPort",
     "onCommand:arduino.changeBaudRate",
-    "onCommand:arduino.addLibPath",
     "onCommand:arduino.openSerialMonitor",
     "onCommand:arduino.sendMessageToSerialPort",
     "onCommand:arduino.closeSerialMonitor",
diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 5263b533..e6a749b3 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -317,6 +317,8 @@ export class ArduinoApp {
         return success;
     }
 
+    // IS-REMOVE: to be removed completely when IntelliSense implementation is merged
+    /*
     public tryToUpdateIncludePaths() {
         const configFilePath = path.join(ArduinoWorkspace.rootPath, constants.CPP_CONFIG_FILE);
         if (!fs.existsSync(configFilePath)) {
@@ -358,6 +360,7 @@ export class ArduinoApp {
                 configuration.defines.push(define);
             }
         }
+    */
         // remove all unexisting paths
         // concern mistake removal, comment temporary
         // for (let pathIndex = 0; pathIndex < configuration.includePath.length; pathIndex++) {
@@ -385,12 +388,15 @@ export class ArduinoApp {
         //         pathIndex--;
         //     }
         // }
-
+    /*
         if (cppConfigFileUpdated) {
             fs.writeFileSync(configFilePath, JSON.stringify(cppConfig, null, 4));
         }
     }
+    */
 
+    // IS-REMOVE: to be removed completely when IntelliSense implementation is merged
+    /*
     // Add selected library path to the intellisense search path.
     public addLibPath(libraryPath: string) {
         let libPaths;
@@ -466,7 +472,7 @@ export class ArduinoApp {
 
         fs.writeFileSync(configFilePath, JSON.stringify(deviceContext, null, 4));
     }
-
+    */
     // Include the *.h header files from selected library to the arduino sketch.
     public async includeLibrary(libraryPath: string) {
         if (!ArduinoWorkspace.rootPath) {
@@ -610,6 +616,8 @@ export class ArduinoApp {
         arduinoChannel.end(`Removed library - ${libName}${os.EOL}`);
     }
 
+    // IS-REMOVE: to be removed completely when IntelliSense implementation is merged
+    /*
     public getDefaultPackageLibPaths(): string[] {
         const result = [];
         const boardDescriptor = this._boardManager.currentBoard;
@@ -644,8 +652,10 @@ export class ArduinoApp {
             result.push(path.normalize(path.join(toolPath, "**")));
         }
         return result;
-    }
+    }*/
 
+    // IS-REMOVE: to be removed completely when IntelliSense implementation is merged
+    /*
     public getDefaultForcedIncludeFiles(): string[] {
         const result = [];
         const boardDescriptor = this._boardManager.currentBoard;
@@ -665,6 +675,7 @@ export class ArduinoApp {
         result.push("USBCON");
         return result;
     }
+    */
 
     public openExample(example) {
         function tmpName(name) {
@@ -705,6 +716,7 @@ export class ArduinoApp {
                 const dc = DeviceContext.getInstance();
                 const arduinoJson = {
                     sketch: sketchFile,
+                    // TODO: COM1 is Windows specific - what about OSX and Linux users?
                     port: dc.port || "COM1",
                     board: dc.board,
                     configuration: dc.configuration,
@@ -713,6 +725,8 @@ export class ArduinoApp {
                 util.mkdirRecursivelySync(path.dirname(arduinoConfigFilePath));
                 fs.writeFileSync(arduinoConfigFilePath, JSON.stringify(arduinoJson, null, 4));
 
+                // IS-REMOVE: to be removed completely when IntelliSense implementation is merged
+                /*
                 // Generate cpptools intellisense config
                 const cppConfigFilePath = path.join(destExample, constants.CPP_CONFIG_FILE);
 
@@ -749,6 +763,7 @@ export class ArduinoApp {
                 };
                 util.mkdirRecursivelySync(path.dirname(cppConfigFilePath));
                 fs.writeFileSync(cppConfigFilePath, JSON.stringify(cppConfig, null, 4));
+                */
             }
 
             // Step 3: Open the arduino project at a new vscode window.
diff --git a/src/arduino/arduinoContentProvider.ts b/src/arduino/arduinoContentProvider.ts
index af0a0b1b..4602404a 100644
--- a/src/arduino/arduinoContentProvider.ts
+++ b/src/arduino/arduinoContentProvider.ts
@@ -206,7 +206,8 @@ export class ArduinoContentProvider implements vscode.TextDocumentContentProvide
             return res.status(400).send("BAD Request! Missing { libraryPath } parameters!");
         } else {
             try {
-                await ArduinoContext.arduinoApp.addLibPath(req.body.libraryPath);
+                // IS-REMOVE: to be removed completely when IntelliSense implementation is merged
+                // await ArduinoContext.arduinoApp.addLibPath(req.body.libraryPath);
                 await ArduinoContext.arduinoApp.includeLibrary(req.body.libraryPath);
                 return res.json({
                     status: "OK",
diff --git a/src/arduino/boardManager.ts b/src/arduino/boardManager.ts
index d8267afa..dd35a80c 100644
--- a/src/arduino/boardManager.ts
+++ b/src/arduino/boardManager.ts
@@ -123,7 +123,8 @@ export class BoardManager {
         this._currentBoard = targetBoard;
         dc.configuration = this._currentBoard.customConfig;
         this._boardConfigStatusBar.text = targetBoard.name;
-        this._arduinoApp.addLibPath(null);
+        // IS-REMOVE: to be removed completely when IntelliSense implementation is merged
+        // this._arduinoApp.addLibPath(null);
 
         this._onBoardTypeChanged.fire();
     }
diff --git a/src/common/util.ts b/src/common/util.ts
index 4344f5ad..d1b51389 100644
--- a/src/common/util.ts
+++ b/src/common/util.ts
@@ -13,6 +13,7 @@ import { arduinoChannel } from "./outputChannel";
 
 const encodingMapping: object = JSON.parse(fs.readFileSync(path.join(__dirname, "../../../misc", "codepageMapping.json"), "utf8"));
 
+// IS-REMOVE: to be removed completely when IntelliSense implementation is merged
 /**
  * This function will return the VSCode C/C++ extesnion compatible platform literals.
  * @function getCppConfigPlatform
diff --git a/src/extension.ts b/src/extension.ts
index 5f461a4c..36d5a71e 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -254,7 +254,8 @@ export async function activate(context: vscode.ExtensionContext) {
         };
     });
 
-    registerArduinoCommand("arduino.addLibPath", (path) => arduinoContextModule.default.arduinoApp.addLibPath(path));
+    // IS-REMOVE: to be removed completely when IntelliSense implementation is merged
+    // registerArduinoCommand("arduino.addLibPath", (path) => arduinoContextModule.default.arduinoApp.addLibPath(path));
     registerArduinoCommand("arduino.openExample", (path) => arduinoContextModule.default.arduinoApp.openExample(path));
     registerArduinoCommand("arduino.loadPackages", async () => await arduinoContextModule.default.boardManager.loadPackages(true));
     registerArduinoCommand("arduino.installBoard", async (packageName, arch, version: string = "") => {
@@ -308,7 +309,8 @@ export async function activate(context: vscode.ExtensionContext) {
                 SerialMonitor.getInstance().initialize();
             }
             arduinoContextModule.default.boardManager.updateStatusBar(true);
-            arduinoContextModule.default.arduinoApp.tryToUpdateIncludePaths();
+            // IS-REMOVE: to be removed completely when IntelliSense implementation is merged
+            // arduinoContextModule.default.arduinoApp.tryToUpdateIncludePaths();
             vscode.commands.executeCommand("setContext", "vscode-arduino:showExampleExplorer", true);
         })();
     }
diff --git a/src/langService/completionProvider.ts b/src/langService/completionProvider.ts
index 12782819..0a21bef4 100644
--- a/src/langService/completionProvider.ts
+++ b/src/langService/completionProvider.ts
@@ -12,6 +12,25 @@ import ArduinoActivator from "../arduinoActivator";
 import ArduinoContext from "../arduinoContext";
 import { ArduinoWorkspace } from "../common/workspace";
 
+/**
+ * Provides completions for library header includes.
+ *
+ * NOTE: With the new IntelliSense auto-configuration this doesn't make
+ * much sense in its current state, since it tries to fetch includes
+ * from the wrongly guessed include paths. And it tries to fetch includes
+ * from the c_cpp_properties which is now automatically generated from the
+ * files already included -> therefore the user already included the header
+ * and doesn't need a completion. Furthermore IntelliSense knows the location
+ * as well and can complete it too.
+ *
+ * To make this useful it has to parse the actual library folders and then
+ * it makes only sense if it reads the library information and checks if
+ * the individual libraries are actually compatible with the current board
+ * before offering a completion.
+ *
+ * EW
+ * 2020-02-17
+ */
 export class CompletionProvider implements vscode.CompletionItemProvider {
 
     private _headerFiles = new Set<string>();
@@ -65,10 +84,12 @@ export class CompletionProvider implements vscode.CompletionItemProvider {
         }
         this._libPaths.clear();
         this._headerFiles.clear();
+        // IS-REMOVE: to be removed completely when IntelliSense implementation is merged
+        /*
         ArduinoContext.arduinoApp.getDefaultPackageLibPaths().forEach((defaultPath) => {
             this._libPaths.add(defaultPath);
         });
-
+        */
         if (fs.existsSync(this._cppConfigFile)) {
             const deviceConfig = util.tryParseJSON(fs.readFileSync(this._cppConfigFile, "utf8"));
             if (deviceConfig) {
diff --git a/test/boardmanager.test.ts b/test/boardmanager.test.ts
index b02526df..561feee2 100644
--- a/test/boardmanager.test.ts
+++ b/test/boardmanager.test.ts
@@ -28,7 +28,8 @@ suite("Arduino: Board Manager.", () => {
         const arduinoApp = TypeMoq.Mock.ofType(ArduinoApp);
         arduinoApp.setup((x) => x.setPref(TypeMoq.It.isAny(), TypeMoq.It.isAny()));
         arduinoApp.setup((x) => x.initialize(TypeMoq.It.isAny()));
-        arduinoApp.setup((x) => x.addLibPath(TypeMoq.It.isAny()));
+        // IS-REMOVE: to be removed completely when IntelliSense implementation is merged
+        // arduinoApp.setup((x) => x.addLibPath(TypeMoq.It.isAny()));
 
         try {
             boardManager = new BoardManager(arduinoSettings.object, arduinoApp.object);
diff --git a/test/commands.test.ts b/test/commands.test.ts
index c188dbb5..124bd403 100644
--- a/test/commands.test.ts
+++ b/test/commands.test.ts
@@ -38,8 +38,10 @@ suite("Arduino: Commands Tests", () => {
         }
     });
 
+    // IS-REMOVE: to be removed completely when IntelliSense implementation is merged
     // Arduino: Library Manager: Add library to include path.
     // tslint:disable-next-line: only-arrow-functions
+    /*
     test("should be able to run command: arduino.addLibPath", function(done) {
         this.timeout(60 * 1000);
         try {
@@ -52,6 +54,7 @@ suite("Arduino: Commands Tests", () => {
             done(new Error(error));
         }
     });
+    */
 
     // Arduino: Boards Manager : Manage packages for boards
     // tslint:disable-next-line: only-arrow-functions
diff --git a/test/extension.test.ts b/test/extension.test.ts
index 566fb6b1..6cde8586 100644
--- a/test/extension.test.ts
+++ b/test/extension.test.ts
@@ -45,7 +45,9 @@ suite("Arduino: Extension Tests", () => {
                     "arduino.showExamples",
                     "arduino.changeBoardType",
                     "arduino.initialize",
-                    "arduino.addLibPath",
+                    // IS-REMOVE: to be removed completely when IntelliSense implementation is merged
+                    //         note: it has been removed from package.json commands already
+                    // "arduino.addLibPath",
                     "arduino.selectSerialPort",
                     "arduino.openSerialMonitor",
                     "arduino.changeBaudRate",

From 6c1fe68b34cd45e1055d063f09f8ce5e5bbfab1a Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Tue, 18 Feb 2020 01:54:11 +0100
Subject: [PATCH 062/142] Updated project log

---
 BRANCHNOTES.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index 62ffff05..591a7354 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -35,7 +35,7 @@ During merging I found some bugs within those functions - mainly due to the abov
 * Error message formatting was fixed within `verify` only
 * No consistent return values within `verify` (when it bailed out early it returned `void`)
 
-**2020 02 17** Disabled and marked all previous implementations of IntelliSense support for later removal.
+**2020 02 17** Disabled and marked all previous implementations of IntelliSense support for later removal using `IS-REMOVE`. Pulled changes from upstream and merged them into the intellisense feature branch. Began to work on event handling/generation: vscode-arduino should detect when sketch/board/configuration and so on has changed, then re-analyze the current setup and set the IntelliSense configuration accordingly. This works more or less but there's a lot to fix in the current implementation which kept me busy till late today (I need some sleep now). Cleanup and commits follow tomorrow. Approaching alpha version for curious testers. OSX and Linux comes first, Windows will follow later.
 
 ### Status
 |      | Tasks   |
@@ -66,6 +66,7 @@ During merging I found some bugs within those functions - mainly due to the abov
 |                                       | :heavy_check_mark: Extract compiler command parser from vscode-arduino and [publish](https://itnext.io/step-by-step-building-and-publishing-an-npm-typescript-package-44fe7164964c) it as a separate package which will allow reusage and easy testing without heavy vscode-arduino rucksack. Done, see [cocopa](https://www.npmjs.com/package/cocopa) |
 |                                       | :heavy_check_mark: Parser only works when arduino is set to `verbose`, since this is the only way we get the compiler invocation command - this has to be fixed (done, see next item) |
 |                                       | :heavy_check_mark: Implement a *Rebuild IntelliSense Configuration* command which runs verify verbosely internally and therefore allows us to find and parse the compiler command |
+|                                       | :white_check_mark: Implement proper event generation for `DeviceContext`. a) Events should be issued only when something actually changes, b) Events should be issued for each setting separately |
 |                                       | :white_check_mark: Finally: go through my code and look for TODOs |
 
 `*` not committed to branch yet
@@ -101,7 +102,7 @@ I will list every supporter here, thanks!
 2020-02-12 Elektronik Workshop: 32 :beers: (8h coding)
 2020-02-15 T.D.: 4 :beers: (20$ - Thanks a lot!)
 2020-02-15 Elektronik Workshop: 28 :beers: (7h coding)
-2020-02-16 Elektronik Workshop: x :beers: (xh coding)
+2020-02-17 Elektronik Workshop: 52 :beers: (13h coding)
 
 <!-- https://github.com/StylishThemes/GitHub-Dark/wiki/Emoji -->
 
@@ -114,6 +115,7 @@ I will list every supporter here, thanks!
 * [Arduino CLI manpage](https://github.com/arduino/Arduino/blob/master/build/shared/manpage.adoc)
 * [Install extensions from file](https://vscode-docs.readthedocs.io/en/stable/extensions/install-extension/)
 * [Publish extensions](https://code.visualstudio.com/api/working-with-extensions/publishing-extension)
+* [Arduino Dev Tools](https://playground.arduino.cc/Main/DevelopmentTools/)
 
 ## Issues Concerning this Project
  * https://github.com/Microsoft/vscode-cpptools/issues/1750
@@ -144,6 +146,8 @@ I will list every supporter here, thanks!
   * general lack of modularity - the above is the result
 * It seems that this extension is pretty chaotic. Most probably some refactoring is necessary.
 * Possibility to jump to compilation errors from compiler output and highlight compiler errors
+* Further IntelliSense enhancements/features:
+  * When having adding a library folder to the workspace IntelliSense should use the same configuration for it to enable library navigation and code completion.
 
 ## Non-categorized Notes
 ### Integrate upstream changes into fork

From d712a94b21f85284a27a0a1637a45f7d74b77dd1 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Tue, 18 Feb 2020 13:26:09 +0100
Subject: [PATCH 063/142] Don't use hard coded paths when possible.

---
 src/common/workspace.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/common/workspace.ts b/src/common/workspace.ts
index 55b38e98..215fa92a 100644
--- a/src/common/workspace.ts
+++ b/src/common/workspace.ts
@@ -4,6 +4,7 @@
 import * as fs from "fs";
 import * as path from "path";
 import * as vscode from "vscode";
+import { ARDUINO_CONFIG_FILE } from "./constants";
 
 export class ArduinoWorkspace {
     static get rootPath(): string|undefined {
@@ -14,7 +15,7 @@ export class ArduinoWorkspace {
 
         for (const workspaceFolder of workspaceFolders) {
             const workspaceFolderPath = workspaceFolder.uri.fsPath;
-            const arduinoConfigPath = path.join(workspaceFolderPath, ".vscode", "arduino.json");
+            const arduinoConfigPath = path.join(workspaceFolderPath, ARDUINO_CONFIG_FILE);
             if (fs.existsSync(arduinoConfigPath)) {
                 return workspaceFolderPath;
             }

From d6c7b5ac74131b7d5614745bfd7536c9031a249c Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Tue, 18 Feb 2020 18:21:21 +0100
Subject: [PATCH 064/142] New classes which will improve the device settings
 management and event handling. To be integrated with one of the next commits.

---
 src/deviceSettings.ts | 234 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 234 insertions(+)
 create mode 100644 src/deviceSettings.ts

diff --git a/src/deviceSettings.ts b/src/deviceSettings.ts
new file mode 100644
index 00000000..1ac678db
--- /dev/null
+++ b/src/deviceSettings.ts
@@ -0,0 +1,234 @@
+import * as fs from "fs";
+import * as path from "path";
+import * as vscode from "vscode";
+
+import * as constants from "./common/constants";
+import * as util from "./common/util";
+import * as logger from "./logger/logger";
+
+/**
+ * Generic class which provides monitoring of a specific settings value.
+ * If the value is modified a flag is set and an event is emitted.
+ *
+ * Usually you want to specialize the setter for any given value type
+ * to prevent invalid or badly formatted values to enter your settings.
+ */
+class Setting<T> {
+    /** The setting's default value. */
+    public readonly default: T;
+    /** The actual value of the setting. */
+    private _value: T | undefined;
+    /** Indicates if the value was changed since the last call to this.commit(). */
+    private _modified: boolean;
+    /** Event emitter which fires when the value is changed. */
+    private _emitter: vscode.EventEmitter<T> = new vscode.EventEmitter<T>();
+
+    constructor(defaultValue?: T) {
+        this.default = defaultValue;
+        this._value = this.default;
+    }
+    /**
+     * Value-setter - sets the value.
+     * If modified, the modified flag is set and the modified event is
+     * fired.
+     */
+    public set value(value: T | undefined) {
+        if (value !== this._value) {
+            this._value = value;
+            this._modified = true;
+            this._emitter.fire(this._value);
+        }
+    }
+    /** Value-getter - returns the internal value. */
+    public get value() {
+        return this._value;
+    }
+    /**
+     * Returns true, if the internal value has been modified.
+     * To clear the modified flag call commit().
+     */
+    public get modified() {
+        return this._modified;
+    }
+    /** Returns the modified-event emitter. */
+    public get emitter() {
+        return this._emitter;
+    }
+    /**
+     * Returns the internal value to its default value.
+     * If the default value is different from the previous value,
+     * it triggers the modified event and the modified flag is set.
+     */
+    public reset() {
+        this.value = this.default;
+    }
+    /** Reset the modified flag (if you know what you're doing) */
+    public commit() {
+        this._modified = false;
+    }
+}
+
+/**
+ * String specialization of the Setting class.
+ */
+class StrSetting extends Setting<string> {
+    /**
+     * When we override setter (below) we have to override getter as well
+     * (see JS language specs).
+     */
+    public get value() {
+        return super.value;
+    }
+    /**
+     * Set string value. Anything else than a string will set the value to
+     * its default value (undefined). White spaces at the front and back are
+     * trimmed before setting the value.
+     * If the setting's value is changed during this operation, the base
+     * class' event emitter will fire and the modified flag will be set.
+     */
+    public set value(value: string) {
+        if (typeof value !== "string") {
+            value = this.default;
+        } else {
+            value = value.trim();
+        }
+        super.value = value;
+    }
+}
+
+/**
+ * This class encapsulates all device/project specific settings and
+ * provides common operations on them.
+ */
+export class DeviceSettings {
+    public port = new StrSetting();
+    public board = new StrSetting();
+    public sketch = new StrSetting();
+    public output = new StrSetting();
+    public debugger = new StrSetting();
+    public disableIntelliSenseAutoGen = new StrSetting();
+    public configuration = new StrSetting();
+    public prebuild = new StrSetting();
+    public programmer = new StrSetting();
+
+    /**
+     * @returns true if any of the settings values has its modified flag
+     * set.
+     */
+    public get modified() {
+        return this.port.modified ||
+               this.board.modified ||
+               this.sketch.modified ||
+               this.output.modified ||
+               this.debugger.modified ||
+               this.disableIntelliSenseAutoGen.modified ||
+               this.configuration.modified ||
+               this.prebuild.modified ||
+               this.programmer.modified;
+    }
+    /**
+     * Clear modified flags of all settings values.
+     */
+    public commit() {
+        this.port.commit();
+        this.board.commit();
+        this.sketch.commit();
+        this.output.commit();
+        this.debugger.commit();
+        this.disableIntelliSenseAutoGen.commit();
+        this.configuration.commit();
+        this.prebuild.commit();
+        this.programmer.commit();
+    }
+    /**
+     * Resets all settings values to their default values.
+     * @param commit If true clear the modified flags after all values are
+     * reset.
+     */
+    public reset(commit: boolean = true) {
+        this.port.reset();
+        this.board.reset();
+        this.sketch.reset();
+        this.output.reset();
+        this.debugger.reset();
+        this.disableIntelliSenseAutoGen.reset();
+        this.configuration.reset();
+        this.prebuild.reset();
+        this.programmer.reset();
+        if (commit) {
+            this.commit();
+        }
+    }
+    /**
+     * Load settings values from the given file.
+     * If a value is changed through this operation, its event emitter will
+     * fire.
+     * @param file Path to the file the settings should be loaded from.
+     * @param commit If true reset the modified flags after all values are read.
+     * @returns true if the settings are loaded successfully.
+     */
+    public load(file: string, commit: boolean = true) {
+        const settings = util.tryParseJSON(fs.readFileSync(file, "utf8"));
+        if (settings) {
+            this.port.value = settings.port;
+            this.board.value = settings.board;
+            this.sketch.value = settings.sketch;
+            this.configuration.value = settings.configuration;
+            this.output.value = settings.output;
+            this.debugger.value = settings.debugger;
+            this.disableIntelliSenseAutoGen.value = settings.disableIntelliSenseAutoGen;
+            this.prebuild.value = settings.prebuild;
+            this.programmer.value = settings.programmer;
+            if (commit) {
+                this.commit();
+            }
+            return true;
+        } else {
+            logger.notifyUserError("arduinoFileError",
+                new Error(constants.messages.ARDUINO_FILE_ERROR));
+            return false;
+        }
+    }
+    /**
+     * Writes the settings to the given file if there are modified
+     * values. The modification flags are reset (commit()) on successful write.
+     * On write failure the modification flags are left unmodified.
+     * @param file Path to file the JSON representation of the settings should
+     * written to. If either the folder or the file does not exist they are
+     * created.
+     * @returns true on succes, false on write failure.
+     */
+    public save(file: string) {
+
+        if (!this.modified) {
+            return true;
+        }
+
+        let settings: any = {};
+        if (util.fileExistsSync(file)) {
+            settings = util.tryParseJSON(fs.readFileSync(file, "utf8"));
+        }
+        if (!settings) {
+            logger.notifyUserError(
+                "arduinoFileError",
+                new Error(constants.messages.ARDUINO_FILE_ERROR));
+            return false;
+        }
+
+        settings.sketch = this.sketch.value;
+        settings.port = this.port.value;
+        settings.board = this.board.value;
+        settings.output = this.output.value;
+        settings.debugger = this.debugger.value;
+        settings.disableIntelliSenseAutoGen = this.disableIntelliSenseAutoGen.value;
+        settings.configuration = this.configuration.value;
+        settings.programmer = this.programmer.value;
+
+        util.mkdirRecursivelySync(path.dirname(file));
+        fs.writeFileSync(file, JSON.stringify(settings, undefined, 4));
+
+        this.commit();
+
+        return true;
+    }
+}

From cabeed61fb077a9154dd926dd0ca608f806a213f Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Tue, 18 Feb 2020 20:12:07 +0100
Subject: [PATCH 065/142] Updated log and issues

* Added/documented all known related issues
* Updated log
* Updated and extended status
* General brushing of structure and text
---
 BRANCHNOTES.md | 118 +++++++++++++++++++++++++++++++++----------------
 1 file changed, 79 insertions(+), 39 deletions(-)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index 591a7354..8777a386 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -1,22 +1,54 @@
 # IntelliSense Autoconfiguration Branch
 ## Problem
-This branch more or less addresses [these](https://github.com/microsoft/vscode-arduino/issues?utf8=%E2%9C%93&q=intellisense+is%3Aopen) issues (about seven).
-
-It implements a parser which parses the output from Arduino's build process to generate a very precise `c_cpp_properties.json` which in turn hopefully renders any user interaction with this file obsolete
+This branch more or less addresses the following issues:
+| # | Issue | Title | Comment |
+|--:|:------|:------------|:--------|
+|  1| [#438](https://github.com/microsoft/vscode-arduino/issues/438) | **The Extension should automagically fill the c_cpp_properties.json, so intellisense works out of the box** | This is the issue to which I usually report news concerning the progress of this project |
+|  2| [#876](https://github.com/microsoft/vscode-arduino/issues/876) | **Missing #define ARDUINO 10808 logic?** | Marked as bug but it's just the same problem again |
+|  3| [#829](https://github.com/microsoft/vscode-arduino/issues/829) | **`Arduino.h` and ESP8266 includes have squiggles** | Stale issue |
+|  4| [#969](https://github.com/microsoft/vscode-arduino/issues/969) | **INO Files defines undefined but can jump to definition**  |  |
+|  5| [#959](https://github.com/microsoft/vscode-arduino/issues/959) | **Update board type command does not update intellisense config automatically**  |  |
+|  6| [#892](https://github.com/microsoft/vscode-arduino/issues/892) | **Default IntelliSense config** |  |
+|  7| [#850](https://github.com/microsoft/vscode-arduino/issues/850) | **How to prevent modifications of c_cpp_properties.json by the extension?**  | Asks if the current implementation can be turned off, because it overwrites a user's config with non working IS config -- this is sad. |
+|  8| [#833](https://github.com/microsoft/vscode-arduino/issues/833) | **Allow C_Cpp.intelliSenseEngine to be set to "Default" instead of "Tag Parser" for better code completion/suggestions**  |  |
+|  9| [#808](https://github.com/microsoft/vscode-arduino/issues/808) | **Identifier "Serial" is undefined**  |  |
+| 10| [#474](https://github.com/microsoft/vscode-arduino/issues/474) | **Enrich device develop experience**  |  |
+
+<!-- | 11| [#](https://github.com/microsoft/vscode-arduino/issues/) |  |  | -->
+<!-- | 12| [#](https://github.com/microsoft/vscode-arduino/issues/) |  |  | -->
+<!-- | 13| [#](https://github.com/microsoft/vscode-arduino/issues/) |  |  | -->
+<!-- | 14| [#](https://github.com/microsoft/vscode-arduino/issues/) |  |  | -->
+
+-- the list is probably incomplete - I didn't search exhaustively and didn't consider closed issues as long as I didn't stumble upon one. New duplicates are popping up at a rate of about one per week.
+
+Further related issues
+* [vscode-arduino issue search for IntelliSense](https://github.com/microsoft/vscode-arduino/issues?utf8=%E2%9C%93&q=intellisense+is%3Aopen)
+* [Wrongly attributed to vscode instead of vscode-arduino](https://github.com/Microsoft/vscode-cpptools/issues/1750)
+* [Problems with IntelliSense itself](https://github.com/microsoft/vscode-cpptools/issues/1034)
+
+## Solution
+Implement and add a a parser which parses the output from Arduino's build process and generate a very precise `c_cpp_properties.json` which in turn hopefully renders any user interaction with this file obsolete.
+
+This mechanism should try it's best to detect situations in which the setup changes (board changed, sketch changed and so forth) and re-generate this configuration. For all other situations I'll provide a command to manually re-generate it.
 
 ## Branch Goals
 ### Build Output Parser
-The parser which parses the relevant includes, defines, compiler paths and flags from Arduino's build output
+The parser which identifies the main compilation command from Arduino's build output. It then parses the relevant includes, defines, compiler paths and flags from it.
+
 ### `c_cpp_properties.json` Generator
-The generator takes the parser's output and transforms it into a valid `c_cpp_properties.json` file.
+The generator takes the parser's output and transforms it into a valid `c_cpp_properties.json` file. It merges the generated configuration with the existing (e.g. user-) configurations and writes it back to the configuration file.
 
 ### Configuration Flags
-Provide a configuration flag which allows the user to turn this feature off - this is useful for the cases in which this magic fails or the user has a very specific setup. Although this branch tries to eliminate most of the latter cases.
+Provide a global configuration flag which allows the user to turn this feature off. A project- (sketch-) specific override will be provided which allows the user to turn it off or on - regardless of the global setting.
+This is useful for the rare cases for which this magic should fail or the user has a very exotic setup. This branch tries to eliminate most of the latter cases though. Especially it will always write to the `Arduino` configuration. If the user sets up a custom configuration she/he must simply name it differently, e.g. `John's Custom Config`, and the generator won't touch it.
 
 ### Global Tasks in vscode-arduino
-See table below.
+* Integrate it into vscode-arduino's build mechanics
+* Install event trigger generation/handling to run the analysis as soon as something changes
+* Remove the current implementation
+For more details see table below.
 
-### Branch Log
+## Branch Log
 **2020 02 05** Currently I'm able to generate error free IntelliSense setups for AVR and ESP32 using the preliminary implementation. For ESP32 I just had to add the intrinsic compiler paths manually. A solution has to be found for these ... which there is, see [here](https://stackoverflow.com/a/6666338)
 **2020 02 06** Got it fully working (with built-in include directories) for AVR, ESP32, ESP8266. Rewrote the backend to facilitate writing of further parser engines in the future.
 **2020 02 07** Wrote compiler command parser npm package [cocopa](https://www.npmjs.com/package/cocopa) and began writing a test framework for it. Added a global configuration switch which allows the IntelliSense configuration generation to be turned off.
@@ -36,8 +68,9 @@ During merging I found some bugs within those functions - mainly due to the abov
 * No consistent return values within `verify` (when it bailed out early it returned `void`)
 
 **2020 02 17** Disabled and marked all previous implementations of IntelliSense support for later removal using `IS-REMOVE`. Pulled changes from upstream and merged them into the intellisense feature branch. Began to work on event handling/generation: vscode-arduino should detect when sketch/board/configuration and so on has changed, then re-analyze the current setup and set the IntelliSense configuration accordingly. This works more or less but there's a lot to fix in the current implementation which kept me busy till late today (I need some sleep now). Cleanup and commits follow tomorrow. Approaching alpha version for curious testers. OSX and Linux comes first, Windows will follow later.
+**2020 02 18** Finished basic event triggering. Rewrote `DeviceContext` for proper settings modification detection (trigger events only on actual change) and generation of setting specific events (e.g. board changed) instead of one global event (aka. "something in the settings changed").
 
-### Status
+## Status
 |      | Tasks   |
 |-----:|:--------|
 | **Build output parser**               | :heavy_check_mark: Basic parser working |
@@ -58,15 +91,23 @@ During merging I found some bugs within those functions - mainly due to the abov
 | **Unit tests**                        | :heavy_check_mark: Basic parser (known boards, match/no match)|
 |                                       | :white_check_mark: All unit tests in cocopa |
 |                                       | :white_check_mark: Test with cpp sketches |
-| **General**                           | :white_check_mark: Review and remove previous attempts messing with `c_cpp_properties.json` or IntelliSense. (Partially done - documented in the [General Tasks](#General-Tasks) section |
-|                                       | :white_check_mark: Auto-run verify after a) *setting a board* b) *changing the sketch* c) *workbench initialized and no `c_cpp_properties.json` has been found*. We have to generate a valid `c_cpp_properties.json` to keep IntelliSense working in such situations. Identify other occasions where this applies (usually when adding new libraries), hint the user to run *Arduino: Rebuild IntelliSense Configuration*? -> Good moment would be after the workbench initialization -> message in arduino channel |
+| **General**                           | :heavy_check_mark: Review and remove previous attempts messing with `c_cpp_properties.json` or IntelliSense (documented in the [General Tasks](#General-Tasks) section) `*` |
+|                                       | :white_check_mark: *Auto-run verify when* |
+|                                       | &nbsp;&nbsp;&nbsp;&nbsp;:heavy_check_mark: a) setting a board `*` |
+|                                       | &nbsp;&nbsp;&nbsp;&nbsp;:heavy_check_mark: b) changing the board's configuration `*` |
+|                                       | &nbsp;&nbsp;&nbsp;&nbsp;:heavy_check_mark: c) changing the sketch `*` |
+|                                       | &nbsp;&nbsp;&nbsp;&nbsp;:white_check_mark: d) workbench initialized and no `c_cpp_properties.json` found |
+|                                       | &nbsp;&nbsp;&nbsp;&nbsp;:white_check_mark: e) Identify other occasions where this applies (usually when adding new libraries) |
+|                                       | :white_check_mark: Hint the user to run *Arduino: Rebuild IntelliSense Configuration*? -> Good moment would be after the workbench initialization -> message in arduino channel |
+|                                       | :white_check_mark: Better build management such that regular builds and analyze builds do not interfere |
+|                                       | :white_check_mark: Analyze task queue which fits in the latter |
 |                                       | :heavy_check_mark: Document configuration settings in [README.md](README.md) |
 |                                       | :white_check_mark: Document features in [README.md](README.md) (partially done) |
 |                                       | :heavy_check_mark: Try to auto-generate even if verify (i.e. compilation) fails |
-|                                       | :heavy_check_mark: Extract compiler command parser from vscode-arduino and [publish](https://itnext.io/step-by-step-building-and-publishing-an-npm-typescript-package-44fe7164964c) it as a separate package which will allow reusage and easy testing without heavy vscode-arduino rucksack. Done, see [cocopa](https://www.npmjs.com/package/cocopa) |
+|                                       | :heavy_check_mark: Extract compiler command parser from vscode-arduino and [publish](https://itnext.io/step-by-step-building-and-publishing-an-npm-typescript-package-44fe7164964c) it as a separate package which will allow reusage and easy testing without heavy vscode-arduino rucksack -- done, see [cocopa](https://www.npmjs.com/package/cocopa) |
 |                                       | :heavy_check_mark: Parser only works when arduino is set to `verbose`, since this is the only way we get the compiler invocation command - this has to be fixed (done, see next item) |
 |                                       | :heavy_check_mark: Implement a *Rebuild IntelliSense Configuration* command which runs verify verbosely internally and therefore allows us to find and parse the compiler command |
-|                                       | :white_check_mark: Implement proper event generation for `DeviceContext`. a) Events should be issued only when something actually changes, b) Events should be issued for each setting separately |
+|                                       | :heavy_check_mark: Implement proper event generation for `DeviceContext`. a) Events should be issued only when something actually changes, b) Events should be issued for each setting separately `*`|
 |                                       | :white_check_mark: Finally: go through my code and look for TODOs |
 
 `*` not committed to branch yet
@@ -80,8 +121,8 @@ I write a lot of code for Arduino, especially libraries. The Arduino IDE is not
 
 Then remains vscode-arduino. It seems that it isn't completely dead - but almost. Most of the core functionality seems to work (I used it a few days now). But the biggest show stopper is the bad IntelliSense support -- which I'll address here now.
 
-## Beer Money :beers:
-You can chip in some beer money to keep me motivated - this is really appreciated.
+## Beer Money :beers: -- Support
+You can chip in some beer money to keep me motivated - this is *really* appreciated.
 
 [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=PVLCSRZHBJ28G&source=url)
 
@@ -103,24 +144,20 @@ I will list every supporter here, thanks!
 2020-02-15 T.D.: 4 :beers: (20$ - Thanks a lot!)
 2020-02-15 Elektronik Workshop: 28 :beers: (7h coding)
 2020-02-17 Elektronik Workshop: 52 :beers: (13h coding)
+2020-02-18 Elektronik Workshop: xx :beers: (xxh coding)
 
 <!-- https://github.com/StylishThemes/GitHub-Dark/wiki/Emoji -->
 
 ## Useful Links
-* [IntelliSense issues on vscode-arduino](https://github.com/microsoft/vscode-arduino/issues?utf8=%E2%9C%93&q=intellisense+is%3Aopen)
 * [`c_cpp_properties.json` reference](https://code.visualstudio.com/docs/cpp/c-cpp-properties-schema-reference)
 * [Interactive regex debugger](https://regex101.com/)
 * [Git branch management](https://blog.scottlowe.org/2015/01/27/using-fork-branch-git-workflow/)
 * [Collapsible Markdown](https://gist.githubusercontent.com/joyrexus/16041f2426450e73f5df9391f7f7ae5f/raw/f774f242feff6bae4a5be7d6c71aa5df2e3fcb0e/README.md)
 * [Arduino CLI manpage](https://github.com/arduino/Arduino/blob/master/build/shared/manpage.adoc)
 * [Install extensions from file](https://vscode-docs.readthedocs.io/en/stable/extensions/install-extension/)
-* [Publish extensions](https://code.visualstudio.com/api/working-with-extensions/publishing-extension)
-* [Arduino Dev Tools](https://playground.arduino.cc/Main/DevelopmentTools/)
-
-## Issues Concerning this Project
- * https://github.com/Microsoft/vscode-cpptools/issues/1750
- * Problems with IntelliSense itself https://github.com/microsoft/vscode-cpptools/issues/1034
- * Logging for IntelliSense https://code.visualstudio.com/docs/cpp/enable-logging-cpp
+* [Publish vscode extensions](https://code.visualstudio.com/api/working-with-extensions/publishing-extension)
+* [Debug logging for IntelliSense](https://code.visualstudio.com/docs/cpp/enable-logging-cpp)
+* [Arduino Dev Tools](https://playground.arduino.cc/Main/DevelopmentTools/) (obsolete/outdated)
 
 ## Future Work
 * Proper interactive serial terminal (this is the second major show stopper in my opinion)
@@ -244,15 +281,11 @@ Sometimes IntelliSense has problems within the extension host (which you're runn
 
 ----
 
-## Implementation
-**Note** Check this vscode feature:
-```
-Configuration provider
-The ID of a VS Code extension that can provide IntelliSense configuration information for source files. For example, use the VS Code extension ID ms-vscode.cmake-tools to provide configuration information from the CMake Tools extension.
-```
+# Implementation
+Here are some implementation notes. Probably only of interest to me.
 
-### Build Output Parser
-#### Intrinsic Include Paths
+## Build Output Parser
+### Intrinsic Include Paths
 Some include paths are built into gcc and don't have to be specified on the command line. Just searching the compiler installation directory with something like
 ```bash
 find  ~/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/ -name "include*"
@@ -294,11 +327,11 @@ End of search list.
 ```
 As one can see with the ESP32-gcc not all include directories are named `include`. Parsing of this output is pretty trivial though.
 
-### `c_cpp_properties.json` Generator
+## `c_cpp_properties.json` Generator
 
 
-### Settings
-#### Global Settings
+## Settings
+### Global Settings
 Under linux at `~/.config/Code/User/settings.json`, for instance:
 ```json
 {
@@ -312,7 +345,7 @@ Code: [src/arduino/arduinoSettings.ts](src/arduino/arduinoSettings.ts)
 Code: [src/arduino/vscodeSettings.ts](src/arduino/vscodeSettings.ts)
 Validator: [package.json](package.json)
 
-#### Project Settings
+### Project Settings
 Path in project `.vscode/arduino.json`
 ```json
 {
@@ -325,8 +358,8 @@ Path in project `.vscode/arduino.json`
 Code: [src/deviceContext.ts](src/deviceContext.ts)
 Validator: [misc/arduinoValidator.json](misc/arduinoValidator.json)
 
-### General Tasks
-#### Removing existing Attempts which mess with c_cpp_properties.json or Intellisense
+## General Tasks
+### Removing existing Attempts which mess with c_cpp_properties.json or Intellisense
 
 Remove these as they are helpless attempts to get IntelliSense working:
 ```ts
@@ -344,7 +377,14 @@ Remove these as they are helpless attempts to get IntelliSense working:
 Remove this as this messes in an unpredictable and helpless way with Intellisense
 [src/langService/completionProvider.ts](src/langService/completionProvider.ts)
 
-Remove this folder as this is not necessary when Intellisense works properly:
+Review this folder as some of this is probably obsolete when Intellisense works properly:
 ```
-syntaxes/
+syntaxes/arduino.configuration.json
+syntaxes/arduino.tmLanguage
+# Within package.json
+  {
+    "language": "cpp",
+    "path": "./syntaxes/arduino.tmLanguage",
+    "scopeName": "source.cpp.arduino"
+  },
 ```

From 59bad214e52ae13f1564db9e34ee58c1af231927 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Wed, 19 Feb 2020 16:18:15 +0100
Subject: [PATCH 066/142] Updated project log and status

---
 BRANCHNOTES.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index 8777a386..f2b2849a 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -69,6 +69,7 @@ During merging I found some bugs within those functions - mainly due to the abov
 
 **2020 02 17** Disabled and marked all previous implementations of IntelliSense support for later removal using `IS-REMOVE`. Pulled changes from upstream and merged them into the intellisense feature branch. Began to work on event handling/generation: vscode-arduino should detect when sketch/board/configuration and so on has changed, then re-analyze the current setup and set the IntelliSense configuration accordingly. This works more or less but there's a lot to fix in the current implementation which kept me busy till late today (I need some sleep now). Cleanup and commits follow tomorrow. Approaching alpha version for curious testers. OSX and Linux comes first, Windows will follow later.
 **2020 02 18** Finished basic event triggering. Rewrote `DeviceContext` for proper settings modification detection (trigger events only on actual change) and generation of setting specific events (e.g. board changed) instead of one global event (aka. "something in the settings changed").
+**2020 02 19** Implemented proper build scheduling for analysis build by writing an `AnalysisManager` class. This class collects multiple changes (e.g. board and configuration, which often are changed shortly after another) before running an analysis. In case another build or analysis is in progress it postpones newly filed analysis requests until the other build has completed.
 
 ## Status
 |      | Tasks   |
@@ -95,12 +96,12 @@ During merging I found some bugs within those functions - mainly due to the abov
 |                                       | :white_check_mark: *Auto-run verify when* |
 |                                       | &nbsp;&nbsp;&nbsp;&nbsp;:heavy_check_mark: a) setting a board `*` |
 |                                       | &nbsp;&nbsp;&nbsp;&nbsp;:heavy_check_mark: b) changing the board's configuration `*` |
-|                                       | &nbsp;&nbsp;&nbsp;&nbsp;:heavy_check_mark: c) changing the sketch `*` |
+|                                       | &nbsp;&nbsp;&nbsp;&nbsp;:heavy_check_mark: c) selecting another sketch `*` |
 |                                       | &nbsp;&nbsp;&nbsp;&nbsp;:white_check_mark: d) workbench initialized and no `c_cpp_properties.json` found |
 |                                       | &nbsp;&nbsp;&nbsp;&nbsp;:white_check_mark: e) Identify other occasions where this applies (usually when adding new libraries) |
 |                                       | :white_check_mark: Hint the user to run *Arduino: Rebuild IntelliSense Configuration*? -> Good moment would be after the workbench initialization -> message in arduino channel |
-|                                       | :white_check_mark: Better build management such that regular builds and analyze builds do not interfere |
-|                                       | :white_check_mark: Analyze task queue which fits in the latter |
+|                                       | :heavy_check_mark: Better build management such that regular builds and analyze builds do not interfere (done, 2020-02-19) `*` |
+|                                       | :heavy_check_mark: Analyze task queue which fits in the latter  (done, 2020-02-19) `*` |
 |                                       | :heavy_check_mark: Document configuration settings in [README.md](README.md) |
 |                                       | :white_check_mark: Document features in [README.md](README.md) (partially done) |
 |                                       | :heavy_check_mark: Try to auto-generate even if verify (i.e. compilation) fails |
@@ -144,7 +145,8 @@ I will list every supporter here, thanks!
 2020-02-15 T.D.: 4 :beers: (20$ - Thanks a lot!)
 2020-02-15 Elektronik Workshop: 28 :beers: (7h coding)
 2020-02-17 Elektronik Workshop: 52 :beers: (13h coding)
-2020-02-18 Elektronik Workshop: xx :beers: (xxh coding)
+2020-02-18 Elektronik Workshop: 36 :beers: (9h coding)
+2020-02-19 Elektronik Workshop: x :beers: (xh coding)
 
 <!-- https://github.com/StylishThemes/GitHub-Dark/wiki/Emoji -->
 
@@ -185,6 +187,7 @@ I will list every supporter here, thanks!
 * Possibility to jump to compilation errors from compiler output and highlight compiler errors
 * Further IntelliSense enhancements/features:
   * When having adding a library folder to the workspace IntelliSense should use the same configuration for it to enable library navigation and code completion.
+  * Optimization: Abort analysis build as soon as compiler statement has been found
 
 ## Non-categorized Notes
 ### Integrate upstream changes into fork

From 548c714b1369630238af3306e40f012e43dc45a5 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Wed, 19 Feb 2020 19:36:36 +0100
Subject: [PATCH 067/142] Updated and completed documentation of the current
 state within README.md

* Updated project log and status
---
 BRANCHNOTES.md |  4 ++--
 README.md      | 22 ++++++++++++++--------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index f2b2849a..bcd5a047 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -69,7 +69,7 @@ During merging I found some bugs within those functions - mainly due to the abov
 
 **2020 02 17** Disabled and marked all previous implementations of IntelliSense support for later removal using `IS-REMOVE`. Pulled changes from upstream and merged them into the intellisense feature branch. Began to work on event handling/generation: vscode-arduino should detect when sketch/board/configuration and so on has changed, then re-analyze the current setup and set the IntelliSense configuration accordingly. This works more or less but there's a lot to fix in the current implementation which kept me busy till late today (I need some sleep now). Cleanup and commits follow tomorrow. Approaching alpha version for curious testers. OSX and Linux comes first, Windows will follow later.
 **2020 02 18** Finished basic event triggering. Rewrote `DeviceContext` for proper settings modification detection (trigger events only on actual change) and generation of setting specific events (e.g. board changed) instead of one global event (aka. "something in the settings changed").
-**2020 02 19** Implemented proper build scheduling for analysis build by writing an `AnalysisManager` class. This class collects multiple changes (e.g. board and configuration, which often are changed shortly after another) before running an analysis. In case another build or analysis is in progress it postpones newly filed analysis requests until the other build has completed.
+**2020 02 19** Implemented proper build scheduling for analysis build by writing an `AnalysisManager` class. This class collects multiple changes (e.g. board and configuration, which often are changed shortly after another) before running an analysis. In case another build or analysis is in progress it postpones newly filed analysis requests until the other build has completed. Updated and completed the documentation for the IntelliSense usage within [README](README.md). Alpha test builds of the extension containing the latest implemented features and fixes are now available from the following [Dropbox folder](https://www.dropbox.com/sh/whmcdt26chyjgby/AAB1Ld2fzZ9Z_NfM3CRay17wa). Please note, that Windows is currently not supported yet.
 
 ## Status
 |      | Tasks   |
@@ -103,7 +103,7 @@ During merging I found some bugs within those functions - mainly due to the abov
 |                                       | :heavy_check_mark: Better build management such that regular builds and analyze builds do not interfere (done, 2020-02-19) `*` |
 |                                       | :heavy_check_mark: Analyze task queue which fits in the latter  (done, 2020-02-19) `*` |
 |                                       | :heavy_check_mark: Document configuration settings in [README.md](README.md) |
-|                                       | :white_check_mark: Document features in [README.md](README.md) (partially done) |
+|                                       | :heavy_check_mark: Document features in [README.md](README.md) |
 |                                       | :heavy_check_mark: Try to auto-generate even if verify (i.e. compilation) fails |
 |                                       | :heavy_check_mark: Extract compiler command parser from vscode-arduino and [publish](https://itnext.io/step-by-step-building-and-publishing-an-npm-typescript-package-44fe7164964c) it as a separate package which will allow reusage and easy testing without heavy vscode-arduino rucksack -- done, see [cocopa](https://www.npmjs.com/package/cocopa) |
 |                                       | :heavy_check_mark: Parser only works when arduino is set to `verbose`, since this is the only way we get the compiler invocation command - this has to be fixed (done, see next item) |
diff --git a/README.md b/README.md
index a7dda5ae..1df1360b 100644
--- a/README.md
+++ b/README.md
@@ -102,7 +102,7 @@ The following settings are as per sketch settings of the Arduino extension. You
     "output": "../build",
     "debugger": "jlink",
     "prebuild": "bash prebuild.sh",
-    "disableIntelliSenseAutoGen": "global"
+    "intelliSenseGen": "global"
 }
 ```
 - `sketch` - The main sketch file name of Arduino.
@@ -111,21 +111,27 @@ The following settings are as per sketch settings of the Arduino extension. You
 - `output` - Arduino build output path. If not set, Arduino will create a new temporary output folder each time, which means it cannot reuse the intermediate result of the previous build leading to long verify/upload time, so it is recommended to set the field. Arduino requires that the output path should not be the workspace itself or in a subfolder of the workspace, otherwise, it may not work correctly. By default, this option is not set. It's worth noting that the contents of this file could be deleted during the build process, so pick (or create) a directory that will not store files you want to keep.
 - `debugger` - The short name of the debugger that will be used when the board itself does not have a debugger and there is more than one debugger available. You can find the list of debuggers [here](https://github.com/Microsoft/vscode-arduino/blob/master/misc/debuggerUsbMapping.json). By default, this option is not set.
 - `prebuild` - External command before building the sketch file. You should only set one `prebuild` command. `command1 && command2` does not work. If you need to run multiple commands before the build, then create a script.
-- `disableIntelliSenseAutoGen` - Override the global auto-generation of the IntelliSense configuration (i.e. `.vscode/c_cpp_properties.json`). Three options are available:
+- `intelliSenseGen` - Override the global setting for auto-generation of the IntelliSense configuration (i.e. `.vscode/c_cpp_properties.json`). Three options are available:
   - `"global"`: Use the global settings (default)
   - `"disable"`: Disable the auto-generation even if globally enabled
   - `"enable"`: Enable the auto-generation even if globally disabled
 
 ## IntelliSense
-*TODO: Rewrite this section*
-vscode-arduino auto-configures IntelliSense by default. vscode-arduino analyzes Arduino's compiler output during verify and generates the corresponding configuration file at `.vscode/c_cpp_properties.json` and tries as hard as possible to keep things up to date, e.g. running verify when switching the board or the sketch.
-It doesn't makes sense though to run verify repeatedly. Therefore if the workspace reports problems (for instance after adding new includes to a new library) run *verify* such that IntelliSense knows of the new include directories (since the Arduino-backend performs the library resolution externally).
+vscode-arduino auto-configures IntelliSense by default. vscode-arduino analyzes Arduino's compiler output by running a separate build and generates the corresponding configuration file at `.vscode/c_cpp_properties.json`. vscode-arduino tries as hard as possible to keep things up to date, e.g. it runs the analysis when switching the board or the sketch.
 
-TODO: Note about configuration selection in lower right.
+It doesn't makes sense though to run the analysis repeatedly. Therefore if the workspace reports problems ("squiggles") - for instance after adding new includes from a new library - run the analysis manually:
 
-Manual rebuild: **Ardino: Rebuild IntelliSense Configuration**,
-Keybindings: **Arduino: Rebuild IntelliSense Configuration** <kbd>Alt</kbd> + <kbd>Cmd</kbd> + <kbd>I</kbd> *or* <kbd>Alt</kbd> + <kbd>Ctrl</kbd> + <kbd>I</kbd>
+Manual rebuild: **Arduino: Rebuild IntelliSense Configuration**,
+Keybindings: <kbd>Alt</kbd> + <kbd>Cmd</kbd> + <kbd>I</kbd> *or* <kbd>Alt</kbd> + <kbd>Ctrl</kbd> + <kbd>I</kbd>
 
+When the analysis is invoked manually it ignores any global and project specific disable.
+
+### IntelliSense Configurations
+vscode-arduino's analysis stores the result as a dedicated IntelliSense-configuration named `Arduino`. You have to select it from the far right of the status bar when you're in one of your source files as shown here:
+
+![74001156-cfce8280-496a-11ea-9b9d-7d30c83765c1](https://user-images.githubusercontent.com/21954933/74351237-2696ea80-4db7-11ea-9f7a-1bfc652ad5f5.png)
+
+This system allows you to setup and use own IntelliSense configurations in parallel to the automatically generated configurations provided through vscode-arduino. Just add your configuration to `c_cpp_properties.json` and name it differently from the default configuration (`Arduino`), e.g. `My awesome configuration` and select it from the status bar or via the command palette command **C/C++: Select a Configuration...**
 
 ## Debugging Arduino Code <sup>preview</sup>
 Before you start to debug your Arduino code, please read [this document](https://code.visualstudio.com/docs/editor/debugging) to learn about the basic mechanisms of debugging in Visual Studio Code. Also see [debugging for C++ in VSCode](https://code.visualstudio.com/docs/languages/cpp#_debugging) for further reference.

From c15dc08fa617b34e5b00643ce14d0ea8e827fc9d Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Wed, 19 Feb 2020 22:45:54 +0100
Subject: [PATCH 068/142] IntelliSense auto-analysis integration

* Reworked DeviceContext for fine grained event generation on settings change
* Added dedicated settings classes which allows for the latter
* Changed board manager and serial monitor to used the new fine grained events instead of the "something changed event" - which makes the code marginally more efficient
* Implemented an analysis manager which takes care of analysis requests generated by settings change events and makes sure that analysis builds don't interfere with regular builds
* Adapted the build infrastructure within ArduinoApp such that it allows for the above
* Removed the global build guard and moved it to ArduinoApp (there is a corner case though for programmer selection within extension.ts which I marked with a TODO
* Fixed some linting issues but did not lint most of the stuff committed here - this will be part of a later commit
* I left notes here and there where I saw things which should/could be improved/changed
* Removed the try/catch guards from the build invocations within extension.ts since exceptions are handled within the build function itself
* Changed the project setting parameter for the IntelliSense setup to reflect its workings better
---
 misc/arduinoValidator.json            |   2 +-
 src/arduino/arduino.ts                | 167 +++++++++++++------
 src/arduino/boardManager.ts           |   5 +-
 src/arduino/intellisense.ts           | 195 ++++++++++++++++++++++-
 src/arduino/programmerManager.ts      |   2 +-
 src/arduinoContext.ts                 |   6 +
 src/common/util.ts                    |   2 +-
 src/deviceContext.ts                  | 221 +++++++++++---------------
 src/deviceSettings.ts                 |  15 +-
 src/extension.ts                      |  95 +++++------
 src/langService/completionProvider.ts |   3 +-
 src/serialmonitor/serialMonitor.ts    |  24 ++-
 src/serialmonitor/usbDetector.ts      |   3 +
 13 files changed, 480 insertions(+), 260 deletions(-)

diff --git a/misc/arduinoValidator.json b/misc/arduinoValidator.json
index 48362cb1..57ca7be8 100644
--- a/misc/arduinoValidator.json
+++ b/misc/arduinoValidator.json
@@ -33,7 +33,7 @@
             "type": "string",
             "minLength": 1
         },
-        "disableIntelliSenseAutoGen": {
+        "intelliSenseGen": {
             "description": "Disable/enable the automatic generation of the IntelliSense configuration file (c_cpp_properties.json) for this project (overrides the global setting). When set to \"global\" the global extension settings will be used.",
             "type": "string",
             "default": "global",
diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index e6a749b3..c3159e7d 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -15,7 +15,10 @@ import { DeviceContext } from "../deviceContext";
 import { IArduinoSettings } from "./arduinoSettings";
 import { BoardManager } from "./boardManager";
 import { ExampleManager } from "./exampleManager";
-import { ICoCoPaContext, isCompilerParserEnabled, makeCompilerParserContext } from "./intellisense";
+import { AnalysisManager,
+         ICoCoPaContext,
+         isCompilerParserEnabled,
+         makeCompilerParserContext } from "./intellisense";
 import { LibraryManager } from "./libraryManager";
 import { VscodeSettings } from "./vscodeSettings";
 
@@ -25,6 +28,11 @@ import { SerialMonitor } from "../serialmonitor/serialMonitor";
 import { UsbDetector } from "../serialmonitor/usbDetector";
 import { ProgrammerManager } from "./programmerManager";
 
+/**
+ * Supported build modes. For further explanation see the documentation
+ * of ArduinoApp.build().
+ * The strings are used for status reporting within the above function.
+ */
 export enum BuildMode {
     Verify = "Verifying",
     Analyze = "Analyzing",
@@ -45,10 +53,30 @@ export class ArduinoApp {
 
     private _programmerManager: ProgrammerManager;
 
+    /**
+     * IntelliSense analysis manager.
+     * Makes sure that analysis builds and regular builds go along
+     * and that multiple subsequent analysis requests - as triggered
+     * by board/board-configuration changes - are bundled to a single
+     * analysis build run.
+     */
+    private _analysisManager: AnalysisManager;
+
+    /**
+     * Indicates if a build is currently in progress.
+     * If so any call to this.build() will return false immediately.
+     */
+    private _building: boolean = false;
+
     /**
      * @param {IArduinoSettings} _settings ArduinoSetting object.
      */
     constructor(private _settings: IArduinoSettings) {
+        const analysisDelayMs = 1000 * 3;
+        this._analysisManager = new AnalysisManager(
+            () => this._building,
+            async () => { await this.build(BuildMode.Analyze, true); },
+            analysisDelayMs);
     }
 
     /**
@@ -71,6 +99,17 @@ export class ArduinoApp {
             } catch (ex) {
             }
         }
+
+        // set up event handling for IntelliSense analysis
+        const requestAnalysis = async () => {
+            if (isCompilerParserEnabled()) {
+                await this._analysisManager.requestAnalysis();
+            }
+        };
+        const dc = DeviceContext.getInstance();
+        dc.onChangeBoard(requestAnalysis);
+        dc.onChangeConfiguration(requestAnalysis);
+        dc.onChangeSketch(requestAnalysis);
     }
 
     /**
@@ -101,38 +140,96 @@ export class ArduinoApp {
         }
     }
 
+    /**
+     * Returns true if a build is currently in progress.
+     */
+    public get building() {
+        return this._building;
+    }
+
     /**
      * Runs the arduino builder to build/compile and - if necessary - upload
      * the current sketch.
-     * @param buildMode Build mode. BuildMode.Upload: Compile and upload,
-     * BuildMode.UploadProgrammer: Compile and upload using the user selectable
-     * programmer, BuildMode.Analyze: Compile, analyze the output and generate
-     * IntelliSense configuration from it, BuildMode.Verify: Just compile.
+     * @param buildMode Build mode.
+     *  * BuildMode.Upload: Compile and upload
+     *  * BuildMode.UploadProgrammer: Compile and upload using the user
+     *     selectable programmer
+     *  * BuildMode.Analyze: Compile, analyze the output and generate
+     *     IntelliSense configuration from it.
+     *  * BuildMode.Verify: Just compile.
+     * All build modes except for BuildMode.Analyze run interactively, i.e. if
+     * something is missing, it tries to query the user for the missing piece
+     * of information (sketch, board, etc.). Analyze runs non interactively and
+     * just returns false.
      * @param {bool} compile - Indicates whether to compile the code when using the CLI to upload
      * @param buildDir Override the build directory set by the project settings
      * with the given directory.
+     * @returns true on success, false if
+     *  * another build is currently in progress
+     *  * board- or programmer-manager aren't initialized yet
+     *  * or something went wrong during the build
      */
-    public async build(buildMode: BuildMode, compile: boolean, buildDir?: string): Promise<boolean> {
+    public async build(buildMode: BuildMode, compile: boolean, buildDir?: string) {
+
+        if (!this._boardManager || !this._programmerManager || this._building) {
+            return false;
+        }
+
+        this._building = true;
+
+        return await this._build(buildMode, compile, buildDir)
+        .then((ret) => {
+            this._building = false;
+            return ret;
+        })
+        .catch((reason) => {
+            this._building = false;
+            // TODO EW, 2020-02-19: Report unhandled error (Logger?)
+            return false;
+        });
+    }
+
+// Not moving _build around in the file (yet?) because it would create too much merge/rebase problems.
+/* tslint:disable:member-ordering */
+
+    /**
+     * Private implementation. Not to be called directly. The wrapper build()
+     * manages the build state.
+     * @param buildMode See build()
+     * @param buildDir See build()
+     */
+    public async _build(buildMode: BuildMode, compile: boolean, buildDir?: string): Promise<boolean> {
         const dc = DeviceContext.getInstance();
         const args: string[] = [];
         let restoreSerialMonitor: boolean = false;
         let cocopa: ICoCoPaContext;
 
-        const boardDescriptor = this.getBoardBuildString();
-        if (!boardDescriptor) {
+        if (!this.boardManager.currentBoard) {
+            if (buildMode !== BuildMode.Analyze) {
+                logger.notifyUserError("boardManager.currentBoard", new Error(constants.messages.NO_BOARD_SELECTED));
+            }
             return false;
         }
+        const boardDescriptor = this.boardManager.currentBoard.getBuildConfig();
+
         if (!this.useArduinoCli()) {
             args.push("--board", boardDescriptor);
         }
 
         if (!ArduinoWorkspace.rootPath) {
-            vscode.window.showWarningMessage("Cannot find the sketch file.");
+            vscode.window.showWarningMessage("Workspace doesn't seem to have a folder added to it yet.");
             return false;
         }
 
         if (!dc.sketch || !util.fileExistsSync(path.join(ArduinoWorkspace.rootPath, dc.sketch))) {
-            await this.getMainSketch(dc);
+            if (buildMode === BuildMode.Analyze) {
+                // Analyze runs non interactively
+                return false;
+            }
+            if (!await dc.resolveMainSketch()) {
+                vscode.window.showErrorMessage("No sketch file was found. Please specify the sketch in the arduino.json file");
+                return false;
+            }
         }
 
         const selectSerial = async () => {
@@ -171,8 +268,9 @@ export class ArduinoApp {
                 args.push("--port", dc.port);
             }
         } else if (buildMode === BuildMode.UploadProgrammer) {
-            const programmer = this.getProgrammerString();
+            const programmer = this.programmerManager.currentProgrammer;
             if (!programmer) {
+                logger.notifyUserError("programmerManager.currentProgrammer", new Error(constants.messages.NO_PROGRAMMMER_SELECTED));
                 return false;
             }
             if (!dc.port) {
@@ -205,9 +303,6 @@ export class ArduinoApp {
 
             args.push("--port", dc.port);
         } else if (buildMode === BuildMode.Analyze) {
-            if (!isCompilerParserEnabled()) {
-                return false;
-            }
             cocopa = makeCompilerParserContext(dc);
             if (!this.useArduinoCli()) {
                 args.push("--verify", "--verbose");
@@ -229,6 +324,8 @@ export class ArduinoApp {
 
         await vscode.workspace.saveAll(false);
 
+        // we prepare the channel here since all following code will
+        // or at leas can possibly output to it
         arduinoChannel.show();
         arduinoChannel.start(`${buildMode} sketch '${dc.sketch}'`);
 
@@ -716,7 +813,7 @@ export class ArduinoApp {
                 const dc = DeviceContext.getInstance();
                 const arduinoJson = {
                     sketch: sketchFile,
-                    // TODO: COM1 is Windows specific - what about OSX and Linux users?
+                    // TODO EW, 2020-02-18: COM1 is Windows specific - what about OSX and Linux users?
                     port: dc.port || "COM1",
                     board: dc.board,
                     configuration: dc.configuration,
@@ -818,14 +915,15 @@ export class ArduinoApp {
      * @returns True if successful, false on error.
      */
     protected async runPreBuildCommand(dc: DeviceContext): Promise<boolean> {
-        if (dc.prebuild) {
-            arduinoChannel.info(`Running pre-build command: ${dc.prebuild}`);
-            const prebuildargs = dc.prebuild.split(" ");
-            const prebuildCommand = prebuildargs.shift();
+        const prebuildcmdline = dc.prebuild;
+        if (prebuildcmdline) {
+            arduinoChannel.info(`Running pre-build command: ${prebuildcmdline}`);
+            const args = prebuildcmdline.split(/\s+/);
+            const cmd = args.shift();
             try {
-                await util.spawn(prebuildCommand,
+                await util.spawn(cmd,
                                  arduinoChannel.channel,
-                                 prebuildargs,
+                                 args,
                                  { shell: true, cwd: ArduinoWorkspace.rootPath });
             } catch (ex) {
                 arduinoChannel.error(`Running pre-build command failed: ${os.EOL}${ex.error}`);
@@ -843,30 +941,5 @@ export class ArduinoApp {
         return this._settings.useArduinoCli;
         // return VscodeSettings.getInstance().useArduinoCli;
     }
-
-    private getProgrammerString(): string {
-        const selectProgrammer = this.programmerManager.currentProgrammer;
-        if (!selectProgrammer) {
-            logger.notifyUserError("getProgrammerString", new Error(constants.messages.NO_PROGRAMMMER_SELECTED));
-            return;
-        }
-        return selectProgrammer;
-    }
-
-    private getBoardBuildString(): string {
-        const selectedBoard = this.boardManager.currentBoard;
-        if (!selectedBoard) {
-            logger.notifyUserError("getBoardBuildString", new Error(constants.messages.NO_BOARD_SELECTED));
-            return;
-        }
-        return selectedBoard.getBuildConfig();
-    }
-
-    private async getMainSketch(dc: DeviceContext) {
-        await dc.resolveMainSketch();
-        if (!dc.sketch) {
-            vscode.window.showErrorMessage("No sketch file was found. Please specify the sketch in the arduino.json file");
-            throw new Error("No sketch file was found.");
-        }
-    }
+/* tslint:enable:member-ordering */
 }
diff --git a/src/arduino/boardManager.ts b/src/arduino/boardManager.ts
index dd35a80c..79af7780 100644
--- a/src/arduino/boardManager.ts
+++ b/src/arduino/boardManager.ts
@@ -73,7 +73,10 @@ export class BoardManager {
         this._boardConfigStatusBar.show();
 
         const dc = DeviceContext.getInstance();
-        dc.onDidChange(() => {
+        dc.onChangeBoard(() => {
+            this.updateStatusBar();
+        });
+        dc.onChangeConfiguration(() => {
             this.updateStatusBar();
         });
     }
diff --git a/src/arduino/intellisense.ts b/src/arduino/intellisense.ts
index ad98a0ef..57f5588c 100644
--- a/src/arduino/intellisense.ts
+++ b/src/arduino/intellisense.ts
@@ -1,3 +1,6 @@
+// Copyright (c) Elektronik Workshop. All rights reserved.
+// Licensed under the MIT license.
+
 import * as ccp from "cocopa";
 import * as path from "path";
 
@@ -23,7 +26,7 @@ export function isCompilerParserEnabled(dc?: DeviceContext) {
         dc = DeviceContext.getInstance();
     }
     const globalDisable = VscodeSettings.getInstance().disableIntelliSenseAutoGen;
-    const projectSetting = dc.disableIntelliSenseAutoGen;
+    const projectSetting = dc.intelliSenseGen;
     return projectSetting !== "disable" && !globalDisable ||
            projectSetting === "enable";
 }
@@ -94,6 +97,8 @@ function makeCompilerParserEngines(dc: DeviceContext) {
     const dotcpp = sketch.endsWith(".ino") ? ".cpp" : "";
     sketch = `-o\\s+\\S*${ccp.regExEscape(sketch)}${dotcpp}\\.o`;
 
+    // TODO: handle other architectures here
+
     const matchPattern = [
         // make sure we're running g++
         /(?:^|-)g\+\+\s+/,
@@ -112,3 +117,191 @@ function makeCompilerParserEngines(dc: DeviceContext) {
     const gccParserEngine = new ccp.ParserGcc(matchPattern, dontMatchPattern);
     return [gccParserEngine];
 }
+
+/**
+ * Possible states of AnalysisManager's state machine.
+ */
+enum AnalysisState {
+    /**
+     * No analysis request pending.
+     */
+    Idle = "idle",
+    /**
+     * Analysis request pending. Waiting for the time out to expire or for
+     * another build to complete.
+     */
+    Waiting = "waiting",
+    /**
+     * Analysis in progress.
+     */
+    Analyzing = "analyzing",
+    /**
+     * Analysis in progress with yet another analysis request pending.
+     * As soon as the current analysis completes the manager will directly
+     * enter the Waiting state.
+     */
+    AnalyzingWaiting = "analyzing and waiting",
+}
+
+/**
+ * Events (edges) which cause state changes within AnalysisManager.
+ */
+enum AnalysisEvent {
+    /**
+     * The only external event. Requests an analysis to be run.
+     */
+    AnalysisRequest,
+    /**
+     * The internal wait timeout expired.
+     */
+    WaitTimeout,
+    /**
+     * The current analysis build finished.
+     */
+    AnalysisBuildDone,
+}
+
+/**
+ * This class manages analysis builds for the automatic IntelliSense
+ * configuration synthesis. Its primary purposes are:
+ *
+ *  * delaying analysis requests caused by DeviceContext setting change
+ *      events such that multiple subsequent requests don't cause
+ *      multiple analysis builds
+ *  * make sure that an analysis request is postponed when another build
+ *      is currently in progress
+ *
+ * TODO: initialization sequence: make sure events generated
+ *   during initialization are not lost
+ *
+ * TODO: check time of c_cpp_properties.json and compare it with
+ * * arduino.json
+ * * main sketch file
+ * This way we can perhaps optimize this further. But be aware
+ * that settings events fire before their corresponding values
+ * are actually written to arduino.json -> time of arduino.json
+ * is outdated if no countermeasure is taken.
+ */
+export class AnalysisManager {
+
+    /** The manager's state. */
+    private _state: AnalysisState = AnalysisState.Idle;
+    /** A callback used by the manager to query if the build backend is busy. */
+    private _isBuilding: () => boolean;
+    /** A callback used by the manager to initiate an analysis build. */
+    private _doBuild: () => Promise<void>;
+    /** Timeout for the timeouts/delays in milliseconds. */
+    private _waitPeriodMs: number;
+    /** The internal timer used to implement the above timeouts and delays. */
+    private _timer: NodeJS.Timer;
+
+    /**
+     * Constructor.
+     * @param isBuilding Provide a callback which returns true if another build
+     * is currently in progress.
+     * @param doBuild Provide a callback which runs the analysis build.
+     * @param waitPeriodMs The delay the manger should wait for potential new
+     * analysis request. This delay is used as polling interval as well when
+     * checking for ongoing builds.
+     */
+    constructor(isBuilding: () => boolean,
+                doBuild: () => Promise<void>,
+                waitPeriodMs: number = 1000) {
+        this._isBuilding = isBuilding;
+        this._doBuild = doBuild;
+        this._waitPeriodMs = waitPeriodMs;
+    }
+
+    /**
+     * File an analysis request.
+     * The analysis will be delayed until no further requests are filed
+     * within a wait period or until any build in progress has terminated.
+     */
+    public async requestAnalysis() {
+        await this.update(AnalysisEvent.AnalysisRequest);
+    }
+
+    /**
+     * Update the manager's state machine.
+     * @param event The event which will cause the state transition.
+     *
+     * Implementation note: asynchronous edge actions must be called after
+     * setting the new state since they don't return immediately.
+     */
+    private async update(event: AnalysisEvent) {
+
+        switch (this._state) {
+
+            case AnalysisState.Idle:
+                if (event === AnalysisEvent.AnalysisRequest) {
+                    this._state = AnalysisState.Waiting;
+                    this.startWaitTimeout();
+                }
+                break;
+
+            case AnalysisState.Waiting:
+                if (event === AnalysisEvent.AnalysisRequest) {
+                    // every new request restarts timer
+                    this.startWaitTimeout();
+                } else if (event === AnalysisEvent.WaitTimeout) {
+                    if (this._isBuilding()) {
+                        // another build in progress, continue waiting
+                        this.startWaitTimeout();
+                    } else {
+                        // no other build in progress -> launch analysis
+                        this._state = AnalysisState.Analyzing;
+                        await this.startAnalysis();
+                    }
+                }
+                break;
+
+            case AnalysisState.Analyzing:
+                if (event === AnalysisEvent.AnalysisBuildDone) {
+                    this._state = AnalysisState.Idle;
+                } else if (event === AnalysisEvent.AnalysisRequest) {
+                    this._state = AnalysisState.AnalyzingWaiting;
+                }
+                break;
+
+            case AnalysisState.AnalyzingWaiting:
+                if (event === AnalysisEvent.AnalysisBuildDone) {
+                    // emulate the transition from idle to waiting
+                    // (we don't care if this adds an additional
+                    // timeout - event driven analysis is not time-
+                    // critical)
+                    this._state = AnalysisState.Idle;
+                    await this.update(AnalysisEvent.AnalysisRequest);
+                }
+                break;
+        }
+    }
+
+    /**
+     * Starts the wait timeout timer.
+     * If it's already running, the current timer is stopped and restarted.
+     * The timeout callback will then update the state machine.
+     */
+    private startWaitTimeout() {
+        if (this._timer) {
+            clearTimeout(this._timer);
+        }
+        this._timer = setTimeout(() => {
+            this.update(AnalysisEvent.WaitTimeout);
+            this._timer = undefined;
+        }, this._waitPeriodMs);
+    }
+
+    /**
+     * Starts the analysis build.
+     * When done, the callback will update the state machine.
+     */
+    private async startAnalysis() {
+        await this._doBuild()
+        .then(() => {
+            this.update(AnalysisEvent.AnalysisBuildDone);
+        })
+        .catch((reason) => {
+            this.update(AnalysisEvent.AnalysisBuildDone);
+        });
+    }
+}
diff --git a/src/arduino/programmerManager.ts b/src/arduino/programmerManager.ts
index 08d3a425..7a7e2991 100644
--- a/src/arduino/programmerManager.ts
+++ b/src/arduino/programmerManager.ts
@@ -35,7 +35,7 @@ export class ProgrammerManager {
         this._programmerStatusBar.tooltip = "Select Programmer";
         this.setProgrammerValue(DeviceContext.getInstance().programmer);
         this._programmerStatusBar.show();
-        DeviceContext.getInstance().onDidChange(() => {
+        DeviceContext.getInstance().onChangeProgrammer(() => {
             this.setProgrammerValue(DeviceContext.getInstance().programmer);
         });
     }
diff --git a/src/arduinoContext.ts b/src/arduinoContext.ts
index 58a3f8a4..321d2857 100644
--- a/src/arduinoContext.ts
+++ b/src/arduinoContext.ts
@@ -19,6 +19,8 @@ class ArduinoContext {
         this._arduinoApp = value;
     }
 
+    // TODO EW: This is redundant: the board manager is already part of
+    // the arduino app
     public get boardManager() {
         return this._boardManager;
     }
@@ -38,6 +40,10 @@ class ArduinoContext {
         return this._debuggerManager;
     }
 
+    // TODO EW: You don't have to initialize members to null
+    //  if they don't get a default value or aren't initialized
+    //  within a constructor they are "undefined" by default.
+    //  This makes comparing against null (above) superfluous.
     private _arduinoApp: ArduinoApp = null;
     private _debuggerManager: DebuggerManager = null;
     private _boardManager: BoardManager = null;
diff --git a/src/common/util.ts b/src/common/util.ts
index d1b51389..b37bea47 100644
--- a/src/common/util.ts
+++ b/src/common/util.ts
@@ -277,7 +277,7 @@ export function tryParseJSON(jsonString: string) {
         }
     } catch (ex) { }
 
-    return false;
+    return undefined;
 }
 
 export function isJunk(filename: string): boolean {
diff --git a/src/deviceContext.ts b/src/deviceContext.ts
index 3c0daf6e..dd687c45 100644
--- a/src/deviceContext.ts
+++ b/src/deviceContext.ts
@@ -6,10 +6,10 @@ import * as path from "path";
 import * as vscode from "vscode";
 import * as constants from "./common/constants";
 import * as util from "./common/util";
-import * as Logger from "./logger/logger";
 
 import { ARDUINO_CONFIG_FILE } from "./common/constants";
 import { ArduinoWorkspace } from "./common/workspace";
+import { DeviceSettings } from "./deviceSettings"
 
 /**
  * Interface that represents the arduino context information.
@@ -60,9 +60,7 @@ export interface IDeviceContext {
     /**
      * IntelliSense configuration auto-generation project override.
      */
-    disableIntelliSenseAutoGen: string;
-
-    onDidChange: vscode.Event<void>;
+    intelliSenseGen: string;
 
     initialize(): void;
 }
@@ -75,22 +73,17 @@ export class DeviceContext implements IDeviceContext, vscode.Disposable {
 
     private static _deviceContext: DeviceContext = new DeviceContext();
 
-    private _onDidChange = new vscode.EventEmitter<void>();
-
-    private _port: string;
-
-    private _board: string;
-
-    private _sketch: string;
-
-    private _output: string;
-
-    private _debugger: string;
-
-    private _disableIntelliSenseAutoGen: string;
-
-    private _configuration: string;
-
+    private _settings = new DeviceSettings();
+    /**
+     * TODO EW, 2020-02-17:
+     * The absolute file path of the directory containing the vscode-arduino
+     * extension. Not sure why this is stored here (it's a bit misplaced) and
+     * not in a dedicated extension object containing the extension context
+     * passed during activation. Another way would be a function in util.ts
+     * using a mechanism like
+     *
+     *   path.normalize(path.join(path.dirname(__filename), ".."))
+     */
     private _extensionPath: string;
 
     private _watcher: vscode.FileSystemWatcher;
@@ -99,10 +92,6 @@ export class DeviceContext implements IDeviceContext, vscode.Disposable {
 
     private _sketchStatusBar: vscode.StatusBarItem;
 
-    private _prebuild: string;
-
-    private _programmer: string;
-
     /**
      * @constructor
      */
@@ -143,39 +132,25 @@ export class DeviceContext implements IDeviceContext, vscode.Disposable {
      * TODO: Current we use the Arduino default settings. For future release, this dependency might be removed
      * and the setting only depends on device.json.
      * @method
+     *
+     * TODO EW, 2020-02-18:
+     * A problem I discovered: here you try to find the config file location
+     * and when you're writing below, you use a hard-coded location. When
+     * resorting to "find", you have to store the file's location at least and
+     * reuse it when saving.
+     * But I think the intention is: load a config file from anywhere and save
+     * it under .vscode/arduino.json. But then the initial load has to use find
+     * and afterwards it must not use find anymore.
      */
     public loadContext(): Thenable<object> {
         return vscode.workspace.findFiles(ARDUINO_CONFIG_FILE, null, 1)
             .then((files) => {
-                let deviceConfigJson: any = {};
                 if (files && files.length > 0) {
-                    const configFile = files[0];
-                    deviceConfigJson = util.tryParseJSON(fs.readFileSync(configFile.fsPath, "utf8"));
-                    if (deviceConfigJson) {
-                        this._port = deviceConfigJson.port;
-                        this._board = deviceConfigJson.board;
-                        this._sketch = deviceConfigJson.sketch;
-                        this._configuration = deviceConfigJson.configuration;
-                        this._output = deviceConfigJson.output;
-                        this._debugger = deviceConfigJson["debugger"];
-                        this._disableIntelliSenseAutoGen = deviceConfigJson.disableIntelliSenseAutoGen;
-                        this._prebuild = deviceConfigJson.prebuild;
-                        this._programmer = deviceConfigJson.programmer;
-                        this._onDidChange.fire();
-                    } else {
-                        Logger.notifyUserError("arduinoFileError", new Error(constants.messages.ARDUINO_FILE_ERROR));
-                    }
+                    this._settings.load(files[0].fsPath);
+                    // on invalid configuration we continue with current settings
                 } else {
-                    this._port = null;
-                    this._board = null;
-                    this._sketch = null;
-                    this._configuration = null;
-                    this._output = null;
-                    this._debugger = null;
-                    this._disableIntelliSenseAutoGen = null;
-                    this._prebuild = null;
-                    this._programmer = null;
-                    this._onDidChange.fire();
+                    // No configuration file found, starting over with defaults
+                    this._settings.reset();
                 }
                 return this;
             }, (reason) => {
@@ -185,148 +160,112 @@ export class DeviceContext implements IDeviceContext, vscode.Disposable {
                 // Logger.notifyUserError("arduinoFileUnhandleError", new Error(reason.toString()));
 
                  // Workaround for change in API, populate required props for arduino.json
-                this._port = null;
-                this._board = null;
-                this._sketch = null;
-                this._configuration = null;
-                this._output = null;
-                this._debugger = null;
-                this._disableIntelliSenseAutoGen = null;
-                this._prebuild = null;
-                this._programmer = null;
-                this._onDidChange.fire();
-
+                this._settings.reset();
                 return this;
             });
     }
 
     public showStatusBar() {
-        if (!this._sketch) {
+        if (!this._settings.sketch.value) {
             return false;
         }
-
-        this._sketchStatusBar.text = this._sketch;
+        this._sketchStatusBar.text = this._settings.sketch.value;
         this._sketchStatusBar.show();
     }
 
-    public saveContext() {
-        if (!ArduinoWorkspace.rootPath) {
-            return;
-        }
-        const deviceConfigFile = path.join(ArduinoWorkspace.rootPath, ARDUINO_CONFIG_FILE);
-        let deviceConfigJson: any = {};
-        if (util.fileExistsSync(deviceConfigFile)) {
-            deviceConfigJson = util.tryParseJSON(fs.readFileSync(deviceConfigFile, "utf8"));
-        }
-        if (!deviceConfigJson) {
-            Logger.notifyUserError("arduinoFileError", new Error(constants.messages.ARDUINO_FILE_ERROR));
-            return;
-        }
-        deviceConfigJson.sketch = this.sketch;
-        deviceConfigJson.port = this.port;
-        deviceConfigJson.board = this.board;
-        deviceConfigJson.output = this.output;
-        deviceConfigJson["debugger"] = this.debugger_;
-        deviceConfigJson.disableIntelliSenseAutoGen = this.disableIntelliSenseAutoGen;
-        deviceConfigJson.configuration = this.configuration;
-        deviceConfigJson.programmer = this.programmer;
-
-        util.mkdirRecursivelySync(path.dirname(deviceConfigFile));
-        fs.writeFileSync(deviceConfigFile, JSON.stringify(deviceConfigJson, (key, value) => {
-            if (value === null) {
-                return undefined;
-            }
-            return value;
-        }, 4));
-    }
-
-    public get onDidChange(): vscode.Event<void> {
-        return this._onDidChange.event;
-    }
+    public get onChangePort() { return this._settings.port.emitter.event }
+    public get onChangeBoard() { return this._settings.board.emitter.event }
+    public get onChangeSketch() { return this._settings.sketch.emitter.event }
+    public get onChangeOutput() { return this._settings.output.emitter.event }
+    public get onChangeDebugger() { return this._settings.debugger.emitter.event }
+    public get onChangeISAutoGen() { return this._settings.intelliSenseGen.emitter.event }
+    public get onChangeConfiguration() { return this._settings.configuration.emitter.event }
+    public get onChangePrebuild() { return this._settings.prebuild.emitter.event }
+    public get onChangeProgrammer() { return this._settings.programmer.emitter.event }
 
     public get port() {
-        return this._port;
+        return this._settings.port.value;
     }
 
     public set port(value: string) {
-        this._port = value;
+        this._settings.port.value = value;
         this.saveContext();
     }
 
     public get board() {
-        return this._board;
+        return this._settings.board.value;
     }
 
     public set board(value: string) {
-        this._board = value;
+        this._settings.board.value = value;
         this.saveContext();
     }
 
     public get sketch() {
-        return this._sketch;
+        return this._settings.sketch.value;
     }
 
     public set sketch(value: string) {
-        this._sketch = value;
+        this._settings.sketch.value = value;
         this.saveContext();
     }
 
     public get prebuild() {
-        return this._prebuild ? this._prebuild.trim() : "";
+        return this._settings.prebuild.value;
     }
 
     public get output() {
-        return this._output;
+        return this._settings.output.value;
     }
 
     public set output(value: string) {
-        this._output = value;
+        this._settings.output.value = value;
         this.saveContext();
     }
 
     public get debugger_() {
-        return this._debugger;
+        return this._settings.debugger.value;
     }
 
     public set debugger_(value: string) {
-        this._debugger = value;
+        this._settings.debugger.value = value;
         this.saveContext();
     }
 
-    public get disableIntelliSenseAutoGen() {
-        return this._disableIntelliSenseAutoGen;
+    public get intelliSenseGen() {
+        return this._settings.intelliSenseGen.value;
     }
 
-    public set disableIntelliSenseAutoGen(value: string) {
-        this._disableIntelliSenseAutoGen = value;
+    public set intelliSenseGen(value: string) {
+        this._settings.intelliSenseGen.value = value;
         this.saveContext();
     }
 
     public get configuration() {
-        return this._configuration;
+        return this._settings.configuration.value;
     }
 
     public set configuration(value: string) {
-        this._configuration = value;
+        this._settings.configuration.value = value;
         this.saveContext();
     }
 
     public get programmer() {
-        return this._programmer;
+        return this._settings.programmer.value;
     }
 
     public set programmer(value: string) {
-        this._programmer = value;
+        this._settings.programmer.value = value;
         this.saveContext();
     }
 
     public async initialize() {
         if (ArduinoWorkspace.rootPath && util.fileExistsSync(path.join(ArduinoWorkspace.rootPath, ARDUINO_CONFIG_FILE))) {
-            vscode.window.showInformationMessage("Arduino.json is already generated.");
+            vscode.window.showInformationMessage("Arduino.json already generated.");
             return;
         } else {
             if (!ArduinoWorkspace.rootPath) {
-                vscode.window.showInformationMessage("Please open an folder first.");
+                vscode.window.showInformationMessage("Please open a folder first.");
                 return;
             }
             await this.resolveMainSketch();
@@ -334,20 +273,41 @@ export class DeviceContext implements IDeviceContext, vscode.Disposable {
                 await vscode.commands.executeCommand("arduino.changeBoardType");
                 vscode.window.showInformationMessage("The workspace is initialized with the Arduino extension support.");
             } else {
-                vscode.window.showInformationMessage("No *.ino sketch file was found or selected, so skip initialize command.");
+                vscode.window.showInformationMessage("No sketch (*.ino or *.cpp) was found or selected - initialization skipped.");
             }
         }
     }
 
+    /**
+     * Note: We're using the class' setter for the sketch (i.e. this.sketch = ...)
+     * to make sure that any changes are synched to the configuration file.
+     */
     public async resolveMainSketch() {
-        return await vscode.workspace.findFiles("**/*.ino", null)
+        // TODO (EW, 2020-02-18): Here you look for *.ino files but below you allow
+        //  *.cpp/*.c files to be set as sketch
+        await vscode.workspace.findFiles("**/*.ino", null)
             .then(async (fileUris) => {
                 if (fileUris.length === 0) {
                     let newSketchFileName = await vscode.window.showInputBox({
-                        value: "app.ino",
-                        prompt: "No .ino file was found on workspace, initialize sketch first",
-                        placeHolder: "Input the sketch file name",
+                        value: "my-sketch.ino",
+                        prompt: "No sketch (*.ino) found in workspace, please provide a name",
+                        placeHolder: "Sketch file name (*.ino or *.cpp)",
                         validateInput: (value) => {
+                            /* TODO (EW, 2020-02-18):
+                             * is 'c' actually allowed? Also found on within other files.
+                             * And the regular expression doesn't need the internal groups.
+                             * The outer group can be an anonymous group.
+                             * And \w doesn't match dashes - so any sketch containing dashes
+                             * will not be found.
+                             * The correct expression therefore would be something like this:
+                             *
+                             *   /^[\w\-]+\.(?:ino|cpp)$/
+                             *
+                             * I'd recommend to define such regular expressions (including)
+                             * line splitting etc.) at the global constants file.
+                             * This is true for any hard coded paths (like the snippets below)
+                             * as well.
+                             */
                             if (value && /^\w+\.((ino)|(cpp)|c)$/.test(value.trim())) {
                                 return null;
                             } else {
@@ -364,7 +324,7 @@ export class DeviceContext implements IDeviceContext, vscode.Disposable {
                         const textDocument = await vscode.workspace.openTextDocument(path.join(ArduinoWorkspace.rootPath, newSketchFileName));
                         vscode.window.showTextDocument(textDocument, vscode.ViewColumn.One, true);
                     } else {
-                        this._sketch = undefined;
+                        this.sketch = undefined;
                     }
                 } else if (fileUris.length === 1) {
                     this.sketch = path.relative(ArduinoWorkspace.rootPath, fileUris[0].fsPath);
@@ -380,5 +340,14 @@ export class DeviceContext implements IDeviceContext, vscode.Disposable {
                     }
                 }
             });
+        return this.sketch;
+    }
+
+    private saveContext() {
+        if (!ArduinoWorkspace.rootPath) {
+            return;
+        }
+        const deviceConfigFile = path.join(ArduinoWorkspace.rootPath, ARDUINO_CONFIG_FILE);
+        this._settings.save(deviceConfigFile);
     }
 }
diff --git a/src/deviceSettings.ts b/src/deviceSettings.ts
index 1ac678db..d930cdc2 100644
--- a/src/deviceSettings.ts
+++ b/src/deviceSettings.ts
@@ -1,3 +1,6 @@
+// Copyright (c) Elektronik Workshop. All rights reserved.
+// Licensed under the MIT license.
+
 import * as fs from "fs";
 import * as path from "path";
 import * as vscode from "vscode";
@@ -106,7 +109,7 @@ export class DeviceSettings {
     public sketch = new StrSetting();
     public output = new StrSetting();
     public debugger = new StrSetting();
-    public disableIntelliSenseAutoGen = new StrSetting();
+    public intelliSenseGen = new StrSetting();
     public configuration = new StrSetting();
     public prebuild = new StrSetting();
     public programmer = new StrSetting();
@@ -121,7 +124,7 @@ export class DeviceSettings {
                this.sketch.modified ||
                this.output.modified ||
                this.debugger.modified ||
-               this.disableIntelliSenseAutoGen.modified ||
+               this.intelliSenseGen.modified ||
                this.configuration.modified ||
                this.prebuild.modified ||
                this.programmer.modified;
@@ -135,7 +138,7 @@ export class DeviceSettings {
         this.sketch.commit();
         this.output.commit();
         this.debugger.commit();
-        this.disableIntelliSenseAutoGen.commit();
+        this.intelliSenseGen.commit();
         this.configuration.commit();
         this.prebuild.commit();
         this.programmer.commit();
@@ -151,7 +154,7 @@ export class DeviceSettings {
         this.sketch.reset();
         this.output.reset();
         this.debugger.reset();
-        this.disableIntelliSenseAutoGen.reset();
+        this.intelliSenseGen.reset();
         this.configuration.reset();
         this.prebuild.reset();
         this.programmer.reset();
@@ -176,7 +179,7 @@ export class DeviceSettings {
             this.configuration.value = settings.configuration;
             this.output.value = settings.output;
             this.debugger.value = settings.debugger;
-            this.disableIntelliSenseAutoGen.value = settings.disableIntelliSenseAutoGen;
+            this.intelliSenseGen.value = settings.intelliSenseGen;
             this.prebuild.value = settings.prebuild;
             this.programmer.value = settings.programmer;
             if (commit) {
@@ -220,7 +223,7 @@ export class DeviceSettings {
         settings.board = this.board.value;
         settings.output = this.output.value;
         settings.debugger = this.debugger.value;
-        settings.disableIntelliSenseAutoGen = this.disableIntelliSenseAutoGen.value;
+        settings.intelliSenseGen = this.intelliSenseGen.value;
         settings.configuration = this.configuration.value;
         settings.programmer = this.programmer.value;
 
diff --git a/src/extension.ts b/src/extension.ts
index 36d5a71e..9e7e3fe0 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -31,8 +31,6 @@ import { BuildMode } from "./arduino/arduino";
 import { SerialMonitor } from "./serialmonitor/serialMonitor";
 const usbDetectorModule = impor("./serialmonitor/usbDetector") as typeof import ("./serialmonitor/usbDetector");
 
-const status: any = {};
-
 export async function activate(context: vscode.ExtensionContext) {
     Logger.configure(context);
     const activeGuid = uuidModule().replace(/-/g, "");
@@ -117,18 +115,13 @@ export async function activate(context: vscode.ExtensionContext) {
     registerArduinoCommand("arduino.initialize", async () => await deviceContext.initialize());
 
     registerArduinoCommand("arduino.verify", async () => {
-        if (!status.compile) {
-            status.compile = "verify";
-            try {
-                await vscode.window.withProgress({
-                    location: vscode.ProgressLocation.Window,
-                    title: "Arduino: Verifying...",
-                }, async () => {
-                    await arduinoContextModule.default.arduinoApp.build(BuildMode.Verify, true);
-                });
-            } catch (ex) {
-            }
-            delete status.compile;
+        if (!arduinoContextModule.default.arduinoApp.building) {
+            await vscode.window.withProgress({
+                location: vscode.ProgressLocation.Window,
+                title: "Arduino: Verifying...",
+            }, async () => {
+                await arduinoContextModule.default.arduinoApp.build(BuildMode.Verify, true);
+            });
         }
     }, () => {
         return {
@@ -138,36 +131,26 @@ export async function activate(context: vscode.ExtensionContext) {
     });
 
     registerArduinoCommand("arduino.upload", async () => {
-        if (!status.compile) {
-            status.compile = "upload";
-            try {
-                await vscode.window.withProgress({
-                    location: vscode.ProgressLocation.Window,
-                    title: "Arduino: Uploading...",
-                }, async () => {
-                    await arduinoContextModule.default.arduinoApp.build(BuildMode.Upload, true);
-                });
-            } catch (ex) {
-            }
-            delete status.compile;
+        if (!arduinoContextModule.default.arduinoApp.building) {
+            await vscode.window.withProgress({
+                location: vscode.ProgressLocation.Window,
+                title: "Arduino: Uploading...",
+            }, async () => {
+                await arduinoContextModule.default.arduinoApp.build(BuildMode.Upload, true);
+            });
         }
     }, () => {
         return { board: arduinoContextModule.default.boardManager.currentBoard.name };
     });
 
     registerArduinoCommand("arduino.cliUpload", async () => {
-        if (!status.compile) {
-            status.compile = "cliUpload";
-            try {
-                await vscode.window.withProgress({
-                    location: vscode.ProgressLocation.Window,
-                    title: "Arduino: Using CLI to upload...",
-                }, async () => {
-                    await arduinoContextModule.default.arduinoApp.build(BuildMode.Upload, false);
-                });
-            } catch (ex) {
-            }
-            delete status.compile;
+        if (!arduinoContextModule.default.arduinoApp.building) {
+            await vscode.window.withProgress({
+                location: vscode.ProgressLocation.Window,
+                title: "Arduino: Using CLI to upload...",
+            }, async () => {
+                await arduinoContextModule.default.arduinoApp.build(BuildMode.Upload, false);
+            });
         }
     }, () => {
         return { board: arduinoContextModule.default.boardManager.currentBoard.name };
@@ -195,57 +178,51 @@ export async function activate(context: vscode.ExtensionContext) {
     });
 
     registerArduinoCommand("arduino.uploadUsingProgrammer", async () => {
-        if (!status.compile) {
-            status.compile = "upload";
-            // TODO: no progress indicator
-            //       and: exceptions should be handled within build
-            //            function
-            try {
+        if (!arduinoContextModule.default.arduinoApp.building) {
+            await vscode.window.withProgress({
+                location: vscode.ProgressLocation.Window,
+                title: "Arduino: Uploading (programmer)...",
+            }, async () => {
                 await arduinoContextModule.default.arduinoApp.build(BuildMode.UploadProgrammer, true);
-            } catch (ex) {
-            }
-            delete status.compile;
+            });
         }
     }, () => {
         return { board: arduinoContextModule.default.boardManager.currentBoard.name };
     });
 
     registerArduinoCommand("arduino.cliUploadUsingProgrammer", async () => {
-        if (!status.compile) {
-            status.compile = "cliUpload";
-            try {
+        if (!arduinoContextModule.default.arduinoApp.building) {
+            await vscode.window.withProgress({
+                location: vscode.ProgressLocation.Window,
+                title: "Arduino: Using CLI to upload (programmer)...",
+            }, async () => {
                 await arduinoContextModule.default.arduinoApp.build(BuildMode.UploadProgrammer, false);
-            } catch (ex) {
-            }
-            delete status.compile;
+            });
         }
     }, () => {
         return { board: arduinoContextModule.default.boardManager.currentBoard.name };
     });
 
     registerArduinoCommand("arduino.rebuildIntelliSenseConfig", async () => {
-        if (!status.compile) {
-            status.compile = "intellisenserebuild";
+        if (!arduinoContextModule.default.arduinoApp.building) {
             await vscode.window.withProgress({
                 location: vscode.ProgressLocation.Window,
                 title: "Arduino: Rebuilding IS Configuration...",
             }, async () => {
                 await arduinoContextModule.default.arduinoApp.build(BuildMode.Analyze, true);
             });
-            delete status.compile;
         }
     }, () => {
         return { board: arduinoContextModule.default.boardManager.currentBoard.name };
     });
 
     registerArduinoCommand("arduino.selectProgrammer", async () => {
-        if (!status.compile) {
-            status.compile = "upload";
+        // TODO EW: this guard does not prevent building when setting the programmer
+        if (!arduinoContextModule.default.arduinoApp.building) {
             try {
                 await arduinoContextModule.default.arduinoApp.programmerManager.selectProgrammer();
             } catch (ex) {
             }
-            delete status.compile;
         }
     }, () => {
         return {
diff --git a/src/langService/completionProvider.ts b/src/langService/completionProvider.ts
index 0a21bef4..1b5d9d31 100644
--- a/src/langService/completionProvider.ts
+++ b/src/langService/completionProvider.ts
@@ -28,8 +28,7 @@ import { ArduinoWorkspace } from "../common/workspace";
  * the individual libraries are actually compatible with the current board
  * before offering a completion.
  *
- * EW
- * 2020-02-17
+ * EW, 2020-02-17
  */
 export class CompletionProvider implements vscode.CompletionItemProvider {
 
diff --git a/src/serialmonitor/serialMonitor.ts b/src/serialmonitor/serialMonitor.ts
index 812801d5..28b58fa7 100644
--- a/src/serialmonitor/serialMonitor.ts
+++ b/src/serialmonitor/serialMonitor.ts
@@ -48,18 +48,6 @@ export class SerialMonitor implements vscode.Disposable {
 
     private _outputChannel: vscode.OutputChannel;
 
-    private constructor() {
-        const dc = DeviceContext.getInstance();
-        dc.onDidChange(() => {
-            if (dc.port) {
-                if (!this.initialized) {
-                    this.initialize();
-                }
-                this.updatePortListStatus(null);
-            }
-        });
-    }
-
     public initialize() {
         let defaultBaudRate;
         if (ArduinoContext.arduinoApp && ArduinoContext.arduinoApp.settings && ArduinoContext.arduinoApp.settings.defaultBaudRate) {
@@ -85,6 +73,11 @@ export class SerialMonitor implements vscode.Disposable {
         this._baudRateStatusBar.tooltip = "Baud Rate";
         this._baudRateStatusBar.text = defaultBaudRate.toString();
         this.updatePortListStatus(null);
+
+        const dc = DeviceContext.getInstance();
+        dc.onChangePort(() => {
+            this.updatePortListStatus(null);
+        });
     }
     public get initialized(): boolean {
         return !!this._outputChannel;
@@ -185,15 +178,15 @@ export class SerialMonitor implements vscode.Disposable {
         const rates = SerialMonitor.listBaudRates();
         const chosen = await vscode.window.showQuickPick(rates.map((rate) => rate.toString()));
         if (!chosen) {
-            Logger.warn("No rate is selected, keep baud rate no changed.");
+            Logger.warn("No baud rate selected, keeping previous baud rate.");
             return;
         }
         if (!parseInt(chosen, 10)) {
-            Logger.warn("Invalid baud rate, keep baud rate no changed.", { value: chosen });
+            Logger.warn("Invalid baud rate, keeping previous baud rate.", { value: chosen });
             return;
         }
         if (!this._serialPortCtrl) {
-            Logger.warn("Serial Monitor have not been started.");
+            Logger.warn("Serial Monitor has not been started.");
             return;
         }
         const selectedRate: number = parseInt(chosen, 10);
@@ -217,6 +210,7 @@ export class SerialMonitor implements vscode.Disposable {
         }
     }
 
+    // TODO EW: use default value for port function parameter and change all updatePortListStatus(null) calls accordingly
     private updatePortListStatus(port: string) {
         const dc = DeviceContext.getInstance();
         if (port) {
diff --git a/src/serialmonitor/usbDetector.ts b/src/serialmonitor/usbDetector.ts
index 51dfe872..a5b71a96 100644
--- a/src/serialmonitor/usbDetector.ts
+++ b/src/serialmonitor/usbDetector.ts
@@ -76,6 +76,9 @@ export class UsbDetector {
                 if (!SerialMonitor.getInstance().initialized) {
                     SerialMonitor.getInstance().initialize();
                 }
+
+                // TODO EW: this is board manager code which should be moved into board manager
+
                 let bd = ArduinoContext.boardManager.installedBoards.get(boardKey);
                 const openEditor = vscode.window.activeTextEditor;
                 if (ArduinoWorkspace.rootPath && (

From 5fd1a2706f1f1d6ba37fc9bbbc668f91aef2ddd7 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Wed, 19 Feb 2020 23:01:36 +0100
Subject: [PATCH 069/142] Updated log and beers.

---
 BRANCHNOTES.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index bcd5a047..d2b4f807 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -69,7 +69,7 @@ During merging I found some bugs within those functions - mainly due to the abov
 
 **2020 02 17** Disabled and marked all previous implementations of IntelliSense support for later removal using `IS-REMOVE`. Pulled changes from upstream and merged them into the intellisense feature branch. Began to work on event handling/generation: vscode-arduino should detect when sketch/board/configuration and so on has changed, then re-analyze the current setup and set the IntelliSense configuration accordingly. This works more or less but there's a lot to fix in the current implementation which kept me busy till late today (I need some sleep now). Cleanup and commits follow tomorrow. Approaching alpha version for curious testers. OSX and Linux comes first, Windows will follow later.
 **2020 02 18** Finished basic event triggering. Rewrote `DeviceContext` for proper settings modification detection (trigger events only on actual change) and generation of setting specific events (e.g. board changed) instead of one global event (aka. "something in the settings changed").
-**2020 02 19** Implemented proper build scheduling for analysis build by writing an `AnalysisManager` class. This class collects multiple changes (e.g. board and configuration, which often are changed shortly after another) before running an analysis. In case another build or analysis is in progress it postpones newly filed analysis requests until the other build has completed. Updated and completed the documentation for the IntelliSense usage within [README](README.md). Alpha test builds of the extension containing the latest implemented features and fixes are now available from the following [Dropbox folder](https://www.dropbox.com/sh/whmcdt26chyjgby/AAB1Ld2fzZ9Z_NfM3CRay17wa). Please note, that Windows is currently not supported yet.
+**2020 02 19** Implemented proper build scheduling for analysis build by writing an `AnalysisManager` class. This class collects multiple changes (e.g. board and configuration, which often are changed shortly after another) before running an analysis. In case another build or analysis is in progress it postpones newly filed analysis requests until the other build has completed. Updated and completed the documentation for the IntelliSense usage within [README](README.md). Alpha test builds of the extension containing the latest implemented features and fixes are now available from the following [Dropbox folder](https://www.dropbox.com/sh/whmcdt26chyjgby/AAB1Ld2fzZ9Z_NfM3CRay17wa). Please note, that Windows is currently not supported yet. Reviewed, documented/commented all changes and committed the automatic analysis integration changes.
 
 ## Status
 |      | Tasks   |
@@ -146,7 +146,7 @@ I will list every supporter here, thanks!
 2020-02-15 Elektronik Workshop: 28 :beers: (7h coding)
 2020-02-17 Elektronik Workshop: 52 :beers: (13h coding)
 2020-02-18 Elektronik Workshop: 36 :beers: (9h coding)
-2020-02-19 Elektronik Workshop: x :beers: (xh coding)
+2020-02-19 Elektronik Workshop: 48 :beers: (12h coding)
 
 <!-- https://github.com/StylishThemes/GitHub-Dark/wiki/Emoji -->
 

From 01e92e9d6158fad87e1d8d3c8e081e494188c5b3 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Wed, 19 Feb 2020 23:59:01 +0100
Subject: [PATCH 070/142] Added "some" additional issues -- currently I've
 found 28!

---
 BRANCHNOTES.md | 51 ++++++++++++++++++++++++++++++++++----------------
 1 file changed, 35 insertions(+), 16 deletions(-)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index d2b4f807..9e3c3173 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -3,26 +3,45 @@
 This branch more or less addresses the following issues:
 | # | Issue | Title | Comment |
 |--:|:------|:------------|:--------|
-|  1| [#438](https://github.com/microsoft/vscode-arduino/issues/438) | **The Extension should automagically fill the c_cpp_properties.json, so intellisense works out of the box** | This is the issue to which I usually report news concerning the progress of this project |
-|  2| [#876](https://github.com/microsoft/vscode-arduino/issues/876) | **Missing #define ARDUINO 10808 logic?** | Marked as bug but it's just the same problem again |
-|  3| [#829](https://github.com/microsoft/vscode-arduino/issues/829) | **`Arduino.h` and ESP8266 includes have squiggles** | Stale issue |
-|  4| [#969](https://github.com/microsoft/vscode-arduino/issues/969) | **INO Files defines undefined but can jump to definition**  |  |
-|  5| [#959](https://github.com/microsoft/vscode-arduino/issues/959) | **Update board type command does not update intellisense config automatically**  |  |
-|  6| [#892](https://github.com/microsoft/vscode-arduino/issues/892) | **Default IntelliSense config** |  |
-|  7| [#850](https://github.com/microsoft/vscode-arduino/issues/850) | **How to prevent modifications of c_cpp_properties.json by the extension?**  | Asks if the current implementation can be turned off, because it overwrites a user's config with non working IS config -- this is sad. |
-|  8| [#833](https://github.com/microsoft/vscode-arduino/issues/833) | **Allow C_Cpp.intelliSenseEngine to be set to "Default" instead of "Tag Parser" for better code completion/suggestions**  |  |
-|  9| [#808](https://github.com/microsoft/vscode-arduino/issues/808) | **Identifier "Serial" is undefined**  |  |
-| 10| [#474](https://github.com/microsoft/vscode-arduino/issues/474) | **Enrich device develop experience**  |  |
-
-<!-- | 11| [#](https://github.com/microsoft/vscode-arduino/issues/) |  |  | -->
-<!-- | 12| [#](https://github.com/microsoft/vscode-arduino/issues/) |  |  | -->
-<!-- | 13| [#](https://github.com/microsoft/vscode-arduino/issues/) |  |  | -->
-<!-- | 14| [#](https://github.com/microsoft/vscode-arduino/issues/) |  |  | -->
+|  1| [#438](https://github.com/microsoft/vscode-arduino/issues/438) | **The Extension should automagically fill the `c_cpp_properties.json`, so intellisense works out of the box** | This is the issue to which I usually report news concerning the progress of this project |
+|  2| [#969](https://github.com/microsoft/vscode-arduino/issues/969) | **INO Files defines undefined but can jump to definition**  |  |
+|  3| [#959](https://github.com/microsoft/vscode-arduino/issues/959) | **Update board type command does not update intellisense config automatically**  |  |
+|  4| [#892](https://github.com/microsoft/vscode-arduino/issues/892) | **Default IntelliSense config** |  |
+|  5| [#876](https://github.com/microsoft/vscode-arduino/issues/876) | **Missing #define ARDUINO 10808 logic?** | Marked as bug but it's just the same problem again |
+|  6| [#850](https://github.com/microsoft/vscode-arduino/issues/850) | **How to prevent modifications of `c_cpp_properties.json` by the extension?**  | Asks if the current implementation can be turned off, because it overwrites a user's config with non working IS config -- this is sad. |
+|  7| [#833](https://github.com/microsoft/vscode-arduino/issues/833) | **Allow C_Cpp.intelliSenseEngine to be set to "Default" instead of "Tag Parser" for better code completion/suggestions**  |  |
+|  8| [#831](https://github.com/microsoft/vscode-arduino/issues/831) | **IntelliSenseEngine doesn't work as default** |  |
+|  9| [#829](https://github.com/microsoft/vscode-arduino/issues/829) | **`Arduino.h` and ESP8266 includes have squiggles** | Stale issue |
+| 10| [#823](https://github.com/microsoft/vscode-arduino/issues/823) | **Intellisense is not highlighting code** | Stale issue |
+| 11| [#818](https://github.com/microsoft/vscode-arduino/issues/818) | **Warning with default includePath after initialize, cannot open source file `avr/pgmspace.h`** | Stale issue |
+| 12| [#808](https://github.com/microsoft/vscode-arduino/issues/808) | **Identifier `Serial` is undefined**  |  |
+| 13| [#776](https://github.com/microsoft/vscode-arduino/issues/776) | **Can not open source file `omp.h` (dependency of `ESP8266WiFi.h`** |  |
+| 14| [#772](https://github.com/microsoft/vscode-arduino/issues/772) | **How to fix red squiggles under constants like D2 (upload works fine)** |  |
+| 15| [#761](https://github.com/microsoft/vscode-arduino/issues/761) | **When creating the `c_cpp_properties.json` it should include the libraries folder as well as all of the other folders.** |  |
+| 16| [#749](https://github.com/microsoft/vscode-arduino/issues/749) | **Non-fatal error on Adafruit Feather M0: cannot open source file `sam.h`** | Stale issue |
+| 17| [#727](https://github.com/microsoft/vscode-arduino/issues/727) | **Intellisense for Arduino Tabs** | Stale issue |
+| 18| [#684](https://github.com/microsoft/vscode-arduino/issues/684) | **Default C/C++ configuration uses MSVC for IntelliSense rather than GCC** | Stale issue |
+| 19| [#678](https://github.com/microsoft/vscode-arduino/issues/678) | **Dependency error `avr32/io.h`** | Stale issue |
+| 20| [#645](https://github.com/microsoft/vscode-arduino/issues/645) | **Should IntelliSense suggest only built in function?** | Stale issue |
+| 21| [#613](https://github.com/microsoft/vscode-arduino/issues/613) | **Read content of `keywords.txt` for text highlights** | This will become obsolete as well since `keywords.txt` is a dirty workaround for the arduino IDE which doesn't have IntelliSense at all. |
+| 22| [#563](https://github.com/microsoft/vscode-arduino/issues/563) | **Support of intellisence for library Wire(sam)** |  |
+| 23| [#525](https://github.com/microsoft/vscode-arduino/issues/525) | **`#include` errors detected - Tag Parser.** | Closed but still not fixed properly |
+| 24| [#474](https://github.com/microsoft/vscode-arduino/issues/474) | **Enrich device develop experience**  |  |
+| 25| [#127](https://github.com/microsoft/vscode-arduino/issues/127) | **Syntax highlighting for some of the Classes/Instances is missing** | Closed but still not fixed properly |
+| 26| [#126](https://github.com/microsoft/vscode-arduino/issues/126) | **Syntax highlighting for some of the Macros is missing** | Closed but still not fixed properly |
+| 27| [#125](https://github.com/microsoft/vscode-arduino/issues/125) | **Missing syntax highlighting for partial arduino constants** | Closed but still not fixed properly |
+| 28| [#115](https://github.com/microsoft/vscode-arduino/issues/115) | **Dot prompting the methods doesn't work on Mac** | Closed but still not fixed properly |
+
+<!-- |   | [#](https://github.com/microsoft/vscode-arduino/issues/) | **** |  | -->
+<!-- |   | [#](https://github.com/microsoft/vscode-arduino/issues/) | **** |  | -->
+<!-- |   | [#](https://github.com/microsoft/vscode-arduino/issues/) | **** |  | -->
+<!-- |   | [#](https://github.com/microsoft/vscode-arduino/issues/) | **** |  | -->
 
 -- the list is probably incomplete - I didn't search exhaustively and didn't consider closed issues as long as I didn't stumble upon one. New duplicates are popping up at a rate of about one per week.
 
-Further related issues
+Some issue searches and other related issues
 * [vscode-arduino issue search for IntelliSense](https://github.com/microsoft/vscode-arduino/issues?utf8=%E2%9C%93&q=intellisense+is%3Aopen)
+* [vscode-arduino issue search for intellisense label](https://github.com/microsoft/vscode-arduino/issues?utf8=%E2%9C%93&q=label%3Aintellisense)
 * [Wrongly attributed to vscode instead of vscode-arduino](https://github.com/Microsoft/vscode-cpptools/issues/1750)
 * [Problems with IntelliSense itself](https://github.com/microsoft/vscode-cpptools/issues/1034)
 

From 98dbc0d35246cff5201b04f5ae2abb4e733f628f Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Fri, 21 Feb 2020 00:40:16 +0100
Subject: [PATCH 071/142] Updated log, status and beers

---
 BRANCHNOTES.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index 9e3c3173..c8600a7b 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -89,6 +89,7 @@ During merging I found some bugs within those functions - mainly due to the abov
 **2020 02 17** Disabled and marked all previous implementations of IntelliSense support for later removal using `IS-REMOVE`. Pulled changes from upstream and merged them into the intellisense feature branch. Began to work on event handling/generation: vscode-arduino should detect when sketch/board/configuration and so on has changed, then re-analyze the current setup and set the IntelliSense configuration accordingly. This works more or less but there's a lot to fix in the current implementation which kept me busy till late today (I need some sleep now). Cleanup and commits follow tomorrow. Approaching alpha version for curious testers. OSX and Linux comes first, Windows will follow later.
 **2020 02 18** Finished basic event triggering. Rewrote `DeviceContext` for proper settings modification detection (trigger events only on actual change) and generation of setting specific events (e.g. board changed) instead of one global event (aka. "something in the settings changed").
 **2020 02 19** Implemented proper build scheduling for analysis build by writing an `AnalysisManager` class. This class collects multiple changes (e.g. board and configuration, which often are changed shortly after another) before running an analysis. In case another build or analysis is in progress it postpones newly filed analysis requests until the other build has completed. Updated and completed the documentation for the IntelliSense usage within [README](README.md). Alpha test builds of the extension containing the latest implemented features and fixes are now available from the following [Dropbox folder](https://www.dropbox.com/sh/whmcdt26chyjgby/AAB1Ld2fzZ9Z_NfM3CRay17wa). Please note, that Windows is currently not supported yet. Reviewed, documented/commented all changes and committed the automatic analysis integration changes.
+**2020 02 20** Windows support - what a PITA. This OS is so foobar'ed... The only positive outcome from this experience: I found some substantial bugs in the parser which - of course (Murphy) - didn't affect me up to now. The parser should be much more resistant against strange paths and escapes now: Added proper command line lexer to cocopa and worked around several ridiculous Windows shortcomings (Microsoft owes me at least 50 crates of beer). The whole mess is not cleaned up and committed yet so please don't build from the repository and use the alpha release packages as outlined above.
 
 ## Status
 |      | Tasks   |
@@ -97,7 +98,7 @@ During merging I found some bugs within those functions - mainly due to the abov
 |                                       | :heavy_check_mark: Support for different boards (done for AVR, ESP32, ESP8266) -- The code has been designed such that it is easy to write/add new parser engines (for non gcc compilers for instance) |
 |                                       | :heavy_check_mark: Getting intrinsic gcc include paths |
 |                                       | :heavy_check_mark: Handling quoted arguments |
-|                                       | :white_check_mark: X-platform support |
+|                                       | :heavy_check_mark: X-platform support |
 | **`c_cpp_properties.json` generator** | :heavy_check_mark: Basic objects |
 |                                       | :heavy_check_mark: Basic setting of parsing result |
 |                                       | :heavy_check_mark: Basic file input  |
@@ -166,6 +167,7 @@ I will list every supporter here, thanks!
 2020-02-17 Elektronik Workshop: 52 :beers: (13h coding)
 2020-02-18 Elektronik Workshop: 36 :beers: (9h coding)
 2020-02-19 Elektronik Workshop: 48 :beers: (12h coding)
+2020-02-20 Elektronik Workshop: 56 :beers: (14h coding)
 
 <!-- https://github.com/StylishThemes/GitHub-Dark/wiki/Emoji -->
 

From 640f269725d46d172c6bf93b39ac3066a2ad7e60 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Fri, 21 Feb 2020 21:45:52 +0100
Subject: [PATCH 072/142] Removed obsolete doc folder as all this is now part
 of cocopa

---
 .../compilerinfo/avr-gcc_built_in_specs.txt   | 33 -------------------
 .../xtensa-esp32-elf-gcc_built_in_specs.txt   | 32 ------------------
 2 files changed, 65 deletions(-)
 delete mode 100644 doc/intellisense/compilerinfo/avr-gcc_built_in_specs.txt
 delete mode 100644 doc/intellisense/compilerinfo/xtensa-esp32-elf-gcc_built_in_specs.txt

diff --git a/doc/intellisense/compilerinfo/avr-gcc_built_in_specs.txt b/doc/intellisense/compilerinfo/avr-gcc_built_in_specs.txt
deleted file mode 100644
index 950f0c06..00000000
--- a/doc/intellisense/compilerinfo/avr-gcc_built_in_specs.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-Using built-in specs.
-Reading specs from /home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/device-specs/specs-avr2
-COLLECT_GCC=/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/avr-gcc
-Target: avr
-Configured with: ../gcc/configure --enable-fixed-point --enable-languages=c,c++ --prefix=/home/jenkins/workspace/avr-gcc-staging/label/debian7-x86_64/objdir --disable-nls --disable-libssp --disable-libada --disable-shared --with-avrlibc=yes --with-dwarf2 --disable-doc --target=avr
-Thread model: single
-gcc version 7.3.0 (GCC) 
-COLLECT_GCC_OPTIONS='-E' '-v' '-specs=device-specs/specs-avr2'
- /home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../libexec/gcc/avr/7.3.0/cc1plus -E -quiet -v -iprefix /home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/ - -mn-flash=6 -mskip-bug -mn-flash=6 -mskip-bug -fno-rtti -fno-enforce-eh-specs -fno-exceptions
-ignoring nonexistent directory "/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/../../../../avr/include/c++/7.3.0"
-ignoring nonexistent directory "/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/../../../../avr/include/c++/7.3.0/avr"
-ignoring nonexistent directory "/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/../../../../avr/include/c++/7.3.0/backward"
-ignoring nonexistent directory "/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/../../../../avr/sys-include"
-ignoring nonexistent directory "/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/../../lib/gcc/avr/7.3.0/../../../../avr/include/c++/7.3.0"
-ignoring nonexistent directory "/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/../../lib/gcc/avr/7.3.0/../../../../avr/include/c++/7.3.0/avr"
-ignoring nonexistent directory "/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/../../lib/gcc/avr/7.3.0/../../../../avr/include/c++/7.3.0/backward"
-ignoring duplicate directory "/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/../../lib/gcc/avr/7.3.0/include"
-ignoring duplicate directory "/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/../../lib/gcc/avr/7.3.0/include-fixed"
-ignoring nonexistent directory "/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/../../lib/gcc/avr/7.3.0/../../../../avr/sys-include"
-ignoring duplicate directory "/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/../../lib/gcc/avr/7.3.0/../../../../avr/include"
-#include "..." search starts here:
-#include <...> search starts here:
- /home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/include
- /home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/include-fixed
- /home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/../../../../avr/include
-End of search list.
-# 1 "<stdin>"
-# 1 "<built-in>"
-# 1 "<command-line>"
-# 1 "<stdin>"
-COMPILER_PATH=/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../libexec/gcc/avr/7.3.0/:/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../libexec/gcc/:/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/../../../../avr/bin/
-LIBRARY_PATH=/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/:/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/:/home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/../../../../avr/lib/
-COLLECT_GCC_OPTIONS='-E' '-v' '-specs=device-specs/specs-avr2'
diff --git a/doc/intellisense/compilerinfo/xtensa-esp32-elf-gcc_built_in_specs.txt b/doc/intellisense/compilerinfo/xtensa-esp32-elf-gcc_built_in_specs.txt
deleted file mode 100644
index 7e39fe2e..00000000
--- a/doc/intellisense/compilerinfo/xtensa-esp32-elf-gcc_built_in_specs.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-Using built-in specs.
-COLLECT_GCC=/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/xtensa-esp32-elf-gcc
-Target: xtensa-esp32-elf
-Configured with: /builds/idf/crosstool-NG/.build/src/gcc-5.2.0/configure --build=x86_64-build_pc-linux-gnu --host=x86_64-build_pc-linux-gnu --target=xtensa-esp32-elf --prefix=/builds/idf/crosstool-NG/builds/xtensa-esp32-elf --with-local-prefix=/builds/idf/crosstool-NG/builds/xtensa-esp32-elf/xtensa-esp32-elf/sysroot --with-sysroot=/builds/idf/crosstool-NG/builds/xtensa-esp32-elf/xtensa-esp32-elf/sysroot --with-newlib --enable-threads=no --disable-shared --with-pkgversion='crosstool-NG crosstool-ng-1.22.0-80-g6c4433a' --disable-__cxa_atexit --enable-cxx-flags='-fno-rtti -ffunction-sections' --with-gmp=/builds/idf/crosstool-NG/.build/xtensa-esp32-elf/buildtools --with-mpfr=/builds/idf/crosstool-NG/.build/xtensa-esp32-elf/buildtools --with-mpc=/builds/idf/crosstool-NG/.build/xtensa-esp32-elf/buildtools --with-isl=/builds/idf/crosstool-NG/.build/xtensa-esp32-elf/buildtools --with-cloog=/builds/idf/crosstool-NG/.build/xtensa-esp32-elf/buildtools --with-libelf=/builds/idf/crosstool-NG/.build/xtensa-esp32-elf/buildtools --enable-lto --enable-target-optspace --without-long-double-128 --disable-libgomp --disable-libmudflap --disable-libssp --disable-libquadmath --disable-libquadmath-support --disable-nls --enable-languages=c,c++ --disable-libstdcxx-verbose --enable-threads=posix --enable-gcov-custom-rtio
-Thread model: posix
-gcc version 5.2.0 (crosstool-NG crosstool-ng-1.22.0-80-g6c4433a) 
-COLLECT_GCC_OPTIONS='-E' '-v'
- /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../libexec/gcc/xtensa-esp32-elf/5.2.0/cc1plus -E -quiet -v -iprefix /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/ -isysroot /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../xtensa-esp32-elf/sysroot -
-ignoring duplicate directory "/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/../../lib/gcc/xtensa-esp32-elf/5.2.0/../../../../xtensa-esp32-elf/include/c++/5.2.0"
-ignoring duplicate directory "/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/../../lib/gcc/xtensa-esp32-elf/5.2.0/../../../../xtensa-esp32-elf/include/c++/5.2.0/xtensa-esp32-elf"
-ignoring duplicate directory "/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/../../lib/gcc/xtensa-esp32-elf/5.2.0/../../../../xtensa-esp32-elf/include/c++/5.2.0/backward"
-ignoring duplicate directory "/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/../../lib/gcc/xtensa-esp32-elf/5.2.0/include"
-ignoring nonexistent directory "/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../xtensa-esp32-elf/sysroot/builds/idf/crosstool-NG/builds/xtensa-esp32-elf/xtensa-esp32-elf/sysroot/include"
-ignoring duplicate directory "/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/../../lib/gcc/xtensa-esp32-elf/5.2.0/include-fixed"
-ignoring duplicate directory "/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/../../lib/gcc/xtensa-esp32-elf/5.2.0/../../../../xtensa-esp32-elf/include"
-#include "..." search starts here:
-#include <...> search starts here:
- /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/../../../../xtensa-esp32-elf/include/c++/5.2.0
- /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/../../../../xtensa-esp32-elf/include/c++/5.2.0/xtensa-esp32-elf
- /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/../../../../xtensa-esp32-elf/include/c++/5.2.0/backward
- /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/include
- /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/include-fixed
- /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/../../../../xtensa-esp32-elf/include
- /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../xtensa-esp32-elf/sysroot/usr/include
-End of search list.
-# 1 "<stdin>"
-# 1 "<built-in>"
-# 1 "<command-line>"
-# 1 "<stdin>"
-COMPILER_PATH=/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../libexec/gcc/xtensa-esp32-elf/5.2.0/:/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../libexec/gcc/:/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/../../../../xtensa-esp32-elf/bin/
-LIBRARY_PATH=/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/:/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/:/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/../../../../xtensa-esp32-elf/lib/:/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../xtensa-esp32-elf/sysroot/lib/:/home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../xtensa-esp32-elf/sysroot/usr/lib/
-COLLECT_GCC_OPTIONS='-E' '-v'

From 2d52e526b85b70c38bc60b3aea4c1fe460e9a036 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Sat, 22 Feb 2020 14:25:22 +0100
Subject: [PATCH 073/142] Fixed handling of invalid manual configurations.
 Improved code locality for board configuration manipulation and fixed a race
 condition with fine grained event handling. Details:

Added missing checks when board configurations are loaded from the configuration file:
* Up to now vscode-arduino blindly loaded any board configuration from `arduino.json` even if this would result in invalid board configurations which in turn lead to compilation (verify, upload) failure.
* Up to now this state couldn't be recovered by simply removing the offending configuration from the configuration file. Even worse: it stored the wrong configuration in between board changes.

To reproduce the bug in 0.2.29

1. Select Arduino Nano with the *Arduino Board Configuration*
2. Set configuration in `arduino.json` to `cpu=cray2` and save
3. Verify -> fails
4. Switch board to Arduino Uno
5. Switch back to Arduino Nano: The wrong configuration is back and now the user can't even select another (correct) configuration from the *Arduino Board Configuration* window
6. Delete the wrong configuration and save -> verify still fails

`vscode-arduino` does not fall back to a default configuration. The user has now two options: find the correct configuration by himself and set it within arduino.json. Very experienced users could probably accomplish that. Everone else can just restart vscode.

I corrected that by enhancing IBoard.loadConfig and IBoard.updateConfig member functions to
* check for proper formatting of the config string loaded from `arduino.json`
* check if the configuration IDs and the option IDs are valid

If any of the above fails, the functions bail out and return the error. The board manager then loads a default configuration and issues a warning, that the configuration is invalid. This way the user gets the chance to fix her/his configuration but gets informed at the same time, that a different configuration than the intended is loaded (prevents surprises).

This situation is only relevant, when users start fiddling with the configuration values in `arduino.json`. As long as they just set the board and the configurations from within the *Arduino Board Configuration Window* nothing bad can happen. But now custom configurations are handled in a cleaner way.

The DeviceContext's board configuration was set in board.ts and boardManager.ts in different places - even when it was loaded after a DeviceContext's configuration update event which is prone to infinite loops. This has been resolved and it's not re-written/re-set during loading a configuration on change.

This is valid for board manager's updateStatusBar function which fiddled with the board and the configuration. Now updateStatusBar really just updates the status bar. And it isn't necessary to call it from outside the board manager anymore due to proper event handling which identifies the situations during which the status bar has to be updated. Therefore this member is now private.

In board manager itself operations that affect device context and current board now happen only within doChangeBoardType and the event handlers of DeviceContext callbacks onDeviceContextConfigurationChange and onDeviceContextBoardChange. This prevents the accidental creation of infinite event loops, makes the code more understandable, maintainable and therefore resilient against future bugs.
---
 src/arduino/arduinoContentProvider.ts |   3 +
 src/arduino/board.ts                  |  92 ++++++++++++++-----
 src/arduino/boardManager.ts           | 125 ++++++++++++++++++++------
 src/arduino/package.ts                |  55 +++++++++++-
 src/extension.ts                      |   2 -
 5 files changed, 223 insertions(+), 54 deletions(-)

diff --git a/src/arduino/arduinoContentProvider.ts b/src/arduino/arduinoContentProvider.ts
index 4602404a..2ea28c91 100644
--- a/src/arduino/arduinoContentProvider.ts
+++ b/src/arduino/arduinoContentProvider.ts
@@ -8,6 +8,7 @@ import ArduinoActivator from "../arduinoActivator";
 import ArduinoContext from "../arduinoContext";
 import * as Constants from "../common/constants";
 import * as JSONHelper from "../common/cycle";
+import { DeviceContext } from "../deviceContext";
 import * as Logger from "../logger/logger";
 import LocalWebServer from "./localWebServer";
 
@@ -262,6 +263,8 @@ export class ArduinoContentProvider implements vscode.TextDocumentContentProvide
         } else {
             try {
                 ArduinoContext.boardManager.currentBoard.updateConfig(req.body.configId, req.body.optionId);
+                const dc = DeviceContext.getInstance();
+                dc.configuration = ArduinoContext.boardManager.currentBoard.customConfig;
                 return res.json({
                     status: "OK",
                 });
diff --git a/src/arduino/board.ts b/src/arduino/board.ts
index 88c1b6c8..77c15df0 100644
--- a/src/arduino/board.ts
+++ b/src/arduino/board.ts
@@ -1,8 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-import { DeviceContext } from "../deviceContext";
-import { IBoard, IBoardConfigItem, IPlatform } from "./package";
+import { BoardConfigResult, IBoard, IBoardConfigItem, IPlatform } from "./package";
 
 export function parseBoardDescriptor(boardDescriptor: string, plat: IPlatform): Map<string, IBoard> {
     const boardLineRegex = /([^\.]+)\.(\S+)=(.+)/;
@@ -52,15 +51,15 @@ export class Board implements IBoard {
         this._configItems = [];
     }
 
-    public get board(): string {
+    public get board() {
         return this._board;
     }
 
-    public get platform(): IPlatform {
+    public get platform() {
         return this._platform;
     }
 
-    public addParameter(key: string, value: string): void {
+    public addParameter(key: string, value: string) {
         const match = key.match(MENU_REGEX);
         if (match) {
             const existingItem = this._configItems.find((item) => item.id === match[1]);
@@ -82,8 +81,7 @@ export class Board implements IBoard {
             }
         }
     }
-
-    public getBuildConfig(): string {
+    public getBuildConfig() {
         return `${this.getPackageName()}:${this.platform.architecture}:${this.board}${this.customConfig ? ":" + this.customConfig : ""}`;
     }
 
@@ -100,36 +98,86 @@ export class Board implements IBoard {
         }
     }
 
-    public get configItems(): IBoardConfigItem[] {
+    public get configItems() {
         return this._configItems;
     }
 
-    public loadConfig(configString: string): void {
+    public loadConfig(configString: string) {
+        // An empty or undefined config string resets the configuration
+        if (!configString) {
+            this.resetConfig();
+            return BoardConfigResult.Success;
+        }
         const configSections = configString.split(",");
         const keyValueRegex = /(\S+)=(\S+)/;
-        configSections.forEach((configSection) => {
-            const match = configSection.match(keyValueRegex);
-            if (match && match.length >= 2) {
-                this.updateConfig(match[1], match[2]);
+        let result = BoardConfigResult.Success;
+        for (const section of configSections) {
+            const match = section.match(keyValueRegex);
+            if (!match) {
+                return BoardConfigResult.InvalidFormat;
             }
-        });
+            const r = this.updateConfig(match[1], match[2]);
+            switch (r) {
+                case BoardConfigResult.SuccessNoChange:
+                    result = r;
+                    break;
+                case BoardConfigResult.Success:
+                    break;
+                default:
+                    return r;
+            }
+        };
+        return result;
     }
 
-    public updateConfig(configId: string, optionId: string): boolean {
+    /**
+     * For documentation see the documentation on IBoard.updateConfig().
+     */
+    public updateConfig(configId: string, optionId: string) {
         const targetConfig = this._configItems.find((config) => config.id === configId);
         if (!targetConfig) {
-            return false;
+            return BoardConfigResult.InvalidConfigID;
+        }
+        // Iterate through all options and ...
+        for (const o of targetConfig.options) {
+            // Make sure that we only set valid options, e.g. when loading
+            // from config files.
+            if (o.id === optionId) {
+                if (targetConfig.selectedOption !== optionId) {
+                    targetConfig.selectedOption = optionId;
+                    return BoardConfigResult.Success;
+                }
+                return BoardConfigResult.SuccessNoChange;
+            } else {
+                return BoardConfigResult.InvalidOptionID;
+            }
         }
-        if (targetConfig.selectedOption !== optionId) {
-            targetConfig.selectedOption = optionId;
-            const dc = DeviceContext.getInstance();
-            dc.configuration = this.customConfig;
-            return true;
+        return BoardConfigResult.InvalidOptionID;
+    }
+
+    public resetConfig() {
+        for (const c of this._configItems) {
+            c.selectedOption = c.options[0].id;
         }
-        return false;
     }
 
     public getPackageName() {
         return this.platform.packageName ? this.platform.packageName : this.platform.package.name;
     }
 }
+
+/**
+ * Test if two boards are of the same type, i.e. have the same key.
+ * @param {IBoard | undefined} a A board.
+ * @param {IBoard | undefined} b And another board.
+ * @returns {boolean} true if two boards are of the same type, else false.
+ */
+export function boardEqual(a: IBoard | undefined,
+                           b: IBoard | undefined) {
+    if (a && b) {
+        return a.key === b.key;
+    } else if (a || b) {
+        return false;
+    }
+    return true;
+}
diff --git a/src/arduino/boardManager.ts b/src/arduino/boardManager.ts
index 79af7780..34a1ef30 100644
--- a/src/arduino/boardManager.ts
+++ b/src/arduino/boardManager.ts
@@ -12,8 +12,8 @@ import { arduinoChannel } from "../common/outputChannel";
 import { DeviceContext } from "../deviceContext";
 import { ArduinoApp } from "./arduino";
 import { IArduinoSettings } from "./arduinoSettings";
-import { parseBoardDescriptor } from "./board";
-import { IBoard, IPackage, IPlatform } from "./package";
+import { boardEqual, parseBoardDescriptor } from "./board";
+import { BoardConfigResult, IBoard, IPackage, IPlatform } from "./package";
 import { VscodeSettings } from "./vscodeSettings";
 
 export class BoardManager {
@@ -67,18 +67,17 @@ export class BoardManager {
         // Load default platforms from arduino installation directory and user manually installed platforms.
         this.loadInstalledPlatforms();
 
-        // Load all supported boards type.
+        // Load all supported board types
         this.loadInstalledBoards();
-        this.updateStatusBar();
-        this._boardConfigStatusBar.show();
 
         const dc = DeviceContext.getInstance();
-        dc.onChangeBoard(() => {
-            this.updateStatusBar();
-        });
-        dc.onChangeConfiguration(() => {
-            this.updateStatusBar();
-        });
+        dc.onChangeBoard(() => this.onDeviceContextBoardChange());
+        dc.onChangeConfiguration(() => this.onDeviceContextConfigurationChange());
+
+        // load initial board from DeviceContext by emulating
+        // a board change event.
+        this.onDeviceContextBoardChange();
+        this.updateStatusBar(true);
     }
 
     public async changeBoardType() {
@@ -122,14 +121,24 @@ export class BoardManager {
 
     public doChangeBoardType(targetBoard: IBoard) {
         const dc = DeviceContext.getInstance();
+
+        if (dc.board === targetBoard.key) {
+            return;
+        }
+
+        // Resetting the board first that we don't overwrite the configuration
+        // of the previous board.
+        this._currentBoard = null;
+        // This will cause a configuration changed event which will have no
+        // effect because no current board is set.
+        dc.configuration = targetBoard.customConfig;
+        // This will generate a device context board event which will set the
+        // correct board and configuration. We know that it will trigger - we
+        // made sure above that the boards actually differ
         dc.board = targetBoard.key;
-        this._currentBoard = targetBoard;
-        dc.configuration = this._currentBoard.customConfig;
-        this._boardConfigStatusBar.text = targetBoard.name;
+
         // IS-REMOVE: to be removed completely when IntelliSense implementation is merged
         // this._arduinoApp.addLibPath(null);
-
-        this._onBoardTypeChanged.fire();
     }
 
     public get packages(): IPackage[] {
@@ -251,19 +260,12 @@ export class BoardManager {
         }
     }
 
-    public updateStatusBar(show: boolean = true): void {
+    private updateStatusBar(show: boolean = true): void {
         if (show) {
             this._boardConfigStatusBar.show();
-            const dc = DeviceContext.getInstance();
-            const selectedBoard = this._boards.get(dc.board);
-            if (selectedBoard) {
-                this._currentBoard = selectedBoard;
-                this._boardConfigStatusBar.text = selectedBoard.name;
-                if (dc.configuration) {
-                    this._currentBoard.loadConfig(dc.configuration);
-                }
+            if (this._currentBoard) {
+                this._boardConfigStatusBar.text = this._currentBoard.name;
             } else {
-                this._currentBoard = null;
                 this._boardConfigStatusBar.text = "<Select Board Type>";
             }
         } else {
@@ -271,6 +273,77 @@ export class BoardManager {
         }
     }
 
+    /**
+     * Event callback if DeviceContext detected a new board - either when
+     * loaded from configuration file or when set by the doChangeBoardType
+     * member.
+     */
+    private onDeviceContextBoardChange() {
+        const dc = DeviceContext.getInstance();
+        const newBoard = this._boards.get(dc.board);
+        if (boardEqual(newBoard, this._currentBoard)) {
+            return;
+        }
+        if (newBoard) {
+            this._currentBoard = newBoard;
+            if (dc.configuration) {
+                // In case the configuration is incompatible, we reset it as
+                // setting partially valid configurations can lead to nasty
+                // surprises. When setting a new board this is acceptable
+                const r = this._currentBoard.loadConfig(dc.configuration);
+                if (r !== BoardConfigResult.Success && r !== BoardConfigResult.SuccessNoChange) {
+                    this._currentBoard.resetConfig();
+                    // we don't reset dc.configuration to give the user a
+                    // chance to fix her/his configuration
+                    this.invalidConfigWarning(r);
+                }
+            } else {
+                this._currentBoard.resetConfig();
+                dc.configuration = undefined;
+            }
+        } else {
+            this._currentBoard = null;
+        }
+        this._onBoardTypeChanged.fire();
+        this.updateStatusBar();
+    }
+
+    /**
+     * Event callback if DeviceContext detected a configuration change
+     * - either when loaded from configuration file or when set by the
+     * doChangeBoardType member.
+     */
+    private onDeviceContextConfigurationChange() {
+        const dc = DeviceContext.getInstance();
+        if (this._currentBoard) {
+            const r = this._currentBoard.loadConfig(dc.configuration);
+            if (r !== BoardConfigResult.Success && r !== BoardConfigResult.SuccessNoChange) {
+                this._currentBoard.resetConfig();
+                // We reset the configuration here but do not write it back
+                // to the configuration file - this can be annoying when
+                // someone tries to set a special configuration and doesn't
+                // get it right the first time.
+                this.invalidConfigWarning(r);
+            }
+        }
+    }
+
+    private invalidConfigWarning(result: BoardConfigResult) {
+        let what = "";
+        switch (result) {
+            case BoardConfigResult.InvalidFormat:
+                what = ": Invalid format must be of the form \"key1=value2,key1=value2,...\"";
+                break;
+            case BoardConfigResult.InvalidConfigID:
+                what = ": Invalid configuration key";
+                break;
+            case BoardConfigResult.InvalidOptionID:
+                what = ": Invalid configuration value";
+                break;
+        }
+        vscode.window.showWarningMessage(`Invalid board configuration detected in configuration file${what}. Falling back to defaults.`);
+    }
+
     private loadInstalledPlatforms() {
         const installed = this.getInstalledPlatforms();
         installed.forEach((platform) => {
diff --git a/src/arduino/package.ts b/src/arduino/package.ts
index 2966e68a..3d5054b2 100644
--- a/src/arduino/package.ts
+++ b/src/arduino/package.ts
@@ -152,6 +152,35 @@ export interface IBoardConfigItem {
     options: IBoardConfigOption[];
 }
 
+/**
+ * Return values of calls to IBoard.loadConfig() and IBoard.updateConfig().
+ */
+export enum BoardConfigResult {
+    /**
+     * Setting configuration value(s) was successful
+     */
+    Success,
+    /**
+     * Setting configuration value(s) was successful. All or some items
+     * were already set to the requested values.
+     */
+    SuccessNoChange,
+    /**
+     * One or more configuration keys were invalid.
+     */
+    InvalidConfigID,
+    /**
+     * One or more options were invalid.
+     */
+    InvalidOptionID,
+    /**
+     * Can only happen when calling IBoard.loadConfig() and when
+     * the raw configuration string did contain invalid/unparsable
+     * elements.
+     */
+    InvalidFormat,
+}
+
 /**
  * Interface for classes that represent an Arduino supported board.
  *
@@ -206,14 +235,32 @@ export interface IBoard {
     getBuildConfig(): string;
 
     /**
-     * Load default configuration from saved context.
+     * Load configuration from saved context.
+     * Parses the configuration string and tries to set the individual
+     * configuration values. It will bail out on any error.
+     * @param {string} configString The configuration string from the
+     * configuration file.
+     * @returns {BoardConfigResult} Result of the operation - for more
+     * information see documentation of BoardConfigResult.
+     */
+    loadConfig(configString: string): BoardConfigResult;
+
+    /**
+     * Set configuration value.
+     * This function makes sure, that the configuration ID and the option ID
+     * are actually valid. It will bail out on any error
+     * @param {string} configId The ID of the configuration value
+     * @param {string} optionId The ID to which the option of the configuration
+     * value should be set to.
+     * @returns {BoardConfigResult} Result of the operation - for more
+     * information see documentation of BoardConfigResult.
      */
-    loadConfig(configString: string): void;
+    updateConfig(configId: string, optionId: string): BoardConfigResult;
 
     /**
-     * Update the configuration
+     * Reset configuration to defaults and update configuration file.
      */
-    updateConfig(configId: string, optionId: string): boolean;
+    resetConfig();
 
     /**
      * Get the board package name
diff --git a/src/extension.ts b/src/extension.ts
index 9e7e3fe0..46ff9eb6 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -285,7 +285,6 @@ export async function activate(context: vscode.ExtensionContext) {
             if (!SerialMonitor.getInstance().initialized) {
                 SerialMonitor.getInstance().initialize();
             }
-            arduinoContextModule.default.boardManager.updateStatusBar(true);
             // IS-REMOVE: to be removed completely when IntelliSense implementation is merged
             // arduinoContextModule.default.arduinoApp.tryToUpdateIncludePaths();
             vscode.commands.executeCommand("setContext", "vscode-arduino:showExampleExplorer", true);
@@ -303,7 +302,6 @@ export async function activate(context: vscode.ExtensionContext) {
             if (!SerialMonitor.getInstance().initialized) {
                 SerialMonitor.getInstance().initialize();
             }
-            arduinoContextModule.default.boardManager.updateStatusBar(true);
             vscode.commands.executeCommand("setContext", "vscode-arduino:showExampleExplorer", true);
         }
     });

From e6c10cd02fd64cd4d9e45189c3c9e6a0e732e96f Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Sat, 22 Feb 2020 20:24:30 +0100
Subject: [PATCH 074/142] Updated log and beers

---
 BRANCHNOTES.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index c8600a7b..5d310106 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -90,6 +90,7 @@ During merging I found some bugs within those functions - mainly due to the abov
 **2020 02 18** Finished basic event triggering. Rewrote `DeviceContext` for proper settings modification detection (trigger events only on actual change) and generation of setting specific events (e.g. board changed) instead of one global event (aka. "something in the settings changed").
 **2020 02 19** Implemented proper build scheduling for analysis build by writing an `AnalysisManager` class. This class collects multiple changes (e.g. board and configuration, which often are changed shortly after another) before running an analysis. In case another build or analysis is in progress it postpones newly filed analysis requests until the other build has completed. Updated and completed the documentation for the IntelliSense usage within [README](README.md). Alpha test builds of the extension containing the latest implemented features and fixes are now available from the following [Dropbox folder](https://www.dropbox.com/sh/whmcdt26chyjgby/AAB1Ld2fzZ9Z_NfM3CRay17wa). Please note, that Windows is currently not supported yet. Reviewed, documented/commented all changes and committed the automatic analysis integration changes.
 **2020 02 20** Windows support - what a PITA. This OS is so foobar'ed... The only positive outcome from this experience: I found some substantial bugs in the parser which - of course (Murphy) - didn't affect me up to now. The parser should be much more resistant against strange paths and escapes now: Added proper command line lexer to cocopa and worked around several ridiculous Windows shortcomings (Microsoft owes me at least 50 crates of beer). The whole mess is not cleaned up and committed yet so please don't build from the repository and use the alpha release packages as outlined above.
+**2020 02 21** Discovered problems and bugs in the current official releas from Microsoft: Fixed event handling within board manager. Added validity checks when loading board configurations from arduino.json. Better error handling and code locality, for details see commit.
 
 ## Status
 |      | Tasks   |
@@ -168,6 +169,7 @@ I will list every supporter here, thanks!
 2020-02-18 Elektronik Workshop: 36 :beers: (9h coding)
 2020-02-19 Elektronik Workshop: 48 :beers: (12h coding)
 2020-02-20 Elektronik Workshop: 56 :beers: (14h coding)
+2020-02-21 Elektronik Workshop: 48 :beers: (12h coding)
 
 <!-- https://github.com/StylishThemes/GitHub-Dark/wiki/Emoji -->
 
@@ -209,6 +211,7 @@ I will list every supporter here, thanks!
 * Further IntelliSense enhancements/features:
   * When having adding a library folder to the workspace IntelliSense should use the same configuration for it to enable library navigation and code completion.
   * Optimization: Abort analysis build as soon as compiler statement has been found
+* Non-IDE unit testing - to eliminate dependency injection use ts-mock-imports for instance
 
 ## Non-categorized Notes
 ### Integrate upstream changes into fork

From 4238e12089560110cf682c25dac3c12106299259 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Sat, 22 Feb 2020 20:33:16 +0100
Subject: [PATCH 075/142] Updated to latest cocopa which features X-platform
 support and better lexer

---
 package-lock.json           | 44 +++++++++++++++++++++++++++----------
 package.json                |  2 +-
 src/arduino/intellisense.ts | 38 ++++++++++++--------------------
 3 files changed, 47 insertions(+), 37 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9c9bab37..28126120 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -214,8 +214,7 @@
     "@types/color-name": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
-      "dev": true
+      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="
     },
     "@types/compare-versions": {
       "version": "3.3.0",
@@ -541,7 +540,6 @@
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
       "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-      "dev": true,
       "requires": {
         "@types/color-name": "^1.1.1",
         "color-convert": "^2.0.1"
@@ -551,7 +549,6 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
           "requires": {
             "color-name": "~1.1.4"
           }
@@ -559,8 +556,7 @@
         "color-name": {
           "version": "1.1.4",
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
         }
       }
     },
@@ -1563,9 +1559,30 @@
       "dev": true
     },
     "cocopa": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/cocopa/-/cocopa-0.0.7.tgz",
-      "integrity": "sha512-L/BaneLuO56MCjAkbzUFRRZhKf0P37LY+3JClzV/poVQTEDHxS8KWa8Rw5IpCFOdZiGitQvy6r1L/5I/TJt9nA=="
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/cocopa/-/cocopa-0.0.8.tgz",
+      "integrity": "sha512-owNmofAE5bfJpQcq8j1z5wgvN5QiGSDVuWJoi1bNmpKjpP8CZr/VYQVlQ3uwUEShfiZhxbaJLTWZaE98pNrQKw==",
+      "requires": {
+        "chalk": "^3.0.0",
+        "commander": "^4.1.1",
+        "shlex": "^2.0.1"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "commander": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+          "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="
+        }
+      }
     },
     "code-point-at": {
       "version": "1.1.0",
@@ -7677,6 +7694,11 @@
       "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.1.tgz",
       "integrity": "sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw=="
     },
+    "shlex": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/shlex/-/shlex-2.0.2.tgz",
+      "integrity": "sha512-i4p9nNXgBTILspHwZlBCNsZzwuVWW8SFx5dyIONrjL0R+AbMOPbg7ndqgGfjYivkYRTtZMKqIT8HT+QyOhPQWA=="
+    },
     "signal-exit": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
@@ -8130,7 +8152,6 @@
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
       "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-      "dev": true,
       "requires": {
         "has-flag": "^4.0.0"
       },
@@ -8138,8 +8159,7 @@
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
         }
       }
     },
diff --git a/package.json b/package.json
index 0d39907c..a3246dfb 100644
--- a/package.json
+++ b/package.json
@@ -604,7 +604,7 @@
   },
   "dependencies": {
     "body-parser": "^1.16.1",
-    "cocopa": "^0.0.7",
+    "cocopa": "^0.0.8",
     "compare-versions": "^3.4.0",
     "eventemitter2": "^4.1.0",
     "express": "^4.14.1",
diff --git a/src/arduino/intellisense.ts b/src/arduino/intellisense.ts
index 57f5588c..96c1713a 100644
--- a/src/arduino/intellisense.ts
+++ b/src/arduino/intellisense.ts
@@ -40,6 +40,14 @@ export function isCompilerParserEnabled(dc?: DeviceContext) {
  * and keeps the calling context more readable.
  *
  * @param dc The device context of the caller.
+ *
+ * Possible enhancements:
+ *
+ * * Parse c++ standard from arduino command line
+ *
+ *     Arduino currently sets the C++ standard during compilation with the
+ *     flag -std=gnu++11
+ *
  */
 export function makeCompilerParserContext(dc: DeviceContext): ICoCoPaContext {
 
@@ -92,29 +100,9 @@ export function makeCompilerParserContext(dc: DeviceContext): ICoCoPaContext {
  * @param dc Current device context used to generate the engines.
  */
 function makeCompilerParserEngines(dc: DeviceContext) {
-
-    let sketch = path.basename(dc.sketch);
-    const dotcpp = sketch.endsWith(".ino") ? ".cpp" : "";
-    sketch = `-o\\s+\\S*${ccp.regExEscape(sketch)}${dotcpp}\\.o`;
-
-    // TODO: handle other architectures here
-
-    const matchPattern = [
-        // make sure we're running g++
-        /(?:^|-)g\+\+\s+/,
-        // make sure we're compiling
-        /\s+-c\s+/,
-        // trigger parser when compiling the main sketch
-        RegExp(sketch),
-    ];
-
-    const dontMatchPattern = [
-        // make sure Arduino's not testing libraries
-        /-o\s+\/dev\/null/,
-    ];
-
-    // setup the parser with its engines
-    const gccParserEngine = new ccp.ParserGcc(matchPattern, dontMatchPattern);
+    const sketch = path.basename(dc.sketch);
+    const trigger = ccp.getTriggerForArduinoGcc(sketch);
+    const gccParserEngine = new ccp.ParserGcc(trigger);
     return [gccParserEngine];
 }
 
@@ -286,8 +274,10 @@ export class AnalysisManager {
             clearTimeout(this._timer);
         }
         this._timer = setTimeout(() => {
-            this.update(AnalysisEvent.WaitTimeout);
+            // reset timer variable first - calling update can cause
+            // the timer to be restarted.
             this._timer = undefined;
+            this.update(AnalysisEvent.WaitTimeout);
         }, this._waitPeriodMs);
     }
 

From 5fe6dbc44ec7e53f2ae55562e301280251f0330c Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Sat, 22 Feb 2020 23:17:59 +0100
Subject: [PATCH 076/142] IntelliSense config generator

* Now normalizes generated include paths
* Bumped cocopa to 0.0.9
---
 package-lock.json           | 6 +++---
 package.json                | 2 +-
 src/arduino/intellisense.ts | 9 ++++++++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 28126120..67bf0b1f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1559,9 +1559,9 @@
       "dev": true
     },
     "cocopa": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/cocopa/-/cocopa-0.0.8.tgz",
-      "integrity": "sha512-owNmofAE5bfJpQcq8j1z5wgvN5QiGSDVuWJoi1bNmpKjpP8CZr/VYQVlQ3uwUEShfiZhxbaJLTWZaE98pNrQKw==",
+      "version": "0.0.9",
+      "resolved": "https://registry.npmjs.org/cocopa/-/cocopa-0.0.9.tgz",
+      "integrity": "sha512-lAV7D7FWZruC8wu0XkStVTI2CnahRXsYeqcbQ6KzPdzwip+SLtV712Qj/q2+sNshi9MNk032lQoQJZisrntkIA==",
       "requires": {
         "chalk": "^3.0.0",
         "commander": "^4.1.1",
diff --git a/package.json b/package.json
index a3246dfb..cb7de00f 100644
--- a/package.json
+++ b/package.json
@@ -604,7 +604,7 @@
   },
   "dependencies": {
     "body-parser": "^1.16.1",
-    "cocopa": "^0.0.8",
+    "cocopa": "^0.0.9",
     "compare-versions": "^3.4.0",
     "eventemitter2": "^4.1.0",
     "express": "^4.14.1",
diff --git a/src/arduino/intellisense.ts b/src/arduino/intellisense.ts
index 96c1713a..76e44fde 100644
--- a/src/arduino/intellisense.ts
+++ b/src/arduino/intellisense.ts
@@ -48,6 +48,9 @@ export function isCompilerParserEnabled(dc?: DeviceContext) {
  *     Arduino currently sets the C++ standard during compilation with the
  *     flag -std=gnu++11
  *
+ * * Order of includes: Perhaps insert the internal includes at the front
+ *     as at least for the forcedIncludes IntelliSense seems to take the
+ *     order into account.
  */
 export function makeCompilerParserContext(dc: DeviceContext): ICoCoPaContext {
 
@@ -60,7 +63,10 @@ export function makeCompilerParserContext(dc: DeviceContext): ICoCoPaContext {
             arduinoChannel.warning("Failed to generate IntelliSense configuration.");
             return;
         }
-        const pPath = path.join(ArduinoWorkspace.rootPath, constants.CPP_CONFIG_FILE);
+
+        // Normalize compiler and include paths (resolve ".." and ".")
+        runner.result.normalize();
+
         // TODO: check what kind of result we've got: gcc or other architecture:
         //  and instantiate content accordingly (to be implemented within cocopa)
         const content = new ccp.CCppPropertiesContentResult(runner.result,
@@ -70,6 +76,7 @@ export function makeCompilerParserContext(dc: DeviceContext): ICoCoPaContext {
                                                             // as of 1.8.11 arduino is on C++11
                                                             ccp.CCppPropertiesCppStandard.Cpp11);
         try {
+            const pPath = path.join(ArduinoWorkspace.rootPath, constants.CPP_CONFIG_FILE);
             const prop = new ccp.CCppProperties();
             prop.read(pPath);
             prop.merge(content, ccp.CCppPropertiesMergeMode.ReplaceSameNames);

From b7effbc91110c2f34e4382fb95ac58277d573e6c Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Sat, 22 Feb 2020 23:29:15 +0100
Subject: [PATCH 077/142] Updated log

* Updated branch log and beers
---
 BRANCHNOTES.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index 5d310106..4b37f00d 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -90,7 +90,8 @@ During merging I found some bugs within those functions - mainly due to the abov
 **2020 02 18** Finished basic event triggering. Rewrote `DeviceContext` for proper settings modification detection (trigger events only on actual change) and generation of setting specific events (e.g. board changed) instead of one global event (aka. "something in the settings changed").
 **2020 02 19** Implemented proper build scheduling for analysis build by writing an `AnalysisManager` class. This class collects multiple changes (e.g. board and configuration, which often are changed shortly after another) before running an analysis. In case another build or analysis is in progress it postpones newly filed analysis requests until the other build has completed. Updated and completed the documentation for the IntelliSense usage within [README](README.md). Alpha test builds of the extension containing the latest implemented features and fixes are now available from the following [Dropbox folder](https://www.dropbox.com/sh/whmcdt26chyjgby/AAB1Ld2fzZ9Z_NfM3CRay17wa). Please note, that Windows is currently not supported yet. Reviewed, documented/commented all changes and committed the automatic analysis integration changes.
 **2020 02 20** Windows support - what a PITA. This OS is so foobar'ed... The only positive outcome from this experience: I found some substantial bugs in the parser which - of course (Murphy) - didn't affect me up to now. The parser should be much more resistant against strange paths and escapes now: Added proper command line lexer to cocopa and worked around several ridiculous Windows shortcomings (Microsoft owes me at least 50 crates of beer). The whole mess is not cleaned up and committed yet so please don't build from the repository and use the alpha release packages as outlined above.
-**2020 02 21** Discovered problems and bugs in the current official releas from Microsoft: Fixed event handling within board manager. Added validity checks when loading board configurations from arduino.json. Better error handling and code locality, for details see commit.
+**2020 02 21** Discovered problems and bugs in the current official release from Microsoft: Fixed event handling within board manager. Added validity checks when loading board configurations from arduino.json. Better error handling and code locality, for details see commit.
+**2020 02 22** Worked on cocopa unit tests: restored broken tests and added platform test for built-in parser. Added path normalizing for include paths for both cocopa and vscode-arduino. Verified correct behaviour on Windows with latest release (alpha tester claimed it not to be working)
 
 ## Status
 |      | Tasks   |
@@ -170,6 +171,7 @@ I will list every supporter here, thanks!
 2020-02-19 Elektronik Workshop: 48 :beers: (12h coding)
 2020-02-20 Elektronik Workshop: 56 :beers: (14h coding)
 2020-02-21 Elektronik Workshop: 48 :beers: (12h coding)
+2020-02-22 Elektronik Workshop: 44 :beers: (11h coding)
 
 <!-- https://github.com/StylishThemes/GitHub-Dark/wiki/Emoji -->
 

From f2a5307279b5d45dbf5736daf408366c4c6522ce Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Sun, 23 Feb 2020 18:26:31 +0100
Subject: [PATCH 078/142] Forceinclude Arduino.h

* Added message to end of each build to inform user how to update the IntelliSense configuration
* The magic now searches all identified include paths for the Arduino core include file (aka Arduino.h) and adds it as forced include - most users expect Arduino core functionality to work without having to include this header. Added typed-promisify to dependencies since I made use of it in the new code for better readability.
* Conclude is now asynchronous
* Updated branch status and added new future task
* Bumped cocopa version to 0.0.10
---
 BRANCHNOTES.md              | 12 ++++---
 package-lock.json           | 11 +++++--
 package.json                |  3 +-
 src/arduino/arduino.ts      | 18 +++++++----
 src/arduino/intellisense.ts | 63 +++++++++++++++++++++++++++++++++++--
 5 files changed, 89 insertions(+), 18 deletions(-)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index 4b37f00d..7f895035 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -108,20 +108,19 @@ During merging I found some bugs within those functions - mainly due to the abov
 |                                       | :heavy_check_mark: Merging of parsing result and existing file content |
 |                                       | :heavy_check_mark: Handling inexistent files and folders |
 |                                       | :heavy_check_mark: Write configuration on change only |
-|                                       | :white_check_mark: Option to backup old configurations? |
 | **Configuration flags**               | :heavy_check_mark: Provide global disable flag for IntelliSense auto-config |
 |                                       | :heavy_check_mark: Provide project specific override for the global flag - most users will likely use the default setup and disable auto-generation for very specific projects |
 | **Unit tests**                        | :heavy_check_mark: Basic parser (known boards, match/no match)|
 |                                       | :white_check_mark: All unit tests in cocopa |
 |                                       | :white_check_mark: Test with cpp sketches |
 | **General**                           | :heavy_check_mark: Review and remove previous attempts messing with `c_cpp_properties.json` or IntelliSense (documented in the [General Tasks](#General-Tasks) section) `*` |
-|                                       | :white_check_mark: *Auto-run verify when* |
+|                                       | :heavy_check_mark: *Auto-run verify when* |
 |                                       | &nbsp;&nbsp;&nbsp;&nbsp;:heavy_check_mark: a) setting a board `*` |
 |                                       | &nbsp;&nbsp;&nbsp;&nbsp;:heavy_check_mark: b) changing the board's configuration `*` |
 |                                       | &nbsp;&nbsp;&nbsp;&nbsp;:heavy_check_mark: c) selecting another sketch `*` |
-|                                       | &nbsp;&nbsp;&nbsp;&nbsp;:white_check_mark: d) workbench initialized and no `c_cpp_properties.json` found |
-|                                       | &nbsp;&nbsp;&nbsp;&nbsp;:white_check_mark: e) Identify other occasions where this applies (usually when adding new libraries) |
-|                                       | :white_check_mark: Hint the user to run *Arduino: Rebuild IntelliSense Configuration*? -> Good moment would be after the workbench initialization -> message in arduino channel |
+|                                       | &nbsp;&nbsp;&nbsp;&nbsp;:heavy_check_mark: d) ~~workbench initialized and no `c_cpp_properties.json` found~~ obsolete: when board and board configuration is loaded on start up the analysis is triggered anyways |
+|                                       | &nbsp;&nbsp;&nbsp;&nbsp;:white_check_mark: e) Identify other occasions where this applies (usually when adding new libraries) -- any suggestions? |
+|                                       | :heavy_check_mark: Hint the user to run *Arduino: Rebuild IntelliSense Configuration* -> printing message after each build (verify, upload, ...) |
 |                                       | :heavy_check_mark: Better build management such that regular builds and analyze builds do not interfere (done, 2020-02-19) `*` |
 |                                       | :heavy_check_mark: Analyze task queue which fits in the latter  (done, 2020-02-19) `*` |
 |                                       | :heavy_check_mark: Document configuration settings in [README.md](README.md) |
@@ -214,6 +213,9 @@ I will list every supporter here, thanks!
   * When having adding a library folder to the workspace IntelliSense should use the same configuration for it to enable library navigation and code completion.
   * Optimization: Abort analysis build as soon as compiler statement has been found
 * Non-IDE unit testing - to eliminate dependency injection use ts-mock-imports for instance
+* Hardcoded and scattered constants:
+  * Load package.json and use values from therein instead of hard coding redundant values like shortcuts (like I did for the IntelliSense message in `arduino.ts`)
+  * Scan code for other hard coded stuff and take appropriate countermeasures
 
 ## Non-categorized Notes
 ### Integrate upstream changes into fork
diff --git a/package-lock.json b/package-lock.json
index 67bf0b1f..1507d73d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1559,9 +1559,9 @@
       "dev": true
     },
     "cocopa": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/cocopa/-/cocopa-0.0.9.tgz",
-      "integrity": "sha512-lAV7D7FWZruC8wu0XkStVTI2CnahRXsYeqcbQ6KzPdzwip+SLtV712Qj/q2+sNshi9MNk032lQoQJZisrntkIA==",
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/cocopa/-/cocopa-0.0.10.tgz",
+      "integrity": "sha512-MbBG4k2p2alRlxFoxKfPFLIJZ9y5Mbm6Dc1wDl4jpw4yF4wNwbm2dBUTmeDWcAHbLvYj+HE3jIAB5mxZv0zbuA==",
       "requires": {
         "chalk": "^3.0.0",
         "commander": "^4.1.1",
@@ -8599,6 +8599,11 @@
         "mime-types": "~2.1.24"
       }
     },
+    "typed-promisify": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/typed-promisify/-/typed-promisify-0.4.0.tgz",
+      "integrity": "sha1-reHT0yEwdnuk71OFFixyBpgQXQ8="
+    },
     "typedarray": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
diff --git a/package.json b/package.json
index cb7de00f..42dfc7c2 100644
--- a/package.json
+++ b/package.json
@@ -604,7 +604,7 @@
   },
   "dependencies": {
     "body-parser": "^1.16.1",
-    "cocopa": "^0.0.9",
+    "cocopa": "^0.0.10",
     "compare-versions": "^3.4.0",
     "eventemitter2": "^4.1.0",
     "express": "^4.14.1",
@@ -613,6 +613,7 @@
     "impor": "^0.1.1",
     "node-usb-native": "^0.0.18",
     "properties": "^1.2.1",
+    "typed-promisify": "^0.4.0",
     "uuid": "^3.0.1",
     "vscode-extension-telemetry": "0.1.6",
     "winreg": "^1.2.3",
diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index c3159e7d..e186bd29 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -368,7 +368,7 @@ export class ArduinoApp {
 
         const cleanup = async () => {
             if (cocopa) {
-                cocopa.conclude();
+                await cocopa.conclude();
             }
             if (buildMode === BuildMode.Upload || buildMode === BuildMode.UploadProgrammer) {
                 UsbDetector.getInstance().resumeListening();
@@ -399,15 +399,21 @@ export class ArduinoApp {
             stdoutCallback,
         ).then(async () => {
             await cleanup();
+            if (buildMode !== BuildMode.Analyze) {
+                const cmd = os.platform() === "darwin"
+                    ? "Cmd + Alt + I"
+                    : "Ctrl + Alt + I";
+                arduinoChannel.info(`To rebuild your IntelliSense configuration run "${cmd}"`);
+            }
             arduinoChannel.end(`${buildMode} sketch '${dc.sketch}'${os.EOL}`);
             success = true;
         }, async (reason) => {
             await cleanup();
-            const msg = reason.code ?
-                `Exit with code=${reason.code}` :
-                reason.message ?
-                    reason.message :
-                    JSON.stringify(reason);
+            const msg = reason.code
+                ? `Exit with code=${reason.code}`
+                : reason.message
+                    ? reason.message
+                    : JSON.stringify(reason);
             arduinoChannel.error(`${buildMode} sketch '${dc.sketch}': ${msg}${os.EOL}`);
         });
 
diff --git a/src/arduino/intellisense.ts b/src/arduino/intellisense.ts
index 76e44fde..3d40553e 100644
--- a/src/arduino/intellisense.ts
+++ b/src/arduino/intellisense.ts
@@ -2,7 +2,9 @@
 // Licensed under the MIT license.
 
 import * as ccp from "cocopa";
+import * as fs from "fs";
 import * as path from "path";
+import * as tp from "typed-promisify";
 
 import * as constants from "../common/constants";
 import { arduinoChannel } from "../common/outputChannel";
@@ -13,7 +15,7 @@ import { VscodeSettings } from "./vscodeSettings";
 
 export interface ICoCoPaContext {
     callback: (s: string) => void;
-    conclude: () => void;
+    conclude: () => Promise<void>;
 };
 
 /**
@@ -58,7 +60,7 @@ export function makeCompilerParserContext(dc: DeviceContext): ICoCoPaContext {
     const runner = new ccp.Runner(engines);
 
     // Set up the callback to be called after parsing
-    const _conclude = () => {
+    const _conclude = async () => {
         if (!runner.result) {
             arduinoChannel.warning("Failed to generate IntelliSense configuration.");
             return;
@@ -67,6 +69,17 @@ export function makeCompilerParserContext(dc: DeviceContext): ICoCoPaContext {
         // Normalize compiler and include paths (resolve ".." and ".")
         runner.result.normalize();
 
+        // Search for Arduino.h in the include paths - we need it for a
+        // forced include - users expect Arduino symbols to be available
+        // in main sketch without having to include the header explicitly
+        const ardHeader = await locateArduinoHeader(runner.result.includes);
+        const forcedIncludes = ardHeader
+            ? [ ardHeader ]
+            : undefined;
+        if (!ardHeader) {
+            arduinoChannel.warning("Unable to locate \"Arduino.h\" within IntelliSense include paths.");
+        }
+
         // TODO: check what kind of result we've got: gcc or other architecture:
         //  and instantiate content accordingly (to be implemented within cocopa)
         const content = new ccp.CCppPropertiesContentResult(runner.result,
@@ -74,7 +87,8 @@ export function makeCompilerParserContext(dc: DeviceContext): ICoCoPaContext {
                                                             ccp.CCppPropertiesISMode.Gcc_X64,
                                                             ccp.CCppPropertiesCStandard.C11,
                                                             // as of 1.8.11 arduino is on C++11
-                                                            ccp.CCppPropertiesCppStandard.Cpp11);
+                                                            ccp.CCppPropertiesCppStandard.Cpp11,
+                                                            forcedIncludes);
         try {
             const pPath = path.join(ArduinoWorkspace.rootPath, constants.CPP_CONFIG_FILE);
             const prop = new ccp.CCppProperties();
@@ -113,6 +127,49 @@ function makeCompilerParserEngines(dc: DeviceContext) {
     return [gccParserEngine];
 }
 
+/**
+ * Search directories recursively for a file.
+ * @param dir Directory where the search should begin.
+ * @param what The file we're looking for.
+ * @returns The path of the directory which contains the file else undefined.
+ */
+async function findDirContaining(dir: string, what: string): Promise<string | undefined> {
+    const readdir = tp.promisify(fs.readdir);
+    const fsstat = tp.promisify(fs.stat);
+
+    for (const entry of await readdir(dir)) {
+        const p = path.join(dir, entry);
+        const s = await fsstat(p);
+        if (s.isDirectory()) {
+            const result = await findDirContaining(p, what);
+            if (result) {
+                return result;
+            }
+        } else if (entry === what) {
+            return dir;
+        }
+    }
+    return undefined;
+};
+
+/**
+ * Tries to find the main Arduino header (i.e. Arduino.h) in the given include
+ * paths.
+ * @param includes Array containing all include paths in which we should look
+ * for Arduino.h
+ * @returns The full path of the main Arduino header.
+ */
+async function locateArduinoHeader(includes: string[]) {
+    const header = "Arduino.h";
+    for (const i of includes) {
+        const result = await findDirContaining(i, header);
+        if (result) {
+            return path.join(result, header);
+        }
+    }
+    return undefined;
+}
+
 /**
  * Possible states of AnalysisManager's state machine.
  */

From b5714b6fa8243697907652b6b697ec01f7449b23 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Sun, 23 Feb 2020 18:34:33 +0100
Subject: [PATCH 079/142] Updated log and beers

---
 BRANCHNOTES.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index 7f895035..47a335c6 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -92,6 +92,7 @@ During merging I found some bugs within those functions - mainly due to the abov
 **2020 02 20** Windows support - what a PITA. This OS is so foobar'ed... The only positive outcome from this experience: I found some substantial bugs in the parser which - of course (Murphy) - didn't affect me up to now. The parser should be much more resistant against strange paths and escapes now: Added proper command line lexer to cocopa and worked around several ridiculous Windows shortcomings (Microsoft owes me at least 50 crates of beer). The whole mess is not cleaned up and committed yet so please don't build from the repository and use the alpha release packages as outlined above.
 **2020 02 21** Discovered problems and bugs in the current official release from Microsoft: Fixed event handling within board manager. Added validity checks when loading board configurations from arduino.json. Better error handling and code locality, for details see commit.
 **2020 02 22** Worked on cocopa unit tests: restored broken tests and added platform test for built-in parser. Added path normalizing for include paths for both cocopa and vscode-arduino. Verified correct behaviour on Windows with latest release (alpha tester claimed it not to be working)
+**2020 02 23** Several tests, fixes and improvements within cocopa. `Arduino.h` now added to forced includes. Fixed code which wasn't linted up to now. Added hint to end of build how to rebuild the IntelliSense configuration. Added missing version field to `c_cpp_properties.json`.
 
 ## Status
 |      | Tasks   |
@@ -171,6 +172,7 @@ I will list every supporter here, thanks!
 2020-02-20 Elektronik Workshop: 56 :beers: (14h coding)
 2020-02-21 Elektronik Workshop: 48 :beers: (12h coding)
 2020-02-22 Elektronik Workshop: 44 :beers: (11h coding)
+2020-02-23 Elektronik Workshop: 20 :beers: (5h coding)
 
 <!-- https://github.com/StylishThemes/GitHub-Dark/wiki/Emoji -->
 
@@ -215,6 +217,7 @@ I will list every supporter here, thanks!
 * Non-IDE unit testing - to eliminate dependency injection use ts-mock-imports for instance
 * Hardcoded and scattered constants:
   * Load package.json and use values from therein instead of hard coding redundant values like shortcuts (like I did for the IntelliSense message in `arduino.ts`)
+  * Line splitting and other regexes
   * Scan code for other hard coded stuff and take appropriate countermeasures
 
 ## Non-categorized Notes

From 31e530c72c8b1c75d870dc0879fb47571f537f6e Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Tue, 25 Feb 2020 17:16:15 +0100
Subject: [PATCH 080/142] Updated cocopa to version 0.0.12

* Implemented and tested support for `.cpp`-sketches.
* Done implementing the most relevant unit tests in cocopa.
* Two independent alpha testers confirmed proper working of the previous alpha releases.
* Updated to the latest revision of cocopa.
---
 BRANCHNOTES.md        | 14 +++++++++++---
 ThirdPartyNotices.txt | 29 ++++++++++++++++++++++++++++-
 package-lock.json     |  6 +++---
 package.json          |  2 +-
 4 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index 47a335c6..d2b9aa06 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -93,6 +93,7 @@ During merging I found some bugs within those functions - mainly due to the abov
 **2020 02 21** Discovered problems and bugs in the current official release from Microsoft: Fixed event handling within board manager. Added validity checks when loading board configurations from arduino.json. Better error handling and code locality, for details see commit.
 **2020 02 22** Worked on cocopa unit tests: restored broken tests and added platform test for built-in parser. Added path normalizing for include paths for both cocopa and vscode-arduino. Verified correct behaviour on Windows with latest release (alpha tester claimed it not to be working)
 **2020 02 23** Several tests, fixes and improvements within cocopa. `Arduino.h` now added to forced includes. Fixed code which wasn't linted up to now. Added hint to end of build how to rebuild the IntelliSense configuration. Added missing version field to `c_cpp_properties.json`.
+**2020 02 25** Implemented and tested support for `.cpp`-sketches. Done implementing the most relevant unit tests in cocopa. Two independent alpha testers confirm proper working of the previous alpha releases. Updated to the latest revision of cocopa.
 
 ## Status
 |      | Tasks   |
@@ -112,8 +113,8 @@ During merging I found some bugs within those functions - mainly due to the abov
 | **Configuration flags**               | :heavy_check_mark: Provide global disable flag for IntelliSense auto-config |
 |                                       | :heavy_check_mark: Provide project specific override for the global flag - most users will likely use the default setup and disable auto-generation for very specific projects |
 | **Unit tests**                        | :heavy_check_mark: Basic parser (known boards, match/no match)|
-|                                       | :white_check_mark: All unit tests in cocopa |
-|                                       | :white_check_mark: Test with cpp sketches |
+|                                       | :heavy_check_mark: All unit tests in cocopa |
+|                                       | :heavy_check_mark: Test with cpp sketches |
 | **General**                           | :heavy_check_mark: Review and remove previous attempts messing with `c_cpp_properties.json` or IntelliSense (documented in the [General Tasks](#General-Tasks) section) `*` |
 |                                       | :heavy_check_mark: *Auto-run verify when* |
 |                                       | &nbsp;&nbsp;&nbsp;&nbsp;:heavy_check_mark: a) setting a board `*` |
@@ -173,6 +174,7 @@ I will list every supporter here, thanks!
 2020-02-21 Elektronik Workshop: 48 :beers: (12h coding)
 2020-02-22 Elektronik Workshop: 44 :beers: (11h coding)
 2020-02-23 Elektronik Workshop: 20 :beers: (5h coding)
+2020-02-25 Elektronik Workshop: 12 :beers: (3h coding)
 
 <!-- https://github.com/StylishThemes/GitHub-Dark/wiki/Emoji -->
 
@@ -219,7 +221,13 @@ I will list every supporter here, thanks!
   * Load package.json and use values from therein instead of hard coding redundant values like shortcuts (like I did for the IntelliSense message in `arduino.ts`)
   * Line splitting and other regexes
   * Scan code for other hard coded stuff and take appropriate countermeasures
-
+* Write good documentation/manual
+  * Integration of Arduino
+  * Project structure
+  * How does the compiling work
+  * Build/Arduino Backend
+  * Include paths
+  * Relation of IntelliSense and build
 ## Non-categorized Notes
 ### Integrate upstream changes into fork
 ```bash
diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt
index fdacfadc..95505d66 100644
--- a/ThirdPartyNotices.txt
+++ b/ThirdPartyNotices.txt
@@ -25,7 +25,7 @@ Visual Studio Code Extension for Arduino incorporates third party material from
 18.	vscode-extension-telemetry (https://github.com/Microsoft/vscode-extension-telemetry)
 19.	winreg (https://github.com/fresc81/node-winreg)
 20.	Winston (https://github.com/winstonjs/winston)
-
+21. cocopa (https://github.com/elektronikworkshop/cocopa)
 
 %% body-parser NOTICES, INFORMATION, AND LICENSE BEGIN HERE
 =========================================
@@ -532,4 +532,31 @@ THE SOFTWARE.
 =========================================
 END OF Winston NOTICES, INFORMATION, AND LICENSE
 
+%% cocopa NOTICES, INFORMATION, AND LICENSE BEGIN HERE
+=========================================
+Copyright (C) 2020 Uli Franke - Elektronik Workshop
+
+All rights reserved.
+
+The MIT License (MIT)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+=========================================
+END OF cocopa NOTICES, INFORMATION, AND LICENSE
 
diff --git a/package-lock.json b/package-lock.json
index 1507d73d..452f13de 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1559,9 +1559,9 @@
       "dev": true
     },
     "cocopa": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/cocopa/-/cocopa-0.0.10.tgz",
-      "integrity": "sha512-MbBG4k2p2alRlxFoxKfPFLIJZ9y5Mbm6Dc1wDl4jpw4yF4wNwbm2dBUTmeDWcAHbLvYj+HE3jIAB5mxZv0zbuA==",
+      "version": "0.0.12",
+      "resolved": "https://registry.npmjs.org/cocopa/-/cocopa-0.0.12.tgz",
+      "integrity": "sha512-ZT9LLP94AglKH1q+hLPxlsBRzD1QgAEIEqYQvMA8va4RQfFxOR9vewA9oR9Kv0vHEp2olYsu0HtGtflyTtVlJw==",
       "requires": {
         "chalk": "^3.0.0",
         "commander": "^4.1.1",
diff --git a/package.json b/package.json
index 42dfc7c2..ef57e0f7 100644
--- a/package.json
+++ b/package.json
@@ -604,7 +604,7 @@
   },
   "dependencies": {
     "body-parser": "^1.16.1",
-    "cocopa": "^0.0.10",
+    "cocopa": "^0.0.12",
     "compare-versions": "^3.4.0",
     "eventemitter2": "^4.1.0",
     "express": "^4.14.1",

From d408686c1d3dff04da6396d1bb9218af0904be4b Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Wed, 26 Feb 2020 14:22:52 +0100
Subject: [PATCH 081/142] Removed IS-REMOVE code

* Removed code marked with `IS-REMOVE` previously
* Added constant for the `c_cpp_properties.json`-configuration managed by vscode-arduino
* Removed code rendered dead by the previous removal
---
 BRANCHNOTES.md                        |  18 +-
 src/arduino/arduino.ts                | 257 --------------------------
 src/arduino/arduinoContentProvider.ts |   2 -
 src/arduino/boardManager.ts           |   3 -
 src/arduino/intellisense.ts           |   2 +-
 src/common/constants.ts               |   2 +
 src/common/util.ts                    |  16 --
 src/extension.ts                      |   4 -
 src/langService/completionProvider.ts |   9 +-
 test/boardmanager.test.ts             |   2 -
 test/commands.test.ts                 |  18 --
 test/extension.test.ts                |   3 -
 12 files changed, 15 insertions(+), 321 deletions(-)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index d2b9aa06..57797d0d 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -94,6 +94,7 @@ During merging I found some bugs within those functions - mainly due to the abov
 **2020 02 22** Worked on cocopa unit tests: restored broken tests and added platform test for built-in parser. Added path normalizing for include paths for both cocopa and vscode-arduino. Verified correct behaviour on Windows with latest release (alpha tester claimed it not to be working)
 **2020 02 23** Several tests, fixes and improvements within cocopa. `Arduino.h` now added to forced includes. Fixed code which wasn't linted up to now. Added hint to end of build how to rebuild the IntelliSense configuration. Added missing version field to `c_cpp_properties.json`.
 **2020 02 25** Implemented and tested support for `.cpp`-sketches. Done implementing the most relevant unit tests in cocopa. Two independent alpha testers confirm proper working of the previous alpha releases. Updated to the latest revision of cocopa.
+**2020 02 26** Preparing for pull request: Removed all code marked `IS-REMOVE` and dead code which I was able to identify.
 
 ## Status
 |      | Tasks   |
@@ -115,23 +116,23 @@ During merging I found some bugs within those functions - mainly due to the abov
 | **Unit tests**                        | :heavy_check_mark: Basic parser (known boards, match/no match)|
 |                                       | :heavy_check_mark: All unit tests in cocopa |
 |                                       | :heavy_check_mark: Test with cpp sketches |
-| **General**                           | :heavy_check_mark: Review and remove previous attempts messing with `c_cpp_properties.json` or IntelliSense (documented in the [General Tasks](#General-Tasks) section) `*` |
+| **General**                           | :heavy_check_mark: Review and remove previous attempts messing with `c_cpp_properties.json` or IntelliSense (documented in the [General Tasks](#General-Tasks) section)  |
 |                                       | :heavy_check_mark: *Auto-run verify when* |
-|                                       | &nbsp;&nbsp;&nbsp;&nbsp;:heavy_check_mark: a) setting a board `*` |
-|                                       | &nbsp;&nbsp;&nbsp;&nbsp;:heavy_check_mark: b) changing the board's configuration `*` |
-|                                       | &nbsp;&nbsp;&nbsp;&nbsp;:heavy_check_mark: c) selecting another sketch `*` |
+|                                       | &nbsp;&nbsp;&nbsp;&nbsp;:heavy_check_mark: a) setting a board  |
+|                                       | &nbsp;&nbsp;&nbsp;&nbsp;:heavy_check_mark: b) changing the board's configuration  |
+|                                       | &nbsp;&nbsp;&nbsp;&nbsp;:heavy_check_mark: c) selecting another sketch  |
 |                                       | &nbsp;&nbsp;&nbsp;&nbsp;:heavy_check_mark: d) ~~workbench initialized and no `c_cpp_properties.json` found~~ obsolete: when board and board configuration is loaded on start up the analysis is triggered anyways |
 |                                       | &nbsp;&nbsp;&nbsp;&nbsp;:white_check_mark: e) Identify other occasions where this applies (usually when adding new libraries) -- any suggestions? |
 |                                       | :heavy_check_mark: Hint the user to run *Arduino: Rebuild IntelliSense Configuration* -> printing message after each build (verify, upload, ...) |
-|                                       | :heavy_check_mark: Better build management such that regular builds and analyze builds do not interfere (done, 2020-02-19) `*` |
-|                                       | :heavy_check_mark: Analyze task queue which fits in the latter  (done, 2020-02-19) `*` |
+|                                       | :heavy_check_mark: Better build management such that regular builds and analyze builds do not interfere (done, 2020-02-19)  |
+|                                       | :heavy_check_mark: Analyze task queue which fits in the latter  (done, 2020-02-19)  |
 |                                       | :heavy_check_mark: Document configuration settings in [README.md](README.md) |
 |                                       | :heavy_check_mark: Document features in [README.md](README.md) |
 |                                       | :heavy_check_mark: Try to auto-generate even if verify (i.e. compilation) fails |
 |                                       | :heavy_check_mark: Extract compiler command parser from vscode-arduino and [publish](https://itnext.io/step-by-step-building-and-publishing-an-npm-typescript-package-44fe7164964c) it as a separate package which will allow reusage and easy testing without heavy vscode-arduino rucksack -- done, see [cocopa](https://www.npmjs.com/package/cocopa) |
 |                                       | :heavy_check_mark: Parser only works when arduino is set to `verbose`, since this is the only way we get the compiler invocation command - this has to be fixed (done, see next item) |
 |                                       | :heavy_check_mark: Implement a *Rebuild IntelliSense Configuration* command which runs verify verbosely internally and therefore allows us to find and parse the compiler command |
-|                                       | :heavy_check_mark: Implement proper event generation for `DeviceContext`. a) Events should be issued only when something actually changes, b) Events should be issued for each setting separately `*`|
+|                                       | :heavy_check_mark: Implement proper event generation for `DeviceContext`. a) Events should be issued only when something actually changes, b) Events should be issued for each setting separately |
 |                                       | :white_check_mark: Finally: go through my code and look for TODOs |
 
 `*` not committed to branch yet
@@ -217,6 +218,9 @@ I will list every supporter here, thanks!
   * When having adding a library folder to the workspace IntelliSense should use the same configuration for it to enable library navigation and code completion.
   * Optimization: Abort analysis build as soon as compiler statement has been found
 * Non-IDE unit testing - to eliminate dependency injection use ts-mock-imports for instance
+* Remove dead code
+* Identify bad code and rework it
+  * all those auxiliary functions in `src/common/util.ts` should be reviewed as they violate every guideline of good coding (try-catch clauses without error handling etc.)
 * Hardcoded and scattered constants:
   * Load package.json and use values from therein instead of hard coding redundant values like shortcuts (like I did for the IntelliSense message in `arduino.ts`)
   * Line splitting and other regexes
diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index e186bd29..75d0e3fe 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -420,162 +420,6 @@ export class ArduinoApp {
         return success;
     }
 
-    // IS-REMOVE: to be removed completely when IntelliSense implementation is merged
-    /*
-    public tryToUpdateIncludePaths() {
-        const configFilePath = path.join(ArduinoWorkspace.rootPath, constants.CPP_CONFIG_FILE);
-        if (!fs.existsSync(configFilePath)) {
-            return;
-        }
-        const cppConfigFile = fs.readFileSync(configFilePath, "utf8");
-        const cppConfig = JSON.parse(cppConfigFile) as { configurations: Array<{
-            includePath: string[],
-            forcedInclude: string[],
-            defines: string[],
-        }> };
-        const libPaths = this.getDefaultPackageLibPaths();
-        const defaultForcedInclude = this.getDefaultForcedIncludeFiles();
-        const defines = this.getDefaultDefines();
-        const configuration = cppConfig.configurations[0];
-
-        let cppConfigFileUpdated = false;
-        // cpp extension changes \\ to \\\\ in paths in JSON string, revert them first
-        configuration.includePath = configuration.includePath.map((path) => path.replace(/\\\\/g, "\\"));
-        configuration.forcedInclude = configuration.forcedInclude.map((path) => path.replace(/\\\\/g, "\\"));
-        configuration.defines = configuration.defines.map((path) => path.replace(/\\\\/g, "\\"));
-
-        for (const libPath of libPaths) {
-            if (configuration.includePath.indexOf(libPath) === -1) {
-                cppConfigFileUpdated = true;
-                configuration.includePath.push(libPath);
-            }
-        }
-        for (const forcedIncludePath of defaultForcedInclude) {
-            if (configuration.forcedInclude.indexOf(forcedIncludePath) === -1) {
-                cppConfigFileUpdated = true;
-                configuration.forcedInclude.push(forcedIncludePath);
-            }
-        }
-
-        for (const define of defines) {
-            if (configuration.defines.indexOf(define) === -1) {
-                cppConfigFileUpdated = true;
-                configuration.defines.push(define);
-            }
-        }
-    */
-        // remove all unexisting paths
-        // concern mistake removal, comment temporary
-        // for (let pathIndex = 0; pathIndex < configuration.includePath.length; pathIndex++) {
-        //     let libPath = configuration.includePath[pathIndex];
-        //     if (libPath.indexOf("${workspaceFolder}") !== -1) {
-        //         continue;
-        //     }
-        //     if (/\*$/.test(libPath)) {
-        //         libPath = libPath.match(/^[^\*]*/)[0];
-        //     }
-        //     if (!fs.existsSync(libPath)) {
-        //         cppConfigFileUpdated = true;
-        //         configuration.includePath.splice(pathIndex, 1);
-        //         pathIndex--;
-        //     }
-        // }
-        // for (let pathIndex = 0; pathIndex < configuration.forcedInclude.length; pathIndex++) {
-        //     const forcedIncludePath = configuration.forcedInclude[pathIndex];
-        //     if (forcedIncludePath.indexOf("${workspaceFolder}") !== -1) {
-        //         continue;
-        //     }
-        //     if (!fs.existsSync(forcedIncludePath)) {
-        //         cppConfigFileUpdated = true;
-        //         configuration.forcedInclude.splice(pathIndex, 1);
-        //         pathIndex--;
-        //     }
-        // }
-    /*
-        if (cppConfigFileUpdated) {
-            fs.writeFileSync(configFilePath, JSON.stringify(cppConfig, null, 4));
-        }
-    }
-    */
-
-    // IS-REMOVE: to be removed completely when IntelliSense implementation is merged
-    /*
-    // Add selected library path to the intellisense search path.
-    public addLibPath(libraryPath: string) {
-        let libPaths;
-        if (libraryPath) {
-            libPaths = [libraryPath];
-        } else {
-            libPaths = this.getDefaultPackageLibPaths();
-        }
-
-        const defaultForcedInclude = this.getDefaultForcedIncludeFiles();
-        const defaultDefines = this.getDefaultDefines();
-
-        if (!ArduinoWorkspace.rootPath) {
-            return;
-        }
-        const configFilePath = path.join(ArduinoWorkspace.rootPath, constants.CPP_CONFIG_FILE);
-        let deviceContext = null;
-        if (!util.fileExistsSync(configFilePath)) {
-            util.mkdirRecursivelySync(path.dirname(configFilePath));
-            deviceContext = {};
-        } else {
-            deviceContext = util.tryParseJSON(fs.readFileSync(configFilePath, "utf8"));
-        }
-        if (!deviceContext) {
-            logger.notifyAndThrowUserError("arduinoFileError", new Error(constants.messages.ARDUINO_FILE_ERROR));
-        }
-
-        deviceContext.configurations = deviceContext.configurations || [];
-        let configSection = null;
-        deviceContext.configurations.forEach((section) => {
-            if (section.name === util.getCppConfigPlatform()) {
-                configSection = section;
-            }
-        });
-
-        if (!configSection) {
-            configSection = {
-                name: util.getCppConfigPlatform(),
-                includePath: [],
-            };
-            deviceContext.configurations.push(configSection);
-        }
-
-        libPaths.forEach((childLibPath) => {
-            childLibPath = path.resolve(path.normalize(childLibPath));
-            if (configSection.includePath && configSection.includePath.length) {
-                for (const existingPath of configSection.includePath) {
-                    if (childLibPath === path.resolve(path.normalize(existingPath))) {
-                        return;
-                    }
-                }
-            } else {
-                configSection.includePath = [];
-            }
-            configSection.includePath.unshift(childLibPath);
-        });
-
-        if (!configSection.forcedInclude) {
-            configSection.forcedInclude = defaultForcedInclude;
-        } else {
-            for (let i = 0; i < configSection.forcedInclude.length; i++) {
-                if (/arduino\.h$/i.test(configSection.forcedInclude[i])) {
-                    configSection.forcedInclude.splice(i, 1);
-                    i--;
-                }
-            }
-            configSection.forcedInclude = defaultForcedInclude.concat(configSection.forcedInclude);
-        }
-
-        if (!configSection.defines) {
-            configSection.defines = defaultDefines;
-        }
-
-        fs.writeFileSync(configFilePath, JSON.stringify(deviceContext, null, 4));
-    }
-    */
     // Include the *.h header files from selected library to the arduino sketch.
     public async includeLibrary(libraryPath: string) {
         if (!ArduinoWorkspace.rootPath) {
@@ -719,67 +563,6 @@ export class ArduinoApp {
         arduinoChannel.end(`Removed library - ${libName}${os.EOL}`);
     }
 
-    // IS-REMOVE: to be removed completely when IntelliSense implementation is merged
-    /*
-    public getDefaultPackageLibPaths(): string[] {
-        const result = [];
-        const boardDescriptor = this._boardManager.currentBoard;
-        if (!boardDescriptor) {
-            return result;
-        }
-        const toolsPath = boardDescriptor.platform.rootBoardPath;
-        result.push(path.normalize(path.join(toolsPath, "**")));
-        const hardwareToolPath = path.join(toolsPath, "..", "..", "tools");
-        if (fs.existsSync(hardwareToolPath)) {
-            result.push(path.normalize(path.join(hardwareToolPath, "**")));
-        }
-
-        // Add default libraries to include path
-        result.push(path.normalize(path.join(this._settings.defaultLibPath, "**")));
-
-        const userLibsPath = (path.join(this._settings.sketchbookPath, "libraries", "**"));
-        result.push(userLibsPath);
-        // if (util.directoryExistsSync(path.join(toolsPath, "cores"))) {
-        //     const coreLibs = fs.readdirSync(path.join(toolsPath, "cores"));
-        //     if (coreLibs && coreLibs.length > 0) {
-        //         coreLibs.forEach((coreLib) => {
-        //             result.push(path.normalize(path.join(toolsPath, "cores", coreLib)));
-        //         });
-        //     }
-        // }
-        // return result;
-
-        // <package>/hardware/<platform>/<version> -> <package>/tools
-        const toolPath = path.join(toolsPath, "..", "..", "..", "tools");
-        if (fs.existsSync(toolPath)) {
-            result.push(path.normalize(path.join(toolPath, "**")));
-        }
-        return result;
-    }*/
-
-    // IS-REMOVE: to be removed completely when IntelliSense implementation is merged
-    /*
-    public getDefaultForcedIncludeFiles(): string[] {
-        const result = [];
-        const boardDescriptor = this._boardManager.currentBoard;
-        if (!boardDescriptor) {
-            return result;
-        }
-        const arduinoHeadFilePath = path.normalize(path.join(boardDescriptor.platform.rootBoardPath, "cores", "arduino", "Arduino.h"));
-        if (fs.existsSync(arduinoHeadFilePath)) {
-            result.push(arduinoHeadFilePath);
-        }
-        return result;
-    }
-
-    public getDefaultDefines(): string[] {
-        const result = [];
-        // USBCON is required in order for Serial to be recognized by intellisense
-        result.push("USBCON");
-        return result;
-    }
-    */
-
     public openExample(example) {
         function tmpName(name) {
             let counter = 0;
@@ -827,46 +610,6 @@ export class ArduinoApp {
                 const arduinoConfigFilePath = path.join(destExample, constants.ARDUINO_CONFIG_FILE);
                 util.mkdirRecursivelySync(path.dirname(arduinoConfigFilePath));
                 fs.writeFileSync(arduinoConfigFilePath, JSON.stringify(arduinoJson, null, 4));
-
-                // IS-REMOVE: to be removed completely when IntelliSense implementation is merged
-                /*
-                // Generate cpptools intellisense config
-                const cppConfigFilePath = path.join(destExample, constants.CPP_CONFIG_FILE);
-
-                // Current workspace
-                let includePath = ["${workspaceRoot}"];
-                // Defaut package for this board
-                const defaultPackageLibPaths = this.getDefaultPackageLibPaths();
-                includePath = includePath.concat(defaultPackageLibPaths);
-                // Arduino built-in package tools
-                includePath.push(path.join(this._settings.arduinoPath, "hardware", "tools", "**"));
-                // Arduino built-in libraries
-                includePath.push(path.join(this._settings.arduinoPath, "libraries", "**"));
-                // Arduino custom package tools
-                includePath.push(path.join(this._settings.sketchbookPath, "hardware", "tools", "**"));
-                // Arduino custom libraries
-                includePath.push(path.join(this._settings.sketchbookPath, "libraries", "**"));
-
-                const forcedInclude = this.getDefaultForcedIncludeFiles();
-
-                const defines = [
-                    "ARDUINO=10800",
-                ];
-                const cppConfig = {
-                    configurations: [{
-                        name: util.getCppConfigPlatform(),
-                        defines,
-                        includePath,
-                        forcedInclude,
-                        intelliSenseMode: "clang-x64",
-                        cStandard: "c11",
-                        cppStandard: "c++17",
-                    }],
-                    version: 3,
-                };
-                util.mkdirRecursivelySync(path.dirname(cppConfigFilePath));
-                fs.writeFileSync(cppConfigFilePath, JSON.stringify(cppConfig, null, 4));
-                */
             }
 
             // Step 3: Open the arduino project at a new vscode window.
diff --git a/src/arduino/arduinoContentProvider.ts b/src/arduino/arduinoContentProvider.ts
index 2ea28c91..76a132e3 100644
--- a/src/arduino/arduinoContentProvider.ts
+++ b/src/arduino/arduinoContentProvider.ts
@@ -207,8 +207,6 @@ export class ArduinoContentProvider implements vscode.TextDocumentContentProvide
             return res.status(400).send("BAD Request! Missing { libraryPath } parameters!");
         } else {
             try {
-                // IS-REMOVE: to be removed completely when IntelliSense implementation is merged
-                // await ArduinoContext.arduinoApp.addLibPath(req.body.libraryPath);
                 await ArduinoContext.arduinoApp.includeLibrary(req.body.libraryPath);
                 return res.json({
                     status: "OK",
diff --git a/src/arduino/boardManager.ts b/src/arduino/boardManager.ts
index 34a1ef30..a2f6d481 100644
--- a/src/arduino/boardManager.ts
+++ b/src/arduino/boardManager.ts
@@ -136,9 +136,6 @@ export class BoardManager {
         // correct board and configuration. We know that it will trigger - we
         // made sure above that the boards actually differ
         dc.board = targetBoard.key;
-
-        // IS-REMOVE: to be removed completely when IntelliSense implementation is merged
-        // this._arduinoApp.addLibPath(null);
     }
 
     public get packages(): IPackage[] {
diff --git a/src/arduino/intellisense.ts b/src/arduino/intellisense.ts
index 3d40553e..da83de55 100644
--- a/src/arduino/intellisense.ts
+++ b/src/arduino/intellisense.ts
@@ -83,7 +83,7 @@ export function makeCompilerParserContext(dc: DeviceContext): ICoCoPaContext {
         // TODO: check what kind of result we've got: gcc or other architecture:
         //  and instantiate content accordingly (to be implemented within cocopa)
         const content = new ccp.CCppPropertiesContentResult(runner.result,
-                                                            "Arduino",
+                                                            constants.C_CPP_PROPERTIES_CONFIG_NAME,
                                                             ccp.CCppPropertiesISMode.Gcc_X64,
                                                             ccp.CCppPropertiesCStandard.C11,
                                                             // as of 1.8.11 arduino is on C++11
diff --git a/src/common/constants.ts b/src/common/constants.ts
index acdfbf78..548fdb20 100644
--- a/src/common/constants.ts
+++ b/src/common/constants.ts
@@ -7,6 +7,8 @@ import * as vscode from "vscode";
 export const ARDUINO_CONFIG_FILE = path.join(".vscode", "arduino.json");
 
 export const CPP_CONFIG_FILE = path.join(".vscode", "c_cpp_properties.json");
+/** The name of the intellisense configuration managed by vscode-arduino. */
+export const C_CPP_PROPERTIES_CONFIG_NAME = "Arduino";
 
 export const ARDUINO_MODE: vscode.DocumentSelector = [
     { language: "cpp", scheme: "file" },
diff --git a/src/common/util.ts b/src/common/util.ts
index b37bea47..f6ca9ab2 100644
--- a/src/common/util.ts
+++ b/src/common/util.ts
@@ -13,22 +13,6 @@ import { arduinoChannel } from "./outputChannel";
 
 const encodingMapping: object = JSON.parse(fs.readFileSync(path.join(__dirname, "../../../misc", "codepageMapping.json"), "utf8"));
 
-// IS-REMOVE: to be removed completely when IntelliSense implementation is merged
-/**
- * This function will return the VSCode C/C++ extesnion compatible platform literals.
- * @function getCppConfigPlatform
- */
-export function getCppConfigPlatform(): string {
-    const plat = os.platform();
-    if (plat === "linux") {
-        return "Linux";
-    } else if (plat === "darwin") {
-        return "Mac";
-    } else if (plat === "win32") {
-        return "Win32";
-    }
-}
-
 /**
  * This function will detect the file existing in the sync mode.
  * @function fileExistsSync
diff --git a/src/extension.ts b/src/extension.ts
index 46ff9eb6..82464b82 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -231,8 +231,6 @@ export async function activate(context: vscode.ExtensionContext) {
         };
     });
 
-    // IS-REMOVE: to be removed completely when IntelliSense implementation is merged
-    // registerArduinoCommand("arduino.addLibPath", (path) => arduinoContextModule.default.arduinoApp.addLibPath(path));
     registerArduinoCommand("arduino.openExample", (path) => arduinoContextModule.default.arduinoApp.openExample(path));
     registerArduinoCommand("arduino.loadPackages", async () => await arduinoContextModule.default.boardManager.loadPackages(true));
     registerArduinoCommand("arduino.installBoard", async (packageName, arch, version: string = "") => {
@@ -285,8 +283,6 @@ export async function activate(context: vscode.ExtensionContext) {
             if (!SerialMonitor.getInstance().initialized) {
                 SerialMonitor.getInstance().initialize();
             }
-            // IS-REMOVE: to be removed completely when IntelliSense implementation is merged
-            // arduinoContextModule.default.arduinoApp.tryToUpdateIncludePaths();
             vscode.commands.executeCommand("setContext", "vscode-arduino:showExampleExplorer", true);
         })();
     }
diff --git a/src/langService/completionProvider.ts b/src/langService/completionProvider.ts
index 1b5d9d31..c92570dd 100644
--- a/src/langService/completionProvider.ts
+++ b/src/langService/completionProvider.ts
@@ -83,12 +83,6 @@ export class CompletionProvider implements vscode.CompletionItemProvider {
         }
         this._libPaths.clear();
         this._headerFiles.clear();
-        // IS-REMOVE: to be removed completely when IntelliSense implementation is merged
-        /*
-        ArduinoContext.arduinoApp.getDefaultPackageLibPaths().forEach((defaultPath) => {
-            this._libPaths.add(defaultPath);
-        });
-        */
         if (fs.existsSync(this._cppConfigFile)) {
             const deviceConfig = util.tryParseJSON(fs.readFileSync(this._cppConfigFile, "utf8"));
             if (deviceConfig) {
@@ -99,9 +93,8 @@ export class CompletionProvider implements vscode.CompletionItemProvider {
                     }
                 }
                 if (deviceConfig.configurations) {
-                    const plat = util.getCppConfigPlatform();
                     deviceConfig.configurations.forEach((configSection) => {
-                        if (configSection.name === plat && Array.isArray(configSection.includePath)) {
+                        if (configSection.name === constants.C_CPP_PROPERTIES_CONFIG_NAME && Array.isArray(configSection.includePath)) {
                             configSection.includePath.forEach((includePath) => {
                                 this._libPaths.add(path.normalize(includePath));
                             });
diff --git a/test/boardmanager.test.ts b/test/boardmanager.test.ts
index 561feee2..06e79850 100644
--- a/test/boardmanager.test.ts
+++ b/test/boardmanager.test.ts
@@ -28,8 +28,6 @@ suite("Arduino: Board Manager.", () => {
         const arduinoApp = TypeMoq.Mock.ofType(ArduinoApp);
         arduinoApp.setup((x) => x.setPref(TypeMoq.It.isAny(), TypeMoq.It.isAny()));
         arduinoApp.setup((x) => x.initialize(TypeMoq.It.isAny()));
-        // IS-REMOVE: to be removed completely when IntelliSense implementation is merged
-        // arduinoApp.setup((x) => x.addLibPath(TypeMoq.It.isAny()));
 
         try {
             boardManager = new BoardManager(arduinoSettings.object, arduinoApp.object);
diff --git a/test/commands.test.ts b/test/commands.test.ts
index 124bd403..9f11322a 100644
--- a/test/commands.test.ts
+++ b/test/commands.test.ts
@@ -38,24 +38,6 @@ suite("Arduino: Commands Tests", () => {
         }
     });
 
-    // IS-REMOVE: to be removed completely when IntelliSense implementation is merged
-    // Arduino: Library Manager: Add library to include path.
-    // tslint:disable-next-line: only-arrow-functions
-    /*
-    test("should be able to run command: arduino.addLibPath", function(done) {
-        this.timeout(60 * 1000);
-        try {
-            // Library Manager: Add library to include path.
-            vscode.commands.executeCommand("arduino.addLibPath", "#include <AzureIoTHub.h>").then((result)  => {
-                done();
-            });
-
-        } catch (error) {
-            done(new Error(error));
-        }
-    });
-    */
-
     // Arduino: Boards Manager : Manage packages for boards
     // tslint:disable-next-line: only-arrow-functions
     test("should be able to run command: arduino.showBoardManager", function(done) {
diff --git a/test/extension.test.ts b/test/extension.test.ts
index 6cde8586..fb746313 100644
--- a/test/extension.test.ts
+++ b/test/extension.test.ts
@@ -45,9 +45,6 @@ suite("Arduino: Extension Tests", () => {
                     "arduino.showExamples",
                     "arduino.changeBoardType",
                     "arduino.initialize",
-                    // IS-REMOVE: to be removed completely when IntelliSense implementation is merged
-                    //         note: it has been removed from package.json commands already
-                    // "arduino.addLibPath",
                     "arduino.selectSerialPort",
                     "arduino.openSerialMonitor",
                     "arduino.changeBaudRate",

From 42025082dbad9bac813776d142f3d28466a7cd41 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Wed, 26 Feb 2020 15:28:52 +0100
Subject: [PATCH 082/142] Reworked util.spawn to mergable version

---
 src/arduino/arduino.ts | 70 ++++++++++++++++++------------------------
 src/common/util.ts     | 51 +++++++++++++++++-------------
 2 files changed, 59 insertions(+), 62 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 75d0e3fe..52516558 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -361,8 +361,6 @@ export class ArduinoApp {
             UsbDetector.getInstance().pauseListening();
         }
 
-        let success = false;
-
         // Push sketch as last argument
         args.push(path.join(ArduinoWorkspace.rootPath, dc.sketch));
 
@@ -378,25 +376,14 @@ export class ArduinoApp {
             }
         }
 
-        // TODO: Get rid of spawn's channel parameter and just support
-        // stdout and stderr callbacks
-        const stdoutCallback = (line: string) => {
-            if (cocopa) {
-                cocopa.callback(line);
-                if (verbose) {
-                    arduinoChannel.channel.append(line);
-                }
-            } else {
-                arduinoChannel.channel.append(line);
-            }
-        }
-
-        await util.spawn(
+        return await util.spawn(
             this._settings.commandPath,
-            arduinoChannel.channel,
             args,
             undefined,
-            stdoutCallback,
+            {
+                channel: !cocopa || cocopa && verbose ? arduinoChannel.channel : undefined,
+                stdout: cocopa ? cocopa.callback : undefined,
+            },
         ).then(async () => {
             await cleanup();
             if (buildMode !== BuildMode.Analyze) {
@@ -406,18 +393,15 @@ export class ArduinoApp {
                 arduinoChannel.info(`To rebuild your IntelliSense configuration run "${cmd}"`);
             }
             arduinoChannel.end(`${buildMode} sketch '${dc.sketch}'${os.EOL}`);
-            success = true;
+            return true;
         }, async (reason) => {
             await cleanup();
             const msg = reason.code
                 ? `Exit with code=${reason.code}`
-                : reason.message
-                    ? reason.message
-                    : JSON.stringify(reason);
+                : JSON.stringify(reason);
             arduinoChannel.error(`${buildMode} sketch '${dc.sketch}': ${msg}${os.EOL}`);
+            return false;
         });
-
-        return success;
     }
 
     // Include the *.h header files from selected library to the arduino sketch.
@@ -481,14 +465,17 @@ export class ArduinoApp {
         }
         arduinoChannel.info(`${packageName}${arch && ":" + arch}${version && ":" + version}`);
         try {
-            this.useArduinoCli() ?
+            if (this.useArduinoCli()) {
                 await util.spawn(this._settings.commandPath,
-                    showOutput ? arduinoChannel.channel : null,
-                    ["core", "install", `${packageName}${arch && ":" + arch}${version && "@" + version}`]) :
+                    ["core", "install", `${packageName}${arch && ":" + arch}${version && "@" + version}`],
+                    undefined,
+                    { channel: showOutput ? arduinoChannel.channel : null });
+            } else {
                 await util.spawn(this._settings.commandPath,
-                    showOutput ? arduinoChannel.channel : null,
-                    ["--install-boards", `${packageName}${arch && ":" + arch}${version && ":" + version}`]);
-
+                    ["--install-boards", `${packageName}${arch && ":" + arch}${version && ":" + version}`],
+                    undefined,
+                    { channel: showOutput ? arduinoChannel.channel : null });
+            }
             if (updatingIndex) {
                 arduinoChannel.end("Updated package index files.");
             } else {
@@ -530,14 +517,17 @@ export class ArduinoApp {
             arduinoChannel.start(`Install library - ${libName}`);
         }
         try {
-            this.useArduinoCli() ?
-            await  util.spawn(this._settings.commandPath,
-                showOutput ? arduinoChannel.channel : null,
-                ["lib", "install", `${libName}${version && "@" + version}`]) :
-            await util.spawn(this._settings.commandPath,
-                showOutput ? arduinoChannel.channel : null,
-                ["--install-library", `${libName}${version && ":" + version}`]);
-
+            if (this.useArduinoCli()) {
+                await  util.spawn(this._settings.commandPath,
+                    ["lib", "install", `${libName}${version && "@" + version}`],
+                    undefined,
+                    { channel: showOutput ? arduinoChannel.channel : undefined });
+            } else {
+                await util.spawn(this._settings.commandPath,
+                    ["--install-library", `${libName}${version && ":" + version}`],
+                    undefined,
+                    { channel: showOutput ? arduinoChannel.channel : undefined });
+            }
             if (updatingIndex) {
                 arduinoChannel.end("Updated library index files.");
             } else {
@@ -671,9 +661,9 @@ export class ArduinoApp {
             const cmd = args.shift();
             try {
                 await util.spawn(cmd,
-                                 arduinoChannel.channel,
                                  args,
-                                 { shell: true, cwd: ArduinoWorkspace.rootPath });
+                                 { shell: true, cwd: ArduinoWorkspace.rootPath },
+                                 { channel: arduinoChannel.channel });
             } catch (ex) {
                 arduinoChannel.error(`Running pre-build command failed: ${os.EOL}${ex.error}`);
                 return false;
diff --git a/src/common/util.ts b/src/common/util.ts
index f6ca9ab2..002edcc9 100644
--- a/src/common/util.ts
+++ b/src/common/util.ts
@@ -185,8 +185,6 @@ export function isArduinoFile(filePath): boolean {
     return fileExistsSync(filePath) && (path.extname(filePath) === ".ino" || path.extname(filePath) === ".pde");
 }
 
-// TODO: remove output channel and just provide callback hooks for stdout and
-// stderr
 /**
  * Send a command to arduino
  * @param {string} command - base command path (either Arduino IDE or CLI)
@@ -197,14 +195,13 @@ export function isArduinoFile(filePath): boolean {
  */
 export function spawn(
     command: string,
-    outputChannel: vscode.OutputChannel,
     args: string[] = [],
     options: any = {},
-    stdoutCallback?: (s: string) => void,
+    output?: {channel?: vscode.OutputChannel,
+              stdout?: (s: string) => void,
+              stderr?: (s: string) => void},
 ): Thenable<object> {
     return new Promise((resolve, reject) => {
-        const stdout = "";
-        const stderr = "";
         options.cwd = options.cwd || path.resolve(path.join(__dirname, ".."));
         const child = childProcess.spawn(command, args, options);
 
@@ -220,27 +217,37 @@ export function spawn(
             }
         }
 
-        if (outputChannel) {
-            child.stdout.on("data", (data: Buffer) => {
-                const decoded = decodeData(data, codepage);
-                if (stdoutCallback) {
-                    stdoutCallback(decoded);
-                } else {
-                    outputChannel.append(decoded);
-                }
-            });
-            child.stderr.on("data", (data: Buffer) => {
-                outputChannel.append(decodeData(data, codepage));
-            });
+        if (output) {
+            if (output.channel || output.stdout) {
+                child.stdout.on("data", (data: Buffer) => {
+                    const decoded = decodeData(data, codepage);
+                    if (output.stdout) {
+                        output.stdout(decoded);
+                    }
+                    if (output.channel) {
+                        output.channel.append(decoded);
+                    }
+                });
+            }
+            if (output.channel || output.stderr) {
+                child.stderr.on("data", (data: Buffer) => {
+                    const decoded = decodeData(data, codepage);
+                    if (output.stderr) {
+                        output.stderr(decoded);
+                    }
+                    if (output.channel) {
+                        output.channel.append(decoded);
+                    }
+                });
+            }
         }
 
-        child.on("error", (error) => reject({ error, stderr, stdout }));
-
+        child.on("error", (error) => reject({ error }));
         child.on("exit", (code) => {
             if (code === 0) {
-                resolve({ code, stdout, stderr });
+                resolve({ code });
             } else {
-                reject({ code, stdout, stderr });
+                reject({ code });
             }
         });
     });

From cdf9f342c349fa2549b0a5eb103d53408ee526d7 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Wed, 26 Feb 2020 15:46:40 +0100
Subject: [PATCH 083/142] Added/reviewed some notes

---
 src/extension.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/extension.ts b/src/extension.ts
index 82464b82..70a78a5e 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -217,7 +217,11 @@ export async function activate(context: vscode.ExtensionContext) {
     });
 
     registerArduinoCommand("arduino.selectProgrammer", async () => {
-        // TODO EW: this guard does not prevent building when setting the programmer
+        // Note: this guard does not prevent building while setting the
+        // programmer. But when looking at the code of selectProgrammer
+        // it seems not to be possible to trigger building while setting
+        // the programmer. If the timed IntelliSense analysis is triggered
+        // this is not a problem, since it doesn't use the programmer.
         if (!arduinoContextModule.default.arduinoApp.building) {
             try {
                 await arduinoContextModule.default.arduinoApp.programmerManager.selectProgrammer();

From deecdf276d1f1287e9dea009c2a5f03010d570cf Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Wed, 26 Feb 2020 15:48:54 +0100
Subject: [PATCH 084/142] Changed Serial.updatePortListStatus to make use of
 optional argument to eliminate updatePortListStatus(null) calls

---
 src/serialmonitor/serialMonitor.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/serialmonitor/serialMonitor.ts b/src/serialmonitor/serialMonitor.ts
index 28b58fa7..622d1855 100644
--- a/src/serialmonitor/serialMonitor.ts
+++ b/src/serialmonitor/serialMonitor.ts
@@ -72,11 +72,11 @@ export class SerialMonitor implements vscode.Disposable {
         this._baudRateStatusBar.command = "arduino.changeBaudRate";
         this._baudRateStatusBar.tooltip = "Baud Rate";
         this._baudRateStatusBar.text = defaultBaudRate.toString();
-        this.updatePortListStatus(null);
+        this.updatePortListStatus();
 
         const dc = DeviceContext.getInstance();
         dc.onChangePort(() => {
-            this.updatePortListStatus(null);
+            this.updatePortListStatus();
         });
     }
     public get initialized(): boolean {
@@ -210,8 +210,7 @@ export class SerialMonitor implements vscode.Disposable {
         }
     }
 
-    // TODO EW: use default value for port function parameter and change all updatePortListStatus(null) calls accordingly
-    private updatePortListStatus(port: string) {
+    private updatePortListStatus(port?: string) {
         const dc = DeviceContext.getInstance();
         if (port) {
             dc.port = port;

From 764d21ebb25125b63828422a9dec60b5b46417eb Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Wed, 26 Feb 2020 15:57:00 +0100
Subject: [PATCH 085/142] Refined some documentation comment

---
 src/arduino/intellisense.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/arduino/intellisense.ts b/src/arduino/intellisense.ts
index da83de55..4bbe2b62 100644
--- a/src/arduino/intellisense.ts
+++ b/src/arduino/intellisense.ts
@@ -223,9 +223,6 @@ enum AnalysisEvent {
  *  * make sure that an analysis request is postponed when another build
  *      is currently in progress
  *
- * TODO: initialization sequence: make sure events generated
- *   during initialization are not lost
- *
  * TODO: check time of c_cpp_properties.json and compare it with
  * * arduino.json
  * * main sketch file

From e7f7d055c92bc141cfb4f2853101ee20d4e1466a Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Wed, 26 Feb 2020 16:14:15 +0100
Subject: [PATCH 086/142] Updated log

---
 BRANCHNOTES.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index 57797d0d..28f4c2a2 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -94,7 +94,7 @@ During merging I found some bugs within those functions - mainly due to the abov
 **2020 02 22** Worked on cocopa unit tests: restored broken tests and added platform test for built-in parser. Added path normalizing for include paths for both cocopa and vscode-arduino. Verified correct behaviour on Windows with latest release (alpha tester claimed it not to be working)
 **2020 02 23** Several tests, fixes and improvements within cocopa. `Arduino.h` now added to forced includes. Fixed code which wasn't linted up to now. Added hint to end of build how to rebuild the IntelliSense configuration. Added missing version field to `c_cpp_properties.json`.
 **2020 02 25** Implemented and tested support for `.cpp`-sketches. Done implementing the most relevant unit tests in cocopa. Two independent alpha testers confirm proper working of the previous alpha releases. Updated to the latest revision of cocopa.
-**2020 02 26** Preparing for pull request: Removed all code marked `IS-REMOVE` and dead code which I was able to identify.
+**2020 02 26** Preparing for pull request: Removed all code marked `IS-REMOVE` and dead code which I was able to identify. Reviewed all TODOs and resolved those which can be fixed without having to bother the maintainers. Left the unresolved on grounds of documentation.
 
 ## Status
 |      | Tasks   |
@@ -133,7 +133,7 @@ During merging I found some bugs within those functions - mainly due to the abov
 |                                       | :heavy_check_mark: Parser only works when arduino is set to `verbose`, since this is the only way we get the compiler invocation command - this has to be fixed (done, see next item) |
 |                                       | :heavy_check_mark: Implement a *Rebuild IntelliSense Configuration* command which runs verify verbosely internally and therefore allows us to find and parse the compiler command |
 |                                       | :heavy_check_mark: Implement proper event generation for `DeviceContext`. a) Events should be issued only when something actually changes, b) Events should be issued for each setting separately |
-|                                       | :white_check_mark: Finally: go through my code and look for TODOs |
+|                                       | :heavy_check_mark: Finally: go through my code and look for TODOs |
 
 `*` not committed to branch yet
 `>` most of the actual parsing and configuration generation is part of [cocopa](https://github.com/elektronikworkshop/cocopa/) ([here](https://www.npmjs.com/package/cocopa)'s the npm package)

From 27d9cac9bcfaccd2e5bf4329e29685f869c8241e Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Wed, 26 Feb 2020 16:15:06 +0100
Subject: [PATCH 087/142] Final pull request dependency style for cocopa

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ef57e0f7..ff21fb72 100644
--- a/package.json
+++ b/package.json
@@ -604,7 +604,7 @@
   },
   "dependencies": {
     "body-parser": "^1.16.1",
-    "cocopa": "^0.0.12",
+    "cocopa": "0.0.12",
     "compare-versions": "^3.4.0",
     "eventemitter2": "^4.1.0",
     "express": "^4.14.1",

From 15fd705a825fccc6ed0e15ba4269372700a72d4a Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Wed, 26 Feb 2020 16:21:12 +0100
Subject: [PATCH 088/142] Updated beers

---
 BRANCHNOTES.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index 28f4c2a2..b855931e 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -176,6 +176,7 @@ I will list every supporter here, thanks!
 2020-02-22 Elektronik Workshop: 44 :beers: (11h coding)
 2020-02-23 Elektronik Workshop: 20 :beers: (5h coding)
 2020-02-25 Elektronik Workshop: 12 :beers: (3h coding)
+2020-02-26 Elektronik Workshop: 16 :beers: (4h coding)
 
 <!-- https://github.com/StylishThemes/GitHub-Dark/wiki/Emoji -->
 

From 88e544a0e6c649fc3cae31dc7b809f4922981ee5 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Wed, 26 Feb 2020 16:36:40 +0100
Subject: [PATCH 089/142] Added link to alpha releases to top of document

---
 BRANCHNOTES.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index b855931e..1c28b544 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -1,4 +1,7 @@
 # IntelliSense Autoconfiguration Branch
+
+**TL;DR:** Alpha versions of this extension of this branch with the latest features and fixes are available from the following [Dropbox folder](https://www.dropbox.com/sh/whmcdt26chyjgby/AAB1Ld2fzZ9Z_NfM3CRay17wa).
+
 ## Problem
 This branch more or less addresses the following issues:
 | # | Issue | Title | Comment |

From b489a8fdec21a8c8ff9eeca26731d7e12657ec14 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Thu, 27 Feb 2020 14:03:58 +0100
Subject: [PATCH 090/142] Run IntelliSense analysis for every build

* Run IntelliSense analysis for every build
* Added global enum for log level
---
 src/arduino/arduino.ts             | 41 +++++++++++++-----------------
 src/arduino/intellisense.ts        |  6 ++++-
 src/common/constants.ts            |  5 ++++
 src/debug/configurationProvider.ts |  3 ++-
 4 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 52516558..557886cb 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -16,7 +16,6 @@ import { IArduinoSettings } from "./arduinoSettings";
 import { BoardManager } from "./boardManager";
 import { ExampleManager } from "./exampleManager";
 import { AnalysisManager,
-         ICoCoPaContext,
          isCompilerParserEnabled,
          makeCompilerParserContext } from "./intellisense";
 import { LibraryManager } from "./libraryManager";
@@ -202,7 +201,8 @@ export class ArduinoApp {
         const dc = DeviceContext.getInstance();
         const args: string[] = [];
         let restoreSerialMonitor: boolean = false;
-        let cocopa: ICoCoPaContext;
+        const cocopa = makeCompilerParserContext(dc);
+        const verbose = VscodeSettings.getInstance().logLevel === constants.LogLevel.Verbose;
 
         if (!this.boardManager.currentBoard) {
             if (buildMode !== BuildMode.Analyze) {
@@ -277,7 +277,6 @@ export class ArduinoApp {
                 await selectSerial();
                 return false;
             }
-
             if (!compile && !this.useArduinoCli()) {
                 arduinoChannel.error("This command is only available when using the Arduino CLI");
                 return false;
@@ -302,12 +301,10 @@ export class ArduinoApp {
             }
 
             args.push("--port", dc.port);
-        } else if (buildMode === BuildMode.Analyze) {
-            cocopa = makeCompilerParserContext(dc);
             if (!this.useArduinoCli()) {
-                args.push("--verify", "--verbose");
+                args.push("--verify");
             } else {
-                args.push("compile", "--verbose", "-b", boardDescriptor);
+                args.push("compile", "-b", boardDescriptor);
             }
         } else {
             if (!this.useArduinoCli()) {
@@ -317,10 +314,8 @@ export class ArduinoApp {
             }
         }
 
-        const verbose = VscodeSettings.getInstance().logLevel === "verbose";
-        if (buildMode !== BuildMode.Analyze && verbose) {
-            args.push("--verbose");
-        }
+        // We always build verbosely but filter the output based on the settings
+        args.push("--verbose");
 
         await vscode.workspace.saveAll(false);
 
@@ -365,9 +360,7 @@ export class ArduinoApp {
         args.push(path.join(ArduinoWorkspace.rootPath, dc.sketch));
 
         const cleanup = async () => {
-            if (cocopa) {
-                await cocopa.conclude();
-            }
+            await cocopa.conclude();
             if (buildMode === BuildMode.Upload || buildMode === BuildMode.UploadProgrammer) {
                 UsbDetector.getInstance().resumeListening();
                 if (restoreSerialMonitor) {
@@ -375,23 +368,23 @@ export class ArduinoApp {
                 }
             }
         }
+        const stdoutcb = (line: string) => {
+            cocopa.callback(line);
+            if (verbose) {
+                arduinoChannel.channel.append(line);
+            }
+        }
+        const stderrcb = (line: string) => {
+            arduinoChannel.channel.append(line);
+        }
 
         return await util.spawn(
             this._settings.commandPath,
             args,
             undefined,
-            {
-                channel: !cocopa || cocopa && verbose ? arduinoChannel.channel : undefined,
-                stdout: cocopa ? cocopa.callback : undefined,
-            },
+            { stdout: stdoutcb, stderr: stderrcb },
         ).then(async () => {
             await cleanup();
-            if (buildMode !== BuildMode.Analyze) {
-                const cmd = os.platform() === "darwin"
-                    ? "Cmd + Alt + I"
-                    : "Ctrl + Alt + I";
-                arduinoChannel.info(`To rebuild your IntelliSense configuration run "${cmd}"`);
-            }
             arduinoChannel.end(`${buildMode} sketch '${dc.sketch}'${os.EOL}`);
             return true;
         }, async (reason) => {
diff --git a/src/arduino/intellisense.ts b/src/arduino/intellisense.ts
index 4bbe2b62..9ecd84c4 100644
--- a/src/arduino/intellisense.ts
+++ b/src/arduino/intellisense.ts
@@ -3,6 +3,7 @@
 
 import * as ccp from "cocopa";
 import * as fs from "fs";
+import * as os from "os";
 import * as path from "path";
 import * as tp from "typed-promisify";
 
@@ -10,7 +11,6 @@ import * as constants from "../common/constants";
 import { arduinoChannel } from "../common/outputChannel";
 import { ArduinoWorkspace } from "../common/workspace";
 import { DeviceContext } from "../deviceContext";
-
 import { VscodeSettings } from "./vscodeSettings";
 
 export interface ICoCoPaContext {
@@ -103,6 +103,10 @@ export function makeCompilerParserContext(dc: DeviceContext): ICoCoPaContext {
             const estr = JSON.stringify(e);
             arduinoChannel.error(`Failed to read or write IntelliSense configuration: ${estr}`);
         }
+        const cmd = os.platform() === "darwin"
+            ? "Cmd + Alt + I"
+            : "Ctrl + Alt + I";
+        arduinoChannel.info(`To manually rebuild your IntelliSense configuration run "${cmd}"`);
     };
     return {
         callback: runner.callback(),
diff --git a/src/common/constants.ts b/src/common/constants.ts
index 548fdb20..2d0c5f74 100644
--- a/src/common/constants.ts
+++ b/src/common/constants.ts
@@ -10,6 +10,11 @@ export const CPP_CONFIG_FILE = path.join(".vscode", "c_cpp_properties.json");
 /** The name of the intellisense configuration managed by vscode-arduino. */
 export const C_CPP_PROPERTIES_CONFIG_NAME = "Arduino";
 
+export enum LogLevel {
+    Info = "info",
+    Verbose = "verbose",
+};
+
 export const ARDUINO_MODE: vscode.DocumentSelector = [
     { language: "cpp", scheme: "file" },
     { language: "arduino", scheme: "file" },
diff --git a/src/debug/configurationProvider.ts b/src/debug/configurationProvider.ts
index 19588160..f0fe77e2 100644
--- a/src/debug/configurationProvider.ts
+++ b/src/debug/configurationProvider.ts
@@ -9,6 +9,7 @@ import ArduinoActivator from "../arduinoActivator";
 import ArduinoContext from "../arduinoContext";
 
 import { VscodeSettings } from "../arduino/vscodeSettings";
+import * as constants from "../common/constants";
 import * as platform from "../common/platform";
 import * as util from "../common/util";
 import { ArduinoWorkspace } from "../common/workspace";
@@ -77,7 +78,7 @@ export class ArduinoDebugConfigurationProvider implements vscode.DebugConfigurat
             await ArduinoActivator.activate();
         }
 
-        if (VscodeSettings.getInstance().logLevel === "verbose" && !config.logging) {
+        if (VscodeSettings.getInstance().logLevel === constants.LogLevel.Verbose && !config.logging) {
             config = {
                 ...config, logging: {
                     engineLogging: true,

From 314d4a8648ea509ebcad7d7e904f38ad1e6259ac Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Thu, 27 Feb 2020 16:11:33 +0100
Subject: [PATCH 091/142] Build/analysis logging improvements

---
 src/arduino/arduino.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 557886cb..a017c947 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -375,7 +375,14 @@ export class ArduinoApp {
             }
         }
         const stderrcb = (line: string) => {
-            arduinoChannel.channel.append(line);
+            if (os.platform() === "win32") {
+                line = line.trim();
+                if (line.length && !line.startsWith("DEBUG ") && !line.startsWith("TRACE ") && !line.startsWith("INFO ")) {
+                    arduinoChannel.channel.append(`${line}${os.EOL}`);
+                }
+            } else {
+                arduinoChannel.channel.append(line);
+            }
         }
 
         return await util.spawn(

From 70d323d07ef382e8894f521aee80e1d835b5b2ff Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Thu, 27 Feb 2020 18:36:01 +0100
Subject: [PATCH 092/142] Fixed bug in board.ts: Conceptual flaw when checking
 if configuration option is valid

---
 src/arduino/board.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/arduino/board.ts b/src/arduino/board.ts
index 77c15df0..294ce7cf 100644
--- a/src/arduino/board.ts
+++ b/src/arduino/board.ts
@@ -148,8 +148,6 @@ export class Board implements IBoard {
                     return BoardConfigResult.Success;
                 }
                 return BoardConfigResult.SuccessNoChange;
-            } else {
-                return BoardConfigResult.InvalidOptionID;
             }
         }
         return BoardConfigResult.InvalidOptionID;

From 194dc920f20057330e3f90fc2b89fe29f43a6c23 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Thu, 27 Feb 2020 18:40:27 +0100
Subject: [PATCH 093/142] Fixed exception which occurs if one of the include
 directories doesn't exists and we try to search it for Arduino.h

---
 src/arduino/intellisense.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/arduino/intellisense.ts b/src/arduino/intellisense.ts
index 9ecd84c4..94060575 100644
--- a/src/arduino/intellisense.ts
+++ b/src/arduino/intellisense.ts
@@ -141,7 +141,13 @@ async function findDirContaining(dir: string, what: string): Promise<string | un
     const readdir = tp.promisify(fs.readdir);
     const fsstat = tp.promisify(fs.stat);
 
-    for (const entry of await readdir(dir)) {
+    let entries: string[];
+    try {
+        entries = await readdir(dir);
+    } catch (e) {
+        return undefined;
+    }
+    for (const entry of entries) {
         const p = path.join(dir, entry);
         const s = await fsstat(p);
         if (s.isDirectory()) {

From fed508f4b7b24032f937ca81b4f1eeb0f009202e Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Thu, 27 Feb 2020 19:44:35 +0100
Subject: [PATCH 094/142] Filter out invalid include directories

* Filtering out invalid include directories (discovered when compiling for ESP8266)
* Compacted IntelliSense message and hint to manual build into a single line
---
 src/arduino/intellisense.ts | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/arduino/intellisense.ts b/src/arduino/intellisense.ts
index 94060575..74666f92 100644
--- a/src/arduino/intellisense.ts
+++ b/src/arduino/intellisense.ts
@@ -69,6 +69,8 @@ export function makeCompilerParserContext(dc: DeviceContext): ICoCoPaContext {
         // Normalize compiler and include paths (resolve ".." and ".")
         runner.result.normalize();
 
+        runner.result.includes = await removeInvalidDirs(runner.result.includes);
+
         // Search for Arduino.h in the include paths - we need it for a
         // forced include - users expect Arduino symbols to be available
         // in main sketch without having to include the header explicitly
@@ -90,23 +92,23 @@ export function makeCompilerParserContext(dc: DeviceContext): ICoCoPaContext {
                                                             ccp.CCppPropertiesCppStandard.Cpp11,
                                                             forcedIncludes);
         try {
+            const cmd = os.platform() === "darwin"
+                ? "Cmd + Alt + I"
+                : "Ctrl + Alt + I";
+            const help = `To manually rebuild your IntelliSense configuration run "${cmd}"`;
             const pPath = path.join(ArduinoWorkspace.rootPath, constants.CPP_CONFIG_FILE);
             const prop = new ccp.CCppProperties();
             prop.read(pPath);
             prop.merge(content, ccp.CCppPropertiesMergeMode.ReplaceSameNames);
             if (prop.write(pPath)) {
-                arduinoChannel.info("IntelliSense configuration updated.");
+                arduinoChannel.info(`IntelliSense configuration updated. ${help}`);
             } else {
-                arduinoChannel.info("IntelliSense configuration already up to date.");
+                arduinoChannel.info(`IntelliSense configuration already up to date. ${help}`);
             }
         } catch (e) {
             const estr = JSON.stringify(e);
             arduinoChannel.error(`Failed to read or write IntelliSense configuration: ${estr}`);
         }
-        const cmd = os.platform() === "darwin"
-            ? "Cmd + Alt + I"
-            : "Ctrl + Alt + I";
-        arduinoChannel.info(`To manually rebuild your IntelliSense configuration run "${cmd}"`);
     };
     return {
         callback: runner.callback(),
@@ -114,6 +116,27 @@ export function makeCompilerParserContext(dc: DeviceContext): ICoCoPaContext {
     }
 };
 
+// TODO: move to cocopa
+/**
+ * Filter directory list by directories by their existence.
+ * @param dirs Directories to be checked.
+ * @returns The list of directories which exist.
+ */
+async function removeInvalidDirs(dirs: string[]) {
+    const fsstat = tp.promisify(fs.stat);
+    const res: string[] = [];
+    for (const d of dirs) {
+        try {
+            const s = await fsstat(d);
+            if (s.isDirectory()) {
+                res.push(d);
+            }
+        } catch (e) {
+        }
+    }
+    return res;
+}
+
 /**
  * Assembles compiler parser engines which then will be used to find the main
  * sketch's compile command and parse the infomation from it required for

From 30210dc336910c9b748045cd4435d7fd1e003369 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Thu, 27 Feb 2020 19:47:44 +0100
Subject: [PATCH 095/142] Make upload verbosity be conditional and extend
 filtering

* Building always verbosely but upload only verbosely when requested
* Filtering of spurious messages now with regex list and for all platforms
---
 src/arduino/arduino.ts | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index a017c947..57e54e3e 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -196,6 +196,7 @@ export class ArduinoApp {
      * manages the build state.
      * @param buildMode See build()
      * @param buildDir See build()
+     * @see https://github.com/arduino/Arduino/blob/master/build/shared/manpage.adoc
      */
     public async _build(buildMode: BuildMode, compile: boolean, buildDir?: string): Promise<boolean> {
         const dc = DeviceContext.getInstance();
@@ -315,7 +316,10 @@ export class ArduinoApp {
         }
 
         // We always build verbosely but filter the output based on the settings
-        args.push("--verbose");
+        args.push("--verbose-build");
+        if (verbose) {
+            args.push("--verbose-upload");
+        }
 
         await vscode.workspace.saveAll(false);
 
@@ -377,12 +381,31 @@ export class ArduinoApp {
         const stderrcb = (line: string) => {
             if (os.platform() === "win32") {
                 line = line.trim();
-                if (line.length && !line.startsWith("DEBUG ") && !line.startsWith("TRACE ") && !line.startsWith("INFO ")) {
-                    arduinoChannel.channel.append(`${line}${os.EOL}`);
+                if (line.length <= 0) {
+                    return;
+                }
+                line = `${line}${os.EOL}`;
+            }
+            if (!verbose) {
+                // Don't spill log with spurious info from the backend
+                // This list could be fetched from a config file to
+                // accommodate messages of unknown board packages, newer
+                // backend revisions etc.
+                const filters = [
+                    /^Picked\sup\sJAVA_TOOL_OPTIONS:\s+/,
+                    /^\d+\d+-\d+-\d+T\d+:\d+:\d+.\d+Z\sINFO\s/,
+                    /^\d+\d+-\d+-\d+T\d+:\d+:\d+.\d+Z\sWARN\s/,
+                    /^DEBUG\s+/,
+                    /^TRACE\s+/,
+                    /^INFO\s+/,
+                ];
+                for (const f of filters) {
+                    if (line.match(f)) {
+                        return;
+                    }
                 }
-            } else {
-                arduinoChannel.channel.append(line);
             }
+            arduinoChannel.channel.append(line);
         }
 
         return await util.spawn(

From deaa18a231cc494580c0ee655f59127200666e4d Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Thu, 27 Feb 2020 21:02:49 +0100
Subject: [PATCH 096/142] Collapsing multiple consecutive newlines into a
 single newline for non verbose build log

---
 src/arduino/arduino.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 57e54e3e..67902504 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -384,6 +384,7 @@ export class ArduinoApp {
                 if (line.length <= 0) {
                     return;
                 }
+                line = line.replace(/(?:\r|\r\n|\n)+/g, os.EOL);
                 line = `${line}${os.EOL}`;
             }
             if (!verbose) {

From 7039ea8de9204b6f2241fcf1ca038bb3559180d2 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Thu, 27 Feb 2020 21:21:33 +0100
Subject: [PATCH 097/142] IntelliSense auto gen respected global and project
 specific dis-/enable flags for analyze only. Now these flags have the same
 effect during regular builds.

---
 src/arduino/arduino.ts      |  4 +++-
 src/arduino/intellisense.ts | 11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 67902504..dbb8decd 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -373,7 +373,9 @@ export class ArduinoApp {
             }
         }
         const stdoutcb = (line: string) => {
-            cocopa.callback(line);
+            if (cocopa.callback) {
+                cocopa.callback(line);
+            }
             if (verbose) {
                 arduinoChannel.channel.append(line);
             }
diff --git a/src/arduino/intellisense.ts b/src/arduino/intellisense.ts
index 74666f92..1d763dcc 100644
--- a/src/arduino/intellisense.ts
+++ b/src/arduino/intellisense.ts
@@ -56,6 +56,17 @@ export function isCompilerParserEnabled(dc?: DeviceContext) {
  */
 export function makeCompilerParserContext(dc: DeviceContext): ICoCoPaContext {
 
+    // TODO: callback for local setting: when IG gen is re-enabled file
+    //   analysis trigger. Perhaps for global possible as well?
+    if (!isCompilerParserEnabled(dc)) {
+        return {
+            callback: undefined,
+            conclude: async () => {
+                arduinoChannel.info("IntelliSense auto-configuration disabled.");
+            },
+        };
+    }
+
     const engines = makeCompilerParserEngines(dc);
     const runner = new ccp.Runner(engines);
 

From f6c3b2c66f5c350b2cb1570c6becf5a4d6c2feb2 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Thu, 27 Feb 2020 22:49:54 +0100
Subject: [PATCH 098/142] Added post build command support

* Added post build command support
* Added validator for both pre and post build (former was missing)
Yet to be decided: Solution for analysis run: with or without pre/post build?
Addresses #786
---
 README.md                  |  4 +++-
 misc/arduinoValidator.json | 10 ++++++++++
 src/arduino/arduino.ts     | 41 ++++++++++++++++++++++++++++----------
 src/deviceContext.ts       |  5 +++++
 src/deviceSettings.ts      |  5 +++++
 5 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 1df1360b..3732f72a 100644
--- a/README.md
+++ b/README.md
@@ -102,6 +102,7 @@ The following settings are as per sketch settings of the Arduino extension. You
     "output": "../build",
     "debugger": "jlink",
     "prebuild": "bash prebuild.sh",
+    "postbuild": "bash postbuild.sh",
     "intelliSenseGen": "global"
 }
 ```
@@ -110,7 +111,8 @@ The following settings are as per sketch settings of the Arduino extension. You
 - `board` - Currently selected Arduino board alias. Can be set by the `Arduino: Change Board Type` command. Also, you can find the board list there.
 - `output` - Arduino build output path. If not set, Arduino will create a new temporary output folder each time, which means it cannot reuse the intermediate result of the previous build leading to long verify/upload time, so it is recommended to set the field. Arduino requires that the output path should not be the workspace itself or in a subfolder of the workspace, otherwise, it may not work correctly. By default, this option is not set. It's worth noting that the contents of this file could be deleted during the build process, so pick (or create) a directory that will not store files you want to keep.
 - `debugger` - The short name of the debugger that will be used when the board itself does not have a debugger and there is more than one debugger available. You can find the list of debuggers [here](https://github.com/Microsoft/vscode-arduino/blob/master/misc/debuggerUsbMapping.json). By default, this option is not set.
-- `prebuild` - External command before building the sketch file. You should only set one `prebuild` command. `command1 && command2` does not work. If you need to run multiple commands before the build, then create a script.
+- `prebuild` - External command which will be invoked before any sketch build (verify, upload). You must only set one `prebuild` command. `command1 && command2` does not work. If you need to run multiple commands before the build, then create a script.
+- `postbuild` - External command to be run after the sketch has been built successfully. Same rules as for `prebuild` apply. <!-- TODO: note about cwd would be a good thing -->
 - `intelliSenseGen` - Override the global setting for auto-generation of the IntelliSense configuration (i.e. `.vscode/c_cpp_properties.json`). Three options are available:
   - `"global"`: Use the global settings (default)
   - `"disable"`: Disable the auto-generation even if globally enabled
diff --git a/misc/arduinoValidator.json b/misc/arduinoValidator.json
index 57ca7be8..97f41cac 100644
--- a/misc/arduinoValidator.json
+++ b/misc/arduinoValidator.json
@@ -42,6 +42,16 @@
                 "disable",
                 "enable"
             ]
+        },
+        "prebuild": {
+            "description": "Command to be run before every build",
+            "type": "string",
+            "minLength": 1
+        },
+        "postbuild": {
+            "description": "Command to be run after every build",
+            "type": "string",
+            "minLength": 1
         }
     }
 }
diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index dbb8decd..f51dd003 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -328,7 +328,10 @@ export class ArduinoApp {
         arduinoChannel.show();
         arduinoChannel.start(`${buildMode} sketch '${dc.sketch}'`);
 
-        if (!await this.runPreBuildCommand(dc)) {
+        // TODO EW: What should we do with pre-/post build commands when running
+        //   analysis? Some could use it to generate/manipulate code which could
+        //   be a prerequisite for a successful build
+        if (!await this.runPrePostBuildCommand(dc, "pre")) {
             return false;
         }
 
@@ -363,7 +366,10 @@ export class ArduinoApp {
         // Push sketch as last argument
         args.push(path.join(ArduinoWorkspace.rootPath, dc.sketch));
 
-        const cleanup = async () => {
+        const cleanup = async (result: "ok" | "error") => {
+            if (result === "ok") {
+                await this.runPrePostBuildCommand(dc, "post");
+            }
             await cocopa.conclude();
             if (buildMode === BuildMode.Upload || buildMode === BuildMode.UploadProgrammer) {
                 UsbDetector.getInstance().resumeListening();
@@ -417,11 +423,11 @@ export class ArduinoApp {
             undefined,
             { stdout: stdoutcb, stderr: stderrcb },
         ).then(async () => {
-            await cleanup();
+            await cleanup("ok");
             arduinoChannel.end(`${buildMode} sketch '${dc.sketch}'${os.EOL}`);
             return true;
         }, async (reason) => {
-            await cleanup();
+            await cleanup("error");
             const msg = reason.code
                 ? `Exit with code=${reason.code}`
                 : JSON.stringify(reason);
@@ -671,19 +677,27 @@ export class ArduinoApp {
     }
 
     /**
-     * Runs the pre build command.
+     * Runs the pre or post build command.
      * Usually before one of
      *  * verify
      *  * upload
      *  * upload using programmer
      * @param dc Device context prepared during one of the above actions
+     * @param what "pre" if the pre-build command should be run, "post" if the
+     * post-build command should be run.
      * @returns True if successful, false on error.
      */
-    protected async runPreBuildCommand(dc: DeviceContext): Promise<boolean> {
-        const prebuildcmdline = dc.prebuild;
-        if (prebuildcmdline) {
-            arduinoChannel.info(`Running pre-build command: ${prebuildcmdline}`);
-            const args = prebuildcmdline.split(/\s+/);
+    protected async runPrePostBuildCommand(dc: DeviceContext,
+                                           what: "pre" | "post"): Promise<boolean> {
+        const cmdline = what === "pre"
+            ? dc.prebuild
+            : dc.postbuild;
+
+        if (cmdline) {
+            arduinoChannel.info(`Running ${what}-build command: "${cmdline}"`);
+            // TODO 2020-02-27, EW: We could call bash -c "cmd" here at least for
+            //   UNIX systems. Windows users must live with their poor system :)
+            const args = cmdline.split(/\s+/);
             const cmd = args.shift();
             try {
                 await util.spawn(cmd,
@@ -691,7 +705,12 @@ export class ArduinoApp {
                                  { shell: true, cwd: ArduinoWorkspace.rootPath },
                                  { channel: arduinoChannel.channel });
             } catch (ex) {
-                arduinoChannel.error(`Running pre-build command failed: ${os.EOL}${ex.error}`);
+                const msg = ex.error
+                    ? `${ex.error}`
+                    : ex.code
+                        ? `Exit code = ${ex.code}`
+                        : JSON.stringify(ex);
+                arduinoChannel.error(`Running ${what}-build command failed: ${os.EOL}${msg}`);
                 return false;
             }
         }
diff --git a/src/deviceContext.ts b/src/deviceContext.ts
index dd687c45..f655ed6e 100644
--- a/src/deviceContext.ts
+++ b/src/deviceContext.ts
@@ -181,6 +181,7 @@ export class DeviceContext implements IDeviceContext, vscode.Disposable {
     public get onChangeISAutoGen() { return this._settings.intelliSenseGen.emitter.event }
     public get onChangeConfiguration() { return this._settings.configuration.emitter.event }
     public get onChangePrebuild() { return this._settings.prebuild.emitter.event }
+    public get onChangePostbuild() { return this._settings.postbuild.emitter.event }
     public get onChangeProgrammer() { return this._settings.programmer.emitter.event }
 
     public get port() {
@@ -214,6 +215,10 @@ export class DeviceContext implements IDeviceContext, vscode.Disposable {
         return this._settings.prebuild.value;
     }
 
+    public get postbuild() {
+        return this._settings.postbuild.value;
+    }
+
     public get output() {
         return this._settings.output.value;
     }
diff --git a/src/deviceSettings.ts b/src/deviceSettings.ts
index d930cdc2..65c7a7b6 100644
--- a/src/deviceSettings.ts
+++ b/src/deviceSettings.ts
@@ -112,6 +112,7 @@ export class DeviceSettings {
     public intelliSenseGen = new StrSetting();
     public configuration = new StrSetting();
     public prebuild = new StrSetting();
+    public postbuild = new StrSetting();
     public programmer = new StrSetting();
 
     /**
@@ -127,6 +128,7 @@ export class DeviceSettings {
                this.intelliSenseGen.modified ||
                this.configuration.modified ||
                this.prebuild.modified ||
+               this.postbuild.modified ||
                this.programmer.modified;
     }
     /**
@@ -141,6 +143,7 @@ export class DeviceSettings {
         this.intelliSenseGen.commit();
         this.configuration.commit();
         this.prebuild.commit();
+        this.postbuild.commit();
         this.programmer.commit();
     }
     /**
@@ -157,6 +160,7 @@ export class DeviceSettings {
         this.intelliSenseGen.reset();
         this.configuration.reset();
         this.prebuild.reset();
+        this.postbuild.reset();
         this.programmer.reset();
         if (commit) {
             this.commit();
@@ -181,6 +185,7 @@ export class DeviceSettings {
             this.debugger.value = settings.debugger;
             this.intelliSenseGen.value = settings.intelliSenseGen;
             this.prebuild.value = settings.prebuild;
+            this.postbuild.value = settings.postbuild;
             this.programmer.value = settings.programmer;
             if (commit) {
                 this.commit();

From 2b84aa853f94c5ec498e75547a792d75f6e3730b Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Fri, 28 Feb 2020 15:28:21 +0100
Subject: [PATCH 099/142] C++ standard is now parsed from compiler arguments

Plus: Moved some methods to cocopa and got rid of the typed-promisify dependency
---
 package-lock.json           | 11 ++---
 package.json                |  3 +-
 src/arduino/intellisense.ts | 99 ++++---------------------------------
 3 files changed, 13 insertions(+), 100 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 452f13de..74bb9c6b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1559,9 +1559,9 @@
       "dev": true
     },
     "cocopa": {
-      "version": "0.0.12",
-      "resolved": "https://registry.npmjs.org/cocopa/-/cocopa-0.0.12.tgz",
-      "integrity": "sha512-ZT9LLP94AglKH1q+hLPxlsBRzD1QgAEIEqYQvMA8va4RQfFxOR9vewA9oR9Kv0vHEp2olYsu0HtGtflyTtVlJw==",
+      "version": "0.0.13",
+      "resolved": "https://registry.npmjs.org/cocopa/-/cocopa-0.0.13.tgz",
+      "integrity": "sha512-MKWdCbaC9MpT+CMNXRP2rufpIndIaCKY1KD3XXwg6I2jNI1uFjEKNGXObL1mJ+7X53FTzKaZydJbPinCG+WJTQ==",
       "requires": {
         "chalk": "^3.0.0",
         "commander": "^4.1.1",
@@ -8599,11 +8599,6 @@
         "mime-types": "~2.1.24"
       }
     },
-    "typed-promisify": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/typed-promisify/-/typed-promisify-0.4.0.tgz",
-      "integrity": "sha1-reHT0yEwdnuk71OFFixyBpgQXQ8="
-    },
     "typedarray": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
diff --git a/package.json b/package.json
index ff21fb72..ba1d75a9 100644
--- a/package.json
+++ b/package.json
@@ -604,7 +604,7 @@
   },
   "dependencies": {
     "body-parser": "^1.16.1",
-    "cocopa": "0.0.12",
+    "cocopa": "0.0.13",
     "compare-versions": "^3.4.0",
     "eventemitter2": "^4.1.0",
     "express": "^4.14.1",
@@ -613,7 +613,6 @@
     "impor": "^0.1.1",
     "node-usb-native": "^0.0.18",
     "properties": "^1.2.1",
-    "typed-promisify": "^0.4.0",
     "uuid": "^3.0.1",
     "vscode-extension-telemetry": "0.1.6",
     "winreg": "^1.2.3",
diff --git a/src/arduino/intellisense.ts b/src/arduino/intellisense.ts
index 1d763dcc..a664b923 100644
--- a/src/arduino/intellisense.ts
+++ b/src/arduino/intellisense.ts
@@ -2,10 +2,8 @@
 // Licensed under the MIT license.
 
 import * as ccp from "cocopa";
-import * as fs from "fs";
 import * as os from "os";
 import * as path from "path";
-import * as tp from "typed-promisify";
 
 import * as constants from "../common/constants";
 import { arduinoChannel } from "../common/outputChannel";
@@ -45,11 +43,6 @@ export function isCompilerParserEnabled(dc?: DeviceContext) {
  *
  * Possible enhancements:
  *
- * * Parse c++ standard from arduino command line
- *
- *     Arduino currently sets the C++ standard during compilation with the
- *     flag -std=gnu++11
- *
  * * Order of includes: Perhaps insert the internal includes at the front
  *     as at least for the forcedIncludes IntelliSense seems to take the
  *     order into account.
@@ -79,34 +72,30 @@ export function makeCompilerParserContext(dc: DeviceContext): ICoCoPaContext {
 
         // Normalize compiler and include paths (resolve ".." and ".")
         runner.result.normalize();
-
-        runner.result.includes = await removeInvalidDirs(runner.result.includes);
+        // Remove invalid paths
+        await runner.result.cleanup();
 
         // Search for Arduino.h in the include paths - we need it for a
         // forced include - users expect Arduino symbols to be available
         // in main sketch without having to include the header explicitly
-        const ardHeader = await locateArduinoHeader(runner.result.includes);
-        const forcedIncludes = ardHeader
-            ? [ ardHeader ]
+        const ardHeader = await runner.result.findFile("Arduino.h");
+        const forcedIncludes = ardHeader.length > 0
+            ? ardHeader
             : undefined;
-        if (!ardHeader) {
+        if (!forcedIncludes) {
             arduinoChannel.warning("Unable to locate \"Arduino.h\" within IntelliSense include paths.");
         }
 
-        // TODO: check what kind of result we've got: gcc or other architecture:
-        //  and instantiate content accordingly (to be implemented within cocopa)
+        // The C++ standard is set to the following default value if no compiler flag has been found.
         const content = new ccp.CCppPropertiesContentResult(runner.result,
                                                             constants.C_CPP_PROPERTIES_CONFIG_NAME,
                                                             ccp.CCppPropertiesISMode.Gcc_X64,
                                                             ccp.CCppPropertiesCStandard.C11,
-                                                            // as of 1.8.11 arduino is on C++11
                                                             ccp.CCppPropertiesCppStandard.Cpp11,
                                                             forcedIncludes);
         try {
-            const cmd = os.platform() === "darwin"
-                ? "Cmd + Alt + I"
-                : "Ctrl + Alt + I";
-            const help = `To manually rebuild your IntelliSense configuration run "${cmd}"`;
+            const cmd = os.platform() === "darwin" ? "Cmd" : "Ctrl";
+            const help = `To manually rebuild your IntelliSense configuration run "${cmd}+Alt+I"`;
             const pPath = path.join(ArduinoWorkspace.rootPath, constants.CPP_CONFIG_FILE);
             const prop = new ccp.CCppProperties();
             prop.read(pPath);
@@ -127,27 +116,6 @@ export function makeCompilerParserContext(dc: DeviceContext): ICoCoPaContext {
     }
 };
 
-// TODO: move to cocopa
-/**
- * Filter directory list by directories by their existence.
- * @param dirs Directories to be checked.
- * @returns The list of directories which exist.
- */
-async function removeInvalidDirs(dirs: string[]) {
-    const fsstat = tp.promisify(fs.stat);
-    const res: string[] = [];
-    for (const d of dirs) {
-        try {
-            const s = await fsstat(d);
-            if (s.isDirectory()) {
-                res.push(d);
-            }
-        } catch (e) {
-        }
-    }
-    return res;
-}
-
 /**
  * Assembles compiler parser engines which then will be used to find the main
  * sketch's compile command and parse the infomation from it required for
@@ -165,55 +133,6 @@ function makeCompilerParserEngines(dc: DeviceContext) {
     return [gccParserEngine];
 }
 
-/**
- * Search directories recursively for a file.
- * @param dir Directory where the search should begin.
- * @param what The file we're looking for.
- * @returns The path of the directory which contains the file else undefined.
- */
-async function findDirContaining(dir: string, what: string): Promise<string | undefined> {
-    const readdir = tp.promisify(fs.readdir);
-    const fsstat = tp.promisify(fs.stat);
-
-    let entries: string[];
-    try {
-        entries = await readdir(dir);
-    } catch (e) {
-        return undefined;
-    }
-    for (const entry of entries) {
-        const p = path.join(dir, entry);
-        const s = await fsstat(p);
-        if (s.isDirectory()) {
-            const result = await findDirContaining(p, what);
-            if (result) {
-                return result;
-            }
-        } else if (entry === what) {
-            return dir;
-        }
-    }
-    return undefined;
-};
-
-/**
- * Tries to find the main Arduino header (i.e. Arduino.h) in the given include
- * paths.
- * @param includes Array containing all include paths in which we should look
- * for Arduino.h
- * @returns The full path of the main Arduino header.
- */
-async function locateArduinoHeader(includes: string[]) {
-    const header = "Arduino.h";
-    for (const i of includes) {
-        const result = await findDirContaining(i, header);
-        if (result) {
-            return path.join(result, header);
-        }
-    }
-    return undefined;
-}
-
 /**
  * Possible states of AnalysisManager's state machine.
  */

From 7c1104c7011046ae0b490965e2be7c99ed7b0e4c Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Fri, 28 Feb 2020 15:29:32 +0100
Subject: [PATCH 100/142] Section which outlines additional features this
 branch addresses

---
 BRANCHNOTES.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index 1c28b544..49164b0a 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -141,6 +141,9 @@ During merging I found some bugs within those functions - mainly due to the abov
 `*` not committed to branch yet
 `>` most of the actual parsing and configuration generation is part of [cocopa](https://github.com/elektronikworkshop/cocopa/) ([here](https://www.npmjs.com/package/cocopa)'s the npm package)
 
+## Additional Stuff this Branch addresses
+* Support for `postbuild` commands, see [#786](https://github.com/microsoft/vscode-arduino/issues/786)
+
 ## Motivation
 I write a lot of code for Arduino, especially libraries. The Arduino IDE is not suited for more complex projects and I tried several alternatives:
 * The old and dysfunctional Arduino CDT extension for eclipse somehow stalled (even if it was promising)

From d3bcf6e19f707333ffb586400a425b48ad7268b8 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Fri, 28 Feb 2020 21:07:50 +0100
Subject: [PATCH 101/142] Logging and post-build commands

* Error logging for exceptions during build cleanup
* Compacted log message filter regexes
* Moved pre-build command after initialization of the output folder in case this command somehow wants to operate on it somehow
* Better error message handling when post-build command fails
* Forwarding post-build command error
---
 src/arduino/arduino.ts | 45 +++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index f51dd003..7d970702 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -183,7 +183,9 @@ export class ArduinoApp {
         })
         .catch((reason) => {
             this._building = false;
-            // TODO EW, 2020-02-19: Report unhandled error (Logger?)
+            logger.notifyUserError("ArduinoApp.build",
+                                   reason,
+                                   `Unhandled exception when cleaning up build (${buildMode}).`);
             return false;
         });
     }
@@ -328,13 +330,6 @@ export class ArduinoApp {
         arduinoChannel.show();
         arduinoChannel.start(`${buildMode} sketch '${dc.sketch}'`);
 
-        // TODO EW: What should we do with pre-/post build commands when running
-        //   analysis? Some could use it to generate/manipulate code which could
-        //   be a prerequisite for a successful build
-        if (!await this.runPrePostBuildCommand(dc, "pre")) {
-            return false;
-        }
-
         if ((buildDir || dc.output) && compile) {
             const outputPath = path.resolve(ArduinoWorkspace.rootPath, buildDir || dc.output);
             const dirPath = path.dirname(outputPath);
@@ -356,6 +351,13 @@ export class ArduinoApp {
             arduinoChannel.warning(msg);
         }
 
+        // TODO EW: What should we do with pre-/post build commands when running
+        //   analysis? Some could use it to generate/manipulate code which could
+        //   be a prerequisite for a successful build
+        if (!await this.runPrePostBuildCommand(dc, "pre")) {
+            return false;
+        }
+
         // stop serial monitor when everything is prepared and good
         // what makes restoring of its previous state easier
         if (buildMode === BuildMode.Upload || buildMode === BuildMode.UploadProgrammer) {
@@ -365,10 +367,10 @@ export class ArduinoApp {
 
         // Push sketch as last argument
         args.push(path.join(ArduinoWorkspace.rootPath, dc.sketch));
-
         const cleanup = async (result: "ok" | "error") => {
+            let ret = true;
             if (result === "ok") {
-                await this.runPrePostBuildCommand(dc, "post");
+                ret = await this.runPrePostBuildCommand(dc, "post");
             }
             await cocopa.conclude();
             if (buildMode === BuildMode.Upload || buildMode === BuildMode.UploadProgrammer) {
@@ -377,6 +379,7 @@ export class ArduinoApp {
                     await SerialMonitor.getInstance().openSerialMonitor();
                 }
             }
+            return ret;
         }
         const stdoutcb = (line: string) => {
             if (cocopa.callback) {
@@ -396,17 +399,13 @@ export class ArduinoApp {
                 line = `${line}${os.EOL}`;
             }
             if (!verbose) {
-                // Don't spill log with spurious info from the backend
-                // This list could be fetched from a config file to
-                // accommodate messages of unknown board packages, newer
-                // backend revisions etc.
+                // Don't spill log with spurious info from the backend. This
+                // list could be fetched from a config file to accommodate
+                // messages of unknown board packages, newer backend revisions
                 const filters = [
                     /^Picked\sup\sJAVA_TOOL_OPTIONS:\s+/,
-                    /^\d+\d+-\d+-\d+T\d+:\d+:\d+.\d+Z\sINFO\s/,
-                    /^\d+\d+-\d+-\d+T\d+:\d+:\d+.\d+Z\sWARN\s/,
-                    /^DEBUG\s+/,
-                    /^TRACE\s+/,
-                    /^INFO\s+/,
+                    /^\d+\d+-\d+-\d+T\d+:\d+:\d+.\d+Z\s(?:INFO|WARN)\s/,
+                    /^(?:DEBUG|TRACE|INFO)\s+/,
                 ];
                 for (const f of filters) {
                     if (line.match(f)) {
@@ -423,9 +422,11 @@ export class ArduinoApp {
             undefined,
             { stdout: stdoutcb, stderr: stderrcb },
         ).then(async () => {
-            await cleanup("ok");
-            arduinoChannel.end(`${buildMode} sketch '${dc.sketch}'${os.EOL}`);
-            return true;
+            const ret = await cleanup("ok");
+            if (ret) {
+                arduinoChannel.end(`${buildMode} sketch '${dc.sketch}'${os.EOL}`);
+            }
+            return ret;
         }, async (reason) => {
             await cleanup("error");
             const msg = reason.code

From 2af8f11af5ac41adbcf654d3b8437b01d9830587 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Fri, 28 Feb 2020 23:19:56 +0100
Subject: [PATCH 102/142] Pre-/post-build command improvements

* Full bash syntax support for pre-/post-build commands on UNIX systems
* Environment variables for pre-/post-build commands which give the user access to several build process parameters like the sketch, the output directory, serial port, build mode (verify, upload, analyze, ...), board type and workspace path
Addresses #786
---
 src/arduino/arduino.ts | 57 +++++++++++++++++++++++++++++++-----------
 src/common/util.ts     |  8 +++---
 2 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 7d970702..5aa0f253 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -133,8 +133,7 @@ export class ArduinoApp {
     public async setPref(key, value) {
         try {
             await util.spawn(this._settings.commandPath,
-                null,
-                ["--pref", `${key}=${value}`, "--save-prefs"]);
+                             ["--pref", `${key}=${value}`, "--save-prefs"]);
         } catch (ex) {
         }
     }
@@ -331,30 +330,45 @@ export class ArduinoApp {
         arduinoChannel.start(`${buildMode} sketch '${dc.sketch}'`);
 
         if ((buildDir || dc.output) && compile) {
-            const outputPath = path.resolve(ArduinoWorkspace.rootPath, buildDir || dc.output);
-            const dirPath = path.dirname(outputPath);
+            buildDir = path.resolve(ArduinoWorkspace.rootPath, buildDir || dc.output);
+            const dirPath = path.dirname(buildDir);
             if (!util.directoryExistsSync(dirPath)) {
-                logger.notifyUserError("InvalidOutPutPath", new Error(constants.messages.INVALID_OUTPUT_PATH + outputPath));
+                logger.notifyUserError("InvalidOutPutPath", new Error(constants.messages.INVALID_OUTPUT_PATH + buildDir));
                 return false;
             }
 
             if (this.useArduinoCli()) {
-                args.push("--build-path", outputPath);
+                args.push("--build-path", buildDir);
 
             } else {
-                args.push("--pref", `build.path=${outputPath}`);
+                args.push("--pref", `build.path=${buildDir}`);
             }
 
-            arduinoChannel.info(`Please see the build logs in output path: ${outputPath}`);
+            arduinoChannel.info(`Please see the build logs in output path: ${buildDir}`);
         } else {
             const msg = "Output path is not specified. Unable to reuse previously compiled files. Build will be slower. See README.";
             arduinoChannel.warning(msg);
         }
 
+        // Environment variables passed to pre- and post-build commands
+        const env = {
+            VSCA_BUILD_MODE: buildMode,
+            VSCA_SKETCH: dc.sketch,
+            VSCA_BOARD: boardDescriptor,
+            VSCA_WORKSPACE_DIR: ArduinoWorkspace.rootPath,
+            VSCA_LOG_LEVEL: verbose ? constants.LogLevel.Verbose : constants.LogLevel.Info,
+        };
+        if (dc.port) {
+            env["VSCA_SERIAL"] = dc.port;
+        }
+        if (buildDir) {
+            env["VSCA_BUILD_DIR"] = buildDir;
+        }
+
         // TODO EW: What should we do with pre-/post build commands when running
         //   analysis? Some could use it to generate/manipulate code which could
         //   be a prerequisite for a successful build
-        if (!await this.runPrePostBuildCommand(dc, "pre")) {
+        if (!await this.runPrePostBuildCommand(dc, env, "pre")) {
             return false;
         }
 
@@ -370,7 +384,7 @@ export class ArduinoApp {
         const cleanup = async (result: "ok" | "error") => {
             let ret = true;
             if (result === "ok") {
-                ret = await this.runPrePostBuildCommand(dc, "post");
+                ret = await this.runPrePostBuildCommand(dc, env, "post");
             }
             await cocopa.conclude();
             if (buildMode === BuildMode.Upload || buildMode === BuildMode.UploadProgrammer) {
@@ -689,6 +703,7 @@ export class ArduinoApp {
      * @returns True if successful, false on error.
      */
     protected async runPrePostBuildCommand(dc: DeviceContext,
+                                           environment: any,
                                            what: "pre" | "post"): Promise<boolean> {
         const cmdline = what === "pre"
             ? dc.prebuild
@@ -696,14 +711,26 @@ export class ArduinoApp {
 
         if (cmdline) {
             arduinoChannel.info(`Running ${what}-build command: "${cmdline}"`);
-            // TODO 2020-02-27, EW: We could call bash -c "cmd" here at least for
-            //   UNIX systems. Windows users must live with their poor system :)
-            const args = cmdline.split(/\s+/);
-            const cmd = args.shift();
+            let cmd: string;
+            let args: string[];
+            // pre-/post-build commands feature full bash support on UNIX systems.
+            // Windows users must live with their poor system unless someone is
+            // willing to fight with the annoying Windows cmd escaping -- good luck!
+            if (os.platform() === "win32") {
+                args = cmdline.split(/\s+/);
+                cmd = args.shift();
+            } else {
+                args = ["-c", cmdline];
+                cmd = "bash";
+            }
             try {
                 await util.spawn(cmd,
                                  args,
-                                 { shell: true, cwd: ArduinoWorkspace.rootPath },
+                                 {
+                                     shell: os.platform() === "win32",
+                                     cwd: ArduinoWorkspace.rootPath,
+                                     env: {...environment},
+                                 },
                                  { channel: arduinoChannel.channel });
             } catch (ex) {
                 const msg = ex.error
diff --git a/src/common/util.ts b/src/common/util.ts
index 002edcc9..4445d0de 100644
--- a/src/common/util.ts
+++ b/src/common/util.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-import * as childProcess from "child_process";
+import * as child_process from "child_process";
 import * as fs from "fs";
 import * as iconv from "iconv-lite";
 import * as os from "os";
@@ -196,19 +196,19 @@ export function isArduinoFile(filePath): boolean {
 export function spawn(
     command: string,
     args: string[] = [],
-    options: any = {},
+    options: child_process.SpawnOptions = {},
     output?: {channel?: vscode.OutputChannel,
               stdout?: (s: string) => void,
               stderr?: (s: string) => void},
 ): Thenable<object> {
     return new Promise((resolve, reject) => {
         options.cwd = options.cwd || path.resolve(path.join(__dirname, ".."));
-        const child = childProcess.spawn(command, args, options);
+        const child = child_process.spawn(command, args, options);
 
         let codepage = "65001";
         if (os.platform() === "win32") {
             try {
-                const chcp = childProcess.execSync("chcp.com");
+                const chcp = child_process.execSync("chcp.com");
                 codepage = chcp.toString().split(":").pop().trim();
             } catch (error) {
                 arduinoChannel.warning(`Defaulting to code page 850 because chcp.com failed.\

From f85a78347e59d53ab3f944f823842e1dafcf29cd Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Fri, 28 Feb 2020 23:57:08 +0100
Subject: [PATCH 103/142] Full cmd support for pre-/post-build commands on
 Windows Addresses #786

---
 src/arduino/arduino.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 5aa0f253..5f2ed379 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -714,11 +714,10 @@ export class ArduinoApp {
             let cmd: string;
             let args: string[];
             // pre-/post-build commands feature full bash support on UNIX systems.
-            // Windows users must live with their poor system unless someone is
-            // willing to fight with the annoying Windows cmd escaping -- good luck!
+            // On Windows you have full cmd support.
             if (os.platform() === "win32") {
-                args = cmdline.split(/\s+/);
-                cmd = args.shift();
+                args = [];
+                cmd = cmdline;
             } else {
                 args = ["-c", cmdline];
                 cmd = "bash";

From 95f5a181ec43fe829aa49cf1ea3c52ccc6eeb568 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Sat, 29 Feb 2020 00:32:05 +0100
Subject: [PATCH 104/142] Documentation for pre-/post-build commands and their
 environment variables

---
 README.md | 39 +++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 3732f72a..5b24e3b9 100644
--- a/README.md
+++ b/README.md
@@ -101,8 +101,8 @@ The following settings are as per sketch settings of the Arduino extension. You
     "board": "adafruit:samd:adafruit_feather_m0",
     "output": "../build",
     "debugger": "jlink",
-    "prebuild": "bash prebuild.sh",
-    "postbuild": "bash postbuild.sh",
+    "prebuild": "./prebuild.sh",
+    "postbuild": "./postbuild.sh",
     "intelliSenseGen": "global"
 }
 ```
@@ -111,13 +111,44 @@ The following settings are as per sketch settings of the Arduino extension. You
 - `board` - Currently selected Arduino board alias. Can be set by the `Arduino: Change Board Type` command. Also, you can find the board list there.
 - `output` - Arduino build output path. If not set, Arduino will create a new temporary output folder each time, which means it cannot reuse the intermediate result of the previous build leading to long verify/upload time, so it is recommended to set the field. Arduino requires that the output path should not be the workspace itself or in a subfolder of the workspace, otherwise, it may not work correctly. By default, this option is not set. It's worth noting that the contents of this file could be deleted during the build process, so pick (or create) a directory that will not store files you want to keep.
 - `debugger` - The short name of the debugger that will be used when the board itself does not have a debugger and there is more than one debugger available. You can find the list of debuggers [here](https://github.com/Microsoft/vscode-arduino/blob/master/misc/debuggerUsbMapping.json). By default, this option is not set.
-- `prebuild` - External command which will be invoked before any sketch build (verify, upload). You must only set one `prebuild` command. `command1 && command2` does not work. If you need to run multiple commands before the build, then create a script.
-- `postbuild` - External command to be run after the sketch has been built successfully. Same rules as for `prebuild` apply. <!-- TODO: note about cwd would be a good thing -->
+- `prebuild` - External command which will be invoked before any sketch build (verify, upload, ...). For details see the [Pre- and Post-Build Commands](#Pre--and-Post-Build-Commands) section.
+- `postbuild` - External command to be run after the sketch has been built successfully. See the afore mentioned section for more details.
 - `intelliSenseGen` - Override the global setting for auto-generation of the IntelliSense configuration (i.e. `.vscode/c_cpp_properties.json`). Three options are available:
   - `"global"`: Use the global settings (default)
   - `"disable"`: Disable the auto-generation even if globally enabled
   - `"enable"`: Enable the auto-generation even if globally disabled
 
+## Pre- and Post-Build Commands
+On Windows the commands run within a `cmd`-, on Linux and OSX within a `bash`-instance. Therefore your command can be anything what you can run within those shells. Instead of running a command you can invoke a script. This makes writing more complex pre-/post-build mechanisms much easier and opens up the possibility to run python or other scripting languages.
+The commands run within the workspace root directory and vscode-arduino sets the following environment variables:  
+**`VSCA_BUILD_MODE`** The current build mode, one of `Verifying`, `Uploading`, `Uploading (programmer)` or `Analyzing`. This allows you to run your script on certain build modes only.  
+**`VSCA_SKETCH`** The sketch file relative to your workspace root directory.  
+**`VSCA_BOARD`** Your board and configuration, e.g. `arduino:avr:nano:cpu=atmega328`.  
+**`VSCA_WORKSPACE_DIR`** The absolute path of your workspace root directory.  
+**`VSCA_LOG_LEVEL`** The current log level. This allows you to control the verbosity of your scripts.  
+**`VSCA_SERIAL`** The serial port used for uploading. Not set if you haven't set one in your `arduino.json`.  
+**`VSCA_BUILD_DIR`** The build directory. Not set if you haven't set one in your `arduino.json`.  
+
+For example under Windows the following `arduino.json` setup
+```json
+{
+    "board": "arduino:avr:nano",
+    "sketch": "test.ino",
+    "configuration": "cpu=atmega328",
+    "prebuild": "IF \"%VSCA_BUILD_MODE%\"==\"Verifying\" (echo VSCA_BUILD_MODE=%VSCA_BUILD_MODE% && echo VSCA_BOARD=%VSCA_BOARD%)"
+}
+```
+will produce
+```
+[Starting] Verifying sketch 'test.ino'
+Running pre-build command: "IF "%VSCA_BUILD_MODE%"=="Verifying" (echo VSCA_BUILD_MODE=%VSCA_BUILD_MODE% && echo VSCA_BOARD=%VSCA_BOARD%)"
+VSCA_BUILD_MODE=Verifying 
+VSCA_BOARD=arduino:avr:nano:cpu=atmega328
+Loading configuration...
+<...>
+```
+when verifying.
+
 ## IntelliSense
 vscode-arduino auto-configures IntelliSense by default. vscode-arduino analyzes Arduino's compiler output by running a separate build and generates the corresponding configuration file at `.vscode/c_cpp_properties.json`. vscode-arduino tries as hard as possible to keep things up to date, e.g. it runs the analysis when switching the board or the sketch.
 

From 48c4c64fe3de31a0d4b76ee0f07136ee1d1ef2d3 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Sat, 29 Feb 2020 01:04:29 +0100
Subject: [PATCH 105/142] Updated log, status and beers

---
 BRANCHNOTES.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index 49164b0a..923c7367 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -98,6 +98,9 @@ During merging I found some bugs within those functions - mainly due to the abov
 **2020 02 23** Several tests, fixes and improvements within cocopa. `Arduino.h` now added to forced includes. Fixed code which wasn't linted up to now. Added hint to end of build how to rebuild the IntelliSense configuration. Added missing version field to `c_cpp_properties.json`.
 **2020 02 25** Implemented and tested support for `.cpp`-sketches. Done implementing the most relevant unit tests in cocopa. Two independent alpha testers confirm proper working of the previous alpha releases. Updated to the latest revision of cocopa.
 **2020 02 26** Preparing for pull request: Removed all code marked `IS-REMOVE` and dead code which I was able to identify. Reviewed all TODOs and resolved those which can be fixed without having to bother the maintainers. Left the unresolved on grounds of documentation.
+**2020 02 27** Integrated analysis into all builds. Fixed bug in board management (board configuration couldn't be set anymore). Added logging filter for non-verbose builds and uploads to remove spurious messages. Added post-build script support.
+**2020 02 28** Moved some code to cocopa. Cocopa now tries to parse the compiler arguments to set the C++ standard according to the C++ standard set by the individual board package. Better error handling for pre-/post-build commands. Error reporting for exceptions during build cleanup. Full `cmd` and `bash` support within pre-/post-build commands. Environment variables for pre-/post-build commands.
+
 
 ## Status
 |      | Tasks   |
@@ -114,6 +117,7 @@ During merging I found some bugs within those functions - mainly due to the abov
 |                                       | :heavy_check_mark: Merging of parsing result and existing file content |
 |                                       | :heavy_check_mark: Handling inexistent files and folders |
 |                                       | :heavy_check_mark: Write configuration on change only |
+|                                       | :heavy_check_mark: Parse C++ standard from compiler flags |
 | **Configuration flags**               | :heavy_check_mark: Provide global disable flag for IntelliSense auto-config |
 |                                       | :heavy_check_mark: Provide project specific override for the global flag - most users will likely use the default setup and disable auto-generation for very specific projects |
 | **Unit tests**                        | :heavy_check_mark: Basic parser (known boards, match/no match)|
@@ -183,6 +187,8 @@ I will list every supporter here, thanks!
 2020-02-23 Elektronik Workshop: 20 :beers: (5h coding)
 2020-02-25 Elektronik Workshop: 12 :beers: (3h coding)
 2020-02-26 Elektronik Workshop: 16 :beers: (4h coding)
+2020-02-27 Elektronik Workshop: 48 :beers: (12h coding)
+2020-02-28 Elektronik Workshop: 52 :beers: (13h coding)
 
 <!-- https://github.com/StylishThemes/GitHub-Dark/wiki/Emoji -->
 

From f9cd3c5c9c2229bc2ee2b88f8ef8c2b935661c51 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Sat, 29 Feb 2020 07:55:37 +0100
Subject: [PATCH 106/142] Fix too early initialization of cocopa

* Fixed bug with build: initializing cocopa too early (was failing if sketch wasn't initialized)
* More info in error message for uncaught exception during build cleanup
* Note on output path preparation which seems to be a bit wonky
---
 src/arduino/arduino.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 5f2ed379..492bf57d 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -184,7 +184,7 @@ export class ArduinoApp {
             this._building = false;
             logger.notifyUserError("ArduinoApp.build",
                                    reason,
-                                   `Unhandled exception when cleaning up build (${buildMode}).`);
+                                   `Unhandled exception when cleaning up build "${buildMode}": ${JSON.stringify(reason)}`);
             return false;
         });
     }
@@ -203,7 +203,6 @@ export class ArduinoApp {
         const dc = DeviceContext.getInstance();
         const args: string[] = [];
         let restoreSerialMonitor: boolean = false;
-        const cocopa = makeCompilerParserContext(dc);
         const verbose = VscodeSettings.getInstance().logLevel === constants.LogLevel.Verbose;
 
         if (!this.boardManager.currentBoard) {
@@ -330,6 +329,8 @@ export class ArduinoApp {
         arduinoChannel.start(`${buildMode} sketch '${dc.sketch}'`);
 
         if ((buildDir || dc.output) && compile) {
+            // 2020-02-29, EW: This whole code appears a bit wonky to me.
+            //   What if the user specifies an output directory "../builds/my project"
             buildDir = path.resolve(ArduinoWorkspace.rootPath, buildDir || dc.output);
             const dirPath = path.dirname(buildDir);
             if (!util.directoryExistsSync(dirPath)) {
@@ -381,6 +382,9 @@ export class ArduinoApp {
 
         // Push sketch as last argument
         args.push(path.join(ArduinoWorkspace.rootPath, dc.sketch));
+
+        const cocopa = makeCompilerParserContext(dc);
+
         const cleanup = async (result: "ok" | "error") => {
             let ret = true;
             if (result === "ok") {

From 9543ba7ebf842e3c31eb9f7ad596be0c575ce0db Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Sat, 29 Feb 2020 11:24:35 +0100
Subject: [PATCH 107/142] Support for Arduino preferences in `arduino.json`.
 These preferences are applied during any build and can be used to set custom
 compiler flags and defines for instance. Addresses #975

---
 src/arduino/arduino.ts | 10 +++++++++-
 src/deviceContext.ts   |  4 ++++
 src/deviceSettings.ts  | 36 +++++++++++++++++++++++++++++++++++-
 3 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 492bf57d..790dd48d 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -298,7 +298,7 @@ export class ArduinoApp {
             if (this.useArduinoCli()) {
                 args.push("--programmer", programmer)
             } else {
-                args.push("--useprogrammer", "--pref", "programmer=arduino:" + programmer)
+                args.push("--useprogrammer", "--pref", `programmer=arduino:${programmer}`);
             }
 
             args.push("--port", dc.port);
@@ -315,6 +315,14 @@ export class ArduinoApp {
             }
         }
 
+        if (dc.buildPreferences) {
+            for (const pref of dc.buildPreferences) {
+                // Note: BuildPrefSetting makes sure that each preference
+                // value consists of exactly two items (key and value).
+                args.push("--pref", `${pref[0]}=${pref[1]}`);
+            }
+        }
+
         // We always build verbosely but filter the output based on the settings
         args.push("--verbose-build");
         if (verbose) {
diff --git a/src/deviceContext.ts b/src/deviceContext.ts
index f655ed6e..710782f1 100644
--- a/src/deviceContext.ts
+++ b/src/deviceContext.ts
@@ -264,6 +264,10 @@ export class DeviceContext implements IDeviceContext, vscode.Disposable {
         this.saveContext();
     }
 
+    public get buildPreferences() {
+        return this._settings.buildPreferences.value;
+    }
+
     public async initialize() {
         if (ArduinoWorkspace.rootPath && util.fileExistsSync(path.join(ArduinoWorkspace.rootPath, ARDUINO_CONFIG_FILE))) {
             vscode.window.showInformationMessage("Arduino.json already generated.");
diff --git a/src/deviceSettings.ts b/src/deviceSettings.ts
index 65c7a7b6..439c4ee0 100644
--- a/src/deviceSettings.ts
+++ b/src/deviceSettings.ts
@@ -99,6 +99,35 @@ class StrSetting extends Setting<string> {
     }
 }
 
+class BuildPrefSetting extends Setting<string[][]> {
+    public get value() {
+        return super.value;
+    }
+    public set value(value: string[][]) {
+        if (!Array.isArray(value)) {
+            super.value = super.default;
+            return;
+        }
+        if (value.length <= 0) {
+            super.value = super.default;
+            return;
+        }
+        for (const pref of value) {
+            if (!Array.isArray(pref) || pref.length !== 2) {
+                super.value = super.default;
+                return;
+            }
+            for (const i of pref) {
+                if (typeof i !== "string") {
+                    super.value = super.default;
+                    return;
+                }
+            }
+        }
+        super.value = value;
+    }
+}
+
 /**
  * This class encapsulates all device/project specific settings and
  * provides common operations on them.
@@ -114,6 +143,7 @@ export class DeviceSettings {
     public prebuild = new StrSetting();
     public postbuild = new StrSetting();
     public programmer = new StrSetting();
+    public buildPreferences = new  BuildPrefSetting();
 
     /**
      * @returns true if any of the settings values has its modified flag
@@ -129,7 +159,8 @@ export class DeviceSettings {
                this.configuration.modified ||
                this.prebuild.modified ||
                this.postbuild.modified ||
-               this.programmer.modified;
+               this.programmer.modified ||
+               this.buildPreferences.modified;
     }
     /**
      * Clear modified flags of all settings values.
@@ -145,6 +176,7 @@ export class DeviceSettings {
         this.prebuild.commit();
         this.postbuild.commit();
         this.programmer.commit();
+        this.buildPreferences.commit();
     }
     /**
      * Resets all settings values to their default values.
@@ -162,6 +194,7 @@ export class DeviceSettings {
         this.prebuild.reset();
         this.postbuild.reset();
         this.programmer.reset();
+        this.buildPreferences.reset();
         if (commit) {
             this.commit();
         }
@@ -187,6 +220,7 @@ export class DeviceSettings {
             this.prebuild.value = settings.prebuild;
             this.postbuild.value = settings.postbuild;
             this.programmer.value = settings.programmer;
+            this.buildPreferences.value = settings.buildPreferences;
             if (commit) {
                 this.commit();
             }

From 5f32221c20bb48afd86040494e1ca1214371a709 Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Sat, 29 Feb 2020 12:15:17 +0100
Subject: [PATCH 108/142] Add and document buildPreferences setting

* Validator for `buildPreferences`
* Documentation for `buildPreferences`
---
 README.md                  |  8 ++++++++
 misc/arduinoValidator.json | 12 ++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/README.md b/README.md
index 5b24e3b9..3a66c244 100644
--- a/README.md
+++ b/README.md
@@ -117,6 +117,14 @@ The following settings are as per sketch settings of the Arduino extension. You
   - `"global"`: Use the global settings (default)
   - `"disable"`: Disable the auto-generation even if globally enabled
   - `"enable"`: Enable the auto-generation even if globally disabled
+- `buildPreferences` - Set Arduino preferences which then are used during any build (verify, upload, ...). This allows for extra defines, compiler options or includes. The preference key-value pairs must be set as follows:
+```json
+    "buildPreferences": [
+        ["build.extra_flags", "-DMY_DEFINE=666 -DANOTHER_DEFINE=3.14 -Wall"],
+        ["compiler.cpp.extra_flags", "-DYET_ANOTER=\"hello\""]
+    ]
+}
+```
 
 ## Pre- and Post-Build Commands
 On Windows the commands run within a `cmd`-, on Linux and OSX within a `bash`-instance. Therefore your command can be anything what you can run within those shells. Instead of running a command you can invoke a script. This makes writing more complex pre-/post-build mechanisms much easier and opens up the possibility to run python or other scripting languages.
diff --git a/misc/arduinoValidator.json b/misc/arduinoValidator.json
index 97f41cac..5386fc4f 100644
--- a/misc/arduinoValidator.json
+++ b/misc/arduinoValidator.json
@@ -52,6 +52,18 @@
             "description": "Command to be run after every build",
             "type": "string",
             "minLength": 1
+        },
+        "buildPreferences": {
+            "description": "Arduino preferences which are passed to the Arduino back-end during build",
+            "type": "array",
+            "items": {
+                "type":"array",
+                "minItems": 2,
+                "maxItems": 2,
+                "items": {
+                    "type": "string"
+                }
+            }
         }
     }
 }

From 8a491ed6ddd1df40ce66f8029f53088bde448bcc Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Sat, 29 Feb 2020 13:50:28 +0100
Subject: [PATCH 109/142] Fixed security issue

* Web-server for library-, board-manager etc. was not listening on localhost but on the machine's main interface
* Web-server wasn't launched asynchronously what can cause problems
* Port was stored redundantly in webserver class
Addresses #966
---
 src/arduino/arduinoContentProvider.ts |  9 +++------
 src/arduino/localWebServer.ts         | 29 +++++++++++++++++++--------
 src/extension.ts                      |  4 +++-
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/arduino/arduinoContentProvider.ts b/src/arduino/arduinoContentProvider.ts
index 76a132e3..e3dcce7f 100644
--- a/src/arduino/arduinoContentProvider.ts
+++ b/src/arduino/arduinoContentProvider.ts
@@ -16,12 +16,9 @@ export class ArduinoContentProvider implements vscode.TextDocumentContentProvide
     private _webserver: LocalWebServer;
     private _onDidChange = new vscode.EventEmitter<vscode.Uri>();
 
-    constructor(
-        private _extensionPath: string) {
-        this.initialize();
-    }
+    constructor(private _extensionPath: string) { }
 
-    public initialize() {
+    public async initialize() {
         this._webserver = new LocalWebServer(this._extensionPath);
         // Arduino Boards Manager
         this.addHandlerWithLogger("show-boardmanager", "/boardmanager", (req, res) => this.getHtmlView(req, res));
@@ -50,7 +47,7 @@ export class ArduinoContentProvider implements vscode.TextDocumentContentProvide
         this.addHandlerWithLogger("load-examples", "/api/examples", async (req, res) => await this.getExamples(req, res));
         this.addHandlerWithLogger("open-example", "/api/openexample", (req, res) => this.openExample(req, res), true);
 
-        this._webserver.start();
+        await this._webserver.start();
     }
 
     public async provideTextDocumentContent(uri: vscode.Uri): Promise<string> {
diff --git a/src/arduino/localWebServer.ts b/src/arduino/localWebServer.ts
index 3d1f316c..8266abd5 100644
--- a/src/arduino/localWebServer.ts
+++ b/src/arduino/localWebServer.ts
@@ -9,7 +9,6 @@ import * as path from "path";
 export default class LocalWebServer {
     private app = express();
     private server;
-    private _serverPort: string;
 
     constructor(private _extensionPath: string) {
         this.app.use("/", express.static(path.join(this._extensionPath, "./out/views")));
@@ -18,10 +17,10 @@ export default class LocalWebServer {
     }
 
     public getServerUrl(): string {
-        return `http://localhost:${this._serverPort}`;
+        return `http://localhost:${this.server.address().port}`;
     }
     public getEndpointUri(type: string): string {
-        return `http://localhost:${this._serverPort}/${type}`;
+        return `http://localhost:${this.server.address().port}/${type}`;
     }
 
     public addHandler(url: string, handler: (req, res) => void): void {
@@ -32,10 +31,24 @@ export default class LocalWebServer {
         this.app.post(url, handler);
     }
 
-    public start(): void {
-        const port = this.server.listen(0).address().port;
-        // tslint:disable-next-line
-        console.log(`Starting express server on port: ${port}`);
-        this._serverPort = port;
+    /**
+     * Start webserver.
+     * If it fails to listen reject will report its error.
+     */
+    public async start() {
+        return new Promise<void>((resolve, reject) => {
+            // Address and port are available as soon as the server
+            // started listening, resolving localhost requires
+            // some time.
+            this.server.listen(0, "localhost", (error) => {
+                if (error) {
+                    reject(error);
+                    return;
+                }
+                // tslint:disable-next-line
+                console.log(`Express server listening on port: ${this.server.address().port}`);
+                resolve();
+            });
+        });
     }
 }
diff --git a/src/extension.ts b/src/extension.ts
index 70a78a5e..77c81b94 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -333,8 +333,10 @@ export async function activate(context: vscode.ExtensionContext) {
     }
     Logger.traceUserData("end-activate-extension", { correlationId: activeGuid });
 
-    setTimeout(() => {
+    setTimeout(async () => {
         const arduinoManagerProvider = new arduinoContentProviderModule.ArduinoContentProvider(context.extensionPath);
+        await arduinoManagerProvider.initialize();
+
         context.subscriptions.push(vscode.workspace.registerTextDocumentContentProvider(ARDUINO_MANAGER_PROTOCOL, arduinoManagerProvider));
         registerArduinoCommand("arduino.showBoardManager", async () => {
             const panel = vscode.window.createWebviewPanel("arduinoBoardManager", "Arduino Board Manager", vscode.ViewColumn.Two, {

From c2ab5775e39154cd84051d7dddf50c2c1f4f09cd Mon Sep 17 00:00:00 2001
From: Uli Franke <hoi@elektronikworkshop.ch>
Date: Sat, 29 Feb 2020 14:39:38 +0100
Subject: [PATCH 110/142] Updated log, additional stuff and beers

---
 BRANCHNOTES.md | 51 ++++++++++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
index 923c7367..b49125f6 100644
--- a/BRANCHNOTES.md
+++ b/BRANCHNOTES.md
@@ -100,7 +100,7 @@ During merging I found some bugs within those functions - mainly due to the abov
 **2020 02 26** Preparing for pull request: Removed all code marked `IS-REMOVE` and dead code which I was able to identify. Reviewed all TODOs and resolved those which can be fixed without having to bother the maintainers. Left the unresolved on grounds of documentation.
 **2020 02 27** Integrated analysis into all builds. Fixed bug in board management (board configuration couldn't be set anymore). Added logging filter for non-verbose builds and uploads to remove spurious messages. Added post-build script support.
 **2020 02 28** Moved some code to cocopa. Cocopa now tries to parse the compiler arguments to set the C++ standard according to the C++ standard set by the individual board package. Better error handling for pre-/post-build commands. Error reporting for exceptions during build cleanup. Full `cmd` and `bash` support within pre-/post-build commands. Environment variables for pre-/post-build commands.
-
+**2020 02 29** Added support for Arduino preferences within `arduino.json`. Fixed bug which surfaced when no sketch was set. Fixed security issue reported by Mathieu.
 
 ## Status
 |      | Tasks   |
@@ -147,6 +147,10 @@ During merging I found some bugs within those functions - mainly due to the abov
 
 ## Additional Stuff this Branch addresses
 * Support for `postbuild` commands, see [#786](https://github.com/microsoft/vscode-arduino/issues/786)
+  * Full `cmd` and `bash` syntax support for pre-/post-build commands
+  * Environment variables for pre-/post-build commands
+* Support for Arduino preferences to be set during build, see [#975](https://github.com/microsoft/vscode-arduino/issues/975#issuecomment-592931155)
+* Fixed security issue [#966](https://github.com/microsoft/vscode-arduino/issues/966): Web-server was listening on machine's main interface (0.0.0.0) instead of `localhost`.
 
 ## Motivation
 I write a lot of code for Arduino, especially libraries. The Arduino IDE is not suited for more complex projects and I tried several alternatives:
@@ -167,28 +171,30 @@ I will list every supporter here, thanks!
 ### Supporters
 5$ -> 1 :beer:
 1h coding -> 20$ -> 4 :beers: (very moderate wage though)
-2020-02-04 Elektronik Workshop: 32 :beers: (8h coding)
-2020-02-05 Elektronik Workshop: 40 :beers: (10h coding)
-2020-02-06 Elektronik Workshop: 36 :beers: (9h coding)
-2020-02-07 Elektronik Workshop: 48 :beers: (12h coding)
-2020-02-08 Elektronik Workshop: 52 :beers: (13h coding)
-2020-02-09 Elektronik Workshop: 40 :beers: (10h coding)
-2020-02-10 Elektronik Workshop: 32 :beers: (8h coding)
-2020-02-11 Elektronik Workshop: 16 :beers: (4h coding)
-2020-02-12 Elektronik Workshop: 32 :beers: (8h coding)
+2020-02-04 EW: 32 :beers: (8h coding)
+2020-02-05 EW: 40 :beers: (10h coding)
+2020-02-06 EW: 36 :beers: (9h coding)
+2020-02-07 EW: 48 :beers: (12h coding)
+2020-02-08 EW: 52 :beers: (13h coding)
+2020-02-09 EW: 40 :beers: (10h coding)
+2020-02-10 EW: 32 :beers: (8h coding)
+2020-02-11 EW: 16 :beers: (4h coding)
+2020-02-12 EW: 32 :beers: (8h coding)
 2020-02-15 T.D.: 4 :beers: (20$ - Thanks a lot!)
-2020-02-15 Elektronik Workshop: 28 :beers: (7h coding)
-2020-02-17 Elektronik Workshop: 52 :beers: (13h coding)
-2020-02-18 Elektronik Workshop: 36 :beers: (9h coding)
-2020-02-19 Elektronik Workshop: 48 :beers: (12h coding)
-2020-02-20 Elektronik Workshop: 56 :beers: (14h coding)
-2020-02-21 Elektronik Workshop: 48 :beers: (12h coding)
-2020-02-22 Elektronik Workshop: 44 :beers: (11h coding)
-2020-02-23 Elektronik Workshop: 20 :beers: (5h coding)
-2020-02-25 Elektronik Workshop: 12 :beers: (3h coding)
-2020-02-26 Elektronik Workshop: 16 :beers: (4h coding)
-2020-02-27 Elektronik Workshop: 48 :beers: (12h coding)
-2020-02-28 Elektronik Workshop: 52 :beers: (13h coding)
+2020-02-15 EW: 28 :beers: (7h coding)
+2020-02-17 EW: 52 :beers: (13h coding)
+2020-02-18 EW: 36 :beers: (9h coding)
+2020-02-19 EW: 48 :beers: (12h coding)
+2020-02-20 EW: 56 :beers: (14h coding)
+2020-02-21 EW: 48 :beers: (12h coding)
+2020-02-22 EW: 44 :beers: (11h coding)
+2020-02-23 EW: 20 :beers: (5h coding)
+2020-02-25 EW: 12 :beers: (3h coding)
+2020-02-26 EW: 16 :beers: (4h coding)
+2020-02-27 EW: 48 :beers: (12h coding)
+2020-02-28 EW: 52 :beers: (13h coding)
+2020-02-29 EW: 28 :beers: (7h coding)
+<!-- 7:00 - 14:00 -->
 
 <!-- https://github.com/StylishThemes/GitHub-Dark/wiki/Emoji -->
 
@@ -245,6 +251,7 @@ I will list every supporter here, thanks!
   * Build/Arduino Backend
   * Include paths
   * Relation of IntelliSense and build
+
 ## Non-categorized Notes
 ### Integrate upstream changes into fork
 ```bash

From a6512a4c2e431dc3cea9d47b89dc8a7ef98f6df5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Mon, 4 Jan 2021 21:48:51 +0100
Subject: [PATCH 111/142] Move the _build to the end and make private

---
 src/arduino/arduino.ts | 966 ++++++++++++++++++++---------------------
 1 file changed, 481 insertions(+), 485 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 790dd48d..a1880ba3 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -189,580 +189,576 @@ export class ArduinoApp {
         });
     }
 
-// Not moving _build around in the file (yet?) because it would create too much merge/rebase problems.
-/* tslint:disable:member-ordering */
-
-    /**
-     * Private implementation. Not to be called directly. The wrapper build()
-     * manages the build state.
-     * @param buildMode See build()
-     * @param buildDir See build()
-     * @see https://github.com/arduino/Arduino/blob/master/build/shared/manpage.adoc
-     */
-    public async _build(buildMode: BuildMode, compile: boolean, buildDir?: string): Promise<boolean> {
-        const dc = DeviceContext.getInstance();
-        const args: string[] = [];
-        let restoreSerialMonitor: boolean = false;
-        const verbose = VscodeSettings.getInstance().logLevel === constants.LogLevel.Verbose;
-
-        if (!this.boardManager.currentBoard) {
-            if (buildMode !== BuildMode.Analyze) {
-                logger.notifyUserError("boardManager.currentBoard", new Error(constants.messages.NO_BOARD_SELECTED));
-            }
-            return false;
-        }
-        const boardDescriptor = this.boardManager.currentBoard.getBuildConfig();
-
-        if (!this.useArduinoCli()) {
-            args.push("--board", boardDescriptor);
-        }
-
+    // Include the *.h header files from selected library to the arduino sketch.
+    public async includeLibrary(libraryPath: string) {
         if (!ArduinoWorkspace.rootPath) {
-            vscode.window.showWarningMessage("Workspace doesn't seem to have a folder added to it yet.");
-            return false;
+            return;
         }
+        const dc = DeviceContext.getInstance();
+        const appPath = path.join(ArduinoWorkspace.rootPath, dc.sketch);
+        if (util.fileExistsSync(appPath)) {
+            const hFiles = glob.sync(`${libraryPath}/*.h`, {
+                nodir: true,
+                matchBase: true,
+            });
+            const hIncludes = hFiles.map((hFile) => {
+                return `#include <${path.basename(hFile)}>`;
+            }).join(os.EOL);
 
-        if (!dc.sketch || !util.fileExistsSync(path.join(ArduinoWorkspace.rootPath, dc.sketch))) {
-            if (buildMode === BuildMode.Analyze) {
-                // Analyze runs non interactively
-                return false;
-            }
-            if (!await dc.resolveMainSketch()) {
-                vscode.window.showErrorMessage("No sketch file was found. Please specify the sketch in the arduino.json file");
-                return false;
+            // Open the sketch and bring up it to current visible view.
+            const textDocument = await vscode.workspace.openTextDocument(appPath);
+            await vscode.window.showTextDocument(textDocument, vscode.ViewColumn.One, true);
+            const activeEditor = vscode.window.visibleTextEditors.find((textEditor) => {
+                return path.resolve(textEditor.document.fileName) === path.resolve(appPath);
+            });
+            if (activeEditor) {
+                // Insert *.h at the beginning of the sketch code.
+                await activeEditor.edit((editBuilder) => {
+                    editBuilder.insert(new vscode.Position(0, 0), `${hIncludes}${os.EOL}${os.EOL}`);
+                });
             }
         }
+    }
 
-        const selectSerial = async () => {
-            const choice = await vscode.window.showInformationMessage(
-                "Serial port is not specified. Do you want to select a serial port for uploading?",
-                "Yes", "No");
-            if (choice === "Yes") {
-                vscode.commands.executeCommand("arduino.selectSerialPort");
+     /**
+      * Installs arduino board package.
+      * (If using the aduino CLI this installs the corrosponding core.)
+      * @param {string} packageName - board vendor
+      * @param {string} arch - board architecture
+      * @param {string} version - version of board package or core to download
+      * @param {boolean} [showOutput=true] - show raw output from command
+      */
+    public async installBoard(packageName: string, arch: string = "", version: string = "", showOutput: boolean = true) {
+        arduinoChannel.show();
+        const updatingIndex = packageName === "dummy" && !arch && !version;
+        if (updatingIndex) {
+            arduinoChannel.start(`Update package index files...`);
+        } else {
+            try {
+                const packagePath = path.join(this._settings.packagePath, "packages", packageName, arch);
+                if (util.directoryExistsSync(packagePath)) {
+                    util.rmdirRecursivelySync(packagePath);
+                }
+                arduinoChannel.start(`Install package - ${packageName}...`);
+            } catch (error) {
+                arduinoChannel.start(`Install package - ${packageName} failed under directory : ${error.path}${os.EOL}
+                                      Please make sure the folder is not occupied by other procedures .`);
+                arduinoChannel.error(`Error message - ${error.message}${os.EOL}`);
+                arduinoChannel.error(`Exit with code=${error.code}${os.EOL}`);
+                return;
             }
         }
-
-        if (buildMode === BuildMode.Upload) {
-            if ((!dc.configuration || !/upload_method=[^=,]*st[^,]*link/i.test(dc.configuration)) && !dc.port) {
-                await selectSerial();
-                return false;
-            }
-
-            if (!compile && !this.useArduinoCli()) {
-                arduinoChannel.error("This command is only available when using the Arduino CLI");
-                return false;
+        arduinoChannel.info(`${packageName}${arch && ":" + arch}${version && ":" + version}`);
+        try {
+            if (this.useArduinoCli()) {
+                await util.spawn(this._settings.commandPath,
+                    ["core", "install", `${packageName}${arch && ":" + arch}${version && "@" + version}`],
+                    undefined,
+                    { channel: showOutput ? arduinoChannel.channel : null });
+            } else {
+                await util.spawn(this._settings.commandPath,
+                    ["--install-boards", `${packageName}${arch && ":" + arch}${version && ":" + version}`],
+                    undefined,
+                    { channel: showOutput ? arduinoChannel.channel : null });
             }
-
-            if (!this.useArduinoCli()) {
-                args.push("--upload");
+            if (updatingIndex) {
+                arduinoChannel.end("Updated package index files.");
             } else {
-                // TODO: add the --clean argument to the cli args when v 0.14 is released (this will clean up the build folder after uploading)
-                if (compile) {
-                    args.push("compile", "--upload");
+                arduinoChannel.end(`Installed board package - ${packageName}${os.EOL}`);
+            }
+        } catch (error) {
+            // If a platform with the same version is already installed, nothing is installed and program exits with exit code 1
+            if (error.code === 1) {
+                if (updatingIndex) {
+                    arduinoChannel.end("Updated package index files.");
                 } else {
-                    args.push("upload");
+                    arduinoChannel.end(`Installed board package - ${packageName}${os.EOL}`);
                 }
-                args.push("-b", boardDescriptor);
+            } else {
+                arduinoChannel.error(`Exit with code=${error.code}${os.EOL}`);
             }
+        }
+    }
 
-            if (dc.port) {
-                args.push("--port", dc.port);
-            }
-        } else if (buildMode === BuildMode.UploadProgrammer) {
-            const programmer = this.programmerManager.currentProgrammer;
-            if (!programmer) {
-                logger.notifyUserError("programmerManager.currentProgrammer", new Error(constants.messages.NO_PROGRAMMMER_SELECTED));
-                return false;
-            }
-            if (!dc.port) {
-                await selectSerial();
-                return false;
-            }
-            if (!compile && !this.useArduinoCli()) {
-                arduinoChannel.error("This command is only available when using the Arduino CLI");
-                return false;
-            }
+    public uninstallBoard(boardName: string, packagePath: string) {
+        arduinoChannel.start(`Uninstall board package - ${boardName}...`);
+        util.rmdirRecursivelySync(packagePath);
+        arduinoChannel.end(`Uninstalled board package - ${boardName}${os.EOL}`);
+    }
 
-            if (!this.useArduinoCli()) {
-                args.push("--upload");
-            } else {
-                // TODO: add the --clean argument to the cli args when v 0.14 is released (this will clean up the build folder after uploading)
-                if (compile) {
-                    args.push("compile", "--upload");
-                } else {
-                    args.push("upload");
-                }
-                args.push("-b", boardDescriptor);
-            }
+    /**
+     * Downloads or updates a library
+     * @param {string} libName - name of the library to download
+     * @param {string} version - version of library to download
+     * @param {boolean} [showOutput=true] - show raw output from command
+     */
 
+    public async installLibrary(libName: string, version: string = "", showOutput: boolean = true) {
+        arduinoChannel.show();
+        const updatingIndex = (libName === "dummy" && !version);
+        if (updatingIndex) {
+            arduinoChannel.start("Update library index files...");
+        } else {
+            arduinoChannel.start(`Install library - ${libName}`);
+        }
+        try {
             if (this.useArduinoCli()) {
-                args.push("--programmer", programmer)
+                await  util.spawn(this._settings.commandPath,
+                    ["lib", "install", `${libName}${version && "@" + version}`],
+                    undefined,
+                    { channel: showOutput ? arduinoChannel.channel : undefined });
             } else {
-                args.push("--useprogrammer", "--pref", `programmer=arduino:${programmer}`);
+                await util.spawn(this._settings.commandPath,
+                    ["--install-library", `${libName}${version && ":" + version}`],
+                    undefined,
+                    { channel: showOutput ? arduinoChannel.channel : undefined });
             }
-
-            args.push("--port", dc.port);
-            if (!this.useArduinoCli()) {
-                args.push("--verify");
+            if (updatingIndex) {
+                arduinoChannel.end("Updated library index files.");
             } else {
-                args.push("compile", "-b", boardDescriptor);
+                arduinoChannel.end(`Installed library - ${libName}${os.EOL}`);
             }
-        } else {
-            if (!this.useArduinoCli()) {
-                args.push("--verify");
+        } catch (error) {
+            // If a library with the same version is already installed, nothing is installed and program exits with exit code 1
+            if (error.code === 1) {
+                if (updatingIndex) {
+                    arduinoChannel.end("Updated library index files.");
+                } else {
+                    arduinoChannel.end(`Installed library - ${libName}${os.EOL}`);
+                }
             } else {
-                args.push("compile", "-b", boardDescriptor);
+                arduinoChannel.error(`Exit with code=${error.code}${os.EOL}`);
             }
         }
+    }
 
-        if (dc.buildPreferences) {
-            for (const pref of dc.buildPreferences) {
-                // Note: BuildPrefSetting makes sure that each preference
-                // value consists of exactly two items (key and value).
-                args.push("--pref", `${pref[0]}=${pref[1]}`);
+    public uninstallLibrary(libName: string, libPath: string) {
+        arduinoChannel.start(`Remove library - ${libName}`);
+        util.rmdirRecursivelySync(libPath);
+        arduinoChannel.end(`Removed library - ${libName}${os.EOL}`);
+    }
+
+    public openExample(example) {
+        function tmpName(name) {
+            let counter = 0;
+            let candidateName = name;
+            while (true) {
+                if (!util.fileExistsSync(candidateName) && !util.directoryExistsSync(candidateName)) {
+                    return candidateName;
+                }
+                counter++;
+                candidateName = `${name}_${counter}`;
             }
         }
 
-        // We always build verbosely but filter the output based on the settings
-        args.push("--verbose-build");
-        if (verbose) {
-            args.push("--verbose-upload");
+        // Step 1: Copy the example project to a temporary directory.
+        const sketchPath = path.join(this._settings.sketchbookPath, "generated_examples");
+        if (!util.directoryExistsSync(sketchPath)) {
+            util.mkdirRecursivelySync(sketchPath);
         }
-
-        await vscode.workspace.saveAll(false);
-
-        // we prepare the channel here since all following code will
-        // or at leas can possibly output to it
-        arduinoChannel.show();
-        arduinoChannel.start(`${buildMode} sketch '${dc.sketch}'`);
-
-        if ((buildDir || dc.output) && compile) {
-            // 2020-02-29, EW: This whole code appears a bit wonky to me.
-            //   What if the user specifies an output directory "../builds/my project"
-            buildDir = path.resolve(ArduinoWorkspace.rootPath, buildDir || dc.output);
-            const dirPath = path.dirname(buildDir);
-            if (!util.directoryExistsSync(dirPath)) {
-                logger.notifyUserError("InvalidOutPutPath", new Error(constants.messages.INVALID_OUTPUT_PATH + buildDir));
-                return false;
+        let destExample = "";
+        if (util.directoryExistsSync(example)) {
+            destExample = tmpName(path.join(sketchPath, path.basename(example)));
+            util.cp(example, destExample);
+        } else if (util.fileExistsSync(example)) {
+            const exampleName = path.basename(example, path.extname(example));
+            destExample = tmpName(path.join(sketchPath, exampleName));
+            util.mkdirRecursivelySync(destExample);
+            util.cp(example, path.join(destExample, path.basename(example)));
+        }
+        if (destExample) {
+            // Step 2: Scaffold the example project to an arduino project.
+            const items = fs.readdirSync(destExample);
+            const sketchFile = items.find((item) => {
+                return util.isArduinoFile(path.join(destExample, item));
+            });
+            if (sketchFile) {
+                // Generate arduino.json
+                const dc = DeviceContext.getInstance();
+                const arduinoJson = {
+                    sketch: sketchFile,
+                    // TODO EW, 2020-02-18: COM1 is Windows specific - what about OSX and Linux users?
+                    port: dc.port || "COM1",
+                    board: dc.board,
+                    configuration: dc.configuration,
+                };
+                const arduinoConfigFilePath = path.join(destExample, constants.ARDUINO_CONFIG_FILE);
+                util.mkdirRecursivelySync(path.dirname(arduinoConfigFilePath));
+                fs.writeFileSync(arduinoConfigFilePath, JSON.stringify(arduinoJson, null, 4));
             }
 
-            if (this.useArduinoCli()) {
-                args.push("--build-path", buildDir);
+            // Step 3: Open the arduino project at a new vscode window.
+            vscode.commands.executeCommand("vscode.openFolder", vscode.Uri.file(destExample), true);
+        }
+        return destExample;
+    }
 
-            } else {
-                args.push("--pref", `build.path=${buildDir}`);
-            }
+    public get settings() {
+        return this._settings;
+    }
 
-            arduinoChannel.info(`Please see the build logs in output path: ${buildDir}`);
-        } else {
-            const msg = "Output path is not specified. Unable to reuse previously compiled files. Build will be slower. See README.";
-            arduinoChannel.warning(msg);
-        }
+    public get boardManager() {
+        return this._boardManager;
+    }
 
-        // Environment variables passed to pre- and post-build commands
-        const env = {
-            VSCA_BUILD_MODE: buildMode,
-            VSCA_SKETCH: dc.sketch,
-            VSCA_BOARD: boardDescriptor,
-            VSCA_WORKSPACE_DIR: ArduinoWorkspace.rootPath,
-            VSCA_LOG_LEVEL: verbose ? constants.LogLevel.Verbose : constants.LogLevel.Info,
-        };
-        if (dc.port) {
-            env["VSCA_SERIAL"] = dc.port;
-        }
-        if (buildDir) {
-            env["VSCA_BUILD_DIR"] = buildDir;
-        }
+    public set boardManager(value: BoardManager) {
+        this._boardManager = value;
+    }
 
-        // TODO EW: What should we do with pre-/post build commands when running
-        //   analysis? Some could use it to generate/manipulate code which could
-        //   be a prerequisite for a successful build
-        if (!await this.runPrePostBuildCommand(dc, env, "pre")) {
-            return false;
-        }
+    public get libraryManager() {
+        return this._libraryManager;
+    }
 
-        // stop serial monitor when everything is prepared and good
-        // what makes restoring of its previous state easier
-        if (buildMode === BuildMode.Upload || buildMode === BuildMode.UploadProgrammer) {
-            restoreSerialMonitor = await SerialMonitor.getInstance().closeSerialMonitor(dc.port);
-            UsbDetector.getInstance().pauseListening();
-        }
+    public set libraryManager(value: LibraryManager) {
+        this._libraryManager = value;
+    }
 
-        // Push sketch as last argument
-        args.push(path.join(ArduinoWorkspace.rootPath, dc.sketch));
+    public get exampleManager() {
+        return this._exampleManager;
+    }
 
-        const cocopa = makeCompilerParserContext(dc);
+    public set exampleManager(value: ExampleManager) {
+        this._exampleManager = value;
+    }
 
-        const cleanup = async (result: "ok" | "error") => {
-            let ret = true;
-            if (result === "ok") {
-                ret = await this.runPrePostBuildCommand(dc, env, "post");
-            }
-            await cocopa.conclude();
-            if (buildMode === BuildMode.Upload || buildMode === BuildMode.UploadProgrammer) {
-                UsbDetector.getInstance().resumeListening();
-                if (restoreSerialMonitor) {
-                    await SerialMonitor.getInstance().openSerialMonitor();
-                }
-            }
-            return ret;
-        }
-        const stdoutcb = (line: string) => {
-            if (cocopa.callback) {
-                cocopa.callback(line);
-            }
-            if (verbose) {
-                arduinoChannel.channel.append(line);
-            }
-        }
-        const stderrcb = (line: string) => {
+    public get programmerManager() {
+        return this._programmerManager;
+    }
+
+    public set programmerManager(value: ProgrammerManager) {
+        this._programmerManager = value;
+    }
+
+    /**
+     * Runs the pre or post build command.
+     * Usually before one of
+     *  * verify
+     *  * upload
+     *  * upload using programmer
+     * @param dc Device context prepared during one of the above actions
+     * @param what "pre" if the pre-build command should be run, "post" if the
+     * post-build command should be run.
+     * @returns True if successful, false on error.
+     */
+    protected async runPrePostBuildCommand(dc: DeviceContext,
+                                           environment: any,
+                                           what: "pre" | "post"): Promise<boolean> {
+        const cmdline = what === "pre"
+            ? dc.prebuild
+            : dc.postbuild;
+
+        if (cmdline) {
+            arduinoChannel.info(`Running ${what}-build command: "${cmdline}"`);
+            let cmd: string;
+            let args: string[];
+            // pre-/post-build commands feature full bash support on UNIX systems.
+            // On Windows you have full cmd support.
             if (os.platform() === "win32") {
-                line = line.trim();
-                if (line.length <= 0) {
-                    return;
-                }
-                line = line.replace(/(?:\r|\r\n|\n)+/g, os.EOL);
-                line = `${line}${os.EOL}`;
+                args = [];
+                cmd = cmdline;
+            } else {
+                args = ["-c", cmdline];
+                cmd = "bash";
             }
-            if (!verbose) {
-                // Don't spill log with spurious info from the backend. This
-                // list could be fetched from a config file to accommodate
-                // messages of unknown board packages, newer backend revisions
-                const filters = [
-                    /^Picked\sup\sJAVA_TOOL_OPTIONS:\s+/,
-                    /^\d+\d+-\d+-\d+T\d+:\d+:\d+.\d+Z\s(?:INFO|WARN)\s/,
-                    /^(?:DEBUG|TRACE|INFO)\s+/,
-                ];
-                for (const f of filters) {
-                    if (line.match(f)) {
-                        return;
-                    }
-                }
+            try {
+                await util.spawn(cmd,
+                                 args,
+                                 {
+                                     shell: os.platform() === "win32",
+                                     cwd: ArduinoWorkspace.rootPath,
+                                     env: {...environment},
+                                 },
+                                 { channel: arduinoChannel.channel });
+            } catch (ex) {
+                const msg = ex.error
+                    ? `${ex.error}`
+                    : ex.code
+                        ? `Exit code = ${ex.code}`
+                        : JSON.stringify(ex);
+                arduinoChannel.error(`Running ${what}-build command failed: ${os.EOL}${msg}`);
+                return false;
             }
-            arduinoChannel.channel.append(line);
         }
+        return true;
+    }
 
-        return await util.spawn(
-            this._settings.commandPath,
-            args,
-            undefined,
-            { stdout: stdoutcb, stderr: stderrcb },
-        ).then(async () => {
-            const ret = await cleanup("ok");
-            if (ret) {
-                arduinoChannel.end(`${buildMode} sketch '${dc.sketch}'${os.EOL}`);
+    /**
+     * Checks if the arduino cli is being used
+     * @returns {bool} - true if arduino cli is being use
+     */
+    private useArduinoCli() {
+        return this._settings.useArduinoCli;
+        // return VscodeSettings.getInstance().useArduinoCli;
+    }
+
+    /**
+     * Private implementation. Not to be called directly. The wrapper build()
+     * manages the build state.
+     * @param buildMode See build()
+     * @param buildDir See build()
+     * @see https://github.com/arduino/Arduino/blob/master/build/shared/manpage.adoc
+     */
+    private async _build(buildMode: BuildMode, compile: boolean, buildDir?: string): Promise<boolean> {
+        const dc = DeviceContext.getInstance();
+        const args: string[] = [];
+        let restoreSerialMonitor: boolean = false;
+        const verbose = VscodeSettings.getInstance().logLevel === constants.LogLevel.Verbose;
+
+        if (!this.boardManager.currentBoard) {
+            if (buildMode !== BuildMode.Analyze) {
+                logger.notifyUserError("boardManager.currentBoard", new Error(constants.messages.NO_BOARD_SELECTED));
             }
-            return ret;
-        }, async (reason) => {
-            await cleanup("error");
-            const msg = reason.code
-                ? `Exit with code=${reason.code}`
-                : JSON.stringify(reason);
-            arduinoChannel.error(`${buildMode} sketch '${dc.sketch}': ${msg}${os.EOL}`);
             return false;
-        });
-    }
+        }
+        const boardDescriptor = this.boardManager.currentBoard.getBuildConfig();
+
+        if (!this.useArduinoCli()) {
+            args.push("--board", boardDescriptor);
+        }
 
-    // Include the *.h header files from selected library to the arduino sketch.
-    public async includeLibrary(libraryPath: string) {
         if (!ArduinoWorkspace.rootPath) {
-            return;
+            vscode.window.showWarningMessage("Workspace doesn't seem to have a folder added to it yet.");
+            return false;
         }
-        const dc = DeviceContext.getInstance();
-        const appPath = path.join(ArduinoWorkspace.rootPath, dc.sketch);
-        if (util.fileExistsSync(appPath)) {
-            const hFiles = glob.sync(`${libraryPath}/*.h`, {
-                nodir: true,
-                matchBase: true,
-            });
-            const hIncludes = hFiles.map((hFile) => {
-                return `#include <${path.basename(hFile)}>`;
-            }).join(os.EOL);
 
-            // Open the sketch and bring up it to current visible view.
-            const textDocument = await vscode.workspace.openTextDocument(appPath);
-            await vscode.window.showTextDocument(textDocument, vscode.ViewColumn.One, true);
-            const activeEditor = vscode.window.visibleTextEditors.find((textEditor) => {
-                return path.resolve(textEditor.document.fileName) === path.resolve(appPath);
-            });
-            if (activeEditor) {
-                // Insert *.h at the beginning of the sketch code.
-                await activeEditor.edit((editBuilder) => {
-                    editBuilder.insert(new vscode.Position(0, 0), `${hIncludes}${os.EOL}${os.EOL}`);
-                });
+        if (!dc.sketch || !util.fileExistsSync(path.join(ArduinoWorkspace.rootPath, dc.sketch))) {
+            if (buildMode === BuildMode.Analyze) {
+                // Analyze runs non interactively
+                return false;
+            }
+            if (!await dc.resolveMainSketch()) {
+                vscode.window.showErrorMessage("No sketch file was found. Please specify the sketch in the arduino.json file");
+                return false;
             }
         }
-    }
 
-     /**
-      * Installs arduino board package.
-      * (If using the aduino CLI this installs the corrosponding core.)
-      * @param {string} packageName - board vendor
-      * @param {string} arch - board architecture
-      * @param {string} version - version of board package or core to download
-      * @param {boolean} [showOutput=true] - show raw output from command
-      */
-    public async installBoard(packageName: string, arch: string = "", version: string = "", showOutput: boolean = true) {
-        arduinoChannel.show();
-        const updatingIndex = packageName === "dummy" && !arch && !version;
-        if (updatingIndex) {
-            arduinoChannel.start(`Update package index files...`);
-        } else {
-            try {
-                const packagePath = path.join(this._settings.packagePath, "packages", packageName, arch);
-                if (util.directoryExistsSync(packagePath)) {
-                    util.rmdirRecursivelySync(packagePath);
-                }
-                arduinoChannel.start(`Install package - ${packageName}...`);
-            } catch (error) {
-                arduinoChannel.start(`Install package - ${packageName} failed under directory : ${error.path}${os.EOL}
-                                      Please make sure the folder is not occupied by other procedures .`);
-                arduinoChannel.error(`Error message - ${error.message}${os.EOL}`);
-                arduinoChannel.error(`Exit with code=${error.code}${os.EOL}`);
-                return;
+        const selectSerial = async () => {
+            const choice = await vscode.window.showInformationMessage(
+                "Serial port is not specified. Do you want to select a serial port for uploading?",
+                "Yes", "No");
+            if (choice === "Yes") {
+                vscode.commands.executeCommand("arduino.selectSerialPort");
             }
         }
-        arduinoChannel.info(`${packageName}${arch && ":" + arch}${version && ":" + version}`);
-        try {
-            if (this.useArduinoCli()) {
-                await util.spawn(this._settings.commandPath,
-                    ["core", "install", `${packageName}${arch && ":" + arch}${version && "@" + version}`],
-                    undefined,
-                    { channel: showOutput ? arduinoChannel.channel : null });
-            } else {
-                await util.spawn(this._settings.commandPath,
-                    ["--install-boards", `${packageName}${arch && ":" + arch}${version && ":" + version}`],
-                    undefined,
-                    { channel: showOutput ? arduinoChannel.channel : null });
+
+        if (buildMode === BuildMode.Upload) {
+            if ((!dc.configuration || !/upload_method=[^=,]*st[^,]*link/i.test(dc.configuration)) && !dc.port) {
+                await selectSerial();
+                return false;
             }
-            if (updatingIndex) {
-                arduinoChannel.end("Updated package index files.");
-            } else {
-                arduinoChannel.end(`Installed board package - ${packageName}${os.EOL}`);
+
+            if (!compile && !this.useArduinoCli()) {
+                arduinoChannel.error("This command is only available when using the Arduino CLI");
+                return false;
             }
-        } catch (error) {
-            // If a platform with the same version is already installed, nothing is installed and program exits with exit code 1
-            if (error.code === 1) {
-                if (updatingIndex) {
-                    arduinoChannel.end("Updated package index files.");
+
+            if (!this.useArduinoCli()) {
+                args.push("--upload");
+            } else {
+                // TODO: add the --clean argument to the cli args when v 0.14 is released (this will clean up the build folder after uploading)
+                if (compile) {
+                    args.push("compile", "--upload");
                 } else {
-                    arduinoChannel.end(`Installed board package - ${packageName}${os.EOL}`);
+                    args.push("upload");
                 }
-            } else {
-                arduinoChannel.error(`Exit with code=${error.code}${os.EOL}`);
+                args.push("-b", boardDescriptor);
             }
-        }
-    }
-
-    public uninstallBoard(boardName: string, packagePath: string) {
-        arduinoChannel.start(`Uninstall board package - ${boardName}...`);
-        util.rmdirRecursivelySync(packagePath);
-        arduinoChannel.end(`Uninstalled board package - ${boardName}${os.EOL}`);
-    }
-
-    /**
-     * Downloads or updates a library
-     * @param {string} libName - name of the library to download
-     * @param {string} version - version of library to download
-     * @param {boolean} [showOutput=true] - show raw output from command
-     */
 
-    public async installLibrary(libName: string, version: string = "", showOutput: boolean = true) {
-        arduinoChannel.show();
-        const updatingIndex = (libName === "dummy" && !version);
-        if (updatingIndex) {
-            arduinoChannel.start("Update library index files...");
-        } else {
-            arduinoChannel.start(`Install library - ${libName}`);
-        }
-        try {
-            if (this.useArduinoCli()) {
-                await  util.spawn(this._settings.commandPath,
-                    ["lib", "install", `${libName}${version && "@" + version}`],
-                    undefined,
-                    { channel: showOutput ? arduinoChannel.channel : undefined });
-            } else {
-                await util.spawn(this._settings.commandPath,
-                    ["--install-library", `${libName}${version && ":" + version}`],
-                    undefined,
-                    { channel: showOutput ? arduinoChannel.channel : undefined });
+            if (dc.port) {
+                args.push("--port", dc.port);
             }
-            if (updatingIndex) {
-                arduinoChannel.end("Updated library index files.");
-            } else {
-                arduinoChannel.end(`Installed library - ${libName}${os.EOL}`);
+        } else if (buildMode === BuildMode.UploadProgrammer) {
+            const programmer = this.programmerManager.currentProgrammer;
+            if (!programmer) {
+                logger.notifyUserError("programmerManager.currentProgrammer", new Error(constants.messages.NO_PROGRAMMMER_SELECTED));
+                return false;
             }
-        } catch (error) {
-            // If a library with the same version is already installed, nothing is installed and program exits with exit code 1
-            if (error.code === 1) {
-                if (updatingIndex) {
-                    arduinoChannel.end("Updated library index files.");
+            if (!dc.port) {
+                await selectSerial();
+                return false;
+            }
+            if (!compile && !this.useArduinoCli()) {
+                arduinoChannel.error("This command is only available when using the Arduino CLI");
+                return false;
+            }
+
+            if (!this.useArduinoCli()) {
+                args.push("--upload");
+            } else {
+                // TODO: add the --clean argument to the cli args when v 0.14 is released (this will clean up the build folder after uploading)
+                if (compile) {
+                    args.push("compile", "--upload");
                 } else {
-                    arduinoChannel.end(`Installed library - ${libName}${os.EOL}`);
+                    args.push("upload");
                 }
-            } else {
-                arduinoChannel.error(`Exit with code=${error.code}${os.EOL}`);
+                args.push("-b", boardDescriptor);
             }
-        }
-    }
 
-    public uninstallLibrary(libName: string, libPath: string) {
-        arduinoChannel.start(`Remove library - ${libName}`);
-        util.rmdirRecursivelySync(libPath);
-        arduinoChannel.end(`Removed library - ${libName}${os.EOL}`);
-    }
+            if (this.useArduinoCli()) {
+                args.push("--programmer", programmer)
+            } else {
+                args.push("--useprogrammer", "--pref", `programmer=arduino:${programmer}`);
+            }
 
-    public openExample(example) {
-        function tmpName(name) {
-            let counter = 0;
-            let candidateName = name;
-            while (true) {
-                if (!util.fileExistsSync(candidateName) && !util.directoryExistsSync(candidateName)) {
-                    return candidateName;
-                }
-                counter++;
-                candidateName = `${name}_${counter}`;
+            args.push("--port", dc.port);
+            if (!this.useArduinoCli()) {
+                args.push("--verify");
+            } else {
+                args.push("compile", "-b", boardDescriptor);
+            }
+        } else {
+            if (!this.useArduinoCli()) {
+                args.push("--verify");
+            } else {
+                args.push("compile", "-b", boardDescriptor);
             }
         }
 
-        // Step 1: Copy the example project to a temporary directory.
-        const sketchPath = path.join(this._settings.sketchbookPath, "generated_examples");
-        if (!util.directoryExistsSync(sketchPath)) {
-            util.mkdirRecursivelySync(sketchPath);
-        }
-        let destExample = "";
-        if (util.directoryExistsSync(example)) {
-            destExample = tmpName(path.join(sketchPath, path.basename(example)));
-            util.cp(example, destExample);
-        } else if (util.fileExistsSync(example)) {
-            const exampleName = path.basename(example, path.extname(example));
-            destExample = tmpName(path.join(sketchPath, exampleName));
-            util.mkdirRecursivelySync(destExample);
-            util.cp(example, path.join(destExample, path.basename(example)));
-        }
-        if (destExample) {
-            // Step 2: Scaffold the example project to an arduino project.
-            const items = fs.readdirSync(destExample);
-            const sketchFile = items.find((item) => {
-                return util.isArduinoFile(path.join(destExample, item));
-            });
-            if (sketchFile) {
-                // Generate arduino.json
-                const dc = DeviceContext.getInstance();
-                const arduinoJson = {
-                    sketch: sketchFile,
-                    // TODO EW, 2020-02-18: COM1 is Windows specific - what about OSX and Linux users?
-                    port: dc.port || "COM1",
-                    board: dc.board,
-                    configuration: dc.configuration,
-                };
-                const arduinoConfigFilePath = path.join(destExample, constants.ARDUINO_CONFIG_FILE);
-                util.mkdirRecursivelySync(path.dirname(arduinoConfigFilePath));
-                fs.writeFileSync(arduinoConfigFilePath, JSON.stringify(arduinoJson, null, 4));
+        if (dc.buildPreferences) {
+            for (const pref of dc.buildPreferences) {
+                // Note: BuildPrefSetting makes sure that each preference
+                // value consists of exactly two items (key and value).
+                args.push("--pref", `${pref[0]}=${pref[1]}`);
             }
+        }
 
-            // Step 3: Open the arduino project at a new vscode window.
-            vscode.commands.executeCommand("vscode.openFolder", vscode.Uri.file(destExample), true);
+        // We always build verbosely but filter the output based on the settings
+        args.push("--verbose-build");
+        if (verbose) {
+            args.push("--verbose-upload");
         }
-        return destExample;
-    }
 
-    public get settings() {
-        return this._settings;
-    }
+        await vscode.workspace.saveAll(false);
 
-    public get boardManager() {
-        return this._boardManager;
-    }
+        // we prepare the channel here since all following code will
+        // or at leas can possibly output to it
+        arduinoChannel.show();
+        arduinoChannel.start(`${buildMode} sketch '${dc.sketch}'`);
 
-    public set boardManager(value: BoardManager) {
-        this._boardManager = value;
-    }
+        if ((buildDir || dc.output) && compile) {
+            // 2020-02-29, EW: This whole code appears a bit wonky to me.
+            //   What if the user specifies an output directory "../builds/my project"
+            buildDir = path.resolve(ArduinoWorkspace.rootPath, buildDir || dc.output);
+            const dirPath = path.dirname(buildDir);
+            if (!util.directoryExistsSync(dirPath)) {
+                logger.notifyUserError("InvalidOutPutPath", new Error(constants.messages.INVALID_OUTPUT_PATH + buildDir));
+                return false;
+            }
 
-    public get libraryManager() {
-        return this._libraryManager;
-    }
+            if (this.useArduinoCli()) {
+                args.push("--build-path", buildDir);
 
-    public set libraryManager(value: LibraryManager) {
-        this._libraryManager = value;
-    }
+            } else {
+                args.push("--pref", `build.path=${buildDir}`);
+            }
 
-    public get exampleManager() {
-        return this._exampleManager;
-    }
+            arduinoChannel.info(`Please see the build logs in output path: ${buildDir}`);
+        } else {
+            const msg = "Output path is not specified. Unable to reuse previously compiled files. Build will be slower. See README.";
+            arduinoChannel.warning(msg);
+        }
 
-    public set exampleManager(value: ExampleManager) {
-        this._exampleManager = value;
-    }
+        // Environment variables passed to pre- and post-build commands
+        const env = {
+            VSCA_BUILD_MODE: buildMode,
+            VSCA_SKETCH: dc.sketch,
+            VSCA_BOARD: boardDescriptor,
+            VSCA_WORKSPACE_DIR: ArduinoWorkspace.rootPath,
+            VSCA_LOG_LEVEL: verbose ? constants.LogLevel.Verbose : constants.LogLevel.Info,
+        };
+        if (dc.port) {
+            env["VSCA_SERIAL"] = dc.port;
+        }
+        if (buildDir) {
+            env["VSCA_BUILD_DIR"] = buildDir;
+        }
 
-    public get programmerManager() {
-        return this._programmerManager;
-    }
+        // TODO EW: What should we do with pre-/post build commands when running
+        //   analysis? Some could use it to generate/manipulate code which could
+        //   be a prerequisite for a successful build
+        if (!await this.runPrePostBuildCommand(dc, env, "pre")) {
+            return false;
+        }
 
-    public set programmerManager(value: ProgrammerManager) {
-        this._programmerManager = value;
-    }
+        // stop serial monitor when everything is prepared and good
+        // what makes restoring of its previous state easier
+        if (buildMode === BuildMode.Upload || buildMode === BuildMode.UploadProgrammer) {
+            restoreSerialMonitor = await SerialMonitor.getInstance().closeSerialMonitor(dc.port);
+            UsbDetector.getInstance().pauseListening();
+        }
 
-    /**
-     * Runs the pre or post build command.
-     * Usually before one of
-     *  * verify
-     *  * upload
-     *  * upload using programmer
-     * @param dc Device context prepared during one of the above actions
-     * @param what "pre" if the pre-build command should be run, "post" if the
-     * post-build command should be run.
-     * @returns True if successful, false on error.
-     */
-    protected async runPrePostBuildCommand(dc: DeviceContext,
-                                           environment: any,
-                                           what: "pre" | "post"): Promise<boolean> {
-        const cmdline = what === "pre"
-            ? dc.prebuild
-            : dc.postbuild;
+        // Push sketch as last argument
+        args.push(path.join(ArduinoWorkspace.rootPath, dc.sketch));
 
-        if (cmdline) {
-            arduinoChannel.info(`Running ${what}-build command: "${cmdline}"`);
-            let cmd: string;
-            let args: string[];
-            // pre-/post-build commands feature full bash support on UNIX systems.
-            // On Windows you have full cmd support.
+        const cocopa = makeCompilerParserContext(dc);
+
+        const cleanup = async (result: "ok" | "error") => {
+            let ret = true;
+            if (result === "ok") {
+                ret = await this.runPrePostBuildCommand(dc, env, "post");
+            }
+            await cocopa.conclude();
+            if (buildMode === BuildMode.Upload || buildMode === BuildMode.UploadProgrammer) {
+                UsbDetector.getInstance().resumeListening();
+                if (restoreSerialMonitor) {
+                    await SerialMonitor.getInstance().openSerialMonitor();
+                }
+            }
+            return ret;
+        }
+        const stdoutcb = (line: string) => {
+            if (cocopa.callback) {
+                cocopa.callback(line);
+            }
+            if (verbose) {
+                arduinoChannel.channel.append(line);
+            }
+        }
+        const stderrcb = (line: string) => {
             if (os.platform() === "win32") {
-                args = [];
-                cmd = cmdline;
-            } else {
-                args = ["-c", cmdline];
-                cmd = "bash";
+                line = line.trim();
+                if (line.length <= 0) {
+                    return;
+                }
+                line = line.replace(/(?:\r|\r\n|\n)+/g, os.EOL);
+                line = `${line}${os.EOL}`;
             }
-            try {
-                await util.spawn(cmd,
-                                 args,
-                                 {
-                                     shell: os.platform() === "win32",
-                                     cwd: ArduinoWorkspace.rootPath,
-                                     env: {...environment},
-                                 },
-                                 { channel: arduinoChannel.channel });
-            } catch (ex) {
-                const msg = ex.error
-                    ? `${ex.error}`
-                    : ex.code
-                        ? `Exit code = ${ex.code}`
-                        : JSON.stringify(ex);
-                arduinoChannel.error(`Running ${what}-build command failed: ${os.EOL}${msg}`);
-                return false;
+            if (!verbose) {
+                // Don't spill log with spurious info from the backend. This
+                // list could be fetched from a config file to accommodate
+                // messages of unknown board packages, newer backend revisions
+                const filters = [
+                    /^Picked\sup\sJAVA_TOOL_OPTIONS:\s+/,
+                    /^\d+\d+-\d+-\d+T\d+:\d+:\d+.\d+Z\s(?:INFO|WARN)\s/,
+                    /^(?:DEBUG|TRACE|INFO)\s+/,
+                ];
+                for (const f of filters) {
+                    if (line.match(f)) {
+                        return;
+                    }
+                }
             }
+            arduinoChannel.channel.append(line);
         }
-        return true;
-    }
 
-    /**
-     * Checks if the arduino cli is being used
-     * @returns {bool} - true if arduino cli is being use
-     */
-    private useArduinoCli() {
-        return this._settings.useArduinoCli;
-        // return VscodeSettings.getInstance().useArduinoCli;
+        return await util.spawn(
+            this._settings.commandPath,
+            args,
+            undefined,
+            { stdout: stdoutcb, stderr: stderrcb },
+        ).then(async () => {
+            const ret = await cleanup("ok");
+            if (ret) {
+                arduinoChannel.end(`${buildMode} sketch '${dc.sketch}'${os.EOL}`);
+            }
+            return ret;
+        }, async (reason) => {
+            await cleanup("error");
+            const msg = reason.code
+                ? `Exit with code=${reason.code}`
+                : JSON.stringify(reason);
+            arduinoChannel.error(`${buildMode} sketch '${dc.sketch}': ${msg}${os.EOL}`);
+            return false;
+        });
     }
-/* tslint:enable:member-ordering */
 }

From 8b838738d88933042cbeefcf7dda927af24e4595 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Tue, 5 Jan 2021 23:34:25 +0100
Subject: [PATCH 112/142] Consolidate all boardDescriptor argument pushing

---
 src/arduino/arduino.ts | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index a1880ba3..8ae7ae61 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -512,7 +512,9 @@ export class ArduinoApp {
         }
         const boardDescriptor = this.boardManager.currentBoard.getBuildConfig();
 
-        if (!this.useArduinoCli()) {
+        if (this.useArduinoCli()) {
+            args.push("-b", boardDescriptor);
+        } else {
             args.push("--board", boardDescriptor);
         }
 
@@ -561,7 +563,6 @@ export class ArduinoApp {
                 } else {
                     args.push("upload");
                 }
-                args.push("-b", boardDescriptor);
             }
 
             if (dc.port) {
@@ -591,7 +592,6 @@ export class ArduinoApp {
                 } else {
                     args.push("upload");
                 }
-                args.push("-b", boardDescriptor);
             }
 
             if (this.useArduinoCli()) {
@@ -603,14 +603,10 @@ export class ArduinoApp {
             args.push("--port", dc.port);
             if (!this.useArduinoCli()) {
                 args.push("--verify");
-            } else {
-                args.push("compile", "-b", boardDescriptor);
             }
         } else {
             if (!this.useArduinoCli()) {
                 args.push("--verify");
-            } else {
-                args.push("compile", "-b", boardDescriptor);
             }
         }
 

From 5a49b972164128f5948296efa70c610f25271837 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Tue, 5 Jan 2021 22:23:21 +0100
Subject: [PATCH 113/142] Remove compile argument and expand BuildMode with
 CliUpload and CliUploadProgrammer

---
 src/arduino/arduino.ts             | 67 +++++++++++++++++++-----------
 src/debug/configurationProvider.ts |  2 +-
 src/extension.ts                   | 12 +++---
 3 files changed, 49 insertions(+), 32 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 8ae7ae61..b8dbfd72 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -36,7 +36,9 @@ export enum BuildMode {
     Verify = "Verifying",
     Analyze = "Analyzing",
     Upload = "Uploading",
+    CliUpload = "Uploading using Arduino CLI",
     UploadProgrammer = "Uploading (programmer)",
+    CliUploadProgrammer = "Uploading (programmer) using Arduino CLI",
 };
 
 /**
@@ -74,7 +76,7 @@ export class ArduinoApp {
         const analysisDelayMs = 1000 * 3;
         this._analysisManager = new AnalysisManager(
             () => this._building,
-            async () => { await this.build(BuildMode.Analyze, true); },
+            async () => { await this.build(BuildMode.Analyze); },
             analysisDelayMs);
     }
 
@@ -159,7 +161,6 @@ export class ArduinoApp {
      * something is missing, it tries to query the user for the missing piece
      * of information (sketch, board, etc.). Analyze runs non interactively and
      * just returns false.
-     * @param {bool} compile - Indicates whether to compile the code when using the CLI to upload
      * @param buildDir Override the build directory set by the project settings
      * with the given directory.
      * @returns true on success, false if
@@ -167,7 +168,7 @@ export class ArduinoApp {
      *  * board- or programmer-manager aren't initialized yet
      *  * or something went wrong during the build
      */
-    public async build(buildMode: BuildMode, compile: boolean, buildDir?: string) {
+    public async build(buildMode: BuildMode, buildDir?: string) {
 
         if (!this._boardManager || !this._programmerManager || this._building) {
             return false;
@@ -175,7 +176,7 @@ export class ArduinoApp {
 
         this._building = true;
 
-        return await this._build(buildMode, compile, buildDir)
+        return await this._build(buildMode, buildDir)
         .then((ret) => {
             this._building = false;
             return ret;
@@ -498,7 +499,7 @@ export class ArduinoApp {
      * @param buildDir See build()
      * @see https://github.com/arduino/Arduino/blob/master/build/shared/manpage.adoc
      */
-    private async _build(buildMode: BuildMode, compile: boolean, buildDir?: string): Promise<boolean> {
+    private async _build(buildMode: BuildMode, buildDir?: string): Promise<boolean> {
         const dc = DeviceContext.getInstance();
         const args: string[] = [];
         let restoreSerialMonitor: boolean = false;
@@ -549,22 +550,28 @@ export class ArduinoApp {
                 return false;
             }
 
-            if (!compile && !this.useArduinoCli()) {
-                arduinoChannel.error("This command is only available when using the Arduino CLI");
+            if (!this.useArduinoCli()) {
+                args.push("--upload");
+            } else {
+                args.push("compile", "--upload");
+            }
+
+            if (dc.port) {
+                args.push("--port", dc.port);
+            }
+        } else if (buildMode === BuildMode.CliUpload) {
+            if ((!dc.configuration || !/upload_method=[^=,]*st[^,]*link/i.test(dc.configuration)) && !dc.port) {
+                await selectSerial();
                 return false;
             }
 
             if (!this.useArduinoCli()) {
-                args.push("--upload");
-            } else {
-                // TODO: add the --clean argument to the cli args when v 0.14 is released (this will clean up the build folder after uploading)
-                if (compile) {
-                    args.push("compile", "--upload");
-                } else {
-                    args.push("upload");
-                }
+                arduinoChannel.error("This command is only available when using the Arduino CLI");
+                return false;
             }
 
+            args.push("upload");
+
             if (dc.port) {
                 args.push("--port", dc.port);
             }
@@ -578,20 +585,12 @@ export class ArduinoApp {
                 await selectSerial();
                 return false;
             }
-            if (!compile && !this.useArduinoCli()) {
-                arduinoChannel.error("This command is only available when using the Arduino CLI");
-                return false;
-            }
 
             if (!this.useArduinoCli()) {
                 args.push("--upload");
             } else {
                 // TODO: add the --clean argument to the cli args when v 0.14 is released (this will clean up the build folder after uploading)
-                if (compile) {
-                    args.push("compile", "--upload");
-                } else {
-                    args.push("upload");
-                }
+                args.push("upload");
             }
 
             if (this.useArduinoCli()) {
@@ -604,6 +603,24 @@ export class ArduinoApp {
             if (!this.useArduinoCli()) {
                 args.push("--verify");
             }
+        } else if (buildMode === BuildMode.CliUploadProgrammer) {
+            const programmer = this.programmerManager.currentProgrammer;
+            if (!programmer) {
+                logger.notifyUserError("programmerManager.currentProgrammer", new Error(constants.messages.NO_PROGRAMMMER_SELECTED));
+                return false;
+            }
+            if (!dc.port) {
+                await selectSerial();
+                return false;
+            }
+            if (!this.useArduinoCli()) {
+                arduinoChannel.error("This command is only available when using the Arduino CLI");
+                return false;
+            }
+
+            args.push("compile", "--upload");
+            args.push("--programmer", programmer)
+            args.push("--port", dc.port);
         } else {
             if (!this.useArduinoCli()) {
                 args.push("--verify");
@@ -631,7 +648,7 @@ export class ArduinoApp {
         arduinoChannel.show();
         arduinoChannel.start(`${buildMode} sketch '${dc.sketch}'`);
 
-        if ((buildDir || dc.output) && compile) {
+        if (buildDir || dc.output) {
             // 2020-02-29, EW: This whole code appears a bit wonky to me.
             //   What if the user specifies an output directory "../builds/my project"
             buildDir = path.resolve(ArduinoWorkspace.rootPath, buildDir || dc.output);
diff --git a/src/debug/configurationProvider.ts b/src/debug/configurationProvider.ts
index f0fe77e2..0ac61fcf 100644
--- a/src/debug/configurationProvider.ts
+++ b/src/debug/configurationProvider.ts
@@ -137,7 +137,7 @@ export class ArduinoDebugConfigurationProvider implements vscode.DebugConfigurat
             config.program = path.join(ArduinoWorkspace.rootPath, outputFolder, `${path.basename(dc.sketch)}.elf`);
 
             // always compile elf to make sure debug the right elf
-            if (!await ArduinoContext.arduinoApp.build(BuildMode.Verify, true, outputFolder)) {
+            if (!await ArduinoContext.arduinoApp.build(BuildMode.Verify, outputFolder)) {
                 vscode.window.showErrorMessage("Failed to verify the program, please check the output for details.");
                 return false;
             }
diff --git a/src/extension.ts b/src/extension.ts
index 77c81b94..6ae7b0df 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -120,7 +120,7 @@ export async function activate(context: vscode.ExtensionContext) {
                 location: vscode.ProgressLocation.Window,
                 title: "Arduino: Verifying...",
             }, async () => {
-                await arduinoContextModule.default.arduinoApp.build(BuildMode.Verify, true);
+                await arduinoContextModule.default.arduinoApp.build(BuildMode.Verify);
             });
         }
     }, () => {
@@ -136,7 +136,7 @@ export async function activate(context: vscode.ExtensionContext) {
                 location: vscode.ProgressLocation.Window,
                 title: "Arduino: Uploading...",
             }, async () => {
-                await arduinoContextModule.default.arduinoApp.build(BuildMode.Upload, true);
+                await arduinoContextModule.default.arduinoApp.build(BuildMode.Upload);
             });
         }
     }, () => {
@@ -149,7 +149,7 @@ export async function activate(context: vscode.ExtensionContext) {
                 location: vscode.ProgressLocation.Window,
                 title: "Arduino: Using CLI to upload...",
             }, async () => {
-                await arduinoContextModule.default.arduinoApp.build(BuildMode.Upload, false);
+                await arduinoContextModule.default.arduinoApp.build(BuildMode.CliUpload);
             });
         }
     }, () => {
@@ -183,7 +183,7 @@ export async function activate(context: vscode.ExtensionContext) {
                 location: vscode.ProgressLocation.Window,
                 title: "Arduino: Uploading (programmer)...",
             }, async () => {
-                await arduinoContextModule.default.arduinoApp.build(BuildMode.UploadProgrammer, true);
+                await arduinoContextModule.default.arduinoApp.build(BuildMode.UploadProgrammer);
             });
         }
     }, () => {
@@ -196,7 +196,7 @@ export async function activate(context: vscode.ExtensionContext) {
                 location: vscode.ProgressLocation.Window,
                 title: "Arduino: Using CLI to upload (programmer)...",
             }, async () => {
-                await arduinoContextModule.default.arduinoApp.build(BuildMode.UploadProgrammer, false);
+                await arduinoContextModule.default.arduinoApp.build(BuildMode.CliUploadProgrammer);
             });
         }
     }, () => {
@@ -209,7 +209,7 @@ export async function activate(context: vscode.ExtensionContext) {
                 location: vscode.ProgressLocation.Window,
                 title: "Arduino: Rebuilding IS Configuration...",
             }, async () => {
-                await arduinoContextModule.default.arduinoApp.build(BuildMode.Analyze, true);
+                await arduinoContextModule.default.arduinoApp.build(BuildMode.Analyze);
             });
         }
     }, () => {

From e591480259aa1974910ef12fd707d8641864cd2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Wed, 6 Jan 2021 21:25:59 +0100
Subject: [PATCH 114/142] Reverse and merge tests

---
 src/arduino/arduino.ts | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index b8dbfd72..b28b7215 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -550,10 +550,10 @@ export class ArduinoApp {
                 return false;
             }
 
-            if (!this.useArduinoCli()) {
-                args.push("--upload");
-            } else {
+            if (this.useArduinoCli()) {
                 args.push("compile", "--upload");
+            } else {
+                args.push("--upload");
             }
 
             if (dc.port) {
@@ -586,17 +586,13 @@ export class ArduinoApp {
                 return false;
             }
 
-            if (!this.useArduinoCli()) {
-                args.push("--upload");
-            } else {
-                // TODO: add the --clean argument to the cli args when v 0.14 is released (this will clean up the build folder after uploading)
-                args.push("upload");
-            }
-
             if (this.useArduinoCli()) {
-                args.push("--programmer", programmer)
+                args.push("upload",
+                    "--programmer", programmer);
             } else {
-                args.push("--useprogrammer", "--pref", `programmer=arduino:${programmer}`);
+                args.push("--upload",
+                    "--useprogrammer",
+                    "--pref", `programmer=arduino:${programmer}`);
             }
 
             args.push("--port", dc.port);

From b97a740444dab1550f6738f75bfb439a3650866f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Wed, 6 Jan 2021 22:38:23 +0100
Subject: [PATCH 115/142] Replace "upload" with "compile --upload"

---
 src/arduino/arduino.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index b28b7215..c3ab1355 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -587,7 +587,8 @@ export class ArduinoApp {
             }
 
             if (this.useArduinoCli()) {
-                args.push("upload",
+                args.push("compile",
+                    "--upload",
                     "--programmer", programmer);
             } else {
                 args.push("--upload",

From 0356bb72375b2f5771d250092fcac6283106d8c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Wed, 6 Jan 2021 23:03:06 +0100
Subject: [PATCH 116/142] Join args.push statements

---
 src/arduino/arduino.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index c3ab1355..677f39cb 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -615,9 +615,10 @@ export class ArduinoApp {
                 return false;
             }
 
-            args.push("compile", "--upload");
-            args.push("--programmer", programmer)
-            args.push("--port", dc.port);
+            args.push("compile",
+                "--upload",
+                "--programmer", programmer,
+                "--port", dc.port);
         } else {
             if (!this.useArduinoCli()) {
                 args.push("--verify");

From b5360b5e8b3b44ff7ff1aaeeee590e92bd9616be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5kon=20L=C3=B8vdal?= <kode@denkule.no>
Date: Thu, 7 Jan 2021 00:39:08 +0100
Subject: [PATCH 117/142] Remove arrow-head anti-pattern

---
 src/arduino/arduino.ts | 64 ++++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 677f39cb..b03d5842 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -448,37 +448,39 @@ export class ArduinoApp {
             ? dc.prebuild
             : dc.postbuild;
 
-        if (cmdline) {
-            arduinoChannel.info(`Running ${what}-build command: "${cmdline}"`);
-            let cmd: string;
-            let args: string[];
-            // pre-/post-build commands feature full bash support on UNIX systems.
-            // On Windows you have full cmd support.
-            if (os.platform() === "win32") {
-                args = [];
-                cmd = cmdline;
-            } else {
-                args = ["-c", cmdline];
-                cmd = "bash";
-            }
-            try {
-                await util.spawn(cmd,
-                                 args,
-                                 {
-                                     shell: os.platform() === "win32",
-                                     cwd: ArduinoWorkspace.rootPath,
-                                     env: {...environment},
-                                 },
-                                 { channel: arduinoChannel.channel });
-            } catch (ex) {
-                const msg = ex.error
-                    ? `${ex.error}`
-                    : ex.code
-                        ? `Exit code = ${ex.code}`
-                        : JSON.stringify(ex);
-                arduinoChannel.error(`Running ${what}-build command failed: ${os.EOL}${msg}`);
-                return false;
-            }
+        if (!cmdline) {
+            return true; // Successfully done nothing.
+        }
+
+        arduinoChannel.info(`Running ${what}-build command: "${cmdline}"`);
+        let cmd: string;
+        let args: string[];
+        // pre-/post-build commands feature full bash support on UNIX systems.
+        // On Windows you have full cmd support.
+        if (os.platform() === "win32") {
+            args = [];
+            cmd = cmdline;
+        } else {
+            args = ["-c", cmdline];
+            cmd = "bash";
+        }
+        try {
+            await util.spawn(cmd,
+                                args,
+                                {
+                                    shell: os.platform() === "win32",
+                                    cwd: ArduinoWorkspace.rootPath,
+                                    env: {...environment},
+                                },
+                                { channel: arduinoChannel.channel });
+        } catch (ex) {
+            const msg = ex.error
+                ? `${ex.error}`
+                : ex.code
+                    ? `Exit code = ${ex.code}`
+                    : JSON.stringify(ex);
+            arduinoChannel.error(`Running ${what}-build command failed: ${os.EOL}${msg}`);
+            return false;
         }
         return true;
     }

From 2e763c84f53ab8f0fbeda1bde13b5a93222b77cf Mon Sep 17 00:00:00 2001
From: Adi Azulay <adazulay@microsoft.com>
Date: Thu, 10 Dec 2020 15:53:53 -0500
Subject: [PATCH 118/142] add support for cli

---
 src/arduino/arduino.ts | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index b03d5842..2ead7baf 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -515,6 +515,10 @@ export class ArduinoApp {
         }
         const boardDescriptor = this.boardManager.currentBoard.getBuildConfig();
 
+        if (buildMode === BuildMode.Analyze) {
+            args.push("compile");
+        }
+
         if (this.useArduinoCli()) {
             args.push("-b", boardDescriptor);
         } else {
@@ -636,7 +640,9 @@ export class ArduinoApp {
         }
 
         // We always build verbosely but filter the output based on the settings
-        args.push("--verbose-build");
+
+        this._settings.useArduinoCli ? args.push("--verbose") : args.push("--verbose-build");
+
         if (verbose) {
             args.push("--verbose-upload");
         }
@@ -689,13 +695,16 @@ export class ArduinoApp {
         // TODO EW: What should we do with pre-/post build commands when running
         //   analysis? Some could use it to generate/manipulate code which could
         //   be a prerequisite for a successful build
-        if (!await this.runPrePostBuildCommand(dc, env, "pre")) {
+        if (dc.prebuild && !await this.runPrePostBuildCommand(dc, env, "pre")) {
             return false;
         }
 
         // stop serial monitor when everything is prepared and good
         // what makes restoring of its previous state easier
-        if (buildMode === BuildMode.Upload || buildMode === BuildMode.UploadProgrammer) {
+        if (buildMode === BuildMode.Upload ||
+            buildMode === BuildMode.UploadProgrammer ||
+            buildMode === BuildMode.CliUpload ||
+            buildMode === BuildMode.CliUploadProgrammer) {
             restoreSerialMonitor = await SerialMonitor.getInstance().closeSerialMonitor(dc.port);
             UsbDetector.getInstance().pauseListening();
         }
@@ -758,7 +767,7 @@ export class ArduinoApp {
             this._settings.commandPath,
             args,
             undefined,
-            { stdout: stdoutcb, stderr: stderrcb },
+            { channel: arduinoChannel.channel, stdout: stdoutcb, stderr: stderrcb },
         ).then(async () => {
             const ret = await cleanup("ok");
             if (ret) {

From b91a5cab3cd6520592bc06db33e2bd0ca6b126e5 Mon Sep 17 00:00:00 2001
From: Adi Azulay <adazulay@microsoft.com>
Date: Thu, 10 Dec 2020 16:41:17 -0500
Subject: [PATCH 119/142] fix cli analyze mode

---
 src/arduino/arduino.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 2ead7baf..89e08a9e 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -515,10 +515,6 @@ export class ArduinoApp {
         }
         const boardDescriptor = this.boardManager.currentBoard.getBuildConfig();
 
-        if (buildMode === BuildMode.Analyze) {
-            args.push("compile");
-        }
-
         if (this.useArduinoCli()) {
             args.push("-b", boardDescriptor);
         } else {
@@ -626,7 +622,9 @@ export class ArduinoApp {
                 "--programmer", programmer,
                 "--port", dc.port);
         } else {
-            if (!this.useArduinoCli()) {
+            if (this.useArduinoCli()) {
+                args.unshift("compile");
+            } else {
                 args.push("--verify");
             }
         }
@@ -767,7 +765,7 @@ export class ArduinoApp {
             this._settings.commandPath,
             args,
             undefined,
-            { channel: arduinoChannel.channel, stdout: stdoutcb, stderr: stderrcb },
+            { /*channel: arduinoChannel.channel,*/ stdout: stdoutcb, stderr: stderrcb },
         ).then(async () => {
             const ret = await cleanup("ok");
             if (ret) {

From 7ac331f2c60af3a2eb1a0cff16e370c5df48bb2e Mon Sep 17 00:00:00 2001
From: Adi Azulay <adazulay@microsoft.com>
Date: Tue, 12 Jan 2021 12:08:33 -0800
Subject: [PATCH 120/142] fix verbose setting and cli programmer upload

---
 src/arduino/arduino.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index 89e08a9e..eeaf93b1 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -617,8 +617,7 @@ export class ArduinoApp {
                 return false;
             }
 
-            args.push("compile",
-                "--upload",
+            args.push("upload",
                 "--programmer", programmer,
                 "--port", dc.port);
         } else {
@@ -641,7 +640,7 @@ export class ArduinoApp {
 
         this._settings.useArduinoCli ? args.push("--verbose") : args.push("--verbose-build");
 
-        if (verbose) {
+        if (verbose && !this._settings.useArduinoCli) {
             args.push("--verbose-upload");
         }
 

From 9d1899ef4f140e6e19a74c47dcafefeac39205df Mon Sep 17 00:00:00 2001
From: Adi Azulay <adazulay@microsoft.com>
Date: Tue, 12 Jan 2021 12:25:51 -0800
Subject: [PATCH 121/142] remove redundant prebuild check

---
 src/arduino/arduino.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/arduino/arduino.ts b/src/arduino/arduino.ts
index eeaf93b1..785df236 100644
--- a/src/arduino/arduino.ts
+++ b/src/arduino/arduino.ts
@@ -692,7 +692,7 @@ export class ArduinoApp {
         // TODO EW: What should we do with pre-/post build commands when running
         //   analysis? Some could use it to generate/manipulate code which could
         //   be a prerequisite for a successful build
-        if (dc.prebuild && !await this.runPrePostBuildCommand(dc, env, "pre")) {
+        if (!await this.runPrePostBuildCommand(dc, env, "pre")) {
             return false;
         }
 

From a717e5b4160c6d3d78eb91f1bf0155013a18247a Mon Sep 17 00:00:00 2001
From: Adi Azulay <adazulay@microsoft.com>
Date: Tue, 19 Jan 2021 12:11:25 -0800
Subject: [PATCH 122/142] update travis

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 418a1d17..1e0d015d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,8 +46,8 @@ before_install:
 # https://github.com/arduino/Arduino/issues/8034
 # Arduino 1.8.8 has fixed issue 8034.
 - if [ $TRAVIS_OS_NAME == "osx" ]; then
-    /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)";
-    brew cask install arduino;
+    /usr/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh);
+    brew install --cask arduino;
   fi
 - npm install -g node-gyp
 - npm install -g vsce

From 8bb1130a7b6bbf12fd4cb1bd912a7b4871ad20c6 Mon Sep 17 00:00:00 2001
From: Adi Azulay <adazulay@microsoft.com>
Date: Tue, 19 Jan 2021 12:16:15 -0800
Subject: [PATCH 123/142] fix missing "

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1e0d015d..3b12a659 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,7 +46,7 @@ before_install:
 # https://github.com/arduino/Arduino/issues/8034
 # Arduino 1.8.8 has fixed issue 8034.
 - if [ $TRAVIS_OS_NAME == "osx" ]; then
-    /usr/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh);
+    /usr/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)";
     brew install --cask arduino;
   fi
 - npm install -g node-gyp

From f80b38f6b3d46918fdefb177429e89d85e8e76da Mon Sep 17 00:00:00 2001
From: Jason Tranchida <jtranchida@gmail.com>
Date: Tue, 19 Jan 2021 16:41:36 -0800
Subject: [PATCH 124/142] Populate the list of programmers by parsing
 programmers.txt for each package (#1129)

* Improved handling of programmer selection

- Selected programmer is now saved to and loaded from the arduino.json file
- Arduino.json is monitored for changes, and changing file will update selected programmer & ui
- Programmer selection UI now shows both the friendly name of the programmer, as well as the arduino name
- Minor fix to deviceContexts to fire change events after all states are modified
- Layed groundwork to support querying list of programmers for the current board from arduino toolchain

* Parse the list of programmers from packages

* Tests for parsing programmers

* Show board specific list of programmers when selecting

Populate the selected programmer and it's display name using list of programmers provided by BoardManager.  When selecting programmer, only present the user a list of programmers relevant to the current board.

* Initial set of tests for ProgrammerManager

* add support for cli

* fix hardcoded package name for programmers

* adds programmer.key back to support arduino IDE

* fix handeling of programmer name in ide and cli

Co-authored-by: Adi Azulay <adazulay@microsoft.com>
---
 src/arduino/boardManager.ts                   |  30 ++++-
 src/arduino/package.ts                        |  31 +++++
 src/arduino/programmer.ts                     |  67 ++++++++++
 src/arduino/programmerManager.ts              |  74 ++++++-----
 src/deviceContext.ts                          |  14 +++
 test/boardmanager.test.ts                     |  29 +++++
 test/devicecontext.test.ts                    |   1 +
 test/programmermanager.test.ts                | 100 +++++++++++++++
 test/resources/Arduino15/preferences.txt      |   2 +-
 .../hardware/arduino/avr/programmers.txt      | 115 ++++++++++++++++++
 .../hardware/esp8266/esp8266/programmers.txt  |  14 +++
 test/resources/blink/.vscode/arduino.json     |   3 +-
 12 files changed, 444 insertions(+), 36 deletions(-)
 create mode 100644 src/arduino/programmer.ts
 create mode 100644 test/programmermanager.test.ts
 create mode 100644 test/resources/ArduinoIDE/hardware/arduino/avr/programmers.txt
 create mode 100644 test/resources/Documents/Arduino/hardware/esp8266/esp8266/programmers.txt

diff --git a/src/arduino/boardManager.ts b/src/arduino/boardManager.ts
index a2f6d481..c65c1143 100644
--- a/src/arduino/boardManager.ts
+++ b/src/arduino/boardManager.ts
@@ -13,7 +13,8 @@ import { DeviceContext } from "../deviceContext";
 import { ArduinoApp } from "./arduino";
 import { IArduinoSettings } from "./arduinoSettings";
 import { boardEqual, parseBoardDescriptor } from "./board";
-import { BoardConfigResult, IBoard, IPackage, IPlatform } from "./package";
+import { BoardConfigResult, IBoard, IPackage, IPlatform, IProgrammer } from "./package";
+import { parseProgrammerDescriptor } from "./programmer";
 import { VscodeSettings } from "./vscodeSettings";
 
 export class BoardManager {
@@ -22,6 +23,8 @@ export class BoardManager {
 
     private _platforms: IPlatform[];
 
+    private _programmers: Map<string, IProgrammer>;
+
     private _installedPlatforms: IPlatform[];
 
     private _boards: Map<string, IBoard>;
@@ -69,6 +72,9 @@ export class BoardManager {
 
         // Load all supported board types
         this.loadInstalledBoards();
+        this.loadInstalledProgrammers();
+        this.updateStatusBar();
+        this._boardConfigStatusBar.show();
 
         const dc = DeviceContext.getInstance();
         dc.onChangeBoard(() => this.onDeviceContextBoardChange());
@@ -150,6 +156,10 @@ export class BoardManager {
         return this._boards;
     }
 
+    public get installedProgrammers(): Map<string, IProgrammer> {
+        return this._programmers;
+    }
+
     public get currentBoard(): IBoard {
         return this._currentBoard;
     }
@@ -253,6 +263,7 @@ export class BoardManager {
                     this._installedPlatforms.push(existingPlatform);
                 }
                 this.loadInstalledBoardsFromPlatform(existingPlatform);
+                this.loadInstalledProgrammersFromPlatform(existingPlatform);
             }
         }
     }
@@ -470,6 +481,23 @@ export class BoardManager {
         }
     }
 
+    private loadInstalledProgrammers(): void {
+        this._programmers = new Map<string, IProgrammer>();
+        this._installedPlatforms.forEach((plat) => {
+            this.loadInstalledProgrammersFromPlatform(plat);
+        });
+    }
+
+    private loadInstalledProgrammersFromPlatform(plat: IPlatform) {
+        if (util.fileExistsSync(path.join(plat.rootBoardPath, "programmers.txt"))) {
+            const programmersContent = fs.readFileSync(path.join(plat.rootBoardPath, "programmers.txt"), "utf8");
+            const res = parseProgrammerDescriptor(programmersContent, plat);
+            res.forEach((prog) => {
+                this._programmers.set(prog.name, prog);
+            });
+        }
+    }
+
     private listBoards(): IBoard[] {
         const result = [];
         this._boards.forEach((b) => {
diff --git a/src/arduino/package.ts b/src/arduino/package.ts
index 3d5054b2..817def5a 100644
--- a/src/arduino/package.ts
+++ b/src/arduino/package.ts
@@ -267,3 +267,34 @@ export interface IBoard {
      */
     getPackageName();
 }
+
+/**
+ * Interface for classes that represent an Arduino supported programmer.
+ *
+ * @interface
+ */
+export interface IProgrammer {
+    /**
+     * Unique key that represent the programmer in the package:name.
+     * @property {string}
+     */
+    key: string;
+
+    /**
+     * Programmer name for Arduino compilation such as `avrisp`, `atmel_ice`
+     * @property {string}
+     */
+    name: string;
+
+    /**
+     * The human readable name displayed in the Arduino programmer selection menu
+     * @property {string}
+     */
+    displayName: string;
+
+    /**
+     * Reference to the platform that contains this board.
+     * @prop {IPlatform}
+     */
+    platform: IPlatform;
+}
diff --git a/src/arduino/programmer.ts b/src/arduino/programmer.ts
new file mode 100644
index 00000000..d2fdceb0
--- /dev/null
+++ b/src/arduino/programmer.ts
@@ -0,0 +1,67 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+import { IPlatform, IProgrammer } from "./package";
+
+export function parseProgrammerDescriptor(programmerDescriptor: string, plat: IPlatform): Map<string, IProgrammer> {
+    const progrmmerLineRegex = /([^\.]+)\.(\S+)=(.+)/;
+
+    const result = new Map<string, IProgrammer>();
+    const lines = programmerDescriptor.split(/[\r|\r\n|\n]/);
+    const menuMap = new Map<string, string>();
+
+    lines.forEach((line) => {
+        // Ignore comments.
+        if (line.startsWith("#")) {
+            return;
+        }
+
+        const match = progrmmerLineRegex.exec(line);
+        if (match && match.length > 3) {
+            let programmer = result.get(match[1]);
+            if (!programmer) {
+                programmer = new Programmer(match[1], plat);
+                result.set(programmer.name
+                    , programmer);
+            }
+            if (match[2] === "name") {
+                programmer.displayName = match[3].trim();
+            }
+        }
+    });
+    return result;
+}
+
+export class Programmer implements IProgrammer {
+    constructor(private _name: string,
+                private _platform: IPlatform,
+                private _displayName: string = _name) {
+    }
+
+    public get name(): string {
+        return this._name;
+    }
+
+    public get platform(): IPlatform {
+        return this._platform;
+    }
+
+    public get displayName(): string {
+        return this._displayName;
+    }
+
+    public set displayName(value: string) {
+        this._displayName = value;
+    }
+
+    /**
+     * @returns {string} Return programmer key in format packageName:name
+     */
+    public get key() {
+        return `${this.getPackageName}:${this.name}`;
+    }
+
+    private get getPackageName(): string {
+        return this.platform.packageName ? this.platform.packageName : this.platform.package.name;
+    }
+}
diff --git a/src/arduino/programmerManager.ts b/src/arduino/programmerManager.ts
index 7a7e2991..b766166e 100644
--- a/src/arduino/programmerManager.ts
+++ b/src/arduino/programmerManager.ts
@@ -3,28 +3,15 @@ import * as constants from "../common/constants";
 import { DeviceContext } from "../deviceContext";
 import { ArduinoApp } from "./arduino";
 import { IArduinoSettings } from "./arduinoSettings";
+import { IBoard, IProgrammer } from "./package";
 
 export class ProgrammerManager {
-    private _programmervalue: string;
+    public static notFoundDisplayValue: string = "<Select Programmer>";
 
-    private _programmerStatusBar: vscode.StatusBarItem;
+    private _programmerValue: string;
+    private _programmerDisplayName: string;
 
-    // Static list of 'available' programmers.  This should be repopulated by the currently selected board type.
-    private _availableProgrammers = {
-        avrisp: "AVR ISP",
-        avrispmkii: "AVRISP mkII",
-        usbtinyisp: "USBtinyISP",
-        arduinoisp: "ArduinoISP",
-        usbasp: "USBasp",
-        parallel: "Parallel Programmer",
-        arduinoasisp: "Arduino as ISP",
-        usbGemma: "Arduino Gemma",
-        buspirate: "BusPirate as ISP",
-        stk500: "Atmel STK500 development board",
-        jtag3isp: "Atmel JTAGICE3 (ISP mode)",
-        jtag3: "Atmel JTAGICE3 (JTAG mode)",
-        atmel_ice: "Atmel-ICE (AVR)",
-    };
+    private _programmerStatusBar: vscode.StatusBarItem;
 
     constructor(private _settings: IArduinoSettings, private _arduinoApp: ArduinoApp) {
         this._programmerStatusBar = vscode.window.createStatusBarItem(
@@ -41,7 +28,11 @@ export class ProgrammerManager {
     }
 
     public get currentProgrammer(): string {
-        return this._programmervalue;
+        return this._programmerValue;
+    }
+
+    public get currentDisplayName(): string {
+        return this._programmerDisplayName;
     }
 
     /**
@@ -50,10 +41,10 @@ export class ProgrammerManager {
      * List format: programmer_name:friendly_name
      */
     public async selectProgrammer() {
-        const selectionItems = Object.keys(this._availableProgrammers).map(
+        const selectionItems = this.getAvailableProgrammers(this._arduinoApp.boardManager.currentBoard).map(
             (programmer) => ({
-                label: this.getFriendlyName(programmer),
-                description: programmer,
+                label: programmer.displayName,
+                description: programmer.name,
                 programmer }));
         const chosen = await vscode.window.showQuickPick(selectionItems, {
             placeHolder: "Select programmer",
@@ -62,20 +53,37 @@ export class ProgrammerManager {
             return;
         }
 
-        this.setProgrammerValue(chosen.programmer);
-        const dc = DeviceContext.getInstance();
-        dc.programmer = chosen.programmer;
+        this.setProgrammerValue(chosen.programmer.name);
+        DeviceContext.getInstance().programmer = this._programmerValue;
+    }
+
+    private setProgrammerValue(programmerName: string | null) {
+        const programmer = this._arduinoApp.boardManager.installedProgrammers.get(programmerName);
+        this._programmerValue = this._settings.useArduinoCli ? programmerName : programmer ? programmer.key : programmerName;
+        this._programmerDisplayName = this._programmerValue
+            ? this.getDisplayName(programmerName)
+            : ProgrammerManager.notFoundDisplayValue;
+        this._programmerStatusBar.text = this._programmerDisplayName;
     }
 
-    private setProgrammerValue(programmer: string | null) {
-        this._programmervalue = programmer;
-        this._programmerStatusBar.text = this._programmervalue
-            ? this.getFriendlyName(this._programmervalue)
-            : "<Select Programmer>";
+    private getDisplayName(programmerName: string): string {
+        const programmer = this._arduinoApp.boardManager.installedProgrammers.get(programmerName);
+        return programmer ? programmer.displayName : programmerName;
     }
 
-    private getFriendlyName(programmer: string): string {
-        const friendlyName = this._availableProgrammers[programmer];
-        return friendlyName ? friendlyName : programmer;
+    private getAvailableProgrammers(currentBoard: IBoard): IProgrammer[] {
+        if (!currentBoard || !currentBoard.platform) {
+            return [];
+        }
+
+        // Filter the list of all programmers to those that share the same platform as the board
+        const availableProgrammers: IProgrammer[] = [];
+        for (const programmer of this._arduinoApp.boardManager.installedProgrammers.values()) {
+            if (programmer.platform === currentBoard.platform) {
+                availableProgrammers.push(programmer);
+            }
+        }
+
+        return availableProgrammers;
     }
 }
diff --git a/src/deviceContext.ts b/src/deviceContext.ts
index 710782f1..16451a81 100644
--- a/src/deviceContext.ts
+++ b/src/deviceContext.ts
@@ -92,6 +92,12 @@ export class DeviceContext implements IDeviceContext, vscode.Disposable {
 
     private _sketchStatusBar: vscode.StatusBarItem;
 
+    private _prebuild: string;
+
+    private _programmer: string;
+
+    private _suppressSaveContext: boolean = false;
+
     /**
      * @constructor
      */
@@ -264,6 +270,14 @@ export class DeviceContext implements IDeviceContext, vscode.Disposable {
         this.saveContext();
     }
 
+    public get suppressSaveContext() {
+        return this._suppressSaveContext;
+    }
+
+    public set suppressSaveContext(value: boolean) {
+        this._suppressSaveContext = value;
+    }
+
     public get buildPreferences() {
         return this._settings.buildPreferences.value;
     }
diff --git a/test/boardmanager.test.ts b/test/boardmanager.test.ts
index 06e79850..a17e1b46 100644
--- a/test/boardmanager.test.ts
+++ b/test/boardmanager.test.ts
@@ -12,6 +12,7 @@ import { ArduinoSettings } from "../src/arduino/arduinoSettings";
 import { parseBoardDescriptor } from "../src/arduino/board";
 import { BoardManager } from "../src/arduino/boardManager";
 import { IPlatform } from "../src/arduino/package";
+import { parseProgrammerDescriptor } from "../src/arduino/programmer";
 import * as util from "../src/common/util";
 
 suite("Arduino: Board Manager.", () => {
@@ -67,6 +68,14 @@ suite("Arduino: Board Manager.", () => {
             "should parse installed boards from custom packages ($sketchbook/hardware directory)");
     });
 
+    test("should be able to load installed programmers", () => {
+        assert.equal(boardManager.installedProgrammers.size, 17, `Expected to find programmers for dummy & AVR boards`);
+        assert.ok(boardManager.installedProgrammers.get("avrispmkii"),
+            "should parse installed programmers from Arduino IDE built-in packages");
+        assert.ok(boardManager.installedProgrammers.get("esp8266_dummy"),
+            "should parse installed programmers from custom packages ($sketchbook/hardware directory)");
+    });
+
     test("should parse boards.txt correctly", () => {
         const arduinoAvrBoard = fs.readFileSync(Path.join(Resources.mockedIDEPackagePath, "arduino/avr/boards.txt"), "utf8");
         const platform = {
@@ -92,6 +101,26 @@ suite("Arduino: Board Manager.", () => {
         assert.equal(diecimilaBoard.customConfig, "cpu=atmega328");
     });
 
+    test("should parse programmers.txt correctly", () => {
+        const arduinoAvrBoard = fs.readFileSync(Path.join(Resources.mockedIDEPackagePath, "arduino/avr/programmers.txt"), "utf8");
+        const platform = {
+            name: "Arduino AVR Boards",
+            architecture: "avr",
+            package: {
+                name: "arduino",
+            },
+        };
+        const programmerDescriptors = parseProgrammerDescriptor(arduinoAvrBoard, <IPlatform> platform);
+
+        const avrispmkii = programmerDescriptors.get("avrispmkii");
+        assert.equal(avrispmkii.name, "avrispmkii");
+        assert.equal(avrispmkii.displayName, "AVRISP mkII");
+
+        const usbGemma = programmerDescriptors.get("usbGemma");
+        assert.equal(usbGemma.name, "usbGemma");
+        assert.equal(usbGemma.displayName, "Arduino Gemma");
+    });
+
     test("should parse platform.txt correctly", () => {
         const platformConfig = util.parseConfigFile(Path.join(Resources.mockedSketchbookPath, "hardware/esp8266/esp8266/platform.txt"));
         assert.equal(platformConfig.get("name"), "ESP8266 Modules");
diff --git a/test/devicecontext.test.ts b/test/devicecontext.test.ts
index fac14055..4579b5c6 100644
--- a/test/devicecontext.test.ts
+++ b/test/devicecontext.test.ts
@@ -17,6 +17,7 @@ suite("Arduino: Device Context config", () => {
                 assert.equal(deviceContext.configuration, "cpu=atmega328");
                 assert.equal(deviceContext.output, null);
                 assert.equal(deviceContext.debugger_, null);
+                assert.equal(deviceContext.programmer, "arduino:jtag3isp");
                 done();
             });
         } catch (error) {
diff --git a/test/programmermanager.test.ts b/test/programmermanager.test.ts
new file mode 100644
index 00000000..a73baed0
--- /dev/null
+++ b/test/programmermanager.test.ts
@@ -0,0 +1,100 @@
+import * as assert from "assert";
+import * as TypeMoq from "typemoq";
+import * as vscode from "vscode";
+
+import { ArduinoApp } from "../src/arduino/arduino";
+import { ArduinoSettings } from "../src/arduino/arduinoSettings";
+import { Board } from "../src/arduino/board";
+import { BoardManager } from "../src/arduino/boardManager";
+import { IPlatform, IProgrammer } from "../src/arduino/package";
+import { Programmer } from "../src/arduino/programmer";
+import { ProgrammerManager } from "../src/arduino/programmerManager";
+import { DeviceContext } from "../src/deviceContext";
+import * as Resources from "./resources";
+
+suite("Arduino: Programmer Manager.", () => {
+    let programmerManager: ProgrammerManager;
+    let restoreSuppress: boolean;
+    let programmers: IProgrammer[];
+
+    setup((done) => {
+        // Suppress saving the device context, as not to polute the test arduino.json file
+        restoreSuppress = DeviceContext.getInstance().suppressSaveContext;
+        DeviceContext.getInstance().suppressSaveContext = true;
+
+        // Mock two different platforms
+        const platformMock1 = TypeMoq.Mock.ofType<IPlatform>();
+        platformMock1.setup((x) => x.packageName).returns(() => "mockplatform1");
+        const platformMock2 = TypeMoq.Mock.ofType<IPlatform>();
+        platformMock2.setup((x) => x.packageName).returns(() => "mockplatform2");
+
+        // Mock a single selected board, using the the first mocked platform
+        const mockedBoard = TypeMoq.Mock.ofType(Board);
+        mockedBoard.setup((x) => x.platform).returns(() => platformMock1.object);
+
+        // Setup a list of installed programmers
+        programmers = [
+            new Programmer("test1", platformMock1.object, "test1_display"),
+            new Programmer("test2", platformMock1.object),
+            new Programmer("test3", platformMock2.object)];
+
+        const installedProgrammers = new Map<string, IProgrammer>();
+        programmers.forEach((v) => installedProgrammers.set(v.name, v));
+
+        // Mock the BoardManager with minimal set of required functionality
+        const mockBoardManager = TypeMoq.Mock.ofType(BoardManager);
+        mockBoardManager.setup((x) => x.currentBoard).returns(() => mockedBoard.object);
+        mockBoardManager.setup((x) => x.installedProgrammers).returns(() => installedProgrammers);
+        mockBoardManager.setup((x) => x.onBoardTypeChanged).returns(() => new vscode.EventEmitter<void>().event);
+
+        // Mock minimal ArduinoApp
+        const arduinoApp = TypeMoq.Mock.ofType(ArduinoApp);
+        arduinoApp.setup((x) => x.boardManager).returns(() => mockBoardManager.object);
+
+        try {
+            programmerManager = new ProgrammerManager(TypeMoq.Mock.ofType(ArduinoSettings).object, arduinoApp.object);
+            done();
+        } catch (error) {
+            done(`Failed to initialize ProgrammerManager: ${error}`);
+        }
+    });
+
+    teardown(() => {
+        // Restpre the supression state for the DeviceContext
+        DeviceContext.getInstance().suppressSaveContext = restoreSuppress;
+    });
+
+    test("value stored in arduino.ino should load by default", () => {
+        assert.equal(programmerManager.currentProgrammer, "arduino:jtag3isp");
+        assert.equal(programmerManager.currentDisplayName, "arduino:jtag3isp");
+    });
+
+    test("changing arduino.ino value should change programmer", (done) => {
+        DeviceContext.getInstance().programmer = programmers[0].name;
+        setTimeout(() => {
+            assert.equal(programmerManager.currentProgrammer, programmers[0].key);
+            assert.equal(programmerManager.currentDisplayName, programmers[0].displayName);
+            done();
+        }, 200);
+    });
+
+    test("changing arduino.ino value to null should clear displayname to not found value", (done) => {
+        DeviceContext.getInstance().programmer = null;
+        setTimeout(() => {
+            assert.equal(programmerManager.currentProgrammer, null);
+            assert.equal(programmerManager.currentDisplayName, ProgrammerManager.notFoundDisplayValue);
+            done();
+        }, 200);
+    });
+
+    test("changing arduino.ino value to an unknown value will be accepted, and will replicate value as displayname", (done) => {
+        const unknownProgrammerValue = "unknown:programmer";
+
+        DeviceContext.getInstance().programmer = unknownProgrammerValue;
+        setTimeout(() => {
+            assert.equal(programmerManager.currentProgrammer, unknownProgrammerValue);
+            assert.equal(programmerManager.currentDisplayName, unknownProgrammerValue);
+            done();
+        }, 200);
+    });
+});
diff --git a/test/resources/Arduino15/preferences.txt b/test/resources/Arduino15/preferences.txt
index 6a875364..2378e9c3 100644
--- a/test/resources/Arduino15/preferences.txt
+++ b/test/resources/Arduino15/preferences.txt
@@ -45,7 +45,7 @@ preproc.save_build_files=false
 preproc.substitute_floats=true
 preproc.substitute_unicode=true
 preproc.web_colors=true
-programmer=arduino:avrispmkii
+programmer=avrispmkii
 run.display=1
 run.options=
 run.options.memory=false
diff --git a/test/resources/ArduinoIDE/hardware/arduino/avr/programmers.txt b/test/resources/ArduinoIDE/hardware/arduino/avr/programmers.txt
new file mode 100644
index 00000000..69ddf692
--- /dev/null
+++ b/test/resources/ArduinoIDE/hardware/arduino/avr/programmers.txt
@@ -0,0 +1,115 @@
+avrisp.name=AVR ISP
+avrisp.communication=serial
+avrisp.protocol=stk500v1
+avrisp.program.protocol=stk500v1
+avrisp.program.tool=avrdude
+avrisp.program.extra_params=-P{serial.port}
+
+avrispmkii.name=AVRISP mkII
+avrispmkii.communication=usb
+avrispmkii.protocol=stk500v2
+avrispmkii.program.protocol=stk500v2
+avrispmkii.program.tool=avrdude
+avrispmkii.program.extra_params=-Pusb
+
+usbtinyisp.name=USBtinyISP
+usbtinyisp.protocol=usbtiny
+usbtinyisp.program.tool=avrdude
+usbtinyisp.program.extra_params=
+
+arduinoisp.name=ArduinoISP
+arduinoisp.protocol=arduinoisp
+arduinoisp.program.tool=avrdude
+arduinoisp.program.extra_params=
+
+arduinoisporg.name=ArduinoISP.org
+arduinoisporg.protocol=arduinoisporg
+arduinoisporg.program.tool=avrdude
+arduinoisporg.program.extra_params=
+
+usbasp.name=USBasp
+usbasp.communication=usb
+usbasp.protocol=usbasp
+usbasp.program.protocol=usbasp
+usbasp.program.tool=avrdude
+usbasp.program.extra_params=-Pusb
+
+parallel.name=Parallel Programmer
+parallel.protocol=dapa
+parallel.force=true
+# parallel.delay=200
+parallel.program.tool=avrdude
+parallel.program.extra_params=-F
+
+arduinoasisp.name=Arduino as ISP
+arduinoasisp.communication=serial
+arduinoasisp.protocol=stk500v1
+arduinoasisp.speed=19200
+arduinoasisp.program.protocol=stk500v1
+arduinoasisp.program.speed=19200
+arduinoasisp.program.tool=avrdude
+arduinoasisp.program.extra_params=-P{serial.port} -b{program.speed}
+
+arduinoasispatmega32u4.name=Arduino as ISP (ATmega32U4)
+arduinoasispatmega32u4.communication=serial
+arduinoasispatmega32u4.protocol=arduino
+arduinoasispatmega32u4.speed=19200
+arduinoasispatmega32u4.program.protocol=arduino
+arduinoasispatmega32u4.program.speed=19200
+arduinoasispatmega32u4.program.tool=avrdude
+arduinoasispatmega32u4.program.extra_params=-P{serial.port} -b{program.speed}
+
+usbGemma.name=Arduino Gemma
+usbGemma.protocol=arduinogemma
+usbGemma.program.tool=avrdude
+usbGemma.program.extra_params=
+usbGemma.config.path={runtime.platform.path}/bootloaders/gemma/avrdude.conf
+
+## Notes about Dangerous Prototypes Bus Pirate as ISP
+## Bus Pirate V3 need Firmware v5.10 or later
+## Bus Pirate V4 need Firmware v6.3-r2151 or later
+## Could happen that BP does not have enough current to power an Arduino board 
+## through the ICSP connector. In this case disconnect the +Vcc from ICSP connector
+## and power Arduino board in the normal way.
+buspirate.name=BusPirate as ISP
+buspirate.communication=serial
+buspirate.protocol=buspirate
+buspirate.program.protocol=buspirate
+buspirate.program.tool=avrdude
+buspirate.program.extra_params=-P{serial.port}
+
+# STK500 firmware version v1 and v2 use different serial protocols.
+# Using the 'stk500' protocol tells avrdude to try and autodetect the
+# firmware version. If this leads to problems, we might need to add
+# stk500v1 and stk500v2 entries to allow explicitely selecting the
+# firmware version.
+stk500.name=Atmel STK500 development board
+stk500.communication=serial
+stk500.protocol=stk500
+stk500.program.protocol=stk500
+stk500.program.tool=avrdude
+stk500.program.extra_params=-P{serial.port}
+
+jtag3isp.name=Atmel JTAGICE3 (ISP mode)
+jtag3isp.communication=usb
+jtag3isp.protocol=jtag3isp
+jtag3isp.program.protocol=jtag3isp
+jtag3isp.program.tool=avrdude
+jtag3isp.program.extra_params=
+
+jtag3.name=Atmel JTAGICE3 (JTAG mode)
+jtag3.communication=usb
+jtag3.protocol=jtag3
+jtag3.program.protocol=jtag3
+jtag3.program.tool=avrdude
+# Set a bitclock of 0.1us (the fastest supported value). This should
+# work regardless of the crystal used, since JTAG doesn't use the MCU
+# clock but dictates its own clock.
+jtag3.program.extra_params=-B0.1
+
+atmel_ice.name=Atmel-ICE (AVR)
+atmel_ice.communication=usb
+atmel_ice.protocol=atmelice_isp
+atmel_ice.program.protocol=atmelice_isp
+atmel_ice.program.tool=avrdude
+atmel_ice.program.extra_params=-Pusb
diff --git a/test/resources/Documents/Arduino/hardware/esp8266/esp8266/programmers.txt b/test/resources/Documents/Arduino/hardware/esp8266/esp8266/programmers.txt
new file mode 100644
index 00000000..8fe950d4
--- /dev/null
+++ b/test/resources/Documents/Arduino/hardware/esp8266/esp8266/programmers.txt
@@ -0,0 +1,14 @@
+#**********************************************
+# Dummy esp8266 programmer
+#**********************************************
+esp8266_dummy.name=Dummy esp8266 programmer
+esp8266_dummy.program.tool=bootburn
+esp8266_dummy.program.cmd=esp8266prog
+esp8266_dummy.program.cmd.windows=esp8266prog.exe
+
+#**********************************************
+# Dummy esp8266 bootloader programmer
+#**********************************************
+esp8266_boot_dummy.name=Dummy esp8266 bootloader programmer
+esp8266_boot_dummy.program.tool=bootburn
+esp8266_boot_dummy.program.cmd=esp8266bootprog
\ No newline at end of file
diff --git a/test/resources/blink/.vscode/arduino.json b/test/resources/blink/.vscode/arduino.json
index 5990ff4b..32bd2323 100644
--- a/test/resources/blink/.vscode/arduino.json
+++ b/test/resources/blink/.vscode/arduino.json
@@ -4,5 +4,6 @@
     "board": "arduino:avr:diecimila",
     "output": null,
     "_debugger": null,
-    "configuration": "cpu=atmega328"
+    "configuration": "cpu=atmega328",
+    "programmer": "arduino:jtag3isp"
 }
\ No newline at end of file

From b0375c8c9f9ec0551bd4fad789dd42be9083933b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Jan 2021 09:45:43 -0800
Subject: [PATCH 125/142] Bump ini from 1.3.5 to 1.3.8 (#1159)

Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.8.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.8)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Adi Azulay <adazulay@microsoft.com>
---
 package-lock.json | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 74bb9c6b..1d6ba130 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3554,12 +3554,6 @@
           "dev": true,
           "optional": true
         },
-        "ini": {
-          "version": "1.3.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
@@ -5093,9 +5087,9 @@
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
     "ini": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
     },
     "inquirer": {
       "version": "7.3.3",

From b7094ba74e2a15773193e0bdbd59f0c27598a575 Mon Sep 17 00:00:00 2001
From: Adi Azulay <adazulay@microsoft.com>
Date: Fri, 22 Jan 2021 14:56:07 -0800
Subject: [PATCH 126/142] remove IntelliSense Auto branch notes

---
 BRANCHNOTES.md | 456 -------------------------------------------------
 1 file changed, 456 deletions(-)
 delete mode 100644 BRANCHNOTES.md

diff --git a/BRANCHNOTES.md b/BRANCHNOTES.md
deleted file mode 100644
index b49125f6..00000000
--- a/BRANCHNOTES.md
+++ /dev/null
@@ -1,456 +0,0 @@
-# IntelliSense Autoconfiguration Branch
-
-**TL;DR:** Alpha versions of this extension of this branch with the latest features and fixes are available from the following [Dropbox folder](https://www.dropbox.com/sh/whmcdt26chyjgby/AAB1Ld2fzZ9Z_NfM3CRay17wa).
-
-## Problem
-This branch more or less addresses the following issues:
-| # | Issue | Title | Comment |
-|--:|:------|:------------|:--------|
-|  1| [#438](https://github.com/microsoft/vscode-arduino/issues/438) | **The Extension should automagically fill the `c_cpp_properties.json`, so intellisense works out of the box** | This is the issue to which I usually report news concerning the progress of this project |
-|  2| [#969](https://github.com/microsoft/vscode-arduino/issues/969) | **INO Files defines undefined but can jump to definition**  |  |
-|  3| [#959](https://github.com/microsoft/vscode-arduino/issues/959) | **Update board type command does not update intellisense config automatically**  |  |
-|  4| [#892](https://github.com/microsoft/vscode-arduino/issues/892) | **Default IntelliSense config** |  |
-|  5| [#876](https://github.com/microsoft/vscode-arduino/issues/876) | **Missing #define ARDUINO 10808 logic?** | Marked as bug but it's just the same problem again |
-|  6| [#850](https://github.com/microsoft/vscode-arduino/issues/850) | **How to prevent modifications of `c_cpp_properties.json` by the extension?**  | Asks if the current implementation can be turned off, because it overwrites a user's config with non working IS config -- this is sad. |
-|  7| [#833](https://github.com/microsoft/vscode-arduino/issues/833) | **Allow C_Cpp.intelliSenseEngine to be set to "Default" instead of "Tag Parser" for better code completion/suggestions**  |  |
-|  8| [#831](https://github.com/microsoft/vscode-arduino/issues/831) | **IntelliSenseEngine doesn't work as default** |  |
-|  9| [#829](https://github.com/microsoft/vscode-arduino/issues/829) | **`Arduino.h` and ESP8266 includes have squiggles** | Stale issue |
-| 10| [#823](https://github.com/microsoft/vscode-arduino/issues/823) | **Intellisense is not highlighting code** | Stale issue |
-| 11| [#818](https://github.com/microsoft/vscode-arduino/issues/818) | **Warning with default includePath after initialize, cannot open source file `avr/pgmspace.h`** | Stale issue |
-| 12| [#808](https://github.com/microsoft/vscode-arduino/issues/808) | **Identifier `Serial` is undefined**  |  |
-| 13| [#776](https://github.com/microsoft/vscode-arduino/issues/776) | **Can not open source file `omp.h` (dependency of `ESP8266WiFi.h`** |  |
-| 14| [#772](https://github.com/microsoft/vscode-arduino/issues/772) | **How to fix red squiggles under constants like D2 (upload works fine)** |  |
-| 15| [#761](https://github.com/microsoft/vscode-arduino/issues/761) | **When creating the `c_cpp_properties.json` it should include the libraries folder as well as all of the other folders.** |  |
-| 16| [#749](https://github.com/microsoft/vscode-arduino/issues/749) | **Non-fatal error on Adafruit Feather M0: cannot open source file `sam.h`** | Stale issue |
-| 17| [#727](https://github.com/microsoft/vscode-arduino/issues/727) | **Intellisense for Arduino Tabs** | Stale issue |
-| 18| [#684](https://github.com/microsoft/vscode-arduino/issues/684) | **Default C/C++ configuration uses MSVC for IntelliSense rather than GCC** | Stale issue |
-| 19| [#678](https://github.com/microsoft/vscode-arduino/issues/678) | **Dependency error `avr32/io.h`** | Stale issue |
-| 20| [#645](https://github.com/microsoft/vscode-arduino/issues/645) | **Should IntelliSense suggest only built in function?** | Stale issue |
-| 21| [#613](https://github.com/microsoft/vscode-arduino/issues/613) | **Read content of `keywords.txt` for text highlights** | This will become obsolete as well since `keywords.txt` is a dirty workaround for the arduino IDE which doesn't have IntelliSense at all. |
-| 22| [#563](https://github.com/microsoft/vscode-arduino/issues/563) | **Support of intellisence for library Wire(sam)** |  |
-| 23| [#525](https://github.com/microsoft/vscode-arduino/issues/525) | **`#include` errors detected - Tag Parser.** | Closed but still not fixed properly |
-| 24| [#474](https://github.com/microsoft/vscode-arduino/issues/474) | **Enrich device develop experience**  |  |
-| 25| [#127](https://github.com/microsoft/vscode-arduino/issues/127) | **Syntax highlighting for some of the Classes/Instances is missing** | Closed but still not fixed properly |
-| 26| [#126](https://github.com/microsoft/vscode-arduino/issues/126) | **Syntax highlighting for some of the Macros is missing** | Closed but still not fixed properly |
-| 27| [#125](https://github.com/microsoft/vscode-arduino/issues/125) | **Missing syntax highlighting for partial arduino constants** | Closed but still not fixed properly |
-| 28| [#115](https://github.com/microsoft/vscode-arduino/issues/115) | **Dot prompting the methods doesn't work on Mac** | Closed but still not fixed properly |
-
-<!-- |   | [#](https://github.com/microsoft/vscode-arduino/issues/) | **** |  | -->
-<!-- |   | [#](https://github.com/microsoft/vscode-arduino/issues/) | **** |  | -->
-<!-- |   | [#](https://github.com/microsoft/vscode-arduino/issues/) | **** |  | -->
-<!-- |   | [#](https://github.com/microsoft/vscode-arduino/issues/) | **** |  | -->
-
--- the list is probably incomplete - I didn't search exhaustively and didn't consider closed issues as long as I didn't stumble upon one. New duplicates are popping up at a rate of about one per week.
-
-Some issue searches and other related issues
-* [vscode-arduino issue search for IntelliSense](https://github.com/microsoft/vscode-arduino/issues?utf8=%E2%9C%93&q=intellisense+is%3Aopen)
-* [vscode-arduino issue search for intellisense label](https://github.com/microsoft/vscode-arduino/issues?utf8=%E2%9C%93&q=label%3Aintellisense)
-* [Wrongly attributed to vscode instead of vscode-arduino](https://github.com/Microsoft/vscode-cpptools/issues/1750)
-* [Problems with IntelliSense itself](https://github.com/microsoft/vscode-cpptools/issues/1034)
-
-## Solution
-Implement and add a a parser which parses the output from Arduino's build process and generate a very precise `c_cpp_properties.json` which in turn hopefully renders any user interaction with this file obsolete.
-
-This mechanism should try it's best to detect situations in which the setup changes (board changed, sketch changed and so forth) and re-generate this configuration. For all other situations I'll provide a command to manually re-generate it.
-
-## Branch Goals
-### Build Output Parser
-The parser which identifies the main compilation command from Arduino's build output. It then parses the relevant includes, defines, compiler paths and flags from it.
-
-### `c_cpp_properties.json` Generator
-The generator takes the parser's output and transforms it into a valid `c_cpp_properties.json` file. It merges the generated configuration with the existing (e.g. user-) configurations and writes it back to the configuration file.
-
-### Configuration Flags
-Provide a global configuration flag which allows the user to turn this feature off. A project- (sketch-) specific override will be provided which allows the user to turn it off or on - regardless of the global setting.
-This is useful for the rare cases for which this magic should fail or the user has a very exotic setup. This branch tries to eliminate most of the latter cases though. Especially it will always write to the `Arduino` configuration. If the user sets up a custom configuration she/he must simply name it differently, e.g. `John's Custom Config`, and the generator won't touch it.
-
-### Global Tasks in vscode-arduino
-* Integrate it into vscode-arduino's build mechanics
-* Install event trigger generation/handling to run the analysis as soon as something changes
-* Remove the current implementation
-For more details see table below.
-
-## Branch Log
-**2020 02 05** Currently I'm able to generate error free IntelliSense setups for AVR and ESP32 using the preliminary implementation. For ESP32 I just had to add the intrinsic compiler paths manually. A solution has to be found for these ... which there is, see [here](https://stackoverflow.com/a/6666338)
-**2020 02 06** Got it fully working (with built-in include directories) for AVR, ESP32, ESP8266. Rewrote the backend to facilitate writing of further parser engines in the future.
-**2020 02 07** Wrote compiler command parser npm package [cocopa](https://www.npmjs.com/package/cocopa) and began writing a test framework for it. Added a global configuration switch which allows the IntelliSense configuration generation to be turned off.
-**2020 02 08** Integrated `cocopa` into vscode-arduino. Added project configuration flag which can override the global flag in both ways (forced off, forced on). Made code tslint compliant. Began some documentation in [README.md](README.md). vscode-arduino now tries to generate an IntelliSense configuration even if compilation (verify) should fail. vscode-arduino now tries to generate a IntelliSense configuration even if Arduino's verify failed (if the main sketch compilation was invoked before anything failed)
-**2020 02 09** Moved vscode-arduino specific from cocopa over (to keep cocopa as generic as possible). More unit testing within cocopa. Some research regarding future serial monitor implementation. Implemented c_cpp_properties merging -> compiler analysis results are merged into existing configuration and will preserve configurations of different name than the vscode-studio default configuration name (currently "Arduino"). This opens up the possibility for users to write their own configurations without having to disable the autogeneration. Implemented "write on change" - `c_cpp_properties.json` will only be written if a new configuration has been detected. Now loads of tests have to be written for cocopa.
-**2020 02 10-12** Worked primarily on cocopa and test cases, fixed some npm and build errors on vscode-arduino within my setup.
-**2020 02 15** Merged `upload` `uploadUsingProgrammer` and `verify` into a single function since they shared mostly the same code
-* Better readability
-* Better maintainability
-* Less code redundancy -> less code -> less bugs
-* Keeps the calls to the Arduino build CLI at a single location
-
-During merging I found some bugs within those functions - mainly due to the above problem. The most notable were:
-* The serial monitor state wasn't restored when something went wrong
-* In one of the `upload` functions the original authors forgot to invoke the "pre build command"
-* Error message formatting was fixed within `verify` only
-* No consistent return values within `verify` (when it bailed out early it returned `void`)
-
-**2020 02 17** Disabled and marked all previous implementations of IntelliSense support for later removal using `IS-REMOVE`. Pulled changes from upstream and merged them into the intellisense feature branch. Began to work on event handling/generation: vscode-arduino should detect when sketch/board/configuration and so on has changed, then re-analyze the current setup and set the IntelliSense configuration accordingly. This works more or less but there's a lot to fix in the current implementation which kept me busy till late today (I need some sleep now). Cleanup and commits follow tomorrow. Approaching alpha version for curious testers. OSX and Linux comes first, Windows will follow later.
-**2020 02 18** Finished basic event triggering. Rewrote `DeviceContext` for proper settings modification detection (trigger events only on actual change) and generation of setting specific events (e.g. board changed) instead of one global event (aka. "something in the settings changed").
-**2020 02 19** Implemented proper build scheduling for analysis build by writing an `AnalysisManager` class. This class collects multiple changes (e.g. board and configuration, which often are changed shortly after another) before running an analysis. In case another build or analysis is in progress it postpones newly filed analysis requests until the other build has completed. Updated and completed the documentation for the IntelliSense usage within [README](README.md). Alpha test builds of the extension containing the latest implemented features and fixes are now available from the following [Dropbox folder](https://www.dropbox.com/sh/whmcdt26chyjgby/AAB1Ld2fzZ9Z_NfM3CRay17wa). Please note, that Windows is currently not supported yet. Reviewed, documented/commented all changes and committed the automatic analysis integration changes.
-**2020 02 20** Windows support - what a PITA. This OS is so foobar'ed... The only positive outcome from this experience: I found some substantial bugs in the parser which - of course (Murphy) - didn't affect me up to now. The parser should be much more resistant against strange paths and escapes now: Added proper command line lexer to cocopa and worked around several ridiculous Windows shortcomings (Microsoft owes me at least 50 crates of beer). The whole mess is not cleaned up and committed yet so please don't build from the repository and use the alpha release packages as outlined above.
-**2020 02 21** Discovered problems and bugs in the current official release from Microsoft: Fixed event handling within board manager. Added validity checks when loading board configurations from arduino.json. Better error handling and code locality, for details see commit.
-**2020 02 22** Worked on cocopa unit tests: restored broken tests and added platform test for built-in parser. Added path normalizing for include paths for both cocopa and vscode-arduino. Verified correct behaviour on Windows with latest release (alpha tester claimed it not to be working)
-**2020 02 23** Several tests, fixes and improvements within cocopa. `Arduino.h` now added to forced includes. Fixed code which wasn't linted up to now. Added hint to end of build how to rebuild the IntelliSense configuration. Added missing version field to `c_cpp_properties.json`.
-**2020 02 25** Implemented and tested support for `.cpp`-sketches. Done implementing the most relevant unit tests in cocopa. Two independent alpha testers confirm proper working of the previous alpha releases. Updated to the latest revision of cocopa.
-**2020 02 26** Preparing for pull request: Removed all code marked `IS-REMOVE` and dead code which I was able to identify. Reviewed all TODOs and resolved those which can be fixed without having to bother the maintainers. Left the unresolved on grounds of documentation.
-**2020 02 27** Integrated analysis into all builds. Fixed bug in board management (board configuration couldn't be set anymore). Added logging filter for non-verbose builds and uploads to remove spurious messages. Added post-build script support.
-**2020 02 28** Moved some code to cocopa. Cocopa now tries to parse the compiler arguments to set the C++ standard according to the C++ standard set by the individual board package. Better error handling for pre-/post-build commands. Error reporting for exceptions during build cleanup. Full `cmd` and `bash` support within pre-/post-build commands. Environment variables for pre-/post-build commands.
-**2020 02 29** Added support for Arduino preferences within `arduino.json`. Fixed bug which surfaced when no sketch was set. Fixed security issue reported by Mathieu.
-
-## Status
-|      | Tasks   |
-|-----:|:--------|
-| **Build output parser**               | :heavy_check_mark: Basic parser working |
-|                                       | :heavy_check_mark: Support for different boards (done for AVR, ESP32, ESP8266) -- The code has been designed such that it is easy to write/add new parser engines (for non gcc compilers for instance) |
-|                                       | :heavy_check_mark: Getting intrinsic gcc include paths |
-|                                       | :heavy_check_mark: Handling quoted arguments |
-|                                       | :heavy_check_mark: X-platform support |
-| **`c_cpp_properties.json` generator** | :heavy_check_mark: Basic objects |
-|                                       | :heavy_check_mark: Basic setting of parsing result |
-|                                       | :heavy_check_mark: Basic file input  |
-|                                       | :heavy_check_mark: Basic file output |
-|                                       | :heavy_check_mark: Merging of parsing result and existing file content |
-|                                       | :heavy_check_mark: Handling inexistent files and folders |
-|                                       | :heavy_check_mark: Write configuration on change only |
-|                                       | :heavy_check_mark: Parse C++ standard from compiler flags |
-| **Configuration flags**               | :heavy_check_mark: Provide global disable flag for IntelliSense auto-config |
-|                                       | :heavy_check_mark: Provide project specific override for the global flag - most users will likely use the default setup and disable auto-generation for very specific projects |
-| **Unit tests**                        | :heavy_check_mark: Basic parser (known boards, match/no match)|
-|                                       | :heavy_check_mark: All unit tests in cocopa |
-|                                       | :heavy_check_mark: Test with cpp sketches |
-| **General**                           | :heavy_check_mark: Review and remove previous attempts messing with `c_cpp_properties.json` or IntelliSense (documented in the [General Tasks](#General-Tasks) section)  |
-|                                       | :heavy_check_mark: *Auto-run verify when* |
-|                                       | &nbsp;&nbsp;&nbsp;&nbsp;:heavy_check_mark: a) setting a board  |
-|                                       | &nbsp;&nbsp;&nbsp;&nbsp;:heavy_check_mark: b) changing the board's configuration  |
-|                                       | &nbsp;&nbsp;&nbsp;&nbsp;:heavy_check_mark: c) selecting another sketch  |
-|                                       | &nbsp;&nbsp;&nbsp;&nbsp;:heavy_check_mark: d) ~~workbench initialized and no `c_cpp_properties.json` found~~ obsolete: when board and board configuration is loaded on start up the analysis is triggered anyways |
-|                                       | &nbsp;&nbsp;&nbsp;&nbsp;:white_check_mark: e) Identify other occasions where this applies (usually when adding new libraries) -- any suggestions? |
-|                                       | :heavy_check_mark: Hint the user to run *Arduino: Rebuild IntelliSense Configuration* -> printing message after each build (verify, upload, ...) |
-|                                       | :heavy_check_mark: Better build management such that regular builds and analyze builds do not interfere (done, 2020-02-19)  |
-|                                       | :heavy_check_mark: Analyze task queue which fits in the latter  (done, 2020-02-19)  |
-|                                       | :heavy_check_mark: Document configuration settings in [README.md](README.md) |
-|                                       | :heavy_check_mark: Document features in [README.md](README.md) |
-|                                       | :heavy_check_mark: Try to auto-generate even if verify (i.e. compilation) fails |
-|                                       | :heavy_check_mark: Extract compiler command parser from vscode-arduino and [publish](https://itnext.io/step-by-step-building-and-publishing-an-npm-typescript-package-44fe7164964c) it as a separate package which will allow reusage and easy testing without heavy vscode-arduino rucksack -- done, see [cocopa](https://www.npmjs.com/package/cocopa) |
-|                                       | :heavy_check_mark: Parser only works when arduino is set to `verbose`, since this is the only way we get the compiler invocation command - this has to be fixed (done, see next item) |
-|                                       | :heavy_check_mark: Implement a *Rebuild IntelliSense Configuration* command which runs verify verbosely internally and therefore allows us to find and parse the compiler command |
-|                                       | :heavy_check_mark: Implement proper event generation for `DeviceContext`. a) Events should be issued only when something actually changes, b) Events should be issued for each setting separately |
-|                                       | :heavy_check_mark: Finally: go through my code and look for TODOs |
-
-`*` not committed to branch yet
-`>` most of the actual parsing and configuration generation is part of [cocopa](https://github.com/elektronikworkshop/cocopa/) ([here](https://www.npmjs.com/package/cocopa)'s the npm package)
-
-## Additional Stuff this Branch addresses
-* Support for `postbuild` commands, see [#786](https://github.com/microsoft/vscode-arduino/issues/786)
-  * Full `cmd` and `bash` syntax support for pre-/post-build commands
-  * Environment variables for pre-/post-build commands
-* Support for Arduino preferences to be set during build, see [#975](https://github.com/microsoft/vscode-arduino/issues/975#issuecomment-592931155)
-* Fixed security issue [#966](https://github.com/microsoft/vscode-arduino/issues/966): Web-server was listening on machine's main interface (0.0.0.0) instead of `localhost`.
-
-## Motivation
-I write a lot of code for Arduino, especially libraries. The Arduino IDE is not suited for more complex projects and I tried several alternatives:
-* The old and dysfunctional Arduino CDT extension for eclipse somehow stalled (even if it was promising)
-* Sloeber could be an option but the maintainer is disillusioned and the project is more or less dead. Furthermore Eclipse is pretty heavy and less accessible to beginners
-* Platform IO IDE's license is very [restrictive](https://community.platformio.org/t/what-part-of-platformio-is-open-source-licenced/1447/2).
-
-Then remains vscode-arduino. It seems that it isn't completely dead - but almost. Most of the core functionality seems to work (I used it a few days now). But the biggest show stopper is the bad IntelliSense support -- which I'll address here now.
-
-## Beer Money :beers: -- Support
-You can chip in some beer money to keep me motivated - this is *really* appreciated.
-
-[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=PVLCSRZHBJ28G&source=url)
-
-<!-- https://github.com/patharanordev/donate-in-git -->
-I will list every supporter here, thanks!
-
-### Supporters
-5$ -> 1 :beer:
-1h coding -> 20$ -> 4 :beers: (very moderate wage though)
-2020-02-04 EW: 32 :beers: (8h coding)
-2020-02-05 EW: 40 :beers: (10h coding)
-2020-02-06 EW: 36 :beers: (9h coding)
-2020-02-07 EW: 48 :beers: (12h coding)
-2020-02-08 EW: 52 :beers: (13h coding)
-2020-02-09 EW: 40 :beers: (10h coding)
-2020-02-10 EW: 32 :beers: (8h coding)
-2020-02-11 EW: 16 :beers: (4h coding)
-2020-02-12 EW: 32 :beers: (8h coding)
-2020-02-15 T.D.: 4 :beers: (20$ - Thanks a lot!)
-2020-02-15 EW: 28 :beers: (7h coding)
-2020-02-17 EW: 52 :beers: (13h coding)
-2020-02-18 EW: 36 :beers: (9h coding)
-2020-02-19 EW: 48 :beers: (12h coding)
-2020-02-20 EW: 56 :beers: (14h coding)
-2020-02-21 EW: 48 :beers: (12h coding)
-2020-02-22 EW: 44 :beers: (11h coding)
-2020-02-23 EW: 20 :beers: (5h coding)
-2020-02-25 EW: 12 :beers: (3h coding)
-2020-02-26 EW: 16 :beers: (4h coding)
-2020-02-27 EW: 48 :beers: (12h coding)
-2020-02-28 EW: 52 :beers: (13h coding)
-2020-02-29 EW: 28 :beers: (7h coding)
-<!-- 7:00 - 14:00 -->
-
-<!-- https://github.com/StylishThemes/GitHub-Dark/wiki/Emoji -->
-
-## Useful Links
-* [`c_cpp_properties.json` reference](https://code.visualstudio.com/docs/cpp/c-cpp-properties-schema-reference)
-* [Interactive regex debugger](https://regex101.com/)
-* [Git branch management](https://blog.scottlowe.org/2015/01/27/using-fork-branch-git-workflow/)
-* [Collapsible Markdown](https://gist.githubusercontent.com/joyrexus/16041f2426450e73f5df9391f7f7ae5f/raw/f774f242feff6bae4a5be7d6c71aa5df2e3fcb0e/README.md)
-* [Arduino CLI manpage](https://github.com/arduino/Arduino/blob/master/build/shared/manpage.adoc)
-* [Install extensions from file](https://vscode-docs.readthedocs.io/en/stable/extensions/install-extension/)
-* [Publish vscode extensions](https://code.visualstudio.com/api/working-with-extensions/publishing-extension)
-* [Debug logging for IntelliSense](https://code.visualstudio.com/docs/cpp/enable-logging-cpp)
-* [Arduino Dev Tools](https://playground.arduino.cc/Main/DevelopmentTools/) (obsolete/outdated)
-
-## Future Work
-* Proper interactive serial terminal (this is the second major show stopper in my opinion)
-  * Command history option
-  * From https://github.com/microsoft/vscode-arduino/issues/463#issuecomment-583846263 and following:
-    * Allow input on the serial monitor in a convenient way - ie just type and hit return, just like the Arduino IDE
-    * Have the serial monitor window NOT keep turning off autoscroll (there is a separate ticket for this)
-    * Have the option of the serial monitor and/or compile window auto clear each time the sketch is compiled
-    * There is the annoying default where the compile runs in verbose mode and we have to manually edit config files to turn off the trace output
-    * Is there a way to automatically select the right serial port?
-    * Oh and one more. I want the serial output and perhaps compile windows to be undocked or at least I want them to sit to the right of my code window but they seem rigidly stuck at the bottom of the screen.
-    * And I would probably prioritize ease of use over better editing/intelligence.
-  * Being able to set baud rate within monitor
-  * Possible implementation hooks
-    * run node program in native terminal and connect it to extension
-      * https://github.com/serialport/node-serialport
-        * [General](https://serialport.io/docs/guide-about)
-        * [CLI](https://serialport.io/docs/guide-cli)
-        * [API](https://serialport.io/docs/guide-usage)
-    * write a [debugger extension](https://code.visualstudio.com/api/extension-guides/debugger-extension) with a [mock](https://github.com/Microsoft/vscode-mock-debug) which communicates with the serial
-* Lots of redundant code
-  * e.g. "upload is a superset of "verify"
-  * general lack of modularity - the above is the result
-* It seems that this extension is pretty chaotic. Most probably some refactoring is necessary.
-* Possibility to jump to compilation errors from compiler output and highlight compiler errors
-* Further IntelliSense enhancements/features:
-  * When having adding a library folder to the workspace IntelliSense should use the same configuration for it to enable library navigation and code completion.
-  * Optimization: Abort analysis build as soon as compiler statement has been found
-* Non-IDE unit testing - to eliminate dependency injection use ts-mock-imports for instance
-* Remove dead code
-* Identify bad code and rework it
-  * all those auxiliary functions in `src/common/util.ts` should be reviewed as they violate every guideline of good coding (try-catch clauses without error handling etc.)
-* Hardcoded and scattered constants:
-  * Load package.json and use values from therein instead of hard coding redundant values like shortcuts (like I did for the IntelliSense message in `arduino.ts`)
-  * Line splitting and other regexes
-  * Scan code for other hard coded stuff and take appropriate countermeasures
-* Write good documentation/manual
-  * Integration of Arduino
-  * Project structure
-  * How does the compiling work
-  * Build/Arduino Backend
-  * Include paths
-  * Relation of IntelliSense and build
-
-## Non-categorized Notes
-### Integrate upstream changes into fork
-```bash
-git remote add upstream https://github.com/microsoft/vscode-arduino.git
-git remote -v
-git fetch upstream
-# make sure your working directory is clean, then
-git checkout master
-git merge upstream/master
-git push origin master
-# to pull the changes into you feature branch:
-git checkout intellisense-autoconfig
-git merge master
-git push origin intellisense-autoconfig
-```
-----
-
-## How to beta test cutting edge code from the repo
-
-For development and testing of this fork/branch I've set up a dedicated chat room:
-
-[![Gitter](https://badges.gitter.im/vscode-arduino-ew-fork/community.svg)](https://gitter.im/vscode-arduino-ew-fork/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
-
-**Note:** the topic is strictly development and testing of this feature enhancement branch. It's not a place where you can ask for help on your Arduino problems. There are dedicated forums for that and I'll delete any question of this type.
-
-
-*I wrote the follwing for @iFreilicht, if anyone has some additional findings please let me know to keep this documentation up to date*
-
- > I'd love to try this out and give feedback. It would be a huge quality of life improvement if this was to work. Could you point me to a resource that helps me install your version of the extension?
-
-that's the reason I embarked on this project. Great if you'd like to help out - this comes in really handy. Getting the stuff rock solid is one of my central objectives and testing is one cornerstones here.
-
-Currently my work is at the following state:
-* Parsing works
-* Enable/disable via global or project flags
-* You can have personal configurations which aren't overwritten
-
-But I'm not fully there yet. Things which are yet to be done are:
-
-* Move the parser/configuration-generator out of the "verify" code, since it requires the build to be run with `--verbose` flag enabled which most probably few like (except for me :) I always switch on all warnings and set it to verbose).
-  This is something I can implement pretty fast
-* I have not removed the original "IntelliSense configurator" which ruins the `c_cpp_properties.json` every now and then but that's one of my next tasks as well. And you can simply delete the file as you can re-generate the perfect version with my analyzer/generator by simply verifying your sketch
-* My development system runs on Ubuntu-GNU/linux and I haven't done any work for Windows yet but that's one of the next steps. The chances that it works on OSX "out of the box" are pretty good
-
-To run the development version clone my [repository](https://github.com/elektronikworkshop/vscode-arduino) and checkout the `intellisense-autoconfig` branch
-
-The following steps requires you to have `git`, `vscode`, `npm` and `nodejs` at recent versions. On my Ubuntu system I don't use the versions supplied by my package manager (`apt`) as they are usually pretty outdated - I usually install `nodejs` and `npm` from their respective/official websites. If you're on Windows you'll have to be a bit more patient since I haven't set up a virtual machine yet for testing and Windows is definitely not my domain. But I'll document the setup process as soon as I'll get to it.
-
-```bash
-git clone https://github.com/elektronikworkshop/vscode-arduino
-cd vscode-arduino
-# switch to the feature branch (not necessary probably because this branch is set to default)
-git checkout intellisense-autoconfig
-# check if you're on the right branch
-git status
-# install module dependencies
-npm install
-# install gulp builder globally to make it available to the path (requires relaunching your shell)
-# there's another option below, see ./launchcode.sh
-npm install -g gulp
-# to make sure that gulp is actually working type
-gulp --tasks
-# if not -> configure your $PATH and open a new terminal to make sure it's added, then
-# open vscode
-code .
-```
-Making sure that gulp  is on your `$PATH` is essential. As long this isn't the case the following steps must not be carried out.
-
-Another option to launch code with gulp on your path is (within bash or similar)
-```bash
-# create launch script
-echo "PATH=./node_modules/.bin:$PATH code ." > launchcode
-# make it executable
-chmod +x launchcode
-# now you can launch vscode like this
-./launchcode
-```
-This way you don't have to install gulp globally anymore (no `npm install -g gulp`). The path to the vscode dependency module binary is set as temporary environment variable when launching vscode.
-
-When everything's fine and vscode running, hit F5 to debug or select it from the *Debug* menu. vscode will then complain that there's *No task defined* and you let it generate the configuration for you by clicking the button *Configure Task*. After configuring the tasks debug (`F5`) or build (`Ctrl + Shift + B`) should work.
-
-As soon as you've got it up and running (`F5` spawns a new window), just navigate to your Arduino project. Configure in the vscode-arduino global settings the build output to `verbose` and run verify (`Ctrl + Alt + R`) as you know it. This will then generate a fresh `c_cpp_properties.json`. As long as I haven't removed the generator from the current maintainers you'll have to regenerate it as soon as you see those double asterisk-paths like `whatever/path/**` - if I get to it today, I'll give it a try and will remove/disable it for testing. You can then pull my changes in by running
-```bash
-git pull
-```
-from within your terminal inside vscode (and your `vscode-arduino` folder).
-
-Different IntelliSense configurations can be selected in vscode in the lower right. The configuration my branch generates is called *Arduino* as depicted here:
-
-![74001156-cfce8280-496a-11ea-9b9d-7d30c83765c1](https://user-images.githubusercontent.com/21954933/74351237-2696ea80-4db7-11ea-9f7a-1bfc652ad5f5.png)
-
-Sometimes IntelliSense has problems within the extension host (which you're running when launching it with `F5`) and fails to resolve some header paths. This is a problem of vscode and not the extension. Then just restart. The extension host is a bit buggy if you ask me, so I hope I can provide some development snapshots in the future which will render all the steps above superfluous and let you run the latest development version with your regular vscode.
-
-----
-
-# Implementation
-Here are some implementation notes. Probably only of interest to me.
-
-## Build Output Parser
-### Intrinsic Include Paths
-Some include paths are built into gcc and don't have to be specified on the command line. Just searching the compiler installation directory with something like
-```bash
-find  ~/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/ -name "include*"
-```
-won't do since not all include directories are named `include`. Fortunately gcc can be queried about its configuration ([source](https://stackoverflow.com/a/6666338)) -- built-in include paths are part of it:
-```bash
-# generally for C++
-gcc -xc++ -E -v -
-# for esp32
-~/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/xtensa-esp32-elf-gcc -xc++ -E -v - < /dev/null > xtensa-esp32-elf-gcc_built_in_specs.txt 2>&1
-# avr
-~/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/avr-gcc -xc++ -E -v - < /dev/null > avr-gcc_built_in_specs.txt 2>&1
-```
-The result can be inspected here:
-* [xtensa-esp32-elf-gcc_built_in_specs.txt](doc/intellisense/compilerinfo/xtensa-esp32-elf-gcc_built_in_specs.txt)
-* [avr-gcc_built_in_specs.txt](doc/intellisense/compilerinfo/avr-gcc_built_in_specs.txt)
-
-To show the most interesting section in the output of the above commands, for ESP32:
-```
-#include "..." search starts here:
-#include <...> search starts here:
- /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/../../../../xtensa-esp32-elf/include/c++/5.2.0
- /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/../../../../xtensa-esp32-elf/include/c++/5.2.0/xtensa-esp32-elf
- /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/../../../../xtensa-esp32-elf/include/c++/5.2.0/backward
- /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/include
- /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/include-fixed
- /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../lib/gcc/xtensa-esp32-elf/5.2.0/../../../../xtensa-esp32-elf/include
- /home/uli/.arduino15/packages/esp32/tools/xtensa-esp32-elf-gcc/1.22.0-80-g6c4433a-5.2.0/bin/../xtensa-esp32-elf/sysroot/usr/include
-End of search list.
-```
-for AVR:
-```
-#include "..." search starts here:
-#include <...> search starts here:
- /home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/include
- /home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/include-fixed
- /home/uli/.arduino15/packages/arduino/tools/avr-gcc/7.3.0-atmel3.6.1-arduino5/bin/../lib/gcc/avr/7.3.0/../../../../avr/include
-End of search list.
-```
-As one can see with the ESP32-gcc not all include directories are named `include`. Parsing of this output is pretty trivial though.
-
-## `c_cpp_properties.json` Generator
-
-
-## Settings
-### Global Settings
-Under linux at `~/.config/Code/User/settings.json`, for instance:
-```json
-{
-    "arduino.additionalUrls": "",
-    "arduino.logLevel": "verbose",
-    "arduino.disableTestingOpen": true,
-    "workbench.editor.enablePreview": false
-}
-```
-Code: [src/arduino/arduinoSettings.ts](src/arduino/arduinoSettings.ts)
-Code: [src/arduino/vscodeSettings.ts](src/arduino/vscodeSettings.ts)
-Validator: [package.json](package.json)
-
-### Project Settings
-Path in project `.vscode/arduino.json`
-```json
-{
-  "board": "arduino:avr:nano",
-  "configuration": "cpu=atmega328old",
-  "sketch": "examples/lcdpong-butenc/lcdpong-butenc.ino",
-  "port": "/dev/ttyUSB0"
-}
-```
-Code: [src/deviceContext.ts](src/deviceContext.ts)
-Validator: [misc/arduinoValidator.json](misc/arduinoValidator.json)
-
-## General Tasks
-### Removing existing Attempts which mess with c_cpp_properties.json or Intellisense
-
-Remove these as they are helpless attempts to get IntelliSense working:
-```ts
-//src/arduino/arduino.ts
-  tryToUpdateIncludePaths()
-  addLibPath(libraryPath: string)
-  getDefaultForcedIncludeFiles()
-  // parts in
-  openExample()
-
-  //probably not needed anymore:
-  getDefaultPackageLibPaths()
-
-```
-Remove this as this messes in an unpredictable and helpless way with Intellisense
-[src/langService/completionProvider.ts](src/langService/completionProvider.ts)
-
-Review this folder as some of this is probably obsolete when Intellisense works properly:
-```
-syntaxes/arduino.configuration.json
-syntaxes/arduino.tmLanguage
-# Within package.json
-  {
-    "language": "cpp",
-    "path": "./syntaxes/arduino.tmLanguage",
-    "scopeName": "source.cpp.arduino"
-  },
-```

From 9ca24007f119ee46a73f27dec7f2d5901ccb5749 Mon Sep 17 00:00:00 2001
From: Adi Azulay <adazulay@microsoft.com>
Date: Fri, 5 Mar 2021 09:58:10 -0800
Subject: [PATCH 127/142] remove -MMD from complier args for intellisesne
 (#1208)

---
 src/arduino/intellisense.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/arduino/intellisense.ts b/src/arduino/intellisense.ts
index a664b923..56daeea7 100644
--- a/src/arduino/intellisense.ts
+++ b/src/arduino/intellisense.ts
@@ -93,7 +93,16 @@ export function makeCompilerParserContext(dc: DeviceContext): ICoCoPaContext {
                                                             ccp.CCppPropertiesCStandard.C11,
                                                             ccp.CCppPropertiesCppStandard.Cpp11,
                                                             forcedIncludes);
+
+        // The following 4 lines are added to prevent null.d from being created in the workspace
+        // directory on MacOS and Linux. This is may be a bug in intelliSense
+        const mmdIndex = runner.result.options.findIndex((element) => element === "-MMD");
+        if (mmdIndex) {
+            runner.result.options.splice(mmdIndex);
+        }
+
         try {
+
             const cmd = os.platform() === "darwin" ? "Cmd" : "Ctrl";
             const help = `To manually rebuild your IntelliSense configuration run "${cmd}+Alt+I"`;
             const pPath = path.join(ArduinoWorkspace.rootPath, constants.CPP_CONFIG_FILE);

From 5bf54723cee603299572d1bd7133a5d04d373047 Mon Sep 17 00:00:00 2001
From: Adi Azulay <adazulay@microsoft.com>
Date: Mon, 22 Mar 2021 13:39:53 -0700
Subject: [PATCH 128/142] Squashed commit of the following:

commit 57c8d2dff5637a9cdcea0c2f0188c22e5a2cce3e
Author: Adi Azulay <adazulay@microsoft.com>
Date:   Mon Mar 22 13:00:21 2021 -0700

    update changelog

commit 6e659974165a65fd5a7fe64c19b20b516e890b39
Author: Adi Azulay <adazulay@microsoft.com>
Date:   Mon Mar 22 12:49:56 2021 -0700

    bump to v0.4.0

commit 6d63a018cf2f26dbc6377ab3d38f5a99a5d8544a
Author: Adi Azulay <adazulay@microsoft.com>
Date:   Tue Mar 9 08:54:05 2021 -0800

    update version

commit ed886ad7d8c265643aeb90e172c8b84351baa251
Merge: 6ecfc55 9ca2400
Author: Adi Azulay <adazulay@microsoft.com>
Date:   Mon Mar 8 14:01:55 2021 -0800

    Merge branch 'develop' into pre-release-v0.4.0

commit 6ecfc55c3adc6fd484353d95750436de3171e685
Author: Adi Azulay <adazulay@microsoft.com>
Date:   Thu Feb 18 11:27:45 2021 -0800

    update version in package

commit 11265813085dacc45f02e3ae6bf978620c6bff30
Author: Adi Azulay <adazulay@microsoft.com>
Date:   Thu Feb 18 11:07:59 2021 -0800

    update readme

commit 5571e5249260c80ecc8cbf8ca6d4d55f0761ae48
Author: Adi Azulay <adazulay@microsoft.com>
Date:   Thu Feb 18 10:52:24 2021 -0800

    update package-lock

commit 0b60f1fcd9f632f389882b62495865416adf82ca
Merge: e044711 e97bad8
Author: Adi Azulay <adazulay@microsoft.com>
Date:   Thu Feb 18 09:59:26 2021 -0800

    Merge branch 'master' into pre-release-v0.4.0

commit e97bad8ab8835c433c3d4e1114bf99284c508a4b
Author: Adi Azulay <adazulay@microsoft.com>
Date:   Thu Feb 18 09:56:05 2021 -0800

    bump to v0.3.5 (#1196)

    * update usb native

    * update changelog

    * fix ref tag for publishing

    * fix ref tag for publishing

    * change build to check version env var

    * fix version spelling

    * add {} to if in publish

    * change version check to regex

    * fix formatting

    * change to multiline run

    * add echo for ISPRODUCTION

    * add missing s to outputs

    * remove debugging echo

commit e044711696797428210b18a67f693af70efdc513
Merge: 739aa95 5f4c400
Author: Adi Azulay <adazulay@microsoft.com>
Date:   Thu Feb 4 14:32:52 2021 -0800

    Merge branch 'develop' of https://github.com/microsoft/vscode-arduino into pre-release-v0.4.0

commit 739aa956b1ab2bd3d90cd753008496c97ff71176
Author: Adi Azulay <adazulay@microsoft.com>
Date:   Thu Feb 4 14:21:55 2021 -0800

    pre release v0.4.0
---
 .github/workflows/build.yml |   8 ++-
 CHANGELOG.md                |  25 +++++++
 README.md                   |  12 +++-
 package-lock.json           | 126 ++++++++++++++++++++++--------------
 package.json                |   8 ++-
 5 files changed, 125 insertions(+), 54 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c2598d3d..47a37649 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -103,6 +103,12 @@ jobs:
         tag: ${{ github.ref }}
         overwrite: true
         file_glob: true
+    - name: check for production tag
+      id: check-version
+      run: |
+        if [[ ${{ env.VERSION }} =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+            echo ::set-output name=ISPRODUCTION::true
+        fi
     - name: publish
-      if: github.ref == 'refs/tags/[0-9].[0-9].[0-9]'
+      if: steps.check-version.outputs.ISPRODUCTION == 'true'
       run: vsce publish -p ${{ secrets.VSCE_TOKEN }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 858ce039..a0529ebd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,31 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## Version 0.4.0
+
+### Added
+- Support for Arduino CLI (#1017)
+
+### Changed
+- Autogenerate c_cpp_properties.json with all complier arguments and libraries for IntelliSense (#1183)
+- Detects available programmers for selected board (#1118)
+
+### Fixed
+- Typos
+
+### Breaking Changes
+- Unifies all build commands under a single
+
+### Known Issues
+- Arduino CLI doesn't work on Mac (#1205)
+
+## Version 0.3.5
+
+- Release date: November 22, 2020
+
+### Fixes
+- Update to node-usb-native 0.0.19
+
 ## Version 0.3.4
 
 - Release date: November 22, 2020
diff --git a/README.md b/README.md
index 3a66c244..3bc3adff 100644
--- a/README.md
+++ b/README.md
@@ -16,11 +16,19 @@ Welcome to the Visual Studio Code extension for **Arduino** <sup>preview</sup> !
 * Integrated Arduino Debugging <sup>New</sup>
 
 ## Prerequisites
-The Arduino IDE is required. Please install it from the [download page](https://www.arduino.cc/en/main/software#download).
+Either the Arduino IDE or Arduino CLI are required.
+
+### Arduino IDE
+The Arduino IDE can be installed the Arduino [download page](https://www.arduino.cc/en/main/software#download).
 - The supported Arduino IDE versions are `1.6.x` and later.
 - The Windows Store's version of the Arduino IDE is not supported because of the sandbox environment that the application runs in.
 - *Note:* Arduino IDE `1.8.7` has some breaking changes, causing board package and library installation failures.
 
+### Arduino CLI
+The Arduino CLI can be downloaded from the repository's [release page](https://github.com/arduino/arduino-cli/releases/tag/0.13.0)
+- The extension has only been tested with v0.13.0.
+- If you use the CLI you will have to set `arduino.path` since the CLI does not have a defualt path. 
+
 ## Installation
 Open VS Code and press <kbd>F1</kbd> or <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> to open command palette, select **Install Extension** and type `vscode-arduino`.
 
@@ -48,7 +56,9 @@ This extension provides several commands in the Command Palette (<kbd>F1</kbd> o
 - **Arduino: Select Serial Port**: Change the current serial port.
 - **Arduino: Send Text to Serial Port**: Send a line of text via the current serial port.
 - **Arduino: Upload**: Build sketch and upload to Arduino board.
+- **Arduino: CLI Upload**: Upload complied code without building sketch (CLI only).
 - **Arduino: Upload Using Programmer**: Upload using an external programmer.
+- **Arduino: CLI Upload Using Programmer**: Upload using an external programmer without building sketch (CLI only).
 - **Arduino: Verify**: Build sketch.
 - **Arduino: Rebuild IntelliSense Configuration**: Forced/manual rebuild of the IntelliSense configuration. The extension analyzes Arduino's build output and sets the Intellisense include paths, defines, compiler arguments accordingly.
 
diff --git a/package-lock.json b/package-lock.json
index 1d6ba130..50043aaa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "vscode-arduino",
-  "version": "0.3.4",
+  "version": "0.4.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -84,9 +84,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "requires": {
             "ms": "2.1.2"
           }
@@ -108,9 +108,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "requires": {
             "ms": "2.1.2"
           }
@@ -123,22 +123,22 @@
       }
     },
     "@serialport/bindings": {
-      "version": "9.0.2",
-      "resolved": "https://registry.npmjs.org/@serialport/bindings/-/bindings-9.0.2.tgz",
-      "integrity": "sha512-kQ3co4aGwwbUqkRdJ7UfdlbLB5dUQwNfSglexC8iv65D5HXfjSBR1bE0XUH8PH/v/6Dh6CSnwf6OP0I3H5vMWQ==",
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@serialport/bindings/-/bindings-9.0.4.tgz",
+      "integrity": "sha512-6dlE1vm5c1xk667f1Zm7D+msbHJ9jdnUr9l8DResKpj2iCBzbCNsW+yCYq26WxzXWc1L2HUaS3/aL+k0wm5amg==",
       "requires": {
         "@serialport/binding-abstract": "^9.0.2",
         "@serialport/parser-readline": "^9.0.1",
         "bindings": "^1.5.0",
-        "debug": "^4.1.1",
-        "nan": "^2.14.1",
-        "prebuild-install": "^5.3.5"
+        "debug": "^4.3.1",
+        "nan": "^2.14.2",
+        "prebuild-install": "^6.0.0"
       },
       "dependencies": {
         "debug": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "requires": {
             "ms": "2.1.2"
           }
@@ -170,6 +170,11 @@
       "resolved": "https://registry.npmjs.org/@serialport/parser-delimiter/-/parser-delimiter-9.0.1.tgz",
       "integrity": "sha512-+oaSl5zEu47OlrRiF5p5tn2qgGqYuhVcE+NI+Pv4E1xsNB/A0fFxxMv/8XUw466CRLEJ5IESIB9qbFvKE6ltaQ=="
     },
+    "@serialport/parser-inter-byte-timeout": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/@serialport/parser-inter-byte-timeout/-/parser-inter-byte-timeout-9.0.1.tgz",
+      "integrity": "sha512-lFflcUflcP5SF4vLIixAKs1xUI/wfOzCv1Xq78VbPOBlIjZ6ny9lQ6g7cMPR/sB/M1BHwGcdX7CEr90pe3kkog=="
+    },
     "@serialport/parser-readline": {
       "version": "9.0.1",
       "resolved": "https://registry.npmjs.org/@serialport/parser-readline/-/parser-readline-9.0.1.tgz",
@@ -197,9 +202,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "requires": {
             "ms": "2.1.2"
           }
@@ -1039,9 +1044,9 @@
       }
     },
     "bl": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz",
-      "integrity": "sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.4.tgz",
+      "integrity": "sha512-7tdr4EpSd7jJ6tuQ21vu2ke8w7pNEstzj1O8wwq6sNNzO3UDi5MA8Gny/gquCj7r2C6fHudg8tKRGyjRgmvNxQ==",
       "requires": {
         "buffer": "^5.5.0",
         "inherits": "^2.0.4",
@@ -1251,9 +1256,9 @@
       }
     },
     "buffer": {
-      "version": "5.7.0",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.0.tgz",
-      "integrity": "sha512-cd+5r1VLBwUqTrmnzW+D7ABkJUM6mr7uv1dv+6jRw4Rcl7tFIFHDqHPL98LhpGFn3dbAt3gtLxtrWp4m1kFrqg==",
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
       "requires": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.1.13"
@@ -6343,9 +6348,9 @@
       "dev": true
     },
     "node-abi": {
-      "version": "2.19.1",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.19.1.tgz",
-      "integrity": "sha512-HbtmIuByq44yhAzK7b9j/FelKlHYISKQn0mtvcBrU5QBkhoCMp5bu8Hv5AI34DcKfOAcJBcOEMwLlwO62FFu9A==",
+      "version": "2.19.3",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.19.3.tgz",
+      "integrity": "sha512-9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg==",
       "requires": {
         "semver": "^5.4.1"
       }
@@ -6430,12 +6435,12 @@
       }
     },
     "node-usb-native": {
-      "version": "0.0.18",
-      "resolved": "https://registry.npmjs.org/node-usb-native/-/node-usb-native-0.0.18.tgz",
-      "integrity": "sha512-z2yGYM1MURtCdKsLZkN7X3b8ERNRQeMBLZ+7HEy/2PIJz76tVkrOqU+lvQtK2LkuLBtsIgsArjOzzrFdoYxijw==",
+      "version": "0.0.19",
+      "resolved": "https://registry.npmjs.org/node-usb-native/-/node-usb-native-0.0.19.tgz",
+      "integrity": "sha512-nW5UvIN4aSkWxaX+7b+3hwQkjZ++MtnWLLskp4r+X73KGW2vLm10scyGb1Na7A5Nij0Ey/qsYMZo5j4PLM65WA==",
       "requires": {
         "glob": "^7.1.6",
-        "serialport": "^9.0.1",
+        "serialport": "^9.0.4",
         "usb-detection": "^4.10.0"
       }
     },
@@ -6988,9 +6993,9 @@
       "dev": true
     },
     "prebuild-install": {
-      "version": "5.3.6",
-      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.6.tgz",
-      "integrity": "sha512-s8Aai8++QQGi4sSbs/M1Qku62PFK49Jm1CbgXklGz4nmHveDq0wzJkg7Na5QbnO1uNH8K7iqx2EQ/mV0MZEmOg==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.0.0.tgz",
+      "integrity": "sha512-h2ZJ1PXHKWZpp1caLw0oX9sagVpL2YTk+ZwInQbQ3QqNd4J03O6MpFNmMTJlkfgPENWqe5kP0WjQLqz5OjLfsw==",
       "requires": {
         "detect-libc": "^1.0.3",
         "expand-template": "^2.0.3",
@@ -7577,15 +7582,16 @@
       }
     },
     "serialport": {
-      "version": "9.0.2",
-      "resolved": "https://registry.npmjs.org/serialport/-/serialport-9.0.2.tgz",
-      "integrity": "sha512-N++EVrc2F3kUJ6aCE6BLxHwTrelFAZM3LFw4lo8TV0fDtfrwTc3+aoDpSsvfQg3DxrRf3shCtA6WYEH4g8kapw==",
+      "version": "9.0.6",
+      "resolved": "https://registry.npmjs.org/serialport/-/serialport-9.0.6.tgz",
+      "integrity": "sha512-T9eY4HFzQij0Hd/RsPcZySdeuAqzV5iGICHz8FXUSKVn2SvGT5zjfz/H+pRwI86k+3iFVOyddEyy8gbVNVbW7A==",
       "requires": {
         "@serialport/binding-mock": "^9.0.2",
-        "@serialport/bindings": "^9.0.2",
+        "@serialport/bindings": "^9.0.4",
         "@serialport/parser-byte-length": "^9.0.1",
         "@serialport/parser-cctalk": "^9.0.1",
         "@serialport/parser-delimiter": "^9.0.1",
+        "@serialport/parser-inter-byte-timeout": "^9.0.1",
         "@serialport/parser-readline": "^9.0.1",
         "@serialport/parser-ready": "^9.0.1",
         "@serialport/parser-regex": "^9.0.1",
@@ -7594,9 +7600,9 @@
       },
       "dependencies": {
         "debug": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
-          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
           "requires": {
             "ms": "2.1.2"
           }
@@ -8273,20 +8279,20 @@
       }
     },
     "tar-fs": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.0.tgz",
-      "integrity": "sha512-9uW5iDvrIMCVpvasdFHW0wJPez0K4JnMZtsuIeDI7HyMGJNxmDZDOCQROr7lXyS+iL/QMpj07qcjGYTSdRFXUg==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
       "requires": {
         "chownr": "^1.1.1",
         "mkdirp-classic": "^0.5.2",
         "pump": "^3.0.0",
-        "tar-stream": "^2.0.0"
+        "tar-stream": "^2.1.4"
       }
     },
     "tar-stream": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.4.tgz",
-      "integrity": "sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
       "requires": {
         "bl": "^4.0.3",
         "end-of-stream": "^1.4.1",
@@ -8799,6 +8805,28 @@
           "version": "5.0.1",
           "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-5.0.1.tgz",
           "integrity": "sha1-YZegldX7a1folC9v1+qtY6CclFI="
+        },
+        "prebuild-install": {
+          "version": "5.3.6",
+          "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.6.tgz",
+          "integrity": "sha512-s8Aai8++QQGi4sSbs/M1Qku62PFK49Jm1CbgXklGz4nmHveDq0wzJkg7Na5QbnO1uNH8K7iqx2EQ/mV0MZEmOg==",
+          "requires": {
+            "detect-libc": "^1.0.3",
+            "expand-template": "^2.0.3",
+            "github-from-package": "0.0.0",
+            "minimist": "^1.2.3",
+            "mkdirp-classic": "^0.5.3",
+            "napi-build-utils": "^1.0.1",
+            "node-abi": "^2.7.0",
+            "noop-logger": "^0.1.1",
+            "npmlog": "^4.0.1",
+            "pump": "^3.0.0",
+            "rc": "^1.2.7",
+            "simple-get": "^3.0.3",
+            "tar-fs": "^2.0.0",
+            "tunnel-agent": "^0.6.0",
+            "which-pm-runs": "^1.0.0"
+          }
         }
       }
     },
diff --git a/package.json b/package.json
index ba1d75a9..a97d952f 100644
--- a/package.json
+++ b/package.json
@@ -2,12 +2,12 @@
   "name": "vscode-arduino",
   "displayName": "Arduino",
   "description": "Arduino for Visual Studio Code",
-  "version": "0.3.4",
+  "version": "0.4.0",
   "publisher": "vsciot-vscode",
   "aiKey": "83dd2c27-6594-41d3-85a9-bdb22070eb42",
   "preview": true,
   "engines": {
-    "vscode": "^1.50.0"
+    "vscode": "^1.53.0"
   },
   "icon": "images/arduino.png",
   "license": "SEE LICENSE IN LICENSE.txt",
@@ -36,7 +36,9 @@
     "*",
     "onCommand:arduino.verify",
     "onCommand:arduino.upload",
+    "onCommand:arduino.cliUpload",
     "onCommand:arduino.uploadUsingProgrammer",
+    "onCommand:arduiono.cliUploadUsingProgrammer",
     "onCommand:arduino.rebuildIntelliSenseConfig",
     "onCommand:arduino.selectProgrammer",
     "onCommand:arduino.selectSerialPort",
@@ -611,7 +613,7 @@
     "glob": "^7.1.1",
     "iconv-lite": "^0.4.18",
     "impor": "^0.1.1",
-    "node-usb-native": "^0.0.18",
+    "node-usb-native": "^0.0.19",
     "properties": "^1.2.1",
     "uuid": "^3.0.1",
     "vscode-extension-telemetry": "0.1.6",

From cb7d04086d439c810578f0e8f592693f9d05f834 Mon Sep 17 00:00:00 2001
From: Jason Tranchida <jtranchida@gmail.com>
Date: Mon, 5 Apr 2021 14:21:54 -0700
Subject: [PATCH 129/142] Quick pick selection of sketch files (#1128)

* Quick pick selection of sketch files

- Replace arduino.setSketchFile command with new arduino.selectSketch command which presents the user with a quick select containing all of the sketch files in the workspace.
- Add "Arduino: Select Sketch" to the command palette
- When picking sketches, filter out hardware, library, and build folders that may be under the workspace

* Fix incorrect slash on library exclude pattern

Co-authored-by: Adi Azulay <adazulay@microsoft.com>
---
 package.json           |  5 +++++
 src/deviceContext.ts   |  2 +-
 src/extension.ts       | 40 ++++++++++++++++++++++++++++------------
 test/extension.test.ts |  2 +-
 4 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index a97d952f..9f2c694a 100644
--- a/package.json
+++ b/package.json
@@ -42,6 +42,7 @@
     "onCommand:arduino.rebuildIntelliSenseConfig",
     "onCommand:arduino.selectProgrammer",
     "onCommand:arduino.selectSerialPort",
+    "onCommand:arduino.selectSketch",
     "onCommand:arduino.changeBaudRate",
     "onCommand:arduino.openSerialMonitor",
     "onCommand:arduino.sendMessageToSerialPort",
@@ -115,6 +116,10 @@
         "command": "arduino.selectProgrammer",
         "title": "Arduino: Select Programmer"
       },
+      {
+        "command": "arduino.selectSketch",
+        "title": "Arduino: Select Sketch"
+      },
       {
         "command": "arduino.selectSerialPort",
         "title": "Arduino: Select Serial Port"
diff --git a/src/deviceContext.ts b/src/deviceContext.ts
index 16451a81..0cfaa358 100644
--- a/src/deviceContext.ts
+++ b/src/deviceContext.ts
@@ -112,7 +112,7 @@ export class DeviceContext implements IDeviceContext, vscode.Disposable {
             this._watcher.onDidDelete(() => this.loadContext());
             this._vscodeWatcher.onDidDelete(() => this.loadContext());
             this._sketchStatusBar = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Right, constants.statusBarPriority.SKETCH);
-            this._sketchStatusBar.command = "arduino.setSketchFile";
+            this._sketchStatusBar.command = "arduino.selectSketch";
             this._sketchStatusBar.tooltip = "Sketch File";
         }
     }
diff --git a/src/extension.ts b/src/extension.ts
index 6ae7b0df..b4f6f456 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -156,24 +156,40 @@ export async function activate(context: vscode.ExtensionContext) {
         return { board: arduinoContextModule.default.boardManager.currentBoard.name };
     });
 
-    registerArduinoCommand("arduino.setSketchFile", async () => {
+    registerArduinoCommand("arduino.selectSketch", async () => {
         const sketchFileName = deviceContext.sketch;
-        const newSketchFileName = await vscode.window.showInputBox({
-            placeHolder: sketchFileName,
-            validateInput: (value) => {
-                if (value && /\.((ino)|(cpp)|c)$/.test(value.trim())) {
-                    return null;
-                } else {
-                    return "Invalid sketch file name. Should be *.ino/*.cpp/*.c";
-                }
-            },
-        });
+
+        // Include any ino, cpp, or c files under the workspace folder
+        const includePattern = "**/*.{ino,cpp,c}";
+
+        // The sketchbook folder may contain hardware & library folders, any sketches under these paths
+        // should be excluded
+        const sketchbookPath = arduinoContextModule.default.arduinoApp.settings.sketchbookPath;
+        const excludePatterns = [
+            path.relative(ArduinoWorkspace.rootPath, sketchbookPath + "/hardware/**"),
+            path.relative(ArduinoWorkspace.rootPath, sketchbookPath + "/libraries/**")];
+
+        // If an output path is specified, it should be excluded as well
+        if (deviceContext.output) {
+            const outputPath = path.relative(ArduinoWorkspace.rootPath,
+                path.resolve(ArduinoWorkspace.rootPath, deviceContext.output));
+            excludePatterns.push(`${outputPath}/**`);
+        }
+        const excludePattern = `{${excludePatterns.map((p) => p.replace("\\", "/")).join(",")}}`;
+
+        const fileUris = await vscode.workspace.findFiles(includePattern, excludePattern);
+        const newSketchFileName = await vscode.window.showQuickPick(fileUris.map((fileUri) =>
+            ({
+                label: path.relative(ArduinoWorkspace.rootPath, fileUri.fsPath),
+                description: fileUri.fsPath,
+            })),
+            { placeHolder: sketchFileName, matchOnDescription: true });
 
         if (!newSketchFileName) {
             return;
         }
 
-        deviceContext.sketch = newSketchFileName;
+        deviceContext.sketch = newSketchFileName.label;
         deviceContext.showStatusBar();
     });
 
diff --git a/test/extension.test.ts b/test/extension.test.ts
index fb746313..6c91b0e9 100644
--- a/test/extension.test.ts
+++ b/test/extension.test.ts
@@ -54,7 +54,7 @@ suite("Arduino: Extension Tests", () => {
                     "arduino.showExampleExplorer",
                     "arduino.loadPackages",
                     "arduino.installBoard",
-                    "arduino.setSketchFile",
+                    "arduino.selectSketch",
                     "arduino.cliUpload",
                     "arduino.cliUploadUsingProgrammer",
                 ];

From 25caa39b1a99abfd3fc8fd36f982404cd43a2f99 Mon Sep 17 00:00:00 2001
From: Cameron Bielstein <CTBielstein@gmail.com>
Date: Mon, 5 Apr 2021 14:32:27 -0700
Subject: [PATCH 130/142] Corrected typo from Ardiuno to Arduino. (#1191)

Co-authored-by: Adi Azulay <adazulay@microsoft.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3bc3adff..31fbf6c2 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ This extension provides several commands in the Command Palette (<kbd>F1</kbd> o
 | `arduino.commandPath` | Path to an executable (or script) relative to `arduino.path`. The default value is `arduino_debug.exe` for windows,`Contents/MacOS/Arduino` for Mac and `arduino` for Linux, You also can use a custom launch script to run Arduino by modifying this setting. (Requires a restart after change) Example: `run-arduino.bat` for Windows, `Contents/MacOS/run-arduino.sh` for Mac and `bin/run-arduino.sh` for Linux. |
 | `arduino.additionalUrls` | Additional Boards Manager URLs for 3rd party packages. You can have multiple URLs in one string with a comma(`,`) as separator, or have a string array. The default value is empty. |
 | `arduino.logLevel` | CLI output log level. Could be info or verbose. The default value is `"info"`. |
-| `arduino.allowPDEFiletype` | Allow the VSCode Arduino extension to open .pde files from pre-1.0.0 versions of Ardiuno. Note that this will break Processing code. Default value is `false`. |
+| `arduino.allowPDEFiletype` | Allow the VSCode Arduino extension to open .pde files from pre-1.0.0 versions of Arduino. Note that this will break Processing code. Default value is `false`. |
 | `arduino.enableUSBDetection` | Enable/disable USB detection from the VSCode Arduino extension. The default value is `true`. When your device is plugged in to your computer, it will pop up a message "`Detected board ****, Would you like to switch to this board type`". After clicking the `Yes` button, it will automatically detect which serial port (COM) is connected a USB device. If your device does not support this feature, please provide us with the PID/VID of your device; the code format is defined in `misc/usbmapping.json`.To learn more about how to list the vid/pid, use the following tools: https://github.com/EmergingTechnologyAdvisors/node-serialport `npm install -g serialport` `serialport-list -f jsonline`|
 | `arduino.disableTestingOpen` | Enable/disable automatic sending of a test message to the serial port for checking the open status. The default value is `false` (a test message will be sent). |
 | `arduino.skipHeaderProvider` | Enable/disable the extension providing completion items for headers. This functionality is included in newer versions of the C++ extension. The default value is `false`.|

From ab438d83b834bf90c13a193e5637e48a60495b0a Mon Sep 17 00:00:00 2001
From: Adam Michel <adam@amichel.me>
Date: Mon, 12 Apr 2021 13:04:55 -0700
Subject: [PATCH 131/142] Fix arduinoPath resolution on MacOS (#1227)

* Fix arduinoPath resolution in MacOS.

The `resolveMacArduinoAppPath` utility was automatically adding "Arduino.app" to the resolved `arduinoPath` regardless of whether `useAndroidCli` was enabled.

This was breaking installations of `arduino-cli` made through Homebrew. The path to the command ends up being either `/usr/local/bin/arduino-cli` or `/opt/homebrew/bin/arduino-cli`. This function would resolve an `arduinoPath` of `/opt/homebrew/bin` to `/opt/homebrew/bin/Arduino.app/arduino-cli`.

Co-authored-by: Adi Azulay <adazulay@microsoft.com>
---
 src/arduino/arduinoSettings.ts |  8 ++--
 src/common/sys/darwin.ts       | 79 +++++++++++++++++-----------------
 src/common/util.ts             |  4 +-
 3 files changed, 45 insertions(+), 46 deletions(-)

diff --git a/src/arduino/arduinoSettings.ts b/src/arduino/arduinoSettings.ts
index 8d994d81..0e4a01cb 100644
--- a/src/arduino/arduinoSettings.ts
+++ b/src/arduino/arduinoSettings.ts
@@ -104,7 +104,7 @@ export class ArduinoSettings implements IArduinoSettings {
 
     public get defaultExamplePath(): string {
         if (os.platform() === "darwin") {
-            return path.join(util.resolveMacArduinoAppPath(this._arduinoPath), "/Contents/Java/examples");
+            return path.join(util.resolveMacArduinoAppPath(this._arduinoPath, this._useArduinoCli), "/Contents/Java/examples");
         } else {
             return path.join(this._arduinoPath, "examples");
         }
@@ -116,7 +116,7 @@ export class ArduinoSettings implements IArduinoSettings {
 
     public get defaultPackagePath(): string {
         if (os.platform() === "darwin") {
-            return path.join(util.resolveMacArduinoAppPath(this._arduinoPath), "/Contents/Java/hardware");
+            return path.join(util.resolveMacArduinoAppPath(this._arduinoPath, this._useArduinoCli), "/Contents/Java/hardware");
         } else { // linux and win32.
             return path.join(this._arduinoPath, "hardware");
         }
@@ -124,7 +124,7 @@ export class ArduinoSettings implements IArduinoSettings {
 
     public get defaultLibPath(): string {
         if (os.platform() === "darwin") {
-            return path.join(util.resolveMacArduinoAppPath(this._arduinoPath), "/Contents/Java/libraries");
+            return path.join(util.resolveMacArduinoAppPath(this._arduinoPath, this._useArduinoCli), "/Contents/Java/libraries");
         } else { // linux and win32
             return path.join(this._arduinoPath, "libraries");
         }
@@ -133,7 +133,7 @@ export class ArduinoSettings implements IArduinoSettings {
     public get commandPath(): string {
         const platform = os.platform();
         if (platform === "darwin") {
-            return path.join(util.resolveMacArduinoAppPath(this._arduinoPath), path.normalize(this._commandPath));
+            return path.join(util.resolveMacArduinoAppPath(this._arduinoPath, this._useArduinoCli), path.normalize(this._commandPath));
         } else {
             return path.join(this._arduinoPath, path.normalize(this._commandPath));
         }
diff --git a/src/common/sys/darwin.ts b/src/common/sys/darwin.ts
index 4d5c7e98..f17cfd94 100644
--- a/src/common/sys/darwin.ts
+++ b/src/common/sys/darwin.ts
@@ -1,40 +1,39 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license.
-
-import * as childProcess from "child_process";
-import * as path from "path";
-import { directoryExistsSync, fileExistsSync, resolveMacArduinoAppPath } from "../util";
-
-export function resolveArduinoPath(): string {
-    let result;
-
-    const defaultCommonPaths = [path.join(process.env.HOME, "Applications"), "/Applications"];
-    for (const scanPath of defaultCommonPaths) {
-        if (directoryExistsSync(path.join(scanPath, "Arduino.app"))) {
-            result = scanPath;
-            break;
-        }
-    }
-    return result || "";
-}
-
-export function validateArduinoPath(arduinoPath: string, useArduinoCli = false): boolean {
-    return fileExistsSync(path.join(resolveMacArduinoAppPath(arduinoPath), useArduinoCli ? "arduino-cli" : "/Contents/MacOS/Arduino"));
-
-}
-
-export function findFile(fileName: string, cwd: string): string {
-    let pathString;
-    try {
-        pathString = childProcess.execSync(`find ${cwd} -name ${fileName} -type f`, { encoding: "utf8" }).split("\n");
-
-        if (pathString && pathString[0] && fileExistsSync(pathString[0].trim())) {
-            pathString = path.normalize(pathString[0].trim());
-        } else {
-            pathString = null;
-        }
-    } catch (ex) {
-        // Ignore the errors.
-    }
-    return pathString;
-}
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+import * as childProcess from "child_process";
+import * as path from "path";
+import { directoryExistsSync, fileExistsSync, resolveMacArduinoAppPath } from "../util";
+
+export function resolveArduinoPath(): string {
+    let result;
+
+    const defaultCommonPaths = [path.join(process.env.HOME, "Applications"), "/Applications"];
+    for (const scanPath of defaultCommonPaths) {
+        if (directoryExistsSync(path.join(scanPath, "Arduino.app"))) {
+            result = scanPath;
+            break;
+        }
+    }
+    return result || "";
+}
+
+export function validateArduinoPath(arduinoPath: string, useArduinoCli = false): boolean {
+    return fileExistsSync(path.join(resolveMacArduinoAppPath(arduinoPath, useArduinoCli), useArduinoCli ? "arduino-cli" : "/Contents/MacOS/Arduino"));
+}
+
+export function findFile(fileName: string, cwd: string): string {
+    let pathString;
+    try {
+        pathString = childProcess.execSync(`find ${cwd} -name ${fileName} -type f`, { encoding: "utf8" }).split("\n");
+
+        if (pathString && pathString[0] && fileExistsSync(pathString[0].trim())) {
+            pathString = path.normalize(pathString[0].trim());
+        } else {
+            pathString = null;
+        }
+    } catch (ex) {
+        // Ignore the errors.
+    }
+    return pathString;
+}
diff --git a/src/common/util.ts b/src/common/util.ts
index 4445d0de..b82aa422 100644
--- a/src/common/util.ts
+++ b/src/common/util.ts
@@ -426,8 +426,8 @@ export function convertToHex(number, width = 0) {
  * in case you named Arduino with a version number
  * @argument {string} arduinoPath
  */
-export function resolveMacArduinoAppPath(arduinoPath: string): string {
-    if (/Arduino.*\.app/.test(arduinoPath)) {
+export function resolveMacArduinoAppPath(arduinoPath: string, useArduinoCli = false): string {
+    if (useArduinoCli || /Arduino.*\.app/.test(arduinoPath)) {
         return arduinoPath;
     } else {
         return path.join(arduinoPath, "Arduino.app");

From 232b8c140c2850ffd1c10606a86fe72d061b3fe1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Apr 2021 13:24:21 -0700
Subject: [PATCH 132/142] Bump y18n from 3.2.1 to 3.2.2 (#1219)

Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Adi Azulay <adazulay@microsoft.com>
---
 package-lock.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 50043aaa..25fa2641 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1332,9 +1332,9 @@
           }
         },
         "y18n": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
+          "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
           "dev": true
         },
         "yallist": {
@@ -6223,9 +6223,9 @@
           }
         },
         "y18n": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
+          "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
           "dev": true
         },
         "yargs": {
@@ -9315,9 +9315,9 @@
       "dev": true
     },
     "y18n": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
+      "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
       "dev": true
     },
     "yargs": {
@@ -9574,9 +9574,9 @@
           }
         },
         "y18n": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
+          "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
           "dev": true
         },
         "yargs": {

From f247a6dff884ab99020bec27b1ac1a615468eb70 Mon Sep 17 00:00:00 2001
From: mikebaz <github@bazstuff.com>
Date: Mon, 12 Apr 2021 16:35:04 -0400
Subject: [PATCH 133/142] Fix confusion about IDE breaking changes (#1229)

Closed issue #994 (and presumably others) indicate that the confusing version text referring to 1.8.7 will be corrected, but that never happened.  This PR attempts to improve the text to correct the issue.

Co-authored-by: Adi Azulay <adazulay@microsoft.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 31fbf6c2..ca308d8f 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Either the Arduino IDE or Arduino CLI are required.
 The Arduino IDE can be installed the Arduino [download page](https://www.arduino.cc/en/main/software#download).
 - The supported Arduino IDE versions are `1.6.x` and later.
 - The Windows Store's version of the Arduino IDE is not supported because of the sandbox environment that the application runs in.
-- *Note:* Arduino IDE `1.8.7` has some breaking changes, causing board package and library installation failures.
+- *Note:* Arduino IDE `1.8.7` had some breaking changes, causing board package and library installation failures.  These failures were corrected in `1.8.8` and later.
 
 ### Arduino CLI
 The Arduino CLI can be downloaded from the repository's [release page](https://github.com/arduino/arduino-cli/releases/tag/0.13.0)

From df1a62f41c8b990e09710c98899499482b54ffdc Mon Sep 17 00:00:00 2001
From: jogo- <jogo@laposte.net>
Date: Mon, 12 Apr 2021 23:40:45 +0200
Subject: [PATCH 134/142] Fix typos in CHANGELOG.md (#1226)

Co-authored-by: Adi Azulay <adazulay@microsoft.com>
---
 CHANGELOG.md | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0529ebd..6d66d3c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,8 +31,8 @@ All notable changes to this project will be documented in this file.
 - Release date: November 22, 2020
 
 ### Changed
-- Add DTR and RTS signals on serial open and buad rate change
-- Improves c_cpp_properties.json autogeneration for intelliSense
+- Add DTR and RTS signals on serial open and baud rate change
+- Improves c_cpp_properties.json autogeneration for IntelliSense
 
 ## Version 0.3.3
 
@@ -69,7 +69,7 @@ All notable changes to this project will be documented in this file.
 - Fix issue of "Fail to debug on Ubuntu". [[#933](https://github.com/microsoft/vscode-arduino/issues/933)]
 - Remove line ending selection. Fix the issue of "Save the last used end of line". [[#952](https://github.com/microsoft/vscode-arduino/issues/952)]
 - Fix the issue of "Can't install libraries from VS Code for ESP8266". [[#930](https://github.com/microsoft/vscode-arduino/issues/930)]
-- Fix the issue of "Project path can not be changed". [[#978](https://github.com/microsoft/vscode-arduino/issues/978)]
+- Fix the issue of "Project path cannot be changed". [[#978](https://github.com/microsoft/vscode-arduino/issues/978)]
 
 Special thanks to [raomin](https://github.com/raomin), thanks for your contributions and feedbacks.
 
@@ -82,7 +82,7 @@ Special thanks to [raomin](https://github.com/raomin), thanks for your contribut
 
 ## Version 0.2.28
 
-- Release data: November 15, 2019
+- Release date: November 15, 2019
 
 ### Fixed
 
@@ -158,7 +158,7 @@ Special thanks to [Deqing Sun](https://github.com/DeqingSun), thank you for your
 - Add sketches folder into examples view [#652](https://github.com/Microsoft/vscode-arduino/issues/652)
 
 ### Changed
-- Change Arduino langauge ID to C++ [#686](https://github.com/Microsoft/vscode-arduino/issues/686)
+- Change Arduino language ID to C++ [#686](https://github.com/Microsoft/vscode-arduino/issues/686)
 - Use VS Code new webview API [#701](https://github.com/Microsoft/vscode-arduino/issues/701)
 
 ### Fixed
@@ -181,7 +181,7 @@ Special thanks to [Deqing Sun](https://github.com/DeqingSun), [Takashi Matsuoka]
 - Fix the output path not exist issue [#641](https://github.com/Microsoft/vscode-arduino/issues/641)
 - Update arduino.path instruction [#635](https://github.com/Microsoft/vscode-arduino/issues/635)
 
-Special thanks to [aster94](https://github.com/aster94), [Niels van der Veer](https://github.com/n9iels), [AntoineGirafe](https://github.com/AntoineGirafe), thank you foryour contributions and feedbacks.
+Special thanks to [aster94](https://github.com/aster94), [Niels van der Veer](https://github.com/n9iels), [AntoineGirafe](https://github.com/AntoineGirafe), thank you for your contributions and feedbacks.
 
 ## Version 0.2.20
 
@@ -206,7 +206,7 @@ Special thanks to [aster94](https://github.com/aster94), [Niels van der Veer](ht
 - Add Wio 3G board and WeMos D1 board [#223](https://github.com/Microsoft/vscode-arduino/pull/223)
 
 ### Fixed
-- Fix intellisense issue of `c_cpp_properties.json`
+- Fix IntelliSense issue of `c_cpp_properties.json`
 - Fix "Verifying" is misspelled issue [#591](https://github.com/Microsoft/vscode-arduino/issues/591)
 - Improve config setting descriptions [#605](https://github.com/Microsoft/vscode-arduino/issues/605)
 
@@ -241,13 +241,13 @@ Special thanks to [Thad House](https://github.com/ThadHouse), [Carlos Gomez](htt
 ### Added
 - Add a sketch file button in status bar to reset sketch file [#481](https://github.com/Microsoft/vscode-arduino/issues/481)
 - Add loading status bar for verify and build command [#137](https://github.com/Microsoft/vscode-arduino/issues/137)
-- Add `prebuild` support in `arduio.json` [#411](https://github.com/Microsoft/vscode-arduino/issues/411)
+- Add `prebuild` support in `arduino.json` [#411](https://github.com/Microsoft/vscode-arduino/issues/411)
 - Add upload using programmer command [#407](https://github.com/Microsoft/vscode-arduino/issues/407)
 - Add ignore option for board detection notification [#495](https://github.com/Microsoft/vscode-arduino/issues/495)
 - Add settings for disable/enable serial monitor TestingOpen [#530](https://github.com/Microsoft/vscode-arduino/issues/530)
 
 ### Fixed
-- Fix intellisense issue of `c_cpp_properties.json` (preview) [#438](https://github.com/Microsoft/vscode-arduino/issues/438)
+- Fix IntelliSense issue of `c_cpp_properties.json` (preview) [#438](https://github.com/Microsoft/vscode-arduino/issues/438)
 
 Special thanks to [Joel Santos](https://github.com/mundodisco8), [John](https://github.com/VashJuan), [mybayern1974](https://github.com/mybayern1974), [Maxime Paquatte](https://github.com/maxime-paquatte), [Joe Saavedra](https://github.com/jmsaavedra), [Kye Burchard](https://github.com/kyeb), [Laurent Haas - F6FVY](https://github.com/f6fvy), thank you for your feedbacks.
 
@@ -337,7 +337,7 @@ Special thanks to [GarethE](https://github.com/keyoke), thank you for your contr
 - Contribution from [DeqingSun](https://github.com/DeqingSun): Add board support for STM32F1 with Arudino_STM32 [#377](https://github.com/Microsoft/vscode-arduino/pull/377)
 
 ### Changed 
-- Leverage the ouput path config to speedup upload/verify
+- Leverage the output path config to speedup upload/verify
 - Fix USB detection issue during uploading [#371](https://github.com/Microsoft/vscode-arduino/pull/371), [372](https://github.com/Microsoft/vscode-arduino/pull/372)
 - Contribution from [lialosiu](https://github.com/lialosiu): Fix encoding issue for non UTF-8 [#364](https://github.com/Microsoft/vscode-arduino/pull/364)
 - Update the documents with the helps of 
@@ -361,7 +361,7 @@ Special thanks to [GarethE](https://github.com/keyoke), thank you for your contr
 
 ### Changed
 - Use a new configuration page for switching arduino boards
-- Lazy load the arduino extension on start up, only usb detection works in background, when it detects an arduino board, the extension will fully activate
+- Lazy load the arduino extension on startup, only usb detection works in background, when it detects an arduino board, the extension will fully activate
 - Update unit test to some basic arduino commands
 - Fix some typos in code
 - Fix issue #289 #324 #327
@@ -432,4 +432,4 @@ Special thanks to [GarethE](https://github.com/keyoke), thank you for your contr
 - Built-in serial monitor
 - Snippets for sketches
 - Automatic Arduino project scaffolding
-- Commond Palette (F1) integration of frequently used commands (e.g. Verify, Upload...)
+- Command Palette (F1) integration of frequently used commands (e.g. Verify, Upload...)

From 319583f689df34f0d45e1d4197dbd41674d5fda3 Mon Sep 17 00:00:00 2001
From: jogo- <jogo@laposte.net>
Date: Tue, 13 Apr 2021 00:22:13 +0200
Subject: [PATCH 135/142] Fix typos in README.md (#1225)

Co-authored-by: Adi Azulay <adazulay@microsoft.com>
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index ca308d8f..3935ca40 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ The Arduino IDE can be installed the Arduino [download page](https://www.arduino
 ### Arduino CLI
 The Arduino CLI can be downloaded from the repository's [release page](https://github.com/arduino/arduino-cli/releases/tag/0.13.0)
 - The extension has only been tested with v0.13.0.
-- If you use the CLI you will have to set `arduino.path` since the CLI does not have a defualt path. 
+- If you use the CLI you will have to set `arduino.path` since the CLI does not have a default path. 
 
 ## Installation
 Open VS Code and press <kbd>F1</kbd> or <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> to open command palette, select **Install Extension** and type `vscode-arduino`.
@@ -60,7 +60,7 @@ This extension provides several commands in the Command Palette (<kbd>F1</kbd> o
 - **Arduino: Upload Using Programmer**: Upload using an external programmer.
 - **Arduino: CLI Upload Using Programmer**: Upload using an external programmer without building sketch (CLI only).
 - **Arduino: Verify**: Build sketch.
-- **Arduino: Rebuild IntelliSense Configuration**: Forced/manual rebuild of the IntelliSense configuration. The extension analyzes Arduino's build output and sets the Intellisense include paths, defines, compiler arguments accordingly.
+- **Arduino: Rebuild IntelliSense Configuration**: Forced/manual rebuild of the IntelliSense configuration. The extension analyzes Arduino's build output and sets the IntelliSense include paths, defines, compiler arguments accordingly.
 
 ## Keybindings
 - **Arduino: Upload** <kbd>Alt</kbd> + <kbd>Cmd</kbd> + <kbd>U</kbd> *or* <kbd>Alt</kbd> + <kbd>Ctrl</kbd> + <kbd>U</kbd>
@@ -71,7 +71,7 @@ This extension provides several commands in the Command Palette (<kbd>F1</kbd> o
 | Option | Description |
 | --- | --- |
 | `arduino.path`  | Path to Arduino, you can use a custom version of Arduino by modifying this setting to include the full path. Example: `C:\\Program Files\\Arduino` for Windows, `/Applications` for Mac, `/home/<username>/Downloads/arduino-1.8.1` for Linux. (Requires a restart after change). The default value is automatically detected from your Arduino IDE installation path. |
-| `arduino.commandPath` | Path to an executable (or script) relative to `arduino.path`. The default value is `arduino_debug.exe` for windows,`Contents/MacOS/Arduino` for Mac and `arduino` for Linux, You also can use a custom launch script to run Arduino by modifying this setting. (Requires a restart after change) Example: `run-arduino.bat` for Windows, `Contents/MacOS/run-arduino.sh` for Mac and `bin/run-arduino.sh` for Linux. |
+| `arduino.commandPath` | Path to an executable (or script) relative to `arduino.path`. The default value is `arduino_debug.exe` for Windows, `Contents/MacOS/Arduino` for Mac and `arduino` for Linux, You also can use a custom launch script to run Arduino by modifying this setting. (Requires a restart after change) Example: `run-arduino.bat` for Windows, `Contents/MacOS/run-arduino.sh` for Mac and `bin/run-arduino.sh` for Linux. |
 | `arduino.additionalUrls` | Additional Boards Manager URLs for 3rd party packages. You can have multiple URLs in one string with a comma(`,`) as separator, or have a string array. The default value is empty. |
 | `arduino.logLevel` | CLI output log level. Could be info or verbose. The default value is `"info"`. |
 | `arduino.allowPDEFiletype` | Allow the VSCode Arduino extension to open .pde files from pre-1.0.0 versions of Arduino. Note that this will break Processing code. Default value is `false`. |

From 78049a79bb6de7c7d2adba2dedb1c1dc5c6a96ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Apr 2021 16:12:17 -0700
Subject: [PATCH 136/142] Bump y18n from 4.0.0 to 4.0.1 in /src/views (#1220)

Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Adi Azulay <adazulay@microsoft.com>
---
 src/views/package-lock.json | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/views/package-lock.json b/src/views/package-lock.json
index 3a4e101d..b6e3ee11 100644
--- a/src/views/package-lock.json
+++ b/src/views/package-lock.json
@@ -843,12 +843,6 @@
             "yallist": "^3.0.2"
           }
         },
-        "y18n": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-          "dev": true
-        },
         "yallist": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
@@ -6414,9 +6408,9 @@
       "dev": true
     },
     "y18n": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
+      "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
       "dev": true
     },
     "yallist": {

From 12e7f637158b25d415d9334ab1470b5b98cb7e45 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Apr 2021 08:39:12 -0700
Subject: [PATCH 137/142] Bump elliptic from 6.5.3 to 6.5.4 (#1212)

Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.3...v6.5.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Adi Azulay <adazulay@microsoft.com>
---
 package-lock.json | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 25fa2641..cb7e0ab2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2210,24 +2210,30 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "elliptic": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
-      "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.4.0",
-        "brorand": "^1.0.1",
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
         "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.0"
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
       },
       "dependencies": {
         "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        },
+        "inherits": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
           "dev": true
         }
       }

From f964b7e236483f1901fcb5c084399d1c65b63dcd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Apr 2021 09:10:51 -0700
Subject: [PATCH 138/142] Bump elliptic from 6.5.3 to 6.5.4 in /src/views
 (#1210)

Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.3...v6.5.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Adi Azulay <adazulay@microsoft.com>
---
 src/views/package-lock.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/views/package-lock.json b/src/views/package-lock.json
index b6e3ee11..5e30cfbf 100644
--- a/src/views/package-lock.json
+++ b/src/views/package-lock.json
@@ -1677,24 +1677,24 @@
       }
     },
     "elliptic": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
-      "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.4.0",
-        "brorand": "^1.0.1",
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
         "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.0"
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
       },
       "dependencies": {
         "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
           "dev": true
         }
       }

From 82212bcb6c5b8d2f5a952675c45f4cb86b467d0a Mon Sep 17 00:00:00 2001
From: Adi Azulay <adazulay@microsoft.com>
Date: Thu, 15 Apr 2021 12:20:32 -0700
Subject: [PATCH 139/142] add usbcon macro to config (#1231)

---
 src/arduino/intellisense.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/arduino/intellisense.ts b/src/arduino/intellisense.ts
index 56daeea7..1458cedd 100644
--- a/src/arduino/intellisense.ts
+++ b/src/arduino/intellisense.ts
@@ -101,6 +101,9 @@ export function makeCompilerParserContext(dc: DeviceContext): ICoCoPaContext {
             runner.result.options.splice(mmdIndex);
         }
 
+        // Add USB Connected marco to defines
+        runner.result.defines.push("USBCON")
+
         try {
 
             const cmd = os.platform() === "darwin" ? "Cmd" : "Ctrl";

From f88461dd84af6ccbfd168cbf9005797a62b9016e Mon Sep 17 00:00:00 2001
From: Adi Azulay <adazulay@microsoft.com>
Date: Mon, 19 Apr 2021 09:17:50 -0700
Subject: [PATCH 140/142] add ai key to deploy (#1236)

---
 .github/workflows/build.yml |  8 +++++---
 gulpfile.js                 | 18 ++++--------------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 47a37649..7ab473b9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -53,7 +53,6 @@ jobs:
       - name: scripts
         run: |
           gulp tslint
-          gulp genAikey
           vsce package
       - name: run tests
         if: ${{ matrix.os != 'windows-latest' }}
@@ -93,7 +92,6 @@ jobs:
     - name: scripts
       run: |
         gulp tslint
-        gulp genAikey
         vsce package
     - name: upload .vsix to github tag
       uses: svenstaro/upload-release-action@v2
@@ -111,4 +109,8 @@ jobs:
         fi
     - name: publish
       if: steps.check-version.outputs.ISPRODUCTION == 'true'
-      run: vsce publish -p ${{ secrets.VSCE_TOKEN }}
+      env:
+        PROD_AIKEY: ${{ secrets.PROD_AIKEY }}
+      run: | 
+        gulp genAikey
+        vsce publish -p ${{ secrets.VSCE_TOKEN }}
diff --git a/gulpfile.js b/gulpfile.js
index 7888a888..a8955511 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -81,20 +81,10 @@ gulp.task("clean", (done) => {
 });
 
 gulp.task("genAikey", (done) => {
-    if (process.env.TRAVIS_TAG) {
-        const ISPROD = /^v?[0-9]+\.[0-9]+\.[0-9]+$/.test(process.env.TRAVIS_TAG || "");
-        const packageJson = JSON.parse(fs.readFileSync("package.json"));
-        if (ISPROD) {
-            packageJson.aiKey = process.env["PROD_AIKEY"];
-        } else {
-            packageJson.aiKey = process.env["INT_AIKEY"] || packageJson.aiKey;
-        }
-        fs.writeFileSync("package.json", JSON.stringify(packageJson, null, 2) + "\n");
-        done();
-    } else {
-        log("Skipping genAiKey");
-        done();
-    }
+    const packageJson = JSON.parse(fs.readFileSync("package.json"));
+    packageJson.aiKey = process.env.PROD_AIKEY;
+    fs.writeFileSync("package.json", JSON.stringify(packageJson, null, 2) + "\n");
+    done();
 });
 
 gulp.task("test", (done) => {

From 7ef8b8f4bba788aa3f8a22c322ca99c03e752a4e Mon Sep 17 00:00:00 2001
From: Adi Azulay <adazulay@microsoft.com>
Date: Mon, 19 Apr 2021 14:13:38 -0700
Subject: [PATCH 141/142] Bump to v0.4.1 (#1238)

* pre-release v0.4.1-rc1

* pre-release v0.4.1-rc2

* update version

* bump to v0.4.1
---
 CHANGELOG.md      | 20 ++++++++++++++++----
 package-lock.json |  2 +-
 package.json      |  2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d66d3c2..913605a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,26 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## Version 0.4.1
+
+### Added
+- Quickpick sketch selection [#1128](https://github.com/microsoft/vscode-arduino/pull/1128) Thanks [@maddogjt](https://github.com/maddogjt)
+
+### Fixed
+- Arduino CLI on MacOS [#1221](https://github.com/microsoft/vscode-arduino/issues/1221) Thanks [@awmichel](https://github.com/awmichel)
+- Typos [#1226](https://github.com/microsoft/vscode-arduino/pull/1226), [#1225](https://github.com/microsoft/vscode-arduino/pull/1225), [#1191](https://github.com/microsoft/vscode-arduino/pull/1191) Thanks [@jogo-](https://github.com/jogo-) [@CBielstein](https://github.com/CBielstein)
+- add USBCON back into IntelliSense config [#1216](https://github.com/microsoft/vscode-arduino/issues/1216)
+- Update depedencies
+- App Insights key in Actions [#1236](https://github.com/microsoft/vscode-arduino/pull/1236)
+
 ## Version 0.4.0
 
 ### Added
-- Support for Arduino CLI (#1017)
+- Support for Arduino CLI #1017
 
 ### Changed
-- Autogenerate c_cpp_properties.json with all complier arguments and libraries for IntelliSense (#1183)
-- Detects available programmers for selected board (#1118)
+- Autogenerate c_cpp_properties.json with all complier arguments and libraries for IntelliSense #1183
+- Detects available programmers for selected board #1118
 
 ### Fixed
 - Typos
@@ -17,7 +29,7 @@ All notable changes to this project will be documented in this file.
 - Unifies all build commands under a single
 
 ### Known Issues
-- Arduino CLI doesn't work on Mac (#1205)
+- Arduino CLI doesn't work on Mac [#1205](https://github.com/microsoft/vscode-arduino/issues/1205)
 
 ## Version 0.3.5
 
diff --git a/package-lock.json b/package-lock.json
index cb7e0ab2..4354db20 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "vscode-arduino",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9f2c694a..d049cf7a 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "vscode-arduino",
   "displayName": "Arduino",
   "description": "Arduino for Visual Studio Code",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "publisher": "vsciot-vscode",
   "aiKey": "83dd2c27-6594-41d3-85a9-bdb22070eb42",
   "preview": true,

From 9404967e9d3190b93bc4102a9ae6a1012d721502 Mon Sep 17 00:00:00 2001
From: Adi Azulay <adazulay@microsoft.com>
Date: Thu, 22 Apr 2021 08:43:40 -0700
Subject: [PATCH 142/142] bump to v0.4.2

---
 CHANGELOG.md      | 7 ++++++-
 package-lock.json | 2 +-
 package.json      | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 913605a9..decb8f56 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## Version 0.4.2
+
+### Fixed
+- Update app insights key
+
 ## Version 0.4.1
 
 ### Added
@@ -10,7 +15,7 @@ All notable changes to this project will be documented in this file.
 - Arduino CLI on MacOS [#1221](https://github.com/microsoft/vscode-arduino/issues/1221) Thanks [@awmichel](https://github.com/awmichel)
 - Typos [#1226](https://github.com/microsoft/vscode-arduino/pull/1226), [#1225](https://github.com/microsoft/vscode-arduino/pull/1225), [#1191](https://github.com/microsoft/vscode-arduino/pull/1191) Thanks [@jogo-](https://github.com/jogo-) [@CBielstein](https://github.com/CBielstein)
 - add USBCON back into IntelliSense config [#1216](https://github.com/microsoft/vscode-arduino/issues/1216)
-- Update depedencies
+- Update dependencies
 - App Insights key in Actions [#1236](https://github.com/microsoft/vscode-arduino/pull/1236)
 
 ## Version 0.4.0
diff --git a/package-lock.json b/package-lock.json
index 4354db20..97dae208 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "vscode-arduino",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d049cf7a..15021e6b 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "vscode-arduino",
   "displayName": "Arduino",
   "description": "Arduino for Visual Studio Code",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "publisher": "vsciot-vscode",
   "aiKey": "83dd2c27-6594-41d3-85a9-bdb22070eb42",
   "preview": true,