git: use custom dialog for dirty checkout prompt#319482
Open
sarathfrancis90 wants to merge 1 commit into
Open
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Note
Copilot was unable to run its full agentic suite in this review.
This PR refactors the “dirty work tree checkout” warning into a reusable helper that uses a custom modal dialog, and adds tests to validate the behavior.
Changes:
- Added
pickDirtyWorkTreeCheckoutAction()helper and refactored checkout flow to use it. - Added Mocha tests covering the dialog options and return behavior.
- Enabled the
resolversproposed API in the Git extension (tsconfig + package.json).
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 4 comments.
| File | Description |
|---|---|
| extensions/git/tsconfig.json | Adds proposed API d.ts reference (resolvers). |
| extensions/git/src/test/commands.test.ts | Adds unit tests for the new checkout warning helper. |
| extensions/git/src/commands.ts | Introduces pickDirtyWorkTreeCheckoutAction() and refactors checkout prompt logic. |
| extensions/git/package.json | Enables resolvers proposal in extension enabledApiProposals. |
Contributor
📬 CODENOTIFYThe following users are being notified based on files changed in this PR: @lszomoruMatched files:
|
sarathfrancis90
force-pushed
the
fix-git-force-checkout-enter-239062
branch
from
e8e5b76 to
772b9bf
Compare
Author
|
@microsoft-github-policy-service agree |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #239062
This updates the dirty worktree checkout warning to use VS Code's custom modal dialog path. Native modal dialogs keep Enter bound to the default button, so keyboard users can tab to
Force Checkoutand still activate the defaultStash & Checkoutaction. The custom dialog keeps the existing modal warning and actions while allowing the focused button to handle Enter.The checkout command now maps the selected localized label back to a semantic action before deciding whether to stash, migrate, or force checkout.
Verification:
npm installgulp compile-extension:gitnpm run eslintnpm run vscode-dts-compile-checknpm run hygiene