Multi-root support (fixes microsoft#21)

kieferrm · Apr 2, 2018 · 49687cc · 49687cc
1 parent 108e35e
commit 49687cc
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/package.json b/package.json
@@ -13,7 +13,7 @@
     "url": "https://github.com/Microsoft/vscode-github-issues-prs/issues"
   },
   "engines": {
-    "vscode": "^1.13.0"
+    "vscode": "^1.16.0"
   },
   "categories": [
     "Other"
@@ -168,4 +168,4 @@
     "request":"^2.81.0",
     "open": "0.0.5"
   }
-}
+}
diff --git a/src/github-issues-prs.ts b/src/github-issues-prs.ts
@@ -41,25 +41,28 @@ export class GitHubIssuesPrsProvider implements TreeDataProvider<TreeItem> {
 	private username: string | undefined;
 
 	constructor(private context: ExtensionContext) {
-		context.subscriptions.push(commands.registerCommand('githubIssuesPrs.refresh', this.refresh, this));
-		context.subscriptions.push(commands.registerCommand('githubIssuesPrs.createIssue', this.createIssue, this));
-		context.subscriptions.push(commands.registerCommand('githubIssuesPrs.openIssue', this.openIssue, this));
-		context.subscriptions.push(commands.registerCommand('githubIssuesPrs.openPullRequest', this.openIssue, this));
-		// context.subscriptions.push(commands.registerCommand('githubIssuesPrs.checkoutPullRequest', this.checkoutPullRequest, this));
-		context.subscriptions.push(commands.registerCommand('githubIssuesPrs.copyNumber', this.copyNumber, this));
-		context.subscriptions.push(commands.registerCommand('githubIssuesPrs.copyText', this.copyText, this));
-		context.subscriptions.push(commands.registerCommand('githubIssuesPrs.copyMarkdown', this.copyMarkdown, this));
-
-		context.subscriptions.push(window.onDidChangeActiveTextEditor(this.poll, this));
+		const subscriptions = context.subscriptions;
+		subscriptions.push(commands.registerCommand('githubIssuesPrs.refresh', this.refresh, this));
+		subscriptions.push(commands.registerCommand('githubIssuesPrs.createIssue', this.createIssue, this));
+		subscriptions.push(commands.registerCommand('githubIssuesPrs.openIssue', this.openIssue, this));
+		subscriptions.push(commands.registerCommand('githubIssuesPrs.openPullRequest', this.openIssue, this));
+		// subscriptions.push(commands.registerCommand('githubIssuesPrs.checkoutPullRequest', this.checkoutPullRequest, this));
+		subscriptions.push(commands.registerCommand('githubIssuesPrs.copyNumber', this.copyNumber, this));
+		subscriptions.push(commands.registerCommand('githubIssuesPrs.copyText', this.copyText, this));
+		subscriptions.push(commands.registerCommand('githubIssuesPrs.copyMarkdown', this.copyMarkdown, this));
+
+		subscriptions.push(window.onDidChangeActiveTextEditor(this.poll, this));
 
 		this.username = workspace.getConfiguration('github').get<string>('username');
-		context.subscriptions.push(workspace.onDidChangeConfiguration(() => {
+		subscriptions.push(workspace.onDidChangeConfiguration(() => {
 			const newUsername = workspace.getConfiguration('github').get<string>('username');
 			if (newUsername !== this.username) {
 				this.username = newUsername;
 				this.refresh();
 			}
 		}));
+
+		subscriptions.push(workspace.onDidChangeWorkspaceFolders(this.refresh, this));
 	}
 
 	getTreeItem(element: TreeItem): TreeItem {
@@ -162,7 +165,7 @@ export class GitHubIssuesPrsProvider implements TreeDataProvider<TreeItem> {
 	}
 
 	private async fetchChildren(element?: TreeItem): Promise<TreeItem[]> {
-		if (!workspace.rootPath) {
+		if (!workspace.workspaceFolders) {
 			return [new TreeItem('No folder opened')];
 		}
 
@@ -270,6 +273,7 @@ export class GitHubIssuesPrsProvider implements TreeDataProvider<TreeItem> {
 	}
 
 	/* private */ async checkoutPullRequest(issue: Issue) {
+		// TODO: Move off rootPath
 		const github = new GitHub();
 		const p = Uri.parse(issue.item.repository_url).path;
 		const repo = path.basename(p);
@@ -337,5 +341,5 @@ export class GitHubIssuesPrsProvider implements TreeDataProvider<TreeItem> {
 	}
 
 
-	// none-sense comment
+	// none-sense comment again
 }