From 797d72be4ce81d45434c252a34d65dc0c7fd3fa6 Mon Sep 17 00:00:00 2001
From: Yaohai Zheng <yaozheng@microsoft.com>
Date: Wed, 22 Mar 2017 14:17:08 +0800
Subject: [PATCH 1/2] Fix config for Arduino.

---
 package.json          | 7 +------
 snippets/arduino.json | 8 ++++++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index a269bcd8..ffd2c239 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,6 @@
     "workspaceContains:.vscode/arduino.json",
     "onCommand:arduino.verify",
     "onCommand:arduino.upload",
-    "onCommand:arduino.addLibPath",
     "onCommand:selectSerialPort",
     "onCommand:changeBoardType",
     "onCommand:arduino.showBoardManager",
@@ -47,10 +46,6 @@
         "command": "arduino.upload",
         "title": "Arduino: Upload"
       },
-      {
-        "command": "arduino.addLibPath",
-        "title": "Arduino: Add library paths"
-      },
       {
         "command": "arduino.selectSerialPort",
         "title": "Arduino: Select Serial Port"
@@ -81,7 +76,7 @@
       },
       {
         "command": "arduino.showLibraryManager",
-        "title": "Arduino: Manage Libraries"
+        "title": "Arduino: Libraries Manager"
       }
     ],
     "keybindings": [
diff --git a/snippets/arduino.json b/snippets/arduino.json
index 289bb0d4..320d5110 100644
--- a/snippets/arduino.json
+++ b/snippets/arduino.json
@@ -18,7 +18,9 @@
         "prefix": "aloop",
         "body": [
             "void loop()",
-            "{\n}"
+            "{",
+            "\t${0}",
+            "}"
         ],
         "description": "Function loop"
     },
@@ -26,7 +28,9 @@
         "prefix": "asetup",
         "body": [
             "void setup()",
-            "{\n}"
+            "{",
+            "\t${0}",
+            "}"
         ],
         "description": "Function setup"
     },

From ed283d6978570f3b6a85d73b78a9565dcfd9061b Mon Sep 17 00:00:00 2001
From: Yaohai Zheng <yaozheng@microsoft.com>
Date: Wed, 22 Mar 2017 15:07:47 +0800
Subject: [PATCH 2/2] Fix plural.

---
 src/common/constants.ts | 4 ++--
 src/extension.ts        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/common/constants.ts b/src/common/constants.ts
index f8b35444..0c4fa143 100644
--- a/src/common/constants.ts
+++ b/src/common/constants.ts
@@ -16,8 +16,8 @@ export const ARDUINO_MODE: vscode.DocumentSelector = [
 ];
 
 export const ARDUINO_MANAGER_PROTOCOL = "arduino-manager";
-export const BOARD_MANAGER_URI = vscode.Uri.parse("arduino-manager://arduino/arduino-boardmanager");
-export const LIBRARY_MANAGER_URI = vscode.Uri.parse("arduino-manager://arduino/arduino-librarymanager");
+export const BOARD_MANAGER_URI = vscode.Uri.parse("arduino-manager://arduino/arduino-boardsmanager");
+export const LIBRARY_MANAGER_URI = vscode.Uri.parse("arduino-manager://arduino/arduino-librariesmanager");
 
 export const messages = {
     ARDUINO_FILE_ERROR: "The arduino.json file format is not correct.",
diff --git a/src/extension.ts b/src/extension.ts
index 1990ff67..d35f0260 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -69,7 +69,7 @@ export async function activate(context: vscode.ExtensionContext) {
     }));
 
     context.subscriptions.push(registerCommand("arduino.showLibraryManager", () => {
-        return vscode.commands.executeCommand("vscode.previewHtml", LIBRARY_MANAGER_URI, vscode.ViewColumn.Two, "Arduino Library Manager");
+        return vscode.commands.executeCommand("vscode.previewHtml", LIBRARY_MANAGER_URI, vscode.ViewColumn.Two, "Arduino Libraries Manager");
     }));
 
     // change board type