Revert refactor: use command args instead of setting for markFileAsViewed behavior

Author: laharigandrapu11

package.json

@@ -737,6 +737,11 @@
 					"type": "boolean",
 					"default": false,
 					"description": "%githubIssues.alwaysPromptForNewIssueRepo.description%"
+				},
+				"githubPullRequests.closeFileOnMarkFileAsViewed": {
+					"type": "boolean",
+					"description": "Close the diff editor automatically when marking a file as viewed from the editor title menu or via shortcut.",
+					"default": true
 				}
 			}
 		},
@@ -2852,10 +2857,7 @@
 				{
 					"command": "pr.markFileAsViewed",
 					"group": "navigation",
-					"when": "resourceScheme != pr && resourceScheme != review && resourceScheme != filechange && resourcePath in github:unviewedFiles",
-					"args": {
-						"closeFile": true
-					}
+					"when": "resourceScheme != pr && resourceScheme != review && resourceScheme != filechange && resourcePath in github:unviewedFiles"
 				},
 				{
 					"command": "pr.unmarkFileAsViewed",

src/commands.ts

@@ -12,7 +12,7 @@ import { CommentReply, findActiveHandler, resolveCommentHandler } from './commen
 import { COPILOT_LOGINS } from './common/copilot';
 import { commands } from './common/executeCommands';
 import Logger from './common/logger';
-import { FILE_LIST_LAYOUT, PR_SETTINGS_NAMESPACE } from './common/settingKeys';
+import { CLOSE_ON_MARK_FILE_AS_VIEWED, FILE_LIST_LAYOUT, PR_SETTINGS_NAMESPACE } from './common/settingKeys';
 import { editQuery } from './common/settingsUtils';
 import { ITelemetry } from './common/telemetry';
 import { asTempStorageURI, fromPRUri, fromReviewUri, Schemes, toPRUri } from './common/uri';
@@ -1356,7 +1356,7 @@ ${contents}
 	};
 
 	context.subscriptions.push(
-		vscode.commands.registerCommand('pr.markFileAsViewed', async (treeNode: FileChangeNode | vscode.Uri | undefined, args?: { closeFile?: boolean }) => {
+		vscode.commands.registerCommand('pr.markFileAsViewed', async (treeNode: FileChangeNode | vscode.Uri | undefined) => {
 			try {
 				if (treeNode === undefined) {
 					// Use the active editor to enable keybindings
@@ -1366,9 +1366,10 @@ ${contents}
 				if (treeNode instanceof FileChangeNode) {
 					await treeNode.markFileAsViewed(false);
 				} else if (treeNode) {
-					// When the argument is a uri it came from the editor menu. By default we don't close the editor
-					// but this can be controlled by the command argument
-					const shouldCloseEditor = args?.closeFile ?? false;
+					// When the argument is a uri it came from the editor menu. By default we close the editor
+					// after marking the file as viewed, but this can be controlled by a setting.
+					const shouldCloseEditor = vscode.workspace.getConfiguration(PR_SETTINGS_NAMESPACE)
+						.get<boolean>(CLOSE_ON_MARK_FILE_AS_VIEWED, true);
 					if (shouldCloseEditor) {
 						// Do the close first to improve perceived performance of marking as viewed.
 						const tab = vscode.window.tabGroups.activeTabGroup.activeTab;

src/common/settingKeys.ts

@@ -89,4 +89,5 @@ export const COLOR_THEME = 'colorTheme';
 
 export const CODING_AGENT = `${PR_SETTINGS_NAMESPACE}.codingAgent`;
 export const CODING_AGENT_ENABLED = 'enabled';
-export const CODING_AGENT_AUTO_COMMIT_AND_PUSH = 'autoCommitAndPush';
+export const CODING_AGENT_AUTO_COMMIT_AND_PUSH = 'autoCommitAndPush';
+export const CLOSE_ON_MARK_FILE_AS_VIEWED = 'closeFileOnMarkFileAsViewed';