oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use line-based and word-based diff when reloading and formatting buffers (#25129)

Browse Source 
Closes https://github.com/zed-industries/zed/issues/10122
Closes https://github.com/zed-industries/zed/issues/25034

When formatting buffers or reloading them after they change on disk, we
performed a diff between the buffer's current contents and the new
content. We need this diff in order preserve the positions of cursors
and other decorations when updating the buffer's text.

In order to handle changes within lines, we would previously compute a
*character-wise* diff. This was extremely expensive for large files.

This PR gets rid of the character-wise diff, and instead performs a
normal line-wise diff. Then, for certain replace hunks, we compute a
secondary word-based diff. Also, I've switched to the
[`imara-diff`](https://github.com/pascalkuthe/imara-diff) crate, instead
of `similar`.

Release Notes:

- Fixed a hang that could occur when large files were changed on disk or
formatted.
This commit is contained in:
Max Brunsfeld
2025-02-20 00:56:01 +00:00
committed by GitHub
parent 1087e05da4
commit 0fdad0c0d6
19 changed files with 429 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/project/src/project_tests.rs
+18 -12
View File
@@ -25,7 +25,11 @@ use std::{mem, num::NonZeroU32, ops::Range, task::Poll};
use task::{ResolvedTask, TaskContext};
use unindent::Unindent as _;
use util::{
assert_set_eq, path, paths::PathMatcher, separator, test::TempTree, uri, TryFutureExt as _,
assert_set_eq, path,
paths::PathMatcher,
separator,
test::{marked_text_offsets, TempTree},
uri, TryFutureExt as _,
};
#[gpui::test]
@@ -3625,7 +3629,8 @@ async fn test_buffer_is_dirty(cx: &mut gpui::TestAppContext) {
async fn test_buffer_file_changes_on_disk(cx: &mut gpui::TestAppContext) {
init_test(cx);
let initial_contents = "aaa\nbbbbb\nc\n";
let (initial_contents, initial_offsets) =
marked_text_offsets("one twoˇ\nthree ˇfourˇ five\nsixˇ seven\n");
let fs = FakeFs::new(cx.executor());
fs.insert_tree(
path!("/dir"),
@@ -3640,8 +3645,9 @@ async fn test_buffer_file_changes_on_disk(cx: &mut gpui::TestAppContext) {
.await
.unwrap();
let anchors = (0..3)
.map(|row| buffer.update(cx, |b, _| b.anchor_before(Point::new(row, 1))))
let anchors = initial_offsets
.iter()
.map(|offset| buffer.update(cx, |b, _| b.anchor_before(offset)))
.collect::<Vec<_>>();
// Change the file on disk, adding two new lines of text, and removing
@@ -3650,10 +3656,12 @@ async fn test_buffer_file_changes_on_disk(cx: &mut gpui::TestAppContext) {
assert!(!buffer.is_dirty());
assert!(!buffer.has_conflict());
});
let new_contents = "AAAA\naaa\nBB\nbbbbb\n";
let (new_contents, new_offsets) =
marked_text_offsets("oneˇ\nthree ˇFOURˇ five\nsixtyˇ seven\n");
fs.save(
path!("/dir/the-file").as_ref(),
&new_contents.into(),
&new_contents.as_str().into(),
LineEnding::Unix,
)
.await
@@ -3668,14 +3676,11 @@ async fn test_buffer_file_changes_on_disk(cx: &mut gpui::TestAppContext) {
assert!(!buffer.is_dirty());
assert!(!buffer.has_conflict());
let anchor_positions = anchors
let anchor_offsets = anchors
.iter()
.map(|anchor| anchor.to_point(&*buffer))
.map(|anchor| anchor.to_offset(&*buffer))
.collect::<Vec<_>>();
assert_eq!(
anchor_positions,
[Point::new(1, 1), Point::new(3, 1), Point::new(3, 5)]
);
assert_eq!(anchor_offsets, new_offsets);
});
// Modify the buffer
@@ -3698,6 +3703,7 @@ async fn test_buffer_file_changes_on_disk(cx: &mut gpui::TestAppContext) {
// marked as having a conflict.
cx.executor().run_until_parked();
buffer.update(cx, |buffer, _| {
assert_eq!(buffer.text(), " ".to_string() + &new_contents);
assert!(buffer.has_conflict());
});
}