feat(plugin): add branch deletion option after worktree remove#57
Merged
guodong-sq merged 3 commits intomainfrom Mar 23, 2026
Merged
feat(plugin): add branch deletion option after worktree remove#57guodong-sq merged 3 commits intomainfrom
guodong-sq merged 3 commits intomainfrom
Conversation
Delegate to IntelliJ's built-in GitBrancher.deleteBranches() for branch deletion — provides proper error dialogs, undo support, and automatic git state refresh. Add BranchDeletionMode setting (Ask/Always/Never) in Settings > Tools > Worktree Manager. Default is Ask, which shows a confirmation dialog after worktree removal. Protected branches (main, master) are never offered for deletion. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
The normalizeSafe() path comparison resolved symlink paths to physical paths, causing the active worktree (accessed via symlink) to incorrectly match mainRepoRoot. Use the isMain flag from GitParser instead. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
ContextService.reload() is now called in requireConfig() — the single entry point for all config-dependent actions. This ensures config is fresh before create/remove/switch operations, not just after. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
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
1 participant
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.
Summary
BranchDeletionModesetting (Ask / Always / Never) to Settings > Tools > Worktree ManagerGitBrancher.deleteBranches()— provides proper error dialogs, undo support, and automatic git state refreshCompanion to #56 (CLI side, already merged).
Test plan
./gradlew buildpasses🤖 Generated with Claude Code