Merge branch 'release/v0.15.2'

platformio · May 30, 2018 · 45127ba · 45127ba
2 parents 5dd00cb + 34769a2
commit 45127ba
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Release Notes
 
+## 0.15.2 (2018-05-30)
+
+* Reverted back an order of PlatformIO Toolbar (issue [#114](https://github.com/platformio/platformio-vscode-ide/issues/114))
+* Fixed issue with customization of built-in PlatformIO tasks (issue [#89](https://github.com/platformio/platformio-vscode-ide/issues/89))
+
 ## 0.15.1 (2018-05-26)
 
 * Moved PlatformIO Toolbar to the beginning of the bottom status bar

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "platformio-ide",
-  "version": "0.15.1",
+  "version": "0.15.2",
   "publisher": "platformio",
   "engines": {
     "vscode": "^1.23.0"
@@ -438,12 +438,12 @@
       {
         "type": "PlatformIO",
         "required": [
-          "args"
+          "task"
         ],
         "properties": {
-          "args": {
-            "type": "array",
-            "description": "Arguments for PlatformIO Core"
+          "task": {
+            "type": "string",
+            "description": "Task name"
           }
         }
       }

diff --git a/src/main.js b/src/main.js
@@ -260,7 +260,7 @@ class PlatformIOVSCodeExtension {
       .reverse()
       .forEach((item, index) => {
         const [text, tooltip, command] = item;
-        const sbItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 1000 + index);
+        const sbItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 10 + index);
         sbItem.text = text;
         sbItem.tooltip = tooltip;
         sbItem.command = command;

diff --git a/src/tasks.js b/src/tasks.js
@@ -231,7 +231,7 @@ class TaskCreator {
     const task = new vscode.Task(
       {
         type: PIOTasksProvider.title,
-        args: this._args
+        task: this.name
       },
       this.name,
       PIOTasksProvider.title,