Skip to content

Commit

Permalink
Merge branch 'release/v1.4.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
ivankravets committed Oct 26, 2018
2 parents 596123a + 9c74451 commit bc3189b
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 23 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Release Notes

## 1.4.3 (2018-10-26)

* Handle "Error: Could not create PIO Core Virtual Environment" and propose user to file an issue (issue [#154](https://github.com/platformio/platformio-vscode-ide/issues/154))

## 1.4.2 (2018-10-26)

* [PIO Unified Debugger](http://docs.platformio.org/page/plus/debugging.html):
Expand Down
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "platformio-ide",
"version": "1.4.2",
"version": "1.4.3",
"publisher": "platformio",
"engines": {
"vscode": "^1.24.0"
Expand Down Expand Up @@ -588,9 +588,8 @@
"vscode": "^1.1.1"
},
"dependencies": {
"@sentry/node": "^4.2.3",
"fs-plus": "^3.0.0",
"platformio-node-helpers": "^3.2.0",
"platformio-node-helpers": "^3.3.0",
"platformio-vscode-debug": "^1.2.5"
},
"extensionDependencies": [
Expand Down
6 changes: 3 additions & 3 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
* the root directory of this source tree.
*/

import * as misc from './misc';
import * as pioNodeHelpers from 'platformio-node-helpers';
import * as piodebug from 'platformio-vscode-debug';
import * as misc from './misc';
import * as utils from './utils';

import InstallationManager from './installer/manager';
import PIOHome from './home';
import PIOTerminal from './terminal';
import ProjectTasksTreeProvider from './views/project-tasks-tree';
import QuickAccessTreeProvider from './views/quick-access-tree';
import TaskManager from './tasks';
import ProjectTasksTreeProvider from './views/project-tasks-tree';
import path from 'path';
import vscode from 'vscode';

Expand All @@ -41,7 +41,7 @@ class PlatformIOVSCodeExtension {
this.pioHome,
this.pioTerm
);

const hasPIOProject = !!utils.getActivePIOProjectDir();
if (!hasPIOProject && this.getConfig().get('activateOnlyOnPlatformIOProject')) {
return;
Expand Down
2 changes: 1 addition & 1 deletion src/misc.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* the root directory of this source tree.
*/

import vscode from 'vscode';
import { CONFLICTED_EXTENSION_IDS } from './constants';
import vscode from 'vscode';


export async function maybeRateExtension(globalState) {
Expand Down
18 changes: 2 additions & 16 deletions src/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,15 @@
* the root directory of this source tree.
*/

import * as Sentry from '@sentry/node';
import * as pioNodeHelpers from 'platformio-node-helpers';

import os from 'os';
import vscode from 'vscode';


export async function notifyError(title, err) {
this.notifySentry(err);
const description = err.stack || err.toString();
const description = err.stack || err.toString();

const action = 'Report a problem';
const selected = await vscode.window.showErrorMessage(description, action);
if (selected === action) {
Expand All @@ -41,19 +40,6 @@ ${description}
console.error(err);
}

export function notifySentry(err) {
Sentry.init({
dsn: 'https://[email protected]/1309812',
release: getIDEVersion(),
serverName: `${os.type()}, ${os.release()}, ${os.arch()}`

});
Sentry.configureScope((scope) => {
scope.setTag('vscode', vscode.version);
});
Sentry.captureException(err);
}

export function getIDEManifest() {
return vscode.extensions.getExtension('platformio.platformio-ide').packageJSON;
}
Expand Down

0 comments on commit bc3189b

Please sign in to comment.