Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rework diff rendering to allow putting the cursor into deleted text, soft-wrapping and scrolling deleted text correctly #22994

Draft
wants to merge 118 commits into
base: main
Choose a base branch
from
Draft

Rework diff rendering to allow putting the cursor into deleted text, soft-wrapping and scrolling deleted text correctly #22994

wants to merge 118 commits into from
+5,316 −3,668

Conversation

maxbrunsfeld
Copy link
Collaborator

@maxbrunsfeld maxbrunsfeld commented Jan 11, 2025 •
edited
Loading

⚠️ WIP ⚠️

Release Notes:

  • Improved diff rendering, allowing you to navigate with your cursor inside of deleted text in diff hunks.

maxbrunsfeld and others added 30 commits December 4, 2024 16:49
@maxbrunsfeld @ConradIrwin @cole-miller
Stub in the structure of a DiffMap to go in the display map stack
159c223 
Co-authored-by: Conrad <[email protected]>
Co-authored-by: Cole <[email protected]>
@maxbrunsfeld @ConradIrwin @cole-miller
Start work on DiffMapSnapshot::chunks
67ffe99 
Co-authored-by: Conrad <[email protected]>
Co-authored-by: Cole <[email protected]>
@maxbrunsfeld @ConradIrwin @mikayla-maki
Get DiffMapChunks working to some degree
90c9ad4 
Co-authored-by: Conrad <[email protected]>
Co-authored-by: Mikayla <[email protected]>
@maxbrunsfeld @ConradIrwin @mikayla-maki
Implement DiffMap::set_all_hunks_expanded
09082d1 
Co-authored-by: Conrad <[email protected]>
Co-authored-by: Mikayla <[email protected]>
@maxbrunsfeld @ConradIrwin
Start work on returning edits from DiffMap::sync
d0a8b0f 
Co-authored-by: Conrad <[email protected]>
@maxbrunsfeld
Start work on expanding and collapsing hunks
440b632
@maxbrunsfeld @cole-miller
Start work on expanding and collapsing hunks by range
011880c 
Co-authored-by: Cole <[email protected]>
@maxbrunsfeld @cole-miller
Compute diff map edits in a single pass through the old and new trees
946ae93 
Co-authored-by: Cole <[email protected]>
@maxbrunsfeld @cole-miller
Restructure DiffMap::sync to prepare for handling buffer edits
023f923 
Co-authored-by: Cole <[email protected]>
@maxbrunsfeld @cole-miller
Get DiffMap::sync working for a basic test
3383353 
Co-authored-by: Cole <[email protected]>
@maxbrunsfeld
Start implementing DiffMap::buffer_rows
a20715d
@maxbrunsfeld
Integrate DiffMap into the DisplayMap
61e42b9
@maxbrunsfeld
Merge branch 'main' into new-diff-map
dac0a07
@ConradIrwin
Implement to_offset/to_point
20ec116
@ConradIrwin
implement clip_point
2630dfd
@ConradIrwin
better naming?
9dc5eba
@ConradIrwin
implement text_summary_for_range
a8a9177
@ConradIrwin
seek on DiffMapBufferRows
6e724c1
@maxbrunsfeld
wip
e53d8bb
@maxbrunsfeld @ConradIrwin
Get assertions about DiffMap::chunks passing
c015553 
Co-authored-by: Conrad <[email protected]>
@maxbrunsfeld @ConradIrwin
Fix DiffMap::buffer_rows to handle last empty line of buffer
99edc95 
Co-authored-by: Conrad <[email protected]>
@maxbrunsfeld @ConradIrwin
Get more editor tests passing
ad87dfe 
Correctly handle multiple edits to DiffMap

Co-authored-by: Conrad <[email protected]>
@maxbrunsfeld @ConradIrwin
Start integrating the new DiffMap into the editor
dc814cb 
Co-authored-by: Conrad <[email protected]>
@maxbrunsfeld @mgsloan
Fix dropping of ChangeSet in DiffMap
cc4ecac 
Co-authored-by: Michael <[email protected]>
@maxbrunsfeld @mgsloan
Start work on providing git statuses for each line of diff map
9b526a4 
Co-authored-by: Michael <[email protected]>
@maxbrunsfeld @mgsloan
Replace buffer rows iterators with row info iterators that also give …
b552e32 
…git status

