Address review feedback: Remove test and add "never show again" option

Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

Author: Copilot

package.json

@@ -398,6 +398,11 @@
 					"type": "boolean",
 					"description": "%githubPullRequests.neverIgnoreDefaultBranch.description%"
 				},
+				"githubPullRequests.neverShowUncommittedChangesWarning": {
+					"type": "boolean",
+					"default": false,
+					"description": "%githubPullRequests.neverShowUncommittedChangesWarning.description%"
+				},
 				"githubPullRequests.overrideDefaultBranch": {
 					"type": "string",
 					"description": "%githubPullRequests.overrideDefaultBranch.description%"

package.nls.json

@@ -67,6 +67,7 @@
 	"githubPullRequests.ignoredPullRequestBranches.description": "Prevents branches that are associated with a pull request from being automatically detected. This will prevent review mode from being entered on these branches.",
 	"githubPullRequests.ignoredPullRequestBranches.items": "Branch name",
 	"githubPullRequests.neverIgnoreDefaultBranch.description": "Never offer to ignore a pull request associated with the default branch of a repository.",
+	"githubPullRequests.neverShowUncommittedChangesWarning.description": "Never show the warning dialog for uncommitted changes when checking out a pull request.",
 	"githubPullRequests.overrideDefaultBranch.description": "The default branch for a repository is set on github.com. With this setting, you can override that default with another branch.",
 	"githubPullRequests.postCreate.description": "The action to take after creating a pull request.",
 	"githubPullRequests.postCreate.none": "No action",

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 { FILE_LIST_LAYOUT, NEVER_SHOW_UNCOMMITTED_CHANGES_WARNING, 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';
@@ -50,13 +50,20 @@ import { RepositoryChangesNode } from './view/treeNodes/repositoryChangesNode';
 // Modal dialog options for handling uncommitted changes during PR checkout
 const STASH_CHANGES = vscode.l10n.t('Stash changes');
 const DISCARD_CHANGES = vscode.l10n.t('Discard changes');
+const DONT_SHOW_AGAIN = vscode.l10n.t('Don\'t show again');
 
 /**
  * Shows a modal dialog when there are uncommitted changes during PR checkout
  * @param repository The git repository with uncommitted changes
  * @returns Promise<boolean> true if user chose to proceed (after staging/discarding), false if cancelled
  */
 async function handleUncommittedChanges(repository: Repository): Promise<boolean> {
+	// Check if user has disabled the warning
+	const neverShowWarning = vscode.workspace.getConfiguration(PR_SETTINGS_NAMESPACE).get<boolean>(NEVER_SHOW_UNCOMMITTED_CHANGES_WARNING, false);
+	if (neverShowWarning) {
+		return true; // Setting is enabled, proceed without showing dialog
+	}
+
 	// Filter out untracked files as they typically don't conflict with PR checkout
 	const trackedWorkingTreeChanges = repository.state.workingTreeChanges.filter(change => change.status !== Status.UNTRACKED);
 	const hasTrackedWorkingTreeChanges = trackedWorkingTreeChanges.length > 0;
@@ -74,12 +81,19 @@ async function handleUncommittedChanges(repository: Repository): Promise<boolean
 		},
 		STASH_CHANGES,
 		DISCARD_CHANGES,
+		DONT_SHOW_AGAIN,
 	);
 
 	if (!modalResult) {
 		return false; // User cancelled
 	}
 
+	if (modalResult === DONT_SHOW_AGAIN) {
+		// Update the setting to never show this dialog again
+		await vscode.workspace.getConfiguration(PR_SETTINGS_NAMESPACE).update(NEVER_SHOW_UNCOMMITTED_CHANGES_WARNING, true, vscode.ConfigurationTarget.Global);
+		return true; // Proceed with checkout
+	}
+
 	try {
 		if (modalResult === STASH_CHANGES) {
 			// Stash all changes (working tree changes + any unstaged changes)

src/common/settingKeys.ts

@@ -32,6 +32,7 @@ export const REMOTES = 'remotes';
 export const PULL_PR_BRANCH_BEFORE_CHECKOUT = 'pullPullRequestBranchBeforeCheckout';
 export type PullPRBranchVariants = 'never' | 'pull' | 'pullAndMergeBase' | 'pullAndUpdateBase' | true | false;
 export const UPSTREAM_REMOTE = 'upstreamRemote';
+export const NEVER_SHOW_UNCOMMITTED_CHANGES_WARNING = 'neverShowUncommittedChangesWarning';
 export const DEFAULT_CREATE_OPTION = 'defaultCreateOption';
 export const CREATE_BASE_BRANCH = 'createDefaultBaseBranch';