Begin merging Copilot and PR notifications (#7957)

* Begin merging Copilot and PR notifications

* Fix prompt tsx

* Rename

Author: alexr00

src/commands.ts

@@ -26,7 +26,6 @@ import { GitHubRepository } from './github/githubRepository';
 import { Issue } from './github/interface';
 import { IssueModel } from './github/issueModel';
 import { IssueOverviewPanel } from './github/issueOverview';
-import { NotificationProvider } from './github/notifications';
 import { GHPRComment, GHPRCommentThread, TemporaryComment } from './github/prComment';
 import { PullRequestModel } from './github/pullRequestModel';
 import { PullRequestOverviewPanel } from './github/pullRequestOverview';
@@ -35,7 +34,7 @@ import { RepositoriesManager } from './github/repositoriesManager';
 import { getIssuesUrl, getPullsUrl, isInCodespaces, ISSUE_OR_URL_EXPRESSION, parseIssueExpressionOutput, vscodeDevPrLink } from './github/utils';
 import { OverviewContext } from './github/views';
 import { isNotificationTreeItem, NotificationTreeItem } from './notifications/notificationItem';
-import { PullRequestsTreeDataProvider } from './view/prsTreeDataProvider';
+import { NotificationsManager } from './notifications/notificationsManager';
 import { ReviewCommentController } from './view/reviewCommentController';
 import { ReviewManager } from './view/reviewManager';
 import { ReviewsManager } from './view/reviewsManager';
@@ -149,7 +148,6 @@ export async function openDescription(
 	folderManager: FolderRepositoryManager,
 	revealNode: boolean,
 	preserveFocus: boolean = true,
-	notificationProvider?: NotificationProvider
 ) {
 	const issue = ensurePR(folderManager, issueModel);
 	if (revealNode) {
@@ -165,12 +163,6 @@ export async function openDescription(
 		*/
 		telemetry.sendTelemetryEvent('issue.openDescription');
 	}
-
-	if (notificationProvider?.hasNotification(issue)) {
-		notificationProvider.markPrNotificationsAsRead(issue);
-	}
-
-
 }
 
 export async function openPullRequestOnGitHub(e: PRNode | RepositoryChangesNode | IssueModel | NotificationTreeItem, telemetry: ITelemetry) {
@@ -210,8 +202,8 @@ export function registerCommands(
 	reposManager: RepositoriesManager,
 	reviewsManager: ReviewsManager,
 	telemetry: ITelemetry,
-	tree: PullRequestsTreeDataProvider,
 	copilotRemoteAgentManager: CopilotRemoteAgentManager,
+	notificationManager: NotificationsManager
 ) {
 	const logId = 'RegisterCommands';
 	context.subscriptions.push(
@@ -907,10 +899,7 @@ export function registerCommands(
 	context.subscriptions.push(
 		vscode.commands.registerCommand('pr.dismissNotification', node => {
 			if (node instanceof PRNode) {
-				tree.notificationProvider.markPrNotificationsAsRead(node.pullRequestModel).then(
-					() => tree.refresh(node)
-				);
-
+				notificationManager.markPrNotificationsAsRead(node.pullRequestModel);
 			}
 		}),
 	);
@@ -968,7 +957,7 @@ export function registerCommands(
 
 		const revealDescription = !(argument instanceof PRNode);
 
-		await openDescription(telemetry, issueModel, descriptionNode, folderManager, revealDescription, !(argument instanceof RepositoryChangesNode), tree.notificationProvider);
+		await openDescription(telemetry, issueModel, descriptionNode, folderManager, revealDescription, !(argument instanceof RepositoryChangesNode));
 	}
 
 	async function checkoutChatSessionPullRequest(argument: ChatSessionWithPR) {

src/common/settingKeys.ts

@@ -19,6 +19,7 @@ export const OVERRIDE_DEFAULT_BRANCH = 'overrideDefaultBranch';
 export const PULL_BRANCH = 'pullBranch';
 export const PULL_REQUEST_DESCRIPTION = 'pullRequestDescription';
 export const NOTIFICATION_SETTING = 'notifications';
+export type NotificationVariants = 'off' | 'pullRequests';
 export const POST_CREATE = 'postCreate';
 export const POST_DONE = 'postDone';
 export const QUERIES = 'queries';

src/extension.ts

@@ -37,6 +37,8 @@ import { ChatParticipant, ChatParticipantState } from './lm/participants';
 import { registerTools } from './lm/tools/tools';
 import { migrate } from './migrations';
 import { NotificationsFeatureRegister } from './notifications/notificationsFeatureRegistar';
+import { NotificationsManager } from './notifications/notificationsManager';
+import { NotificationsProvider } from './notifications/notificationsProvider';
 import { ThemeWatcher } from './themeWatcher';
 import { UriHandler } from './uriHandler';
 import { CommentDecorationProvider } from './view/commentDecorationProvider';
@@ -46,7 +48,6 @@ import { FileTypeDecorationProvider } from './view/fileTypeDecorationProvider';
 import { GitHubCommitFileSystemProvider } from './view/githubFileContentProvider';
 import { getInMemPRFileSystemProvider } from './view/inMemPRContentProvider';
 import { PullRequestChangesTreeDataProvider } from './view/prChangesTreeDataProvider';
-import { PRNotificationDecorationProvider } from './view/prNotificationDecorationProvider';
 import { PullRequestsTreeDataProvider } from './view/prsTreeDataProvider';
 import { ReviewManager, ShowPullRequest } from './view/reviewManager';
 import { ReviewsManager } from './view/reviewsManager';
@@ -170,7 +171,13 @@ async function init(
 	context.subscriptions.push(treeDecorationProviders);
 	treeDecorationProviders.registerProviders([new FileTypeDecorationProvider(), new CommentDecorationProvider(reposManager)]);
 
-	const reviewsManager = new ReviewsManager(context, reposManager, reviewManagers, tree, changesTree, telemetry, credentialStore, git, copilotRemoteAgentManager);
+	const notificationsProvider = new NotificationsProvider(credentialStore, reposManager);
+	context.subscriptions.push(notificationsProvider);
+
+	const notificationsManager = new NotificationsManager(notificationsProvider, credentialStore, reposManager, context);
+	context.subscriptions.push(notificationsManager);
+
+	const reviewsManager = new ReviewsManager(context, reposManager, reviewManagers, tree, changesTree, telemetry, credentialStore, git, copilotRemoteAgentManager, notificationsManager);
 	context.subscriptions.push(reviewsManager);
 
 	git.onDidChangeState(() => {
@@ -218,7 +225,6 @@ async function init(
 			return;
 		}
 		addRepo();
-		tree.notificationProvider.refreshOrLaunchPolling();
 		const disposable = repo.state.onDidChange(() => {
 			Logger.appendLine(`Repo state for ${repo.rootUri} changed.`, ACTIVATION);
 			addRepo();
@@ -229,14 +235,11 @@ async function init(
 	git.onDidCloseRepository(repo => {
 		reposManager.removeRepo(repo);
 		reviewsManager.removeReviewManager(repo);
-		tree.notificationProvider.refreshOrLaunchPolling();
 	});
 
-	tree.initialize(reviewsManager.reviewManagers.map(manager => manager.reviewModel), credentialStore);
-
-	context.subscriptions.push(new PRNotificationDecorationProvider(tree.notificationProvider));
+	tree.initialize(reviewsManager.reviewManagers.map(manager => manager.reviewModel), notificationsManager);
 
-	registerCommands(context, reposManager, reviewsManager, telemetry, tree, copilotRemoteAgentManager);
+	registerCommands(context, reposManager, reviewsManager, telemetry, copilotRemoteAgentManager, notificationsManager);
 
 	const layout = vscode.workspace.getConfiguration(PR_SETTINGS_NAMESPACE).get<string>(FILE_LIST_LAYOUT);
 	await vscode.commands.executeCommand('setContext', 'fileListLayout:flat', layout === 'flat');
@@ -245,7 +248,7 @@ async function init(
 	context.subscriptions.push(issuesFeatures);
 	await issuesFeatures.initialize();
 
-	const notificationsFeatures = new NotificationsFeatureRegister(credentialStore, reposManager, telemetry, context);
+	const notificationsFeatures = new NotificationsFeatureRegister(credentialStore, reposManager, telemetry, notificationsManager);
 	context.subscriptions.push(notificationsFeatures);
 
 	context.subscriptions.push(new GitLensIntegration());