Skip to content

Commit

Permalink
Merge branch 'release/v1.0.0-rc.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
ivankravets committed Aug 28, 2018
2 parents 505ae6e + 2cf4505 commit 2f27e4f
Show file tree
Hide file tree
Showing 14 changed files with 497 additions and 570 deletions.
40 changes: 35 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "platformio-ide",
"version": "0.17.4",
"version": "1.0.0-rc.1",
"publisher": "platformio",
"engines": {
"vscode": "^1.24.0"
Expand All @@ -20,7 +20,6 @@
"debug",
"microcontroller"
],
"preview": true,
"main": "./lib/main",
"icon": "resources/platformio-logo.png",
"homepage": "https://platformio.org",
Expand Down Expand Up @@ -136,9 +135,19 @@
"title": "New Terminal",
"category": "PlatformIO"
},
{
"command": "platformio-ide.updateGlobalLibs",
"title": "Update global libraries",
"category": "PlatformIO"
},
{
"command": "platformio-ide.updatePlatforms",
"title": "Update platforms & packages",
"category": "PlatformIO"
},
{
"command": "platformio-ide.updateCore",
"title": "Update installed platforms, packages and libraries",
"title": "Update installed platforms, packages and global libraries",
"category": "PlatformIO"
},
{
Expand Down Expand Up @@ -392,7 +401,29 @@
}
]
},
"viewsContainers": {
"activitybar": [
{
"id": "platformio",
"title": "PlatformIO",
"icon": "resources/platformio-activity-icon.png",
"when": "pioCoreReady"
}
]
},
"views": {
"platformio": [
{
"id": "platformio-activitybar.tasks",
"name": "Project Tasks",
"when": "pioCoreReady"
},
{
"id": "platformio-activitybar.quickAccess",
"name": "Quick Access",
"when": "pioCoreReady"
}
],
"debug": [
{
"id": "platformio-debug.peripherals",
Expand Down Expand Up @@ -543,8 +574,7 @@
},
"dependencies": {
"fs-plus": "^3.0.0",
"ini": "^1.3.4",
"platformio-node-helpers": "^2.1.1",
"platformio-node-helpers": "^3.0.0",
"platformio-vscode-debug": "^1.2.0"
},
"extensionDependencies": [
Expand Down
1 change: 1 addition & 0 deletions resources/icons/task-env-inverse.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/icons/task-env.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/icons/task-inverse.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/icons/task.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/platformio-activity-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 0 additions & 2 deletions src/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,4 @@
export const IS_WINDOWS = process.platform.startsWith('win');
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.3-b.3';
17 changes: 8 additions & 9 deletions src/home.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import vscode from 'vscode';
export default class PIOHome {

constructor() {
this.subscriptions = [];
this._currentPanel = undefined;
this._disposables = [];
}

async toggle() {
Expand All @@ -41,7 +41,7 @@ export default class PIOHome {
}
);
panel.iconPath = vscode.Uri.file(path.join(extension.context.extensionPath, 'resources', 'platformio-mini-logo.png'));
panel.onDidDispose(this.onPanelDisposed.bind(this), null, this._disposables);
panel.onDidDispose(this.onPanelDisposed.bind(this), null, this.subscriptions);
panel.webview.html = this.getLoadingContent();
try {
panel.webview.html = await this.getWebviewContent();
Expand Down Expand Up @@ -70,7 +70,11 @@ export default class PIOHome {
const params = await pioNodeHelpers.home.ensureServerStarted({
onIDECommand: (command, params) => {
if (command === 'open_project') {
vscode.commands.executeCommand('vscode.openFolder', vscode.Uri.file(params));
if (vscode.workspace.workspaceFolders) {
vscode.workspace.updateWorkspaceFolders(vscode.workspace.workspaceFolders.length, null, { uri: vscode.Uri.file(params)});
} else {
vscode.commands.executeCommand('vscode.openFolder', vscode.Uri.file(params));
}
}
}
});
Expand Down Expand Up @@ -106,12 +110,7 @@ export default class PIOHome {
this._currentPanel.dispose();
this._currentPanel = undefined;
}
while (this._disposables.length) {
const x = this._disposables.pop();
if (x) {
x.dispose();
}
}
pioNodeHelpers.misc.disposeSubscriptions(this.subscriptions);
this.shutdownServer();
}

Expand Down
Loading

0 comments on commit 2f27e4f

Please sign in to comment.