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

New diff map #22129

Open
wants to merge 53 commits into
base: main
Choose a base branch
from
Open

New diff map #22129

wants to merge 53 commits into from
+6,500 −1,036

Conversation

ConradIrwin
Copy link
Member

This adds a new diff map, with the goal of being able to move selections into the Git diff,
and to respect softwrap appropriately.

Release Notes:

  • Fixed softwrap in deleted git 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
maxbrunsfeld and others added 18 commits December 13, 2024 16:42
@maxbrunsfeld @ConradIrwin
Fix some problems with expanding and collapsing diff hunks
82fbe27 
Co-authored-by: Conrad <[email protected]>
@maxbrunsfeld
Move logic for defining edits outside of recompute_transforms
4369890
@maxbrunsfeld
Perform the same range expansion in has_expanded_diff_hunks_in_ranges
2266b3c
@maxbrunsfeld
Sync display map immediately when updating diff state
1f28437
@maxbrunsfeld
Add failing unit test for editing inside of an insertion hunk
093c3d3
@maxbrunsfeld
When buffer is edited, compute DiffMap edits using deltas
472fee6
@maxbrunsfeld @ConradIrwin @agu-z
Make EditorTestContext::assert_state_with_diff use new DiffMap
f6aa7df 
Co-authored-by: Conrad <[email protected]>
Co-authored-by: Agus <[email protected]>
@maxbrunsfeld @ConradIrwin @agu-z
Extract logic around custom text highlights out of InlayChunks iterator
241c7a6 
Co-Authored-By: Conrad <[email protected]>
Co-Authored-By: Agus <[email protected]>
@ConradIrwin
rewrite diff map to not depend on inlay map
88b4628
@maxbrunsfeld @ConradIrwin
Put DiffMap before InlayMap in DisplayMap
2625719 
Co-authored-by: Conrad <[email protected]>
@maxbrunsfeld @ConradIrwin
Fix bugs in DiffMap::sync
2f5ea92 
Co-authored-by: Conrad <[email protected]>
@maxbrunsfeld
Fix handling of modified empty lines in assert_state_with_diff helper
87d50ee
@maxbrunsfeld @ConradIrwin
Fix collapsing of hunks when base text changes
5cc3bd1 
Co-authored-by: Conrad <[email protected]>
@maxbrunsfeld
Remove more of the old DiffMap
9450de7
@ConradIrwin
handle diff chunks with no trailing newline
c160ce6
@ConradIrwin
fix test toggle diff hunks (again)
d600c58
@ConradIrwin
fix test_edits_around_expanded_deletion_hunks
d1239f6
@ConradIrwin
Fix test_{addition,deletion,modification}_reverts
2b68817
@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Dec 17, 2024
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
@ConradIrwin @maxbrunsfeld