Skip to content

Commit

Permalink
Merge branch 'release/v1.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
ivankravets committed Aug 30, 2018
2 parents 2f27e4f + 08c2314 commit 5518bf0
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 23 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Release Notes

## 1.0.0 (2018-08-30)

* [Multi-root Workspaces](https://code.visualstudio.com/docs/editor/multi-root-workspaces), work on several related projects at one time (issue [#50](https://github.com/platformio/platformio-vscode-ide/issues/50))
* **PlatformIO Activity Bar**:
- "Quick Access" to PIO Home and maintenance commands
- "Project Tasks", refactored Project Task Manager with a support for multiple environments in `platformio.ini`
* Added "verbose" build and upload project tasks
* Added "Update PlatformIO Core packages" command
* Added new configuration option `platformio-ide.disableToolbar` which allows to disabling of PlatformIO Toolbar in a bottom status bar
* Refactored IntelliSense Indexer
* Fixed issue with task runner when French locale is used (issue [#107](https://github.com/platformio/platformio-vscode-ide/issues/107))

## 0.17.5 (2018-08-21)

* Improvements for [PIO Unified Debugger](http://docs.platformio.org/page/plus/debugging.html):
Expand Down
17 changes: 11 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "platformio-ide",
"version": "1.0.0-rc.1",
"version": "1.0.0",
"publisher": "platformio",
"engines": {
"vscode": "^1.24.0"
},
"license": "Apache-2.0",
"displayName": "PlatformIO IDE",
"description": "Development environment for IoT, Arduino, ARM mbed, Espressif (ESP8266/ESP32), RISC-V, STM32, PIC32, nRF51/nRF52, FPGA, CMSIS, SPL, AVR, Samsung ARTIK, libOpenCM3",
"description": "Development environment for IoT, Arduino, ARM mbed, Espressif (ESP8266/ESP32), RISC-V, STM32, PIC32, nRF51/nRF52, MSP430, MCS-51 (8051), FPGA, FreeRTOS, ESP-IDF, CMSIS, SPL, AVR, Samsung ARTIK, libOpenCM3",
"categories": [
"Programming Languages",
"Debuggers",
Expand Down Expand Up @@ -147,7 +147,7 @@
},
{
"command": "platformio-ide.updateCore",
"title": "Update installed platforms, packages and global libraries",
"title": "Update PlatformIO Core packages",
"category": "PlatformIO"
},
{
Expand Down Expand Up @@ -470,7 +470,7 @@
"properties": {
"task": {
"type": "string",
"description": "Task name"
"description": "PlatformIO Task ID"
}
}
}
Expand All @@ -481,7 +481,7 @@
"owner": "cpp",
"fileLocation": [
"relative",
"${workspaceRoot}"
"${workspaceFolder}"
],
"pattern": {
"regexp": "^([^:\\n]+):(\\d+):(\\d+):\\s+(warning|error):\\s+(.*)$",
Expand Down Expand Up @@ -510,7 +510,7 @@
"platformio-ide.autoRebuildAutocompleteIndex": {
"type": "boolean",
"default": true,
"description": "Automatically rebuild C/C++ Project Index when platformio.ini is changed or when new libraries are installed."
"description": "Automatically rebuild Project IntelliSense Index when platformio.ini is changed or when new libraries are installed."
},
"platformio-ide.customPATH": {
"type": [
Expand Down Expand Up @@ -548,6 +548,11 @@
"type": "boolean",
"default": true,
"description": "Automatically close Serial Port Monitor before uploading/testing"
},
"platformio-ide.disableToolbar": {
"type": "boolean",
"default": false,
"description": "Disable PlatformIO Toolbar"
}
}
}
Expand Down
34 changes: 18 additions & 16 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,19 @@ class PlatformIOVSCodeExtension {
activate(context) {
this.context = context;
this.context.subscriptions.push(
vscode.workspace.onDidChangeWorkspaceFolders(this.init.bind(this))
vscode.workspace.onDidChangeWorkspaceFolders(this.reinit.bind(this)),
vscode.workspace.onDidChangeConfiguration(() => this.reinit(true))
);
this.init();
this.reinit();
}

async init() {
async reinit(force) {
const hasPIOProject = !!utils.getActivePIOProjectDir();
if (!hasPIOProject) {
if (!hasPIOProject || force) {
this.deactivate();
this._inited = false;
if (this.getConfig().get('activateOnlyOnPlatformIOProject')) {
return;
}
}
if (this._inited) {
if (this._inited || (!hasPIOProject && this.getConfig().get('activateOnlyOnPlatformIOProject'))) {
return;
}

Expand All @@ -70,15 +68,14 @@ class PlatformIOVSCodeExtension {
});
await this.startInstaller();
this.initDebug();
if (typeof this.getEnterpriseSetting('onPIOCoreReady') === 'function') {
await this.getEnterpriseSetting('onPIOCoreReady')();
}
}

vscode.commands.executeCommand('setContext', 'pioCoreReady', true);
if (typeof this.getEnterpriseSetting('onPIOCoreReady') === 'function') {
await this.getEnterpriseSetting('onPIOCoreReady')();
}

this.registerGlobalCommands();
this.initTasks();

this.subscriptions.push(
vscode.window.registerTreeDataProvider('platformio-activitybar.quickAccess',
Expand All @@ -87,15 +84,17 @@ class PlatformIOVSCodeExtension {

if (!hasPIOProject) {
await this.startPIOHome();
this.initStatusBar({ filterCommands: ['platformio-ide.showHome'] });
this.initToolbar({ filterCommands: ['platformio-ide.showHome'] });
return;
}

this.initTasks();

if (this.getConfig().get('updateTerminalPathConfiguration')) {
this.pioTerm.updateEnvConfiguration();
}

this.initStatusBar({ ignoreCommands: this.getEnterpriseSetting('ignoreToolbarCommands') });
this.initToolbar({ ignoreCommands: this.getEnterpriseSetting('ignoreToolbarCommands') });
this.initProjectIndexer();
await this.startPIOHome();
maybeRateExtension(this.context.globalState);
Expand Down Expand Up @@ -214,7 +213,7 @@ class PlatformIOVSCodeExtension {
),
vscode.commands.registerCommand(
'platformio-ide.updateCore',
() => this.pioTerm.sendText('platformio update')
() => this.pioTerm.sendText('platformio update --core-packages')
),
vscode.commands.registerCommand(
'platformio-ide.upgradeCore',
Expand Down Expand Up @@ -287,7 +286,10 @@ class PlatformIOVSCodeExtension {
piodebug.activate(this.context);
}

initStatusBar({ filterCommands, ignoreCommands }) {
initToolbar({ filterCommands, ignoreCommands }) {
if (this.getConfig().get('disableToolbar')) {
return;
}
[
['$(home)', 'PlatformIO: Home', 'platformio-ide.showHome'],
['$(check)', 'PlatformIO: Build', 'platformio-ide.build'],
Expand Down
2 changes: 1 addition & 1 deletion src/views/quick-access-tree.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export default class QuickAccessTreeProvider {
new QuickItem('Updates', undefined, vscode.TreeItemCollapsibleState.Expanded, [
new QuickItem('Update global libraries', 'platformio-ide.updateGlobalLibs'),
new QuickItem('Update platforms & packages', 'platformio-ide.updatePlatforms'),
new QuickItem('Update PIO Core packages, platforms, and global libraries', 'platformio-ide.updateCore'),
new QuickItem('Update PlatformIO Core packages', 'platformio-ide.updateCore'),
new QuickItem('Upgrade PlatformIO Core', 'platformio-ide.upgradeCore')
])
];
Expand Down

0 comments on commit 5518bf0

Please sign in to comment.