Merge branch 'master' into yaohai_dev

microsoft · Oct 25, 2017 · 50334c8 · 50334c8
2 parents 1987bdc + 7f8150a
commit 50334c8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/extension.ts b/src/extension.ts
@@ -105,8 +105,11 @@ export async function activate(context: vscode.ExtensionContext) {
         return vscode.commands.executeCommand("vscode.previewHtml", BOARD_CONFIG_URI, vscode.ViewColumn.Two, "Arduino Board Configuration");
     });
 
-    registerArduinoCommand("arduino.showExamples", () => {
+    registerArduinoCommand("arduino.showExamples", (forceRefresh: boolean = false) => {
         vscode.commands.executeCommand("setContext", "vscode-arduino:showExampleExplorer", true);
+        if (forceRefresh) {
+            vscode.commands.executeCommand("arduino.reloadExample");
+        }
         return vscode.commands.executeCommand("vscode.previewHtml", EXAMPLES_URI, vscode.ViewColumn.Two, "Arduino Examples");
     });
 

diff --git a/src/serialmonitor/usbDetector.ts b/src/serialmonitor/usbDetector.ts
@@ -150,7 +150,7 @@ export class UsbDetector {
             if (!util.fileExistsSync(readmeFilePath)) {
                 readmeFilePath = path.join(ArduinoContext.boardManager.currentBoard.platform.rootBoardPath, "README.md");
             }
-            vscode.commands.executeCommand("setContext", "vscode-arduino:showExampleExplorer", true);
+            vscode.commands.executeCommand("arduino.showExamples", true);
             if (util.fileExistsSync(readmeFilePath)) {
                 if (readmeFilePath.endsWith(MARKDOWN_EXT)) {
                     vscode.commands.executeCommand("markdown.showPreview", vscode.Uri.file(readmeFilePath));