Respond with repo change to file change

Fixes microsoft#1768
Fixes microsoft#1741

Author: alexr00

src/extension.ts

@@ -73,7 +73,7 @@ async function init(context: vscode.ExtensionContext, git: ApiImpl, gitAPI: GitA
 			// No multi-select support, always show last selected repo
 			if (repo.ui.selected) {
 				prManager.repository = repo;
-				reviewManager.repository = repo;
+				reviewManager.setRepository(repo, false);
 				tree.updateQueries();
 			}
 		});
@@ -83,12 +83,31 @@ async function init(context: vscode.ExtensionContext, git: ApiImpl, gitAPI: GitA
 		repo.ui.onDidChange(() => {
 			if (repo.ui.selected) {
 				prManager.repository = repo;
-				reviewManager.repository = repo;
+				reviewManager.setRepository(repo, false);
 				tree.updateQueries();
 			}
 		});
+		const disposable = repo.state.onDidChange(() => {
+			prManager.repository = repo;
+			reviewManager.setRepository(repo, true);
+			disposable.dispose();
+		});
 	});
 
+	context.subscriptions.push(vscode.window.onDidChangeActiveTextEditor(editorChange => {
+		if (!editorChange) {
+			return;
+		}
+		for (const repo of git.repositories) {
+			if (editorChange.document.uri.fsPath.toLowerCase().startsWith(repo.rootUri.fsPath.toLowerCase()) &&
+				(repo.rootUri.fsPath.toLowerCase() !== prManager.repository.rootUri.fsPath.toLowerCase())) {
+				prManager.repository = repo;
+				reviewManager.setRepository(repo, true);
+				return;
+			}
+		}
+	}));
+
 	await vscode.commands.executeCommand('setContext', 'github:initialized', true);
 	const issuesFeatures = new IssueFeatureRegistrar(gitAPI, prManager, reviewManager, context, telemetry);
 	context.subscriptions.push(issuesFeatures);

src/github/pullRequestManager.ts

@@ -142,6 +142,9 @@ export class PullRequestManager implements vscode.Disposable {
 	private _onDidChangeState = new vscode.EventEmitter<void>();
 	readonly onDidChangeState: vscode.Event<void> = this._onDidChangeState.event;
 
+	private _onDidChangeRepositories = new vscode.EventEmitter<void>();
+	readonly onDidChangeRepositories: vscode.Event<void> = this._onDidChangeRepositories.event;
+
 	private _onDidChangeAssignableUsers = new vscode.EventEmitter<IAccount[]>();
 	readonly onDidChangeAssignableUsers: vscode.Event<IAccount[]> = this._onDidChangeAssignableUsers.event;
 
@@ -160,7 +163,6 @@ export class PullRequestManager implements vscode.Disposable {
 		this._subs.push(vscode.workspace.onDidChangeConfiguration(async e => {
 			if (e.affectsConfiguration(`${SETTINGS_NAMESPACE}.${REMOTES_SETTING}`)) {
 				await this.updateRepositories();
-				vscode.commands.executeCommand('pr.refreshList');
 			}
 		}));
 
@@ -449,7 +451,7 @@ export class PullRequestManager implements vscode.Disposable {
 		return activeRemotes;
 	}
 
-	async updateRepositories(): Promise<void> {
+	async updateRepositories(silent: boolean = false): Promise<void> {
 		if (this._git.state === 'uninitialized') {
 			return;
 		}
@@ -479,6 +481,9 @@ export class PullRequestManager implements vscode.Disposable {
 			this.getMentionableUsers(repositoriesChanged);
 			this.getAssignableUsers(repositoriesChanged);
 			this.state = isAuthenticated || !activeRemotes.length ? PRManagerState.RepositoriesLoaded : PRManagerState.NeedsAuthentication;
+			if (!silent) {
+				this._onDidChangeRepositories.fire();
+			}
 			return Promise.resolve();
 		});
 	}

src/issues/stateManager.ts

@@ -61,7 +61,9 @@ export class StateManager {
 		readonly gitAPI: GitAPI,
 		private manager: PullRequestManager,
 		private context: vscode.ExtensionContext
-	) { }
+	) {
+		this.context.subscriptions.push(this.manager.onDidChangeRepositories(() => this.refresh()));
+	}
 
 	async tryInitializeAndWait() {
 		if (!this.initializePromise) {

src/view/prsTreeDataProvider.ts

@@ -97,6 +97,9 @@ export class PullRequestsTreeDataProvider implements vscode.TreeDataProvider<Tre
 		this._disposables.push(this._prManager.onDidChangeState(() => {
 			this._onDidChangeTreeData.fire();
 		}));
+		this._disposables.push(this._prManager.onDidChangeRepositories(() => {
+			this._onDidChangeTreeData.fire();
+		}));
 		await this.initializeCategories();
 		this.refresh();
 	}

src/view/reviewManager.ts

@@ -217,9 +217,9 @@ export class ReviewManager {
 		return this._statusBarItem;
 	}
 
-	set repository(repository: Repository) {
+	setRepository(repository: Repository, silent: boolean) {
 		this._repository = repository;
-		this.updateState();
+		this.updateState(silent);
 	}
 
 	private pollForStatusChange() {
@@ -231,27 +231,30 @@ export class ReviewManager {
 		}, 1000 * 60 * 5);
 	}
 
-	public async updateState() {
+	public async updateState(silent: boolean = false) {
 		if (this.switchingToReviewMode) {
 			return;
 		}
 		if (!this._validateStatusInProgress) {
 			Logger.appendLine('Review> Validate state in progress');
-			this._validateStatusInProgress = this.validateState();
+			this._validateStatusInProgress = this.validateState(silent);
 			return this._validateStatusInProgress;
 		} else {
 			Logger.appendLine('Review> Queuing additional validate state');
 			this._validateStatusInProgress = this._validateStatusInProgress.then(async _ => {
-				return await this.validateState();
+				return await this.validateState(silent);
 			});
 
 			return this._validateStatusInProgress;
 		}
 	}
 
-	private async validateState() {
+	private async validateState(silent: boolean) {
 		Logger.appendLine('Review> Validating state...');
-		await this._prManager.updateRepositories();
+		await this._prManager.updateRepositories(silent);
+		if (silent) {
+			return;
+		}
 
 		if (!this._repository.state.HEAD) {
 			this.clear(true);
@@ -644,7 +647,7 @@ export class ReviewManager {
 		return selected;
 	}
 
-	private async getPullRequestTitleAndDescriptionDefaults(progress: vscode.Progress<{message?: string, increment?: number}>): Promise<{ title: string, description: string } | undefined> {
+	private async getPullRequestTitleAndDescriptionDefaults(progress: vscode.Progress<{ message?: string, increment?: number }>): Promise<{ title: string, description: string } | undefined> {
 		const pullRequestTemplates = await this._prManager.getPullRequestTemplates();
 		let template: vscode.Uri | undefined;
 
@@ -709,7 +712,7 @@ export class ReviewManager {
 		return method;
 	}
 
-	public async createPullRequest(draft=false): Promise<void> {
+	public async createPullRequest(draft = false): Promise<void> {
 		const pullRequestDefaults = await this._prManager.getPullRequestDefaults();
 		const githubRemotes = this._prManager.getGitHubRemotes();
 		const targetRemote = await this.getRemote(githubRemotes, 'Select the remote to send the pull request to',