fix(commands): allow history from active diff buffers - #552
Merged
Conversation
Keep the CodeDiff toggle behavior for an argument-less invocation, but dispatch subcommands while a diff session is active. This lets visual line history create its history session instead of closing the current diff. Closes #463
esmuellert
enabled auto-merge
September 6, 2026 03:22
esmuellert
disabled auto-merge
September 6, 2026 03:23
yanuoma
approved these changes
Sep 6, 2026
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.
Summary
:CodeDiffcommand as the session close toggle:CodeDiff historyeven when the current tab already contains a diff session'<,'>CodeDiff historyfrom an inline diff bufferFix
Previously,
commands.vscode_diff()closed any active CodeDiff session before parsing the command arguments. As a result, visual line history issued from an active diff buffer never reached the history handler.The toggle now applies only when there are no arguments. Active diff buffers can invoke history and other explicit CodeDiff subcommands normally.
Closes #463
Testing
CODEDIFF_TEST_JOBS=2 make test-lua— 106 spec files passedstylua --check lua/codediff/commands/init.lua tests/command_e2e_spec.luagit diff --check