Error when refreshing notifications view (#6861)

Fixes #6854

Author: alexr00

src/common/settingsUtils.ts

@@ -18,4 +18,16 @@ export function getReviewMode(): { merged: boolean, closed: boolean } {
 		return { merged: true, closed: true };
 	}
 	return desktopDefaults;
+}
+
+export function initBasedOnSettingChange(namespace: string, key: string, isEnabled: () => boolean, initializer: () => void, disposables: vscode.Disposable[]): void {
+	const eventDisposable = vscode.workspace.onDidChangeConfiguration((e) => {
+		if (e.affectsConfiguration(`${namespace}.${key}`)) {
+			if (isEnabled()) {
+				initializer();
+				eventDisposable.dispose();
+			}
+		}
+	});
+	disposables.push(eventDisposable);
 }

src/extension.ts

@@ -16,6 +16,7 @@ import * as PersistentState from './common/persistentState';
 import { parseRepositoryRemotes } from './common/remote';
 import { Resource } from './common/resources';
 import { BRANCH_PUBLISH, EXPERIMENTAL_CHAT, EXPERIMENTAL_NOTIFICATIONS, FILE_LIST_LAYOUT, GIT, OPEN_DIFF_ON_CLICK, PR_SETTINGS_NAMESPACE, SHOW_INLINE_OPEN_FILE_ACTION } from './common/settingKeys';
+import { initBasedOnSettingChange } from './common/settingsUtils';
 import { TemporaryState } from './common/temporaryState';
 import { Schemes, handler as uriHandler } from './common/uri';
 import { EXTENSION_ID, FOCUS_REVIEW_MODE } from './constants';
@@ -222,10 +223,15 @@ async function init(
 	context.subscriptions.push(issuesFeatures);
 	await issuesFeatures.initialize();
 
-	const notificationsViewEnabled = vscode.workspace.getConfiguration(PR_SETTINGS_NAMESPACE).get<boolean>(EXPERIMENTAL_NOTIFICATIONS, false);
-	if (notificationsViewEnabled) {
+	const notificationsViewEnabled = () => vscode.workspace.getConfiguration(PR_SETTINGS_NAMESPACE).get<boolean>(EXPERIMENTAL_NOTIFICATIONS, false);
+	const initNotifications = () => {
 		const notificationsFeatures = new NotificationsFeatureRegister(credentialStore, reposManager, telemetry);
 		context.subscriptions.push(notificationsFeatures);
+	};
+	if (notificationsViewEnabled()) {
+		initNotifications();
+	} else {
+		initBasedOnSettingChange(PR_SETTINGS_NAMESPACE, EXPERIMENTAL_NOTIFICATIONS, notificationsViewEnabled, initNotifications, context.subscriptions);
 	}
 
 	context.subscriptions.push(new GitLensIntegration());
@@ -255,15 +261,7 @@ function initChat(context: vscode.ExtensionContext, credentialStore: CredentialS
 	if (chatEnabled()) {
 		createParticipant();
 	} else {
-		const disposable = vscode.workspace.onDidChangeConfiguration(e => {
-			if (e.affectsConfiguration(`${PR_SETTINGS_NAMESPACE}.${EXPERIMENTAL_CHAT}`)) {
-				if (chatEnabled()) {
-					disposable.dispose();
-					createParticipant();
-				}
-			}
-		});
-		context.subscriptions.push(disposable);
+		initBasedOnSettingChange(PR_SETTINGS_NAMESPACE, EXPERIMENTAL_CHAT, chatEnabled, createParticipant, context.subscriptions);
 	}
 }
 

src/github/credentials.ts

@@ -14,6 +14,7 @@ import { Disposable } from '../common/lifecycle';
 import Logger from '../common/logger';
 import * as PersistentState from '../common/persistentState';
 import { GITHUB_ENTERPRISE, URI } from '../common/settingKeys';
+import { initBasedOnSettingChange } from '../common/settingsUtils';
 import { ITelemetry } from '../common/telemetry';
 import { agent } from '../env/node/net';
 import { IAccount } from './interface';
@@ -221,18 +222,14 @@ export class CredentialStore extends Disposable {
 
 	private async doCreate(options: vscode.AuthenticationGetSessionOptions, additionalScopes: boolean = false): Promise<AuthResult> {
 		let enterprise: AuthResult | undefined;
-		const initializeEnterprise = () => this.initialize(AuthProvider.githubEnterprise, options, additionalScopes ? SCOPES_WITH_ADDITIONAL : undefined, additionalScopes);
+		const initializeEnterprise = async () => {
+			enterprise = await this.initialize(AuthProvider.githubEnterprise, options, additionalScopes ? SCOPES_WITH_ADDITIONAL : undefined, additionalScopes);
+		};
 		if (hasEnterpriseUri()) {
-			enterprise = await initializeEnterprise();
+			await initializeEnterprise();
 		} else {
 			// Listen for changes to the enterprise URI and try again if it changes.
-			const disposable = vscode.workspace.onDidChangeConfiguration(async e => {
-				if (e.affectsConfiguration(`${GITHUB_ENTERPRISE}.${URI}`) && hasEnterpriseUri()) {
-					enterprise = await initializeEnterprise();
-					disposable.dispose();
-				}
-			});
-			this.context.subscriptions.push(disposable);
+			initBasedOnSettingChange(GITHUB_ENTERPRISE, URI, hasEnterpriseUri, initializeEnterprise, this.context.subscriptions);
 		}
 		let github: AuthResult | undefined;
 		if (!enterprise) {

src/notifications/notificationsFeatureRegistar.ts

@@ -38,6 +38,7 @@ export class NotificationsFeatureRegister extends Disposable {
 		this._register(vscode.window.createTreeView<any>('notifications:github', {
 			treeDataProvider: notificationsManager
 		}));
+		notificationsManager.refresh();
 
 		// Commands
 		this._register(