Moved arduino specifics from cocopa to vscode-arduino

Author: elektronikworkshop

package-lock.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",

package.json

@@ -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),
         ];