Co-authored-by: Michael <[email protected]>
@maxbrunsfeld @mgsloan
Highlight background of expanded hunks
07eb573 
Co-authored-by: Michael <[email protected]>
@maxbrunsfeld
Update more editor rendering to use the new DiffMap
9025fb2
@maxbrunsfeld
WIP - Failing diff map test for hunks staying expanded on diff updates
243d7c6
@ConradIrwin @maxbrunsfeld
Fix bugs in DiffMap's handling of edits and diff updates
41c5e45
ConradIrwin and others added 29 commits January 8, 2025 14:43
@ConradIrwin
Fix highlighint at excerpt boundaries
02c3368
@ConradIrwin
Update assertion: when deleting a range including a hunk, it's now
d66e1dc 
collapsed.

This is a change in behaviour, but an improvement.
@ConradIrwin
Fix diff_hunks_in_range when range starts in deleted hunk
7b7b0e9
@ConradIrwin
Fix overlapping edits in multibuffers
ee6f455
@ConradIrwin @maxbrunsfeld
Start work on MultiBuffer::diff_hunk_before
124ba75 
Co-authored-by: Conrad <[email protected]>
@maxbrunsfeld
Fix panic when editing on line before expanded deletion hunk
7cf3cc6 
* Get randomized tests passing through seed=1000 w/ simple text, operations=5
* Clean up `recompute_expanded_diff_hunks`
@maxbrunsfeld
Make diagnostics_in_range work w/ expanded diff hunks
bf900eb 
Extract a general `lift_buffer_metadata` method, used in that method
and `diff_hunks_in_range`, that does the hard stuff.
@maxbrunsfeld
Fix bugs in lift_buffer_metadata
05e9d92
@maxbrunsfeld
Start work on guaranteeing Anchor::cmp is consistent w/ anchor resolu…
829f2a5 
…tion
@maxbrunsfeld
Name has_trailing_newline consistently btwn diff hunks + excerpts
eecd5d8
@maxbrunsfeld
Avoid using entire summaries for cursor dimensions when resolving anc…
cf63ab9 
…hors
@maxbrunsfeld
Add panicking unit test for backspace after a deletion hunk
d5c2b41
@ConradIrwin
Revert "Avoid using entire summaries for cursor dimensions when resol…
77465c5 
…ving anchors"

This reverts commit cf63ab9.
@ConradIrwin
Use Bias::Left for offsets within diff hunk.
9fd7ae8 
 buffer content ] [ deleted content ] [ buffer content
 		^ ^                 ^ ^
		| |                 | - Bias::Right
		| |                 Bias::Left, diff_anchor = Some(Bias::Left)
		| Bias::Left, diff_anchor = Some(Bias::Right)
		Bias::Left, diff_base = None
@ConradIrwin
Fix diff_hunks in range adjacent to deleted hunk
138b091
@ConradIrwin
Fix expanding diff hunks not at start of line
a32c5ba
@ConradIrwin
Implement diagnostics in previous direction too
0ae0934
@ConradIrwin
simplify
671f27c
@ConradIrwin
Fix overseek if diff transform spans multiple excerpts
b209fe7
@ConradIrwin
Don't seek too far if hunk ends at excerpt boundary
ee20eaa
@ConradIrwin
Fix multibuffer_reverts
c9d3e2e
@ConradIrwin
Fix the display of the buffer indicators
74ef1e1
@ConradIrwin
Remove fn diff_status()
0ff3e45
@ConradIrwin
one more
b322c03
@maxbrunsfeld @ConradIrwin
Fix clicking on git gutter highlights, remote hunk_diff.rs
2a8cfe0 
Co-authored-by: Conrad <[email protected]>
@maxbrunsfeld @ConradIrwin
Add back diff hunk buttons, overlaid on top of hunk
efe8406 
Co-authored-by: Conrad <[email protected]>
@maxbrunsfeld
Fix rendering of hunk controls that extend below visible area
0f87bf3
@maxbrunsfeld
Set the language on base text buffers
893160e
@maxbrunsfeld
Merge branch 'main' into diffs-in-multibuffer
91555d3 
To get this compiling
* rework all calls to `range_to_buffer_ranges`
* implement `excerpt_ids_for_range`
@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Jan 11, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
cla-signed The user has signed the Contributor License Agreement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@maxbrunsfeld @ConradIrwin