diff --git a/README.md b/README.md index cb50c162..e61b33f7 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@ [![Marketplace Version](https://vsmarketplacebadge.apphb.com/version/knisterpeter.vscode-github.svg)](https://marketplace.visualstudio.com/items?itemName=KnisterPeter.vscode-github) [![Installs](https://vsmarketplacebadge.apphb.com/installs/knisterpeter.vscode-github.svg)](https://marketplace.visualstudio.com/items?itemName=KnisterPeter.vscode-github) [![Travis](https://img.shields.io/travis/KnisterPeter/vscode-github.svg)](https://travis-ci.org/KnisterPeter/vscode-github) -[![Coverage Status](https://coveralls.io/repos/github/KnisterPeter/vscode-github/badge.svg?branch=master)](https://coveralls.io/github/KnisterPeter/vscode-github?branch=master) [![Greenkeeper badge](https://badges.greenkeeper.io/KnisterPeter/vscode-github.svg)](https://greenkeeper.io/) This vscode extension integrates with GitHub. diff --git a/package-lock.json b/package-lock.json index 28bd71de..f3e3b921 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1007,9 +1007,9 @@ } }, "execa": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz", + "integrity": "sha1-2NdrvBtVIX7RkP1t1J08d07PyNo=", "requires": { "cross-spawn": "5.1.0", "get-stream": "3.0.0", @@ -3429,9 +3429,9 @@ "dev": true }, "resolve": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz", - "integrity": "sha1-ZVkHw0aahoDcLeOidaj91paR8OU=", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz", + "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==", "dev": true, "requires": { "path-parse": "1.0.5" @@ -4163,9 +4163,9 @@ "dev": true }, "tslint": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.5.0.tgz", - "integrity": "sha1-EOjas+MGH6YelELozuOYKs8gpqo=", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.6.0.tgz", + "integrity": "sha1-CIqmxgJmIzOGULKQCCirPt9Z9s8=", "dev": true, "requires": { "babel-code-frame": "6.22.0", @@ -4174,10 +4174,10 @@ "diff": "3.2.0", "glob": "7.1.2", "minimatch": "3.0.4", - "resolve": "1.3.3", + "resolve": "1.4.0", "semver": "5.3.0", "tslib": "1.7.1", - "tsutils": "2.6.1" + "tsutils": "2.8.0" }, "dependencies": { "colors": { @@ -4189,9 +4189,9 @@ } }, "tsutils": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.6.1.tgz", - "integrity": "sha1-mOzwCVlPTkr4hAV75M9BpFC8djc=", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.8.0.tgz", + "integrity": "sha1-AWAXNymzvxOGKN0UoVN+AIUdgUo=", "dev": true, "requires": { "tslib": "1.7.1" diff --git a/src/extension.ts b/src/extension.ts index 7c876490..7f513403 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -29,13 +29,7 @@ class Extension { context.subscriptions.push(this.channel); this.channel.appendLine('Visual Studio Code GitHub Extension'); - this.githubManager = new GitHubManager(this.cwd, this.channel); - this.statusBarManager = new StatusBarManager(context, this.cwd, this.githubManager, this.channel); - const tokens = context.globalState.get('tokens'); - if (tokens) { - this.githubManager.connect(tokens); - } this.checkVersionAndToken(context, tokens); context.subscriptions.push( @@ -60,6 +54,15 @@ class Extension { vscode.commands.registerCommand('vscode-github.browseOpenIssue', this.wrapCommand(this.browseOpenIssue)), vscode.commands.registerCommand('vscode-github.browseCurrentFile', this.wrapCommand(this.browseCurrentFile)) ); + + if (!vscode.workspace.rootPath) { + return; + } + this.githubManager = new GitHubManager(this.cwd, this.channel); + this.statusBarManager = new StatusBarManager(context, this.cwd, this.githubManager, this.channel); + if (tokens) { + this.githubManager.connect(tokens); + } } catch (e) { this.logAndShowError(e); throw e; @@ -104,7 +107,7 @@ class Extension { private wrapCommand(command: T): T { const wrap: any = (...args: any[]) => { - if (this.githubManager.connected && this.cwd) { + if (this.githubManager && this.githubManager.connected && this.cwd) { try { return (command as any).apply(this, args); } catch (e) {