Merge branch 'master' into programmers_improvement

Author: hairlesshobo

.github/stale.yml

@@ -0,0 +1,23 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 30
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 5
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - "help wanted"
+  - bug
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale and closed because it 
+  has not had recent activity. Please feel free to open a new issue if you
+  would like further discussion. Thank you for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: true
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: true
+# Limit to only `issues` or `pulls`
+only: issues

.vscodeignore

@@ -10,4 +10,5 @@ tsconfig.json
 tslint.json
 .travis.yml
 gulpfile.js
-*.vsix
+*.vsix
+.github/**

CHANGELOG.md

@@ -1,14 +1,28 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## Version 0.2.26
+-Release date: May 30, 2019
+
+### Added
+- Add .pde support
+
+### Changed
+- The value of 'Include Path' will be updated automatically when board package is updated
+
+### Fixed
+- Fix the issue of "ST-Link upload - Please specify the upload serial port" [#595](https://github.com/microsoft/vscode-arduino/issues/595)
+
+Special thanks to [Riz-waan](https://github.com/Riz-waan), [LuisAbrantes](https://github.com/LuisAbrantes), [Christopher Schmitz](https://github.com/chris-schmitz), [Christian](https://github.com/ChriD) and [LMtx](https://github.com/LMtx), thanks for your contributions and feedbacks.
+
 ## Version 0.2.25
 -Release date: January 10, 2019
 
 ### Added
 - Add upload and verify button in action bar [#737](https://github.com/Microsoft/vscode-arduino/pull/737)
 - Add serial port support for Electron 3.0 [#729](https://github.com/Microsoft/vscode-arduino/pull/729), [#730](https://github.com/Microsoft/vscode-arduino/pull/730), [#731](https://github.com/Microsoft/vscode-arduino/pull/731)
 
-Special thanks to [Michael Omiccioli](https://github.com/momiccioli) and [MarNwk](https://github.com/MarNwk),thank you for your feedbacks.
+Special thanks to [Michael Omiccioli](https://github.com/momiccioli) and [MarNwk](https://github.com/MarNwk), thank you for your feedbacks.
 
 ## Version 0.2.24
 -Release date: December 11, 2018

README.md

@@ -32,7 +32,7 @@ ext install vscode-arduino
 You can also install directly from the Marketplace within Visual Studio Code, searching for `Arduino`.
 
 ## Get Started
-You can find code samples and tutorials each time that you connect a supported device. Alternatively you can visit our [IoT Developer Blog Space](https://aka.ms/iotdevblog) or [Get Started Tutorials](https://docs.microsoft.com/azure/iot-hub/iot-hub-arduino-iot-devkit-az3166-get-started).
+You can find code samples and tutorials each time that you connect a supported device. Alternatively you can visit our [IoT Developer Blog Space](https://devblogs.microsoft.com/iotdev/) or [Get Started Tutorials](https://docs.microsoft.com/azure/iot-hub/iot-hub-arduino-iot-devkit-az3166-get-started).
 
 ## Commands
 This extension provides several commands in the Command Palette (<kbd>F1</kbd> or <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd>) for working with `*.ino` files:
@@ -102,7 +102,7 @@ The following settings are as per sketch settings of the Arduino extension. You
 - `sketch` - The main sketch file name of Arduino.
 - `port` - Name of the serial port connected to the device. Can be set by the `Arduino: Select Serial Port` command. For Mac users could be "/dev/cu.wchusbserial1420".
 - `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.
+- `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.
 

package-lock.json

@@ -2,7 +2,7 @@
   "name": "vscode-arduino",
   "displayName": "Arduino",
   "description": "Arduino for Visual Studio Code",
-  "version": "0.2.25",
+  "version": "0.2.26",
   "publisher": "vsciot-vscode",
   "aiKey": "83dd2c27-6594-41d3-85a9-bdb22070eb42",
   "preview": true,
@@ -505,7 +505,8 @@
       {
         "id": "cpp",
         "extensions": [
-          ".ino"
+          ".ino",
+          ".pde"
         ]
       }
     ],

package.json

@@ -108,7 +108,8 @@ export class ArduinoApp {
         if (!dc.sketch || !util.fileExistsSync(path.join(ArduinoWorkspace.rootPath, dc.sketch))) {
             await this.getMainSketch(dc);
         }
-        if (!dc.port) {
+
+        if ((!dc.configuration || !/upload_method=[^=,]*st[^,]*link/i.test(dc.configuration)) && !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");
@@ -140,7 +141,11 @@ export class ArduinoApp {
         }
 
         const appPath = path.join(ArduinoWorkspace.rootPath, dc.sketch);
-        const args = ["--upload", "--board", boardDescriptor, "--port", dc.port, appPath];
+        const args = ["--upload", "--board", boardDescriptor];
+        if (dc.port) {
+            args.push("--port", dc.port);
+        }
+        args.push(appPath);
         if (VscodeSettings.getInstance().logLevel === "verbose") {
             args.push("--verbose");
         }
@@ -304,6 +309,68 @@ export class ArduinoApp {
 
     }
 
+    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[]}>};
+        const libPaths = this.getDefaultPackageLibPaths();
+        const defaultForcedInclude = this.getDefaultForcedIncludeFiles();
+        const configuration = cppConfig.configurations[0];
+
+        let cppConfigFileUpdated = false;
+        // cpp exntension 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, "\\"));
+
+        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);
+            }
+        }
+
+        // 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));
+        }
+    }
+
     // Add selected library path to the intellisense search path.
     public addLibPath(libraryPath: string) {
         let libPaths;

src/arduino/arduino.ts

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
+import * as fs from "fs";
 import * as path from "path";
 import * as Uuid from "uuid/v4";
 import * as vscode from "vscode";
@@ -286,7 +287,7 @@ export async function activate(context: vscode.ExtensionContext) {
     registerNonArduinoCommand("arduino.changeBaudRate", () => serialMonitor.changeBaudRate());
     registerNonArduinoCommand("arduino.changeEnding", () => serialMonitor.changeEnding());
     registerNonArduinoCommand("arduino.sendMessageToSerialPort", () => serialMonitor.sendMessageToSerialPort());
-    registerNonArduinoCommand("arduino.closeSerialMonitor", (port) => serialMonitor.closeSerialMonitor(port));
+    registerNonArduinoCommand("arduino.closeSerialMonitor", (port, showWarning = true) => serialMonitor.closeSerialMonitor(port, showWarning));
 
     const completionProvider = new CompletionProvider();
     context.subscriptions.push(vscode.languages.registerCompletionItemProvider(ARDUINO_MODE, completionProvider, "<", '"', "."));
@@ -307,6 +308,7 @@ export async function activate(context: vscode.ExtensionContext) {
                 SerialMonitor.getInstance().initialize();
             }
             ArduinoContext.boardManager.updateStatusBar(true);
+            ArduinoContext.arduinoApp.tryToUpdateIncludePaths();
             vscode.commands.executeCommand("setContext", "vscode-arduino:showExampleExplorer", true);
         })();
     }
@@ -326,6 +328,30 @@ export async function activate(context: vscode.ExtensionContext) {
             vscode.commands.executeCommand("setContext", "vscode-arduino:showExampleExplorer", true);
         }
     });
+
+    vscode.workspace.onDidOpenTextDocument(async (document) => {
+        if (/\.pde$/.test(document.uri.fsPath)) {
+            const newFsName = document.uri.fsPath.replace(/\.pde$/, ".ino");
+            await vscode.commands.executeCommand("workbench.action.closeActiveEditor");
+            fs.renameSync(document.uri.fsPath, newFsName);
+            await vscode.commands.executeCommand("vscode.open", vscode.Uri.file(newFsName));
+        }
+    });
+
+    vscode.window.onDidChangeActiveTextEditor(async (editor) => {
+        if (!editor) {
+            return;
+        }
+
+        const document = editor.document;
+        if (/\.pde$/.test(document.uri.fsPath)) {
+            const newFsName = document.uri.fsPath.replace(/\.pde$/, ".ino");
+            await vscode.commands.executeCommand("workbench.action.closeActiveEditor");
+            fs.renameSync(document.uri.fsPath, newFsName);
+            await vscode.commands.executeCommand("vscode.open", vscode.Uri.file(newFsName));
+        }
+    });
+
     Logger.traceUserData("end-activate-extension", { correlationId: activeGuid });
 }