Merge branch 'release/v0.2.0'

ivankravets · ivankravets · commit d607a3c29da0 · 2017-05-29T19:09:05.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
-# 0.1.0
+# Release Notes
+
+## 0.2.0 (2017-05-29)
+
+* PlatformIO Toolbar in Status Bar (Build, Upload, Clean, Run Tasks, New Project, Serial Monitor, and Terminal)
+* Improved auto installer for PIO Core
+* Improved C/C++ Code Completion
+
+## 0.1.0 (2017-05-28)
 
 * Initial release
diff --git a/README.md b/README.md
@@ -2,34 +2,40 @@
 
 [![Marketplace Version](https://vsmarketplacebadge.apphb.com/version-short/platformio.platformio-ide.svg)](https://marketplace.visualstudio.com/items?itemName=platformio.platformio-ide) [![Installs](https://vsmarketplacebadge.apphb.com/installs-short/platformio.platformio-ide.svg)](https://marketplace.visualstudio.com/items?itemName=platformio.platformio-ide) [![Rating](https://vsmarketplacebadge.apphb.com/rating-short/platformio.platformio-ide.svg)](https://marketplace.visualstudio.com/items?itemName=platformio.platformio-ide)
 
-[PlatformIO IDE](http://platformio.org/platformio-ide) is the next generation integrated development environment for IoT.
+**The next generation integrated development environment for IoT**
 
-[PlatformIO](http://platformio.org/) is an open source ecosystem for IoT development.
+[PlatformIO](http://platformio.org) is an open source ecosystem for IoT development.
 Cross-platform build system and unified debugger. Remote unit testing and firmware updates.
 
 *Atmel AVR & SAM, Espressif 8266 & 32, Freescale Kinetis, Intel ARC32, Lattice iCE40,
-Microchip PIC32, Nordic nRF51, NXP LPC, Silicon Labs EFM32, ST STM32,
+Maxim Integrated MAX32, Microchip PIC32, Nordic nRF51, Nordic nRF52, NXP LPC, Silicon Labs EFM32, ST STM32,
 TI MSP430 & Tiva, Teensy, Arduino, ARM mbed, libOpenCM3, ESP8266, etc.*
 
 ## Features
 
 * Cross-platform code builder without external dependencies to a system software:
 
-    - 350+ embedded boards
+    - 400+ embedded boards
     - 20+ development platforms
     - 10+ frameworks
 
+* [PIO Remote™](http://docs.platformio.org/page/plus/pio-remote.html)
 * [PIO Unified Debugger](http://docs.platformio.org/page/plus/debugging.html)
+* [Unit Testing](http://docs.platformio.org/page/plus/unit-testing.html)
 * C/C++ Intelligent Code Completion
 * C/C++ Smart Code Linter for rapid professional development
 * Library Manager for the hundreds popular libraries
 * Multi-projects workflow with multiple panes
 * Themes support with dark and light colors
 * Serial Port Monitor
-* Built-in Terminal with PlatformIO Core tool (``pio``, ``platformio``)    
+* Built-in Terminal with [PlatformIO Core](http://docs.platformio.org/page/core.html) tool (``pio``, ``platformio``)
 
 ## How it works
 
+* [Installation](http://docs.platformio.org/page/ide/vscode.html#installation)
+* [Quick Start](http://docs.platformio.org/page/ide/vscode.html#quick-start)
+* [User Guide](http://docs.platformio.org/page/ide/vscode.html#user-quide)
+
 Please follow to the official documentation [PlatformIO IDE for VSCode](http://docs.platformio.org/page/ide/vscode.html).
 
 [![PlatformIO IDE for VSCode](https://raw.githubusercontent.com/platformio/platformio-docs/develop/_static/ide/vscode/platformio-ide-vscode.png)](http://platformio.org/platformio-ide)
@@ -47,5 +53,5 @@ This extension contributes the following settings:
 
 Copyright 2017-present PlatformIO <contact@platformio.org>
 
-The PlatformIO is licensed under the permissive Apache 2.0 license,
+The PlatformIO IDE for VSCode is licensed under the permissive Apache 2.0 license,
 so you can use it in both commercial and personal projects with confidence.
diff --git a/package.json b/package.json
@@ -1,12 +1,13 @@
 {
   "name": "platformio-ide",
+  "preview": true,
   "displayName": "PlatformIO IDE",
   "description": "Official PlatformIO IDE for VSCode: The next generation integrated development environment for IoT. Cross-platform build system and unified debugger. Remote unit testing and firmware updates.",
   "keywords": [
     "PlatformIO",
     "IoT",
     "debugger",
-    "unittest",    
+    "unittest",
     "embedded",
     "arduino",
     "mbed",
@@ -21,21 +22,21 @@
     "hardware",
     "serial",
     "monitor"
-  ], 
+  ],
   "categories": [
     "Languages",
     "Debuggers",
     "Other"
   ],
-  "icon": "images/icon.svg",  
-  "version": "0.1.0",
+  "icon": "images/icon.svg",
+  "version": "0.2.0",
   "author": {
     "name": "PlatformIO.Org"
-  },  
+  },
   "publisher": "platformio",
   "license": "Apache-2.0",
   "engines": {
-    "vscode": "^1.12.0"
+    "vscode": "^1.9.0"
   },
   "bugs": {
       "url": "https://github.com/platformio/platformio-vscode-ide/issues"
@@ -44,13 +45,33 @@
   "repository": {
       "type": "git",
       "url": "https://github.com/platformio/platformio-vscode-ide.git"
-  },  
+  },
   "activationEvents": [
     "*"
   ],
   "main": "./lib/index",
   "contributes": {
     "commands": [
+      {
+        "command": "platformio-ide.build",
+        "title": "Build",
+        "category": "PlatformIO"
+      },
+      {
+        "command": "platformio-ide.upload",
+        "title": "Upload",
+        "category": "PlatformIO"
+      },
+      {
+        "command": "platformio-ide.clean",
+        "title": "Clean",
+        "category": "PlatformIO"
+      },
+      {
+        "command": "platformio-ide.serialMonitor",
+        "title": "Serial Monitor",
+        "category": "PlatformIO"
+      },
       {
         "command": "platformio-ide.initProject",
         "title": "Initialize or update project",
@@ -65,7 +86,12 @@
         "command": "platformio-ide.newTerminal",
         "title": "New Terminal",
         "category": "PlatformIO"
-      }      
+      },
+      {
+        "command": "platformio-ide.libraryManager",
+        "title": "Library Manager",
+        "category": "PlatformIO"
+      }
     ],
     "configuration": {
       "type": "object",
diff --git a/src/commands/init.js b/src/commands/init.js
@@ -9,15 +9,16 @@
 import { runPioCommand } from '../utils';
 import vscode from 'vscode';
 
+
 export default async function initCommand() {
   if (!vscode.workspace.rootPath) {
     vscode.window.showWarningMessage(
-      'PlatformIO projec could not be initialized. Please open a folder '
+      'PlatformIO project could not be initialized. Please open a folder '
       + 'first before performing initialization.'
     );
   }
   await vscode.window.withProgress({
-    title: 'PlatformIO Project initialization',
+    title: 'PlatformIO Project initialization...',
     location: vscode.ProgressLocation.Window,
   }, async (progress) => {
     progress.report({
@@ -57,7 +58,7 @@ export default async function initCommand() {
         });
 
         await new Promise((resolve, reject) => {
-          runPioCommand(['init', '--ide', '--vscode', '--board', selectedBoard.boardId, '--project-dir', vscode.workspace.rootPath], (code, stdout, stderr) => {
+          runPioCommand(['init', '--ide', 'vscode', '--board', selectedBoard.boardId, '--project-dir', vscode.workspace.rootPath], (code, stdout, stderr) => {
             if (code !== 0) {
               reject(stderr);
             } else {
diff --git a/src/constants.js b/src/constants.js
@@ -15,7 +15,8 @@ export const IS_WINDOWS = process.platform.startsWith('win');
 export const PIO_HOME_DIR = _getPioHomeDir(process.env.PLATFORMIO_HOME_DIR || path.join(fs.getHomeDirectory() || '~', '.platformio'));
 export const ENV_DIR = path.join(PIO_HOME_DIR, 'penv');
 export const ENV_BIN_DIR = path.join(ENV_DIR, IS_WINDOWS ? 'Scripts' : 'bin');
-export const PIO_CORE_MIN_VERSION = '3.4.0-b.7';
+export const PIO_CORE_MIN_VERSION = '3.4.0-b.9';
+
 
 function _getPioHomeDir(pioHomeDir) {
   if (IS_WINDOWS) {
diff --git a/src/extension.js b/src/extension.js
@@ -16,14 +16,11 @@ import path from 'path';
 import semver from 'semver';
 import vscode from 'vscode';
 
+
 export default class PlatformIOVSCodeExtension {
 
   constructor() {
     this.activate = this.activate.bind(this);
-
-    const min = 100;
-    const max = 999;
-    this.instanceId = Math.floor(Math.random() * (max - min)) + min;
   }
 
   async activate(context) {
@@ -40,13 +37,40 @@ export default class PlatformIOVSCodeExtension {
     await indexer.toggle();
 
     // Create Terminal Instance with pre-configured environment PATH
-    this.initTerminal();
+    let pioTerm = this.newPIOTerminal();
 
+    // Commands
     context.subscriptions.push(
       vscode.commands.registerCommand(
-        'platformio-ide.newTerminal',
-        () => this.initTerminal().show())
-    );    
+        'platformio-ide.build',
+        utils.makeCommandWithArgs('workbench.action.tasks.runTask', 'PlatformIO: Build'))
+    );
+    context.subscriptions.push(
+      vscode.commands.registerCommand(
+        'platformio-ide.upload',
+        utils.makeCommandWithArgs('workbench.action.tasks.runTask', 'PlatformIO: Upload'))
+    );
+    context.subscriptions.push(
+      vscode.commands.registerCommand(
+        'platformio-ide.clean',
+        utils.makeCommandWithArgs('workbench.action.tasks.runTask', 'PlatformIO: Clean'))
+    );
+    context.subscriptions.push(
+      vscode.commands.registerCommand(
+        'platformio-ide.serialMonitor',
+        () => {
+          pioTerm.sendText('pio device monitor');
+          pioTerm.show();
+        })
+    );
+    context.subscriptions.push(
+      vscode.commands.registerCommand(
+        'platformio-ide.libraryManager',
+        () => {
+          pioTerm.sendText('pio lib');
+          pioTerm.show();
+        })
+    );
     context.subscriptions.push(
       vscode.commands.registerCommand(
         'platformio-ide.initProject',
@@ -59,17 +83,51 @@ export default class PlatformIOVSCodeExtension {
           verbose: true,
         }))
     );
+    context.subscriptions.push(
+      vscode.commands.registerCommand(
+        'platformio-ide.newTerminal',
+        () => {
+          pioTerm = this.newPIOTerminal();
+          pioTerm.show() ;
+      })
+    );
+
+    // Status Bar
+    context.subscriptions.push(
+      utils.makeStatusBarItem('$(check)', 'PlatformIO: Build', 'platformio-ide.build', 8)
+    );
+    context.subscriptions.push(
+      utils.makeStatusBarItem('$(arrow-right)', 'PlatformIO: Upload', 'platformio-ide.upload', 7)
+    );
+    context.subscriptions.push(
+      utils.makeStatusBarItem('$(trashcan)', 'PlatformIO: Clean', 'platformio-ide.clean', 5)
+    );
+    context.subscriptions.push(
+      utils.makeStatusBarItem('$(checklist)', 'PlatformIO: Run a Task', 'workbench.action.tasks.runTask', 5)
+    );
+    context.subscriptions.push(
+      utils.makeStatusBarItem('$(file-code)', 'PlatformIO: Initialize or update project', 'platformio-ide.initProject', 4)
+    );
+    context.subscriptions.push(
+      utils.makeStatusBarItem('$(code)', 'PlatformIO: Library Manager', 'platformio-ide.libraryManager', 3)
+    );
+    context.subscriptions.push(
+      utils.makeStatusBarItem('$(plug)', 'PlatformIO: Serial Monitor', 'platformio-ide.serialMonitor', 2)
+    );
+    context.subscriptions.push(
+      utils.makeStatusBarItem('$(terminal)', 'PlatformIO: New Terminal', 'platformio-ide.newTerminal', 1)
+    );
   }
 
-  initTerminal() {
+  newPIOTerminal() {
     const terminal = vscode.window.createTerminal('PlatformIO');
     if (constants.IS_WINDOWS) {
       terminal.sendText('set PATH=' + process.env.PATH);
     } else if (process.env.SHELL && process.env.SHELL.includes('fish')) {
       terminal.sendText('set -gx PATH ' + process.env.PATH.replace(/\:/g, ' '));
     } else {
       terminal.sendText('export PATH=' + process.env.PATH);
-    }    
+    }
     terminal.sendText('pio --help');
     return terminal;
   }
@@ -101,6 +159,7 @@ export default class PlatformIOVSCodeExtension {
           message: 'Installing PlatformIO IDE...',
         });
         const outputChannel = vscode.window.createOutputChannel('PlatformIO Instalation');
+        outputChannel.show();
 
         outputChannel.appendLine('Installing PlatformIO Core...');
         outputChannel.appendLine("Please don't close this window and don't "
diff --git a/src/installer/manager.js b/src/installer/manager.js
@@ -26,7 +26,7 @@ export default class InstallationManager {
       new PlatformIOCoreStage(this.onDidStatusChange.bind(this), this.stateStorage, {
         useBuiltinPIOCore: config.get('useBuiltinPIOCore'),
         setUseBuiltinPIOCore: (value) => config.update('platformio-ide.useBuiltinPIOCore', value),
-        useDevelopmentPIOCore: config.get('useDevelopmentPIOCore') || true, // FIXME: remove "|| true" when released
+        useDevelopmentPIOCore: config.get('useDevelopmentPIOCore') || true, // @FIXME: remove "|| true" when released
         installConfirm: new VscodePythonInstallConfirm(),
         cacheDir: cacheDir,
         isPrerelease: isPrerelease,
@@ -85,7 +85,6 @@ export default class InstallationManager {
     }
   }
 
-
   destroy() {
     return this.stages.map(stage => stage.destroy());
   }
diff --git a/src/installer/python-install-confirm.js b/src/installer/python-install-confirm.js
@@ -9,6 +9,7 @@
 import open from 'open';
 import vscode from 'vscode';
 
+
 export default class VscodePythonInstallConfirm {
 
   TRY_AGAIN = 0;
diff --git a/src/installer/stages/platformio-core.js b/src/installer/stages/platformio-core.js
@@ -17,6 +17,7 @@ import path from 'path';
 import semver from 'semver';
 import tmp from 'tmp';
 
+
 export default class PlatformIOCoreStage extends BaseStage {
 
   static UPGRADE_PIOCORE_TIMEOUT = 86400 * 3 * 1000; // 3 days
diff --git a/src/project/indexer.js b/src/project/indexer.js
@@ -12,6 +12,7 @@ import { getCurrentPythonExecutable, isPioProject, runPioCommand, spawnCommand }
 import path from 'path';
 import vscode from 'vscode';
 
+
 export default class ProjectIndexer {
 
   constructor(projectPath) {
diff --git a/src/utils.js b/src/utils.js
@@ -13,6 +13,7 @@ import path from 'path';
 import spawn from 'cross-spawn';
 import vscode from 'vscode';
 
+
 export function updateOSEnviron() {
   // Fix for platformio-atom-ide/issues/112
   process.env.LC_ALL = 'en_US.UTF-8';
@@ -29,7 +30,7 @@ export function updateOSEnviron() {
     }
   }
 
-  const config = vscode.workspace.getConfiguration('platformio-ide');  
+  const config = vscode.workspace.getConfiguration('platformio-ide');
   if (config.get('useBuiltinPIOCore')) { // Insert bin directory into PATH
     if (!process.env.PATH.includes(ENV_BIN_DIR)) {
       process.env.PATH = ENV_BIN_DIR + path.delimiter + process.env.PATH;
@@ -187,3 +188,16 @@ function isPython2(executable) {
     );
   });
 }
+
+export function makeCommandWithArgs(command, ...args) {
+  return () => vscode.commands.executeCommand(command, ...args);
+}
+
+export function makeStatusBarItem(text, tooltip, command, priority) {
+  const item = vscode.window.createStatusBarItem(vscode.StatusBarAlignment.Left, priority);
+  item.text = text;
+  item.tooltip = tooltip;
+  item.command = command;
+  item.show();
+  return item;
+}

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ export default class InstallationManager {`
`26`	`26`	`new PlatformIOCoreStage(this.onDidStatusChange.bind(this), this.stateStorage, {`
`27`	`27`	`useBuiltinPIOCore: config.get('useBuiltinPIOCore'),`
`28`	`28`	`setUseBuiltinPIOCore: (value) => config.update('platformio-ide.useBuiltinPIOCore', value),`
`29`		`- useDevelopmentPIOCore: config.get('useDevelopmentPIOCore') \|\| true, // FIXME: remove "\|\| true" when released`
	`29`	`+ useDevelopmentPIOCore: config.get('useDevelopmentPIOCore') \|\| true, // @FIXME: remove "\|\| true" when released`
`30`	`30`	`installConfirm: new VscodePythonInstallConfirm(),`
`31`	`31`	`cacheDir: cacheDir,`
`32`	`32`	`isPrerelease: isPrerelease,`
`@@ -85,7 +85,6 @@ export default class InstallationManager {`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`
`88`		`-`
`89`	`88`	`destroy() {`
`90`	`89`	`return this.stages.map(stage => stage.destroy());`
`91`	`90`	`}`