Merge branch 'release/v0.15.1'

platformio · May 26, 2018 · 5dd00cb · 5dd00cb
2 parents 5781708 + 899470e
commit 5dd00cb
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Release Notes
 
+## 0.15.1 (2018-05-26)
+
+* Moved PlatformIO Toolbar to the beginning of the bottom status bar
+* Fixed issue when trying to open an opened PIO Home again
+
 ## 0.15.0 (2018-05-08)
 
 **Requires VSCode 1.23.0 or above**

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "platformio-ide",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "publisher": "platformio",
   "engines": {
     "vscode": "^1.23.0"
@@ -23,7 +23,7 @@
   "preview": true,
   "main": "./lib/main",
   "icon": "resources/platformio-logo.png",
-  "homepage": "http://platformio.org",
+  "homepage": "https://platformio.org",
   "author": {
     "name": "PlatformIO.Org"
   },

diff --git a/src/constants.js b/src/constants.js
@@ -11,4 +11,4 @@ export const IS_OSX = process.platform == 'darwin';
 export const IS_LINUX = !IS_WINDOWS && !IS_OSX;
 
 export const AUTO_REBUILD_DELAY = 3000;
-export const PIO_CORE_MIN_VERSION = '3.5.2';
+export const PIO_CORE_MIN_VERSION = '3.5.3-b.3';
diff --git a/src/home.js b/src/home.js
@@ -15,18 +15,20 @@ import vscode from 'vscode';
 export default class PIOHome {
 
   constructor() {
-    this._currentPanel = null;
+    this._currentPanel = undefined;
+    this._disposables = [];
   }
 
   toggle() {
+    const column = vscode.window.activeTextEditor ? vscode.window.activeTextEditor.viewColumn : undefined;
     if (this._currentPanel) {
-      this._currentPanel.reveal(vscode.ViewColumn.One);
+      this._currentPanel.reveal(column);
     } else {
       this._currentPanel = this.newPanel();
     }
   }
 
-  async newPanel() {
+  newPanel() {
     const panel = vscode.window.createWebviewPanel(
       'pioHome',
       extension.getEnterpriseSetting('pioHomeTitle', 'PIO Home'),
@@ -36,9 +38,9 @@ export default class PIOHome {
         retainContextWhenHidden: true
       }
     );
-    panel.onDidDispose(this.onPanelDisposed.bind(this));
+    panel.onDidDispose(this.onPanelDisposed.bind(this), null, this._disposables);
     panel.webview.html = this.getLoadingContent();
-    this.getWebviewContent().then(html => panel.webview.html = html );
+    this.getWebviewContent().then(html => panel.webview.html = html);
     return panel;
   }
 
@@ -51,7 +53,7 @@ export default class PIOHome {
     const theme = this.getTheme();
     return `<!DOCTYPE html>
     <html lang="en">
-    <body style="background-color: ${theme === 'light' ? '#FFF' : '#1E1E1E' }">
+    <body style="background-color: ${theme === 'light' ? '#FFF' : '#1E1E1E'}">
       Loading...
     </body>
     </html>`;
@@ -69,12 +71,12 @@ export default class PIOHome {
     const theme = this.getTheme();
     return `<!DOCTYPE html>
       <html lang="en">
-      <body style="margin: 0; padding: 0; height: 100%; overflow: hidden; background-color: ${theme === 'light' ? '#FFF' : '#1E1E1E' }">
+      <body style="margin: 0; padding: 0; height: 100%; overflow: hidden; background-color: ${theme === 'light' ? '#FFF' : '#1E1E1E'}">
         <iframe src="${ pioNodeHelpers.home.getFrontendUri(params.host, params.port, {
         start,
         theme,
         workspace: extension.getEnterpriseSetting('defaultPIOHomeWorkspace')
-      }) }"
+      })}"
           width="100%"
           height="100%"
           frameborder="0"
@@ -85,14 +87,24 @@ export default class PIOHome {
   }
 
   onPanelDisposed() {
-    this._currentPanel = null;
+    this._currentPanel = undefined;
   }
 
   shutdownServer() {
     pioNodeHelpers.home.shutdownServer();
   }
 
   dispose() {
+    if (this._currentPanel) {
+      this._currentPanel.dispose();
+      this._currentPanel = undefined;
+    }
+    while (this._disposables.length) {
+      const x = this._disposables.pop();
+      if (x) {
+        x.dispose();
+      }
+    }
     this.shutdownServer();
   }
 

diff --git a/src/installer/state-storage.js b/src/installer/state-storage.js
@@ -28,7 +28,7 @@ export default class StateStorage {
     if (data && data.hasOwnProperty(key)) {
       return data[key];
     }
-    return null;
+    return undefined;
   }
 
   setValue(key, value) {

diff --git a/src/main.js b/src/main.js
@@ -22,9 +22,9 @@ import vscode from 'vscode';
 class PlatformIOVSCodeExtension {
 
   constructor() {
-    this.context = null;
-    this.pioTerm = null;
-    this.pioHome = null;
+    this.context = undefined;
+    this.pioTerm = undefined;
+    this.pioHome = undefined;
 
     this._isMonitorRun = false;
     this._enterpriseSettings = undefined;
@@ -144,7 +144,7 @@ class PlatformIOVSCodeExtension {
         }
       }
       im.destroy();
-      return Promise.reject(null);
+      return Promise.reject(undefined);
     });
   }
 
@@ -260,7 +260,7 @@ class PlatformIOVSCodeExtension {
       .reverse()
       .forEach((item, index) => {
         const [text, tooltip, command] = item;
-        const sbItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 10 + index);
+        const sbItem = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, 1000 + index);
         sbItem.text = text;
         sbItem.tooltip = tooltip;
         sbItem.command = command;

diff --git a/src/project/indexer.js b/src/project/indexer.js
@@ -16,7 +16,7 @@ import vscode from 'vscode';
 
 export default class ProjectIndexer {
 
-  static PythonExecutable = null;
+  static PythonExecutable = undefined;
 
   constructor(projectDir) {
     this.projectDir = projectDir;
@@ -26,8 +26,8 @@ export default class ProjectIndexer {
 
     this._isActive = false;
     this._inProgress = false;
-    this._rebuildTimeout = null;
-    this._updateLibDirWatchersTimeout = null;
+    this._rebuildTimeout = undefined;
+    this._updateLibDirWatchersTimeout = undefined;
   }
 
   async activate() {

diff --git a/src/tasks.js b/src/tasks.js
@@ -65,7 +65,7 @@ export default class PIOTasksProvider {
     this.projectDir = projectDir;
     this.subscriptions = [];
 
-    this._refreshTimeout = null;
+    this._refreshTimeout = undefined;
 
     this.requestRefresh();
   }
@@ -132,7 +132,7 @@ export default class PIOTasksProvider {
 
   async getTasks() {
     const result = [];
-    let projectConf = null;
+    let projectConf = undefined;
     try {
       const content = await new Promise((resolve, reject) => {
         fs.readFile(

diff --git a/src/terminal.js b/src/terminal.js
@@ -14,13 +14,13 @@ import vscode from 'vscode';
 export default class PIOTerminal {
 
   constructor() {
-    this._instance = null;
+    this._instance = undefined;
   }
 
   new() {
     return vscode.window.createTerminal({
       name: 'PlatformIO',
-      shellPath: constants.IS_WINDOWS ? 'cmd.exe' : null,
+      shellPath: constants.IS_WINDOWS ? 'cmd.exe' : undefined,
       env: {
         PATH: process.env.PATH,
         PLATFORMIO_CALLER: 'vscode'
@@ -40,7 +40,7 @@ export default class PIOTerminal {
     if (this._instance) {
       this._instance.dispose();
     }
-    this._instance = null;
+    this._instance = undefined;
   }
 
   updateEnvConfiguration() {