Make title of "make merged prs" command reflect behavior (#6826)

Author: alexr00

package.json

@@ -1583,6 +1583,12 @@
 				"title": "%command.notifications.markMergedPullRequestsAsRead.title%",
 				"category": "%command.notifications.category%",
 				"icon": "$(git-pull-request)"
+			},
+			{
+				"command": "notifications.markMergedPullRequestsAsDone",
+				"title": "%command.notifications.markMergedPullRequestsAsDone.title%",
+				"category": "%command.notifications.category%",
+				"icon": "$(git-pull-request)"
 			}
 		],
 		"viewsWelcome": [
@@ -2275,6 +2281,10 @@
 					"command": "notifications.markMergedPullRequestsAsRead",
 					"when": "false"
 				},
+				{
+					"command": "notifications.markMergedPullRequestsAsDone",
+					"when": "false"
+				},
 				{
 					"command": "review.copyPrLink",
 					"when": "github:inReviewMode"
@@ -2408,7 +2418,12 @@
 				},
 				{
 					"command": "notifications.markMergedPullRequestsAsRead",
-					"when": "gitHubOpenRepositoryCount != 0 && github:initialized && view == notifications:github && config.githubPullRequests.experimental.notificationsMarkPullRequests != none",
+					"when": "gitHubOpenRepositoryCount != 0 && github:initialized && view == notifications:github && config.githubPullRequests.experimental.notificationsMarkPullRequests == markAsRead",
+					"group": "navigation@0"
+				},
+				{
+					"command": "notifications.markMergedPullRequestsAsDone",
+					"when": "gitHubOpenRepositoryCount != 0 && github:initialized && view == notifications:github && config.githubPullRequests.experimental.notificationsMarkPullRequests == markAsDone",
 					"group": "navigation@0"
 				},
 				{

package.nls.json

@@ -300,6 +300,7 @@
 	"command.notifications.markAsRead.title": "Mark as Read",
 	"command.notifications.markAsDone.title": "Mark as Done",
 	"command.notifications.markMergedPullRequestsAsRead.title": "Mark Merged Pull Requests as Read",
+	"command.notifications.markMergedPullRequestsAsDone.title": "Mark Merged Pull Requests as Done",
 	"command.notification.chatSummarizeNotification.title": "Summarize With Copilot",
 	"welcome.github.login.contents": {
 		"message": "You have not yet signed in with GitHub\n[Sign in](command:pr.signin)",

src/common/settingKeys.ts

@@ -57,7 +57,6 @@ export const EXPERIMENTAL_USE_QUICK_CHAT = 'experimental.useQuickChat';
 export const EXPERIMENTAL_NOTIFICATIONS = 'experimental.notificationsView';
 export const EXPERIMENTAL_NOTIFICATIONS_PAGE_SIZE = 'experimental.notificationsViewPageSize';
 export const EXPERIMENTAL_NOTIFICATIONS_SCORE = 'experimental.notificationsScore';
-export const EXPERIMENTAL_NOTIFICATIONS_MARK_PRS = 'experimental.notificationsMarkPullRequests';
 
 // git
 export const GIT = 'git';

src/notifications/notificationsFeatureRegistar.ts

@@ -127,7 +127,17 @@ export class NotificationsFeatureRegister extends Disposable {
 					"notifications.markMergedPullRequestsAsRead" : {}
 				*/
 				this._telemetry.sendTelemetryEvent('notifications.markMergedPullRequestsAsRead');
-				return notificationsManager.markMergedPullRequestAsRead();
+				return notificationsManager.markMergedPullRequest();
+			})
+		);
+
+		this._register(
+			vscode.commands.registerCommand('notifications.markMergedPullRequestsAsDone', () => {
+				/* __GDPR__
+					"notifications.markMergedPullRequestsAsDone" : {}
+				*/
+				this._telemetry.sendTelemetryEvent('notifications.markMergedPullRequestsAsDone');
+				return notificationsManager.markMergedPullRequest(true);
 			})
 		);
 

src/notifications/notificationsManager.ts

@@ -5,7 +5,6 @@
 
 import * as vscode from 'vscode';
 import { Disposable } from '../common/lifecycle';
-import { EXPERIMENTAL_NOTIFICATIONS_MARK_PRS } from '../common/settingKeys';
 import { EventType, TimelineEvent } from '../common/timelineEvent';
 import { toNotificationUri } from '../common/uri';
 import { CredentialStore } from '../github/credentials';
@@ -263,8 +262,7 @@ export class NotificationsManager extends Disposable implements vscode.TreeDataP
 		}
 	}
 
-	public async markMergedPullRequestAsRead(): Promise<void> {
-		const markAsDone = vscode.workspace.getConfiguration('githubPullRequests').get<'markAsRead' | 'markAsDone'>(EXPERIMENTAL_NOTIFICATIONS_MARK_PRS, 'markAsRead') === 'markAsDone';
+	public async markMergedPullRequest(markAsDone: boolean = false): Promise<void> {
 		const filteredNotifications = Array.from(this._notifications.values()).filter(notification => notification.notification.subject.type === NotificationSubjectType.PullRequest && notification.model.isMerged);
 		const timlines = await Promise.all(filteredNotifications.map(notification => (notification.model as PullRequestModel).getTimelineEvents()));