feat: add three-mode diff view - #35
Merged
Merged
Conversation
Spec for three-mode diff viewing (split, unified, highlights) with CodeMirror 6 integration, Rust-side diff computation via similar crate, and ref picker UI. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
- CodeMirror diff decorations (highlights, unified, split modes) - DiffEditor: prop-driven CodeMirror instance for diff views - DiffModeToggle: segmented control for split/unified/highlights - DiffRefPicker: base/target ref dropdowns with swap - Diff commands in command palette (Cmd+K) - App.svelte: diff context, auto-collapse tree, re-diff on file switch - EditorPane: conditional diff rendering for all three modes - Editor: highlights mode via Compartment - Annotation blocking on delete lines in unified mode Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
… message - Fix effect_update_depth_exceeded: remove $state from DiffEditor view, wrap computeDiff/dispatch in untrack(), add dedup guard for re-diff - Always show diff mode toggle in editor toolbar - Clicking active mode exits diff, clicking inactive enters it - Show "No changes" message when files are identical - Show ref picker only when diff is active Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <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
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
similarcrate with Patience (default) and Myers algorithms, resolves git refs viagit2New files
src-tauri/src/commands/diff.rs—compute_diffandlist_refsTauri commandssrc/lib/stores/diff.svelte.ts— Diff state storesrc/lib/codemirror/diff.ts— CodeMirror decorations, ghost lines, dual gutters, scroll syncsrc/components/DiffEditor.svelte— Prop-driven CodeMirror instance for diff viewssrc/components/DiffModeToggle.svelte— Segmented control for split/unified/highlightssrc/components/DiffRefPicker.svelte— Base/target ref dropdowns with swapTest plan
🤖 Generated with Claude Code