Extract a TextBuffer from Buffer, which has no tree or file
Co-Authored-By: Antonio Scandurra <me@as-cii.com> Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Max Brunsfeld
parent
76774d6a3c
commit
30e2e2014d
4 changed files with 1490 additions and 1403 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -11,23 +11,20 @@ use std::{
|
|||
time::{Duration, Instant},
|
||||
};
|
||||
|
||||
#[gpui::test]
|
||||
fn test_edit(cx: &mut gpui::MutableAppContext) {
|
||||
cx.add_model(|cx| {
|
||||
let mut buffer = Buffer::new(0, "abc", cx);
|
||||
#[test]
|
||||
fn test_edit() {
|
||||
let mut buffer = TextBuffer::new(0, 0, History::new("abc".into()));
|
||||
assert_eq!(buffer.text(), "abc");
|
||||
buffer.edit(vec![3..3], "def", cx);
|
||||
buffer.edit(vec![3..3], "def");
|
||||
assert_eq!(buffer.text(), "abcdef");
|
||||
buffer.edit(vec![0..0], "ghi", cx);
|
||||
buffer.edit(vec![0..0], "ghi");
|
||||
assert_eq!(buffer.text(), "ghiabcdef");
|
||||
buffer.edit(vec![5..5], "jkl", cx);
|
||||
buffer.edit(vec![5..5], "jkl");
|
||||
assert_eq!(buffer.text(), "ghiabjklcdef");
|
||||
buffer.edit(vec![6..7], "", cx);
|
||||
buffer.edit(vec![6..7], "");
|
||||
assert_eq!(buffer.text(), "ghiabjlcdef");
|
||||
buffer.edit(vec![4..9], "mno", cx);
|
||||
buffer.edit(vec![4..9], "mno");
|
||||
assert_eq!(buffer.text(), "ghiamnoef");
|
||||
buffer
|
||||
});
|
||||
}
|
||||
|
||||
#[gpui::test]
|
||||
|
|
@ -88,7 +85,7 @@ fn test_edit_events(cx: &mut gpui::MutableAppContext) {
|
|||
}
|
||||
|
||||
#[gpui::test(iterations = 100)]
|
||||
fn test_random_edits(cx: &mut gpui::MutableAppContext, mut rng: StdRng) {
|
||||
fn test_random_edits(mut rng: StdRng) {
|
||||
let operations = env::var("OPERATIONS")
|
||||
.map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
|
||||
.unwrap_or(10);
|
||||
|
|
@ -97,8 +94,7 @@ fn test_random_edits(cx: &mut gpui::MutableAppContext, mut rng: StdRng) {
|
|||
let mut reference_string = RandomCharIter::new(&mut rng)
|
||||
.take(reference_string_len)
|
||||
.collect::<String>();
|
||||
cx.add_model(|cx| {
|
||||
let mut buffer = Buffer::new(0, reference_string.as_str(), cx);
|
||||
let mut buffer = TextBuffer::new(0, 0, History::new(reference_string.clone().into()));
|
||||
buffer.history.group_interval = Duration::from_millis(rng.gen_range(0..=200));
|
||||
let mut buffer_versions = Vec::new();
|
||||
log::info!(
|
||||
|
|
@ -108,7 +104,7 @@ fn test_random_edits(cx: &mut gpui::MutableAppContext, mut rng: StdRng) {
|
|||
);
|
||||
|
||||
for _i in 0..operations {
|
||||
let (old_ranges, new_text) = buffer.randomly_mutate(&mut rng, cx);
|
||||
let (old_ranges, new_text) = buffer.randomly_mutate(&mut rng);
|
||||
for old_range in old_ranges.iter().rev() {
|
||||
reference_string.replace_range(old_range.clone(), &new_text);
|
||||
}
|
||||
|
|
@ -120,7 +116,7 @@ fn test_random_edits(cx: &mut gpui::MutableAppContext, mut rng: StdRng) {
|
|||
);
|
||||
|
||||
if rng.gen_bool(0.25) {
|
||||
buffer.randomly_undo_redo(&mut rng, cx);
|
||||
buffer.randomly_undo_redo(&mut rng);
|
||||
reference_string = buffer.text();
|
||||
log::info!(
|
||||
"buffer text {:?}, version: {:?}",
|
||||
|
|
@ -156,28 +152,20 @@ fn test_random_edits(cx: &mut gpui::MutableAppContext, mut rng: StdRng) {
|
|||
for edit in edits {
|
||||
let old_start = (edit.old_bytes.start as isize + delta) as usize;
|
||||
let new_text: String = buffer.text_for_range(edit.new_bytes.clone()).collect();
|
||||
old_buffer.edit(
|
||||
Some(old_start..old_start + edit.deleted_bytes()),
|
||||
new_text,
|
||||
cx,
|
||||
);
|
||||
old_buffer.edit(Some(old_start..old_start + edit.deleted_bytes()), new_text);
|
||||
delta += edit.delta();
|
||||
}
|
||||
assert_eq!(old_buffer.text(), buffer.text());
|
||||
}
|
||||
|
||||
buffer
|
||||
});
|
||||
}
|
||||
|
||||
#[gpui::test]
|
||||
fn test_line_len(cx: &mut gpui::MutableAppContext) {
|
||||
cx.add_model(|cx| {
|
||||
let mut buffer = Buffer::new(0, "", cx);
|
||||
buffer.edit(vec![0..0], "abcd\nefg\nhij", cx);
|
||||
buffer.edit(vec![12..12], "kl\nmno", cx);
|
||||
buffer.edit(vec![18..18], "\npqrs\n", cx);
|
||||
buffer.edit(vec![18..21], "\nPQ", cx);
|
||||
#[test]
|
||||
fn test_line_len() {
|
||||
let mut buffer = TextBuffer::new(0, 0, History::new("".into()));
|
||||
buffer.edit(vec![0..0], "abcd\nefg\nhij");
|
||||
buffer.edit(vec![12..12], "kl\nmno");
|
||||
buffer.edit(vec![18..18], "\npqrs\n");
|
||||
buffer.edit(vec![18..21], "\nPQ");
|
||||
|
||||
assert_eq!(buffer.line_len(0), 4);
|
||||
assert_eq!(buffer.line_len(1), 3);
|
||||
|
|
@ -185,14 +173,11 @@ fn test_line_len(cx: &mut gpui::MutableAppContext) {
|
|||
assert_eq!(buffer.line_len(3), 3);
|
||||
assert_eq!(buffer.line_len(4), 4);
|
||||
assert_eq!(buffer.line_len(5), 0);
|
||||
buffer
|
||||
});
|
||||
}
|
||||
|
||||
#[gpui::test]
|
||||
fn test_text_summary_for_range(cx: &mut gpui::MutableAppContext) {
|
||||
cx.add_model(|cx| {
|
||||
let buffer = Buffer::new(0, "ab\nefg\nhklm\nnopqrs\ntuvwxyz", cx);
|
||||
#[test]
|
||||
fn test_text_summary_for_range() {
|
||||
let buffer = TextBuffer::new(0, 0, History::new("ab\nefg\nhklm\nnopqrs\ntuvwxyz".into()));
|
||||
assert_eq!(
|
||||
buffer.text_summary_for_range(1..3),
|
||||
TextSummary {
|
||||
|
|
@ -248,18 +233,15 @@ fn test_text_summary_for_range(cx: &mut gpui::MutableAppContext) {
|
|||
longest_row_chars: 6,
|
||||
}
|
||||
);
|
||||
buffer
|
||||
});
|
||||
}
|
||||
|
||||
#[gpui::test]
|
||||
fn test_chars_at(cx: &mut gpui::MutableAppContext) {
|
||||
cx.add_model(|cx| {
|
||||
let mut buffer = Buffer::new(0, "", cx);
|
||||
buffer.edit(vec![0..0], "abcd\nefgh\nij", cx);
|
||||
buffer.edit(vec![12..12], "kl\nmno", cx);
|
||||
buffer.edit(vec![18..18], "\npqrs", cx);
|
||||
buffer.edit(vec![18..21], "\nPQ", cx);
|
||||
#[test]
|
||||
fn test_chars_at() {
|
||||
let mut buffer = TextBuffer::new(0, 0, History::new("".into()));
|
||||
buffer.edit(vec![0..0], "abcd\nefgh\nij");
|
||||
buffer.edit(vec![12..12], "kl\nmno");
|
||||
buffer.edit(vec![18..18], "\npqrs");
|
||||
buffer.edit(vec![18..21], "\nPQ");
|
||||
|
||||
let chars = buffer.chars_at(Point::new(0, 0));
|
||||
assert_eq!(chars.collect::<String>(), "abcd\nefgh\nijkl\nmno\nPQrs");
|
||||
|
|
@ -277,47 +259,43 @@ fn test_chars_at(cx: &mut gpui::MutableAppContext) {
|
|||
assert_eq!(chars.collect::<String>(), "PQrs");
|
||||
|
||||
// Regression test:
|
||||
let mut buffer = Buffer::new(0, "", cx);
|
||||
buffer.edit(vec![0..0], "[workspace]\nmembers = [\n \"xray_core\",\n \"xray_server\",\n \"xray_cli\",\n \"xray_wasm\",\n]\n", cx);
|
||||
buffer.edit(vec![60..60], "\n", cx);
|
||||
let mut buffer = TextBuffer::new(0, 0, History::new("".into()));
|
||||
buffer.edit(vec![0..0], "[workspace]\nmembers = [\n \"xray_core\",\n \"xray_server\",\n \"xray_cli\",\n \"xray_wasm\",\n]\n");
|
||||
buffer.edit(vec![60..60], "\n");
|
||||
|
||||
let chars = buffer.chars_at(Point::new(6, 0));
|
||||
assert_eq!(chars.collect::<String>(), " \"xray_wasm\",\n]\n");
|
||||
|
||||
buffer
|
||||
});
|
||||
}
|
||||
|
||||
#[gpui::test]
|
||||
fn test_anchors(cx: &mut gpui::MutableAppContext) {
|
||||
cx.add_model(|cx| {
|
||||
let mut buffer = Buffer::new(0, "", cx);
|
||||
buffer.edit(vec![0..0], "abc", cx);
|
||||
#[test]
|
||||
fn test_anchors() {
|
||||
let mut buffer = TextBuffer::new(0, 0, History::new("".into()));
|
||||
buffer.edit(vec![0..0], "abc");
|
||||
let left_anchor = buffer.anchor_before(2);
|
||||
let right_anchor = buffer.anchor_after(2);
|
||||
|
||||
buffer.edit(vec![1..1], "def\n", cx);
|
||||
buffer.edit(vec![1..1], "def\n");
|
||||
assert_eq!(buffer.text(), "adef\nbc");
|
||||
assert_eq!(left_anchor.to_offset(&buffer), 6);
|
||||
assert_eq!(right_anchor.to_offset(&buffer), 6);
|
||||
assert_eq!(left_anchor.to_point(&buffer), Point { row: 1, column: 1 });
|
||||
assert_eq!(right_anchor.to_point(&buffer), Point { row: 1, column: 1 });
|
||||
|
||||
buffer.edit(vec![2..3], "", cx);
|
||||
buffer.edit(vec![2..3], "");
|
||||
assert_eq!(buffer.text(), "adf\nbc");
|
||||
assert_eq!(left_anchor.to_offset(&buffer), 5);
|
||||
assert_eq!(right_anchor.to_offset(&buffer), 5);
|
||||
assert_eq!(left_anchor.to_point(&buffer), Point { row: 1, column: 1 });
|
||||
assert_eq!(right_anchor.to_point(&buffer), Point { row: 1, column: 1 });
|
||||
|
||||
buffer.edit(vec![5..5], "ghi\n", cx);
|
||||
buffer.edit(vec![5..5], "ghi\n");
|
||||
assert_eq!(buffer.text(), "adf\nbghi\nc");
|
||||
assert_eq!(left_anchor.to_offset(&buffer), 5);
|
||||
assert_eq!(right_anchor.to_offset(&buffer), 9);
|
||||
assert_eq!(left_anchor.to_point(&buffer), Point { row: 1, column: 1 });
|
||||
assert_eq!(right_anchor.to_point(&buffer), Point { row: 2, column: 0 });
|
||||
|
||||
buffer.edit(vec![7..9], "", cx);
|
||||
buffer.edit(vec![7..9], "");
|
||||
assert_eq!(buffer.text(), "adf\nbghc");
|
||||
assert_eq!(left_anchor.to_offset(&buffer), 5);
|
||||
assert_eq!(right_anchor.to_offset(&buffer), 7);
|
||||
|
|
@ -423,18 +401,15 @@ fn test_anchors(cx: &mut gpui::MutableAppContext) {
|
|||
.unwrap(),
|
||||
Ordering::Greater
|
||||
);
|
||||
buffer
|
||||
});
|
||||
}
|
||||
|
||||
#[gpui::test]
|
||||
fn test_anchors_at_start_and_end(cx: &mut gpui::MutableAppContext) {
|
||||
cx.add_model(|cx| {
|
||||
let mut buffer = Buffer::new(0, "", cx);
|
||||
#[test]
|
||||
fn test_anchors_at_start_and_end() {
|
||||
let mut buffer = TextBuffer::new(0, 0, History::new("".into()));
|
||||
let before_start_anchor = buffer.anchor_before(0);
|
||||
let after_end_anchor = buffer.anchor_after(0);
|
||||
|
||||
buffer.edit(vec![0..0], "abc", cx);
|
||||
buffer.edit(vec![0..0], "abc");
|
||||
assert_eq!(buffer.text(), "abc");
|
||||
assert_eq!(before_start_anchor.to_offset(&buffer), 0);
|
||||
assert_eq!(after_end_anchor.to_offset(&buffer), 3);
|
||||
|
|
@ -442,15 +417,13 @@ fn test_anchors_at_start_and_end(cx: &mut gpui::MutableAppContext) {
|
|||
let after_start_anchor = buffer.anchor_after(0);
|
||||
let before_end_anchor = buffer.anchor_before(3);
|
||||
|
||||
buffer.edit(vec![3..3], "def", cx);
|
||||
buffer.edit(vec![0..0], "ghi", cx);
|
||||
buffer.edit(vec![3..3], "def");
|
||||
buffer.edit(vec![0..0], "ghi");
|
||||
assert_eq!(buffer.text(), "ghiabcdef");
|
||||
assert_eq!(before_start_anchor.to_offset(&buffer), 0);
|
||||
assert_eq!(after_start_anchor.to_offset(&buffer), 3);
|
||||
assert_eq!(before_end_anchor.to_offset(&buffer), 6);
|
||||
assert_eq!(after_end_anchor.to_offset(&buffer), 9);
|
||||
buffer
|
||||
});
|
||||
}
|
||||
|
||||
#[gpui::test]
|
||||
|
|
@ -469,247 +442,221 @@ async fn test_apply_diff(mut cx: gpui::TestAppContext) {
|
|||
cx.read(|cx| assert_eq!(buffer.read(cx).text(), text));
|
||||
}
|
||||
|
||||
#[gpui::test]
|
||||
fn test_undo_redo(cx: &mut gpui::MutableAppContext) {
|
||||
cx.add_model(|cx| {
|
||||
let mut buffer = Buffer::new(0, "1234", cx);
|
||||
#[test]
|
||||
fn test_undo_redo() {
|
||||
let mut buffer = TextBuffer::new(0, 0, History::new("1234".into()));
|
||||
// Set group interval to zero so as to not group edits in the undo stack.
|
||||
buffer.history.group_interval = Duration::from_secs(0);
|
||||
|
||||
buffer.edit(vec![1..1], "abx", cx);
|
||||
buffer.edit(vec![3..4], "yzef", cx);
|
||||
buffer.edit(vec![3..5], "cd", cx);
|
||||
buffer.edit(vec![1..1], "abx");
|
||||
buffer.edit(vec![3..4], "yzef");
|
||||
buffer.edit(vec![3..5], "cd");
|
||||
assert_eq!(buffer.text(), "1abcdef234");
|
||||
|
||||
let transactions = buffer.history.undo_stack.clone();
|
||||
assert_eq!(transactions.len(), 3);
|
||||
|
||||
buffer.undo_or_redo(transactions[0].clone(), cx).unwrap();
|
||||
buffer.undo_or_redo(transactions[0].clone()).unwrap();
|
||||
assert_eq!(buffer.text(), "1cdef234");
|
||||
buffer.undo_or_redo(transactions[0].clone(), cx).unwrap();
|
||||
buffer.undo_or_redo(transactions[0].clone()).unwrap();
|
||||
assert_eq!(buffer.text(), "1abcdef234");
|
||||
|
||||
buffer.undo_or_redo(transactions[1].clone(), cx).unwrap();
|
||||
buffer.undo_or_redo(transactions[1].clone()).unwrap();
|
||||
assert_eq!(buffer.text(), "1abcdx234");
|
||||
buffer.undo_or_redo(transactions[2].clone(), cx).unwrap();
|
||||
buffer.undo_or_redo(transactions[2].clone()).unwrap();
|
||||
assert_eq!(buffer.text(), "1abx234");
|
||||
buffer.undo_or_redo(transactions[1].clone(), cx).unwrap();
|
||||
buffer.undo_or_redo(transactions[1].clone()).unwrap();
|
||||
assert_eq!(buffer.text(), "1abyzef234");
|
||||
buffer.undo_or_redo(transactions[2].clone(), cx).unwrap();
|
||||
buffer.undo_or_redo(transactions[2].clone()).unwrap();
|
||||
assert_eq!(buffer.text(), "1abcdef234");
|
||||
|
||||
buffer.undo_or_redo(transactions[2].clone(), cx).unwrap();
|
||||
buffer.undo_or_redo(transactions[2].clone()).unwrap();
|
||||
assert_eq!(buffer.text(), "1abyzef234");
|
||||
buffer.undo_or_redo(transactions[0].clone(), cx).unwrap();
|
||||
buffer.undo_or_redo(transactions[0].clone()).unwrap();
|
||||
assert_eq!(buffer.text(), "1yzef234");
|
||||
buffer.undo_or_redo(transactions[1].clone(), cx).unwrap();
|
||||
buffer.undo_or_redo(transactions[1].clone()).unwrap();
|
||||
assert_eq!(buffer.text(), "1234");
|
||||
|
||||
buffer
|
||||
});
|
||||
}
|
||||
|
||||
#[gpui::test]
|
||||
fn test_history(cx: &mut gpui::MutableAppContext) {
|
||||
cx.add_model(|cx| {
|
||||
#[test]
|
||||
fn test_history() {
|
||||
let mut now = Instant::now();
|
||||
let mut buffer = Buffer::new(0, "123456", cx);
|
||||
let mut buffer = TextBuffer::new(0, 0, History::new("123456".into()));
|
||||
|
||||
let set_id =
|
||||
buffer.add_selection_set(buffer.selections_from_ranges(vec![4..4]).unwrap(), cx);
|
||||
let set_id = if let Operation::UpdateSelections { set_id, .. } =
|
||||
buffer.add_selection_set(buffer.selections_from_ranges(vec![4..4]).unwrap())
|
||||
{
|
||||
set_id
|
||||
} else {
|
||||
unreachable!()
|
||||
};
|
||||
buffer.start_transaction_at(Some(set_id), now).unwrap();
|
||||
buffer.edit(vec![2..4], "cd", cx);
|
||||
buffer.end_transaction_at(Some(set_id), now, cx).unwrap();
|
||||
buffer.edit(vec![2..4], "cd");
|
||||
buffer.end_transaction_at(Some(set_id), now).unwrap();
|
||||
assert_eq!(buffer.text(), "12cd56");
|
||||
assert_eq!(buffer.selection_ranges(set_id).unwrap(), vec![4..4]);
|
||||
|
||||
buffer.start_transaction_at(Some(set_id), now).unwrap();
|
||||
buffer
|
||||
.update_selection_set(
|
||||
set_id,
|
||||
buffer.selections_from_ranges(vec![1..3]).unwrap(),
|
||||
cx,
|
||||
)
|
||||
.update_selection_set(set_id, buffer.selections_from_ranges(vec![1..3]).unwrap())
|
||||
.unwrap();
|
||||
buffer.edit(vec![4..5], "e", cx);
|
||||
buffer.end_transaction_at(Some(set_id), now, cx).unwrap();
|
||||
buffer.edit(vec![4..5], "e");
|
||||
buffer.end_transaction_at(Some(set_id), now).unwrap();
|
||||
assert_eq!(buffer.text(), "12cde6");
|
||||
assert_eq!(buffer.selection_ranges(set_id).unwrap(), vec![1..3]);
|
||||
|
||||
now += buffer.history.group_interval + Duration::from_millis(1);
|
||||
buffer.start_transaction_at(Some(set_id), now).unwrap();
|
||||
buffer
|
||||
.update_selection_set(
|
||||
set_id,
|
||||
buffer.selections_from_ranges(vec![2..2]).unwrap(),
|
||||
cx,
|
||||
)
|
||||
.update_selection_set(set_id, buffer.selections_from_ranges(vec![2..2]).unwrap())
|
||||
.unwrap();
|
||||
buffer.edit(vec![0..1], "a", cx);
|
||||
buffer.edit(vec![1..1], "b", cx);
|
||||
buffer.end_transaction_at(Some(set_id), now, cx).unwrap();
|
||||
buffer.edit(vec![0..1], "a");
|
||||
buffer.edit(vec![1..1], "b");
|
||||
buffer.end_transaction_at(Some(set_id), now).unwrap();
|
||||
assert_eq!(buffer.text(), "ab2cde6");
|
||||
assert_eq!(buffer.selection_ranges(set_id).unwrap(), vec![3..3]);
|
||||
|
||||
// Last transaction happened past the group interval, undo it on its
|
||||
// own.
|
||||
buffer.undo(cx);
|
||||
buffer.undo();
|
||||
assert_eq!(buffer.text(), "12cde6");
|
||||
assert_eq!(buffer.selection_ranges(set_id).unwrap(), vec![1..3]);
|
||||
|
||||
// First two transactions happened within the group interval, undo them
|
||||
// together.
|
||||
buffer.undo(cx);
|
||||
buffer.undo();
|
||||
assert_eq!(buffer.text(), "123456");
|
||||
assert_eq!(buffer.selection_ranges(set_id).unwrap(), vec![4..4]);
|
||||
|
||||
// Redo the first two transactions together.
|
||||
buffer.redo(cx);
|
||||
buffer.redo();
|
||||
assert_eq!(buffer.text(), "12cde6");
|
||||
assert_eq!(buffer.selection_ranges(set_id).unwrap(), vec![1..3]);
|
||||
|
||||
// Redo the last transaction on its own.
|
||||
buffer.redo(cx);
|
||||
buffer.redo();
|
||||
assert_eq!(buffer.text(), "ab2cde6");
|
||||
assert_eq!(buffer.selection_ranges(set_id).unwrap(), vec![3..3]);
|
||||
|
||||
buffer.start_transaction_at(None, now).unwrap();
|
||||
buffer.end_transaction_at(None, now, cx).unwrap();
|
||||
buffer.undo(cx);
|
||||
assert!(buffer.end_transaction_at(None, now).is_none());
|
||||
buffer.undo();
|
||||
assert_eq!(buffer.text(), "12cde6");
|
||||
|
||||
buffer
|
||||
});
|
||||
}
|
||||
|
||||
#[gpui::test]
|
||||
fn test_concurrent_edits(cx: &mut gpui::MutableAppContext) {
|
||||
#[test]
|
||||
fn test_concurrent_edits() {
|
||||
let text = "abcdef";
|
||||
|
||||
let buffer1 = cx.add_model(|cx| Buffer::new(1, text, cx));
|
||||
let buffer2 = cx.add_model(|cx| Buffer::new(2, text, cx));
|
||||
let buffer3 = cx.add_model(|cx| Buffer::new(3, text, cx));
|
||||
let mut buffer1 = TextBuffer::new(1, 0, History::new(text.into()));
|
||||
let mut buffer2 = TextBuffer::new(2, 0, History::new(text.into()));
|
||||
let mut buffer3 = TextBuffer::new(3, 0, History::new(text.into()));
|
||||
|
||||
let buf1_op = buffer1.update(cx, |buffer, cx| {
|
||||
buffer.edit(vec![1..2], "12", cx);
|
||||
assert_eq!(buffer.text(), "a12cdef");
|
||||
buffer.operations.last().unwrap().clone()
|
||||
});
|
||||
let buf2_op = buffer2.update(cx, |buffer, cx| {
|
||||
buffer.edit(vec![3..4], "34", cx);
|
||||
assert_eq!(buffer.text(), "abc34ef");
|
||||
buffer.operations.last().unwrap().clone()
|
||||
});
|
||||
let buf3_op = buffer3.update(cx, |buffer, cx| {
|
||||
buffer.edit(vec![5..6], "56", cx);
|
||||
assert_eq!(buffer.text(), "abcde56");
|
||||
buffer.operations.last().unwrap().clone()
|
||||
});
|
||||
let buf1_op = buffer1.edit(vec![1..2], "12");
|
||||
assert_eq!(buffer1.text(), "a12cdef");
|
||||
let buf2_op = buffer2.edit(vec![3..4], "34");
|
||||
assert_eq!(buffer2.text(), "abc34ef");
|
||||
let buf3_op = buffer3.edit(vec![5..6], "56");
|
||||
assert_eq!(buffer3.text(), "abcde56");
|
||||
|
||||
buffer1.update(cx, |buffer, _| {
|
||||
buffer.apply_op(buf2_op.clone()).unwrap();
|
||||
buffer.apply_op(buf3_op.clone()).unwrap();
|
||||
});
|
||||
buffer2.update(cx, |buffer, _| {
|
||||
buffer.apply_op(buf1_op.clone()).unwrap();
|
||||
buffer.apply_op(buf3_op.clone()).unwrap();
|
||||
});
|
||||
buffer3.update(cx, |buffer, _| {
|
||||
buffer.apply_op(buf1_op.clone()).unwrap();
|
||||
buffer.apply_op(buf2_op.clone()).unwrap();
|
||||
});
|
||||
buffer1.apply_op(Operation::Edit(buf2_op.clone())).unwrap();
|
||||
buffer1.apply_op(Operation::Edit(buf3_op.clone())).unwrap();
|
||||
buffer2.apply_op(Operation::Edit(buf1_op.clone())).unwrap();
|
||||
buffer2.apply_op(Operation::Edit(buf3_op.clone())).unwrap();
|
||||
buffer3.apply_op(Operation::Edit(buf1_op.clone())).unwrap();
|
||||
buffer3.apply_op(Operation::Edit(buf2_op.clone())).unwrap();
|
||||
|
||||
assert_eq!(buffer1.read(cx).text(), "a12c34e56");
|
||||
assert_eq!(buffer2.read(cx).text(), "a12c34e56");
|
||||
assert_eq!(buffer3.read(cx).text(), "a12c34e56");
|
||||
assert_eq!(buffer1.text(), "a12c34e56");
|
||||
assert_eq!(buffer2.text(), "a12c34e56");
|
||||
assert_eq!(buffer3.text(), "a12c34e56");
|
||||
}
|
||||
|
||||
#[gpui::test(iterations = 100)]
|
||||
fn test_random_concurrent_edits(cx: &mut gpui::MutableAppContext, mut rng: StdRng) {
|
||||
let peers = env::var("PEERS")
|
||||
.map(|i| i.parse().expect("invalid `PEERS` variable"))
|
||||
.unwrap_or(5);
|
||||
let operations = env::var("OPERATIONS")
|
||||
.map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
|
||||
.unwrap_or(10);
|
||||
// #[gpui::test(iterations = 100)]
|
||||
// fn test_random_concurrent_edits(cx: &mut gpui::MutableAppContext, mut rng: StdRng) {
|
||||
// let peers = env::var("PEERS")
|
||||
// .map(|i| i.parse().expect("invalid `PEERS` variable"))
|
||||
// .unwrap_or(5);
|
||||
// let operations = env::var("OPERATIONS")
|
||||
// .map(|i| i.parse().expect("invalid `OPERATIONS` variable"))
|
||||
// .unwrap_or(10);
|
||||
|
||||
let base_text_len = rng.gen_range(0..10);
|
||||
let base_text = RandomCharIter::new(&mut rng)
|
||||
.take(base_text_len)
|
||||
.collect::<String>();
|
||||
let mut replica_ids = Vec::new();
|
||||
let mut buffers = Vec::new();
|
||||
let mut network = Network::new(rng.clone());
|
||||
// let base_text_len = rng.gen_range(0..10);
|
||||
// let base_text = RandomCharIter::new(&mut rng)
|
||||
// .take(base_text_len)
|
||||
// .collect::<String>();
|
||||
// let mut replica_ids = Vec::new();
|
||||
// let mut buffers = Vec::new();
|
||||
// let mut network = Network::new(rng.clone());
|
||||
|
||||
for i in 0..peers {
|
||||
let buffer = cx.add_model(|cx| {
|
||||
let mut buf = Buffer::new(i as ReplicaId, base_text.as_str(), cx);
|
||||
buf.history.group_interval = Duration::from_millis(rng.gen_range(0..=200));
|
||||
buf
|
||||
});
|
||||
buffers.push(buffer);
|
||||
replica_ids.push(i as u16);
|
||||
network.add_peer(i as u16);
|
||||
}
|
||||
// for i in 0..peers {
|
||||
// let buffer = cx.add_model(|cx| {
|
||||
// let mut buf = Buffer::new(i as ReplicaId, base_text.as_str(), cx);
|
||||
// buf.history.group_interval = Duration::from_millis(rng.gen_range(0..=200));
|
||||
// buf
|
||||
// });
|
||||
// buffers.push(buffer);
|
||||
// replica_ids.push(i as u16);
|
||||
// network.add_peer(i as u16);
|
||||
// }
|
||||
|
||||
log::info!("initial text: {:?}", base_text);
|
||||
// log::info!("initial text: {:?}", base_text);
|
||||
|
||||
let mut mutation_count = operations;
|
||||
loop {
|
||||
let replica_index = rng.gen_range(0..peers);
|
||||
let replica_id = replica_ids[replica_index];
|
||||
buffers[replica_index].update(cx, |buffer, cx| match rng.gen_range(0..=100) {
|
||||
0..=50 if mutation_count != 0 => {
|
||||
buffer.randomly_mutate(&mut rng, cx);
|
||||
network.broadcast(buffer.replica_id, mem::take(&mut buffer.operations));
|
||||
log::info!("buffer {} text: {:?}", buffer.replica_id, buffer.text());
|
||||
mutation_count -= 1;
|
||||
}
|
||||
51..=70 if mutation_count != 0 => {
|
||||
buffer.randomly_undo_redo(&mut rng, cx);
|
||||
network.broadcast(buffer.replica_id, mem::take(&mut buffer.operations));
|
||||
mutation_count -= 1;
|
||||
}
|
||||
71..=100 if network.has_unreceived(replica_id) => {
|
||||
let ops = network.receive(replica_id);
|
||||
if !ops.is_empty() {
|
||||
log::info!(
|
||||
"peer {} applying {} ops from the network.",
|
||||
replica_id,
|
||||
ops.len()
|
||||
);
|
||||
buffer.apply_ops(ops, cx).unwrap();
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
});
|
||||
// let mut mutation_count = operations;
|
||||
// loop {
|
||||
// let replica_index = rng.gen_range(0..peers);
|
||||
// let replica_id = replica_ids[replica_index];
|
||||
// buffers[replica_index].update(cx, |buffer, cx| match rng.gen_range(0..=100) {
|
||||
// 0..=50 if mutation_count != 0 => {
|
||||
// buffer.randomly_mutate(&mut rng, cx);
|
||||
// network.broadcast(buffer.replica_id, mem::take(&mut buffer.operations));
|
||||
// log::info!("buffer {} text: {:?}", buffer.replica_id, buffer.text());
|
||||
// mutation_count -= 1;
|
||||
// }
|
||||
// 51..=70 if mutation_count != 0 => {
|
||||
// buffer.randomly_undo_redo(&mut rng, cx);
|
||||
// network.broadcast(buffer.replica_id, mem::take(&mut buffer.operations));
|
||||
// mutation_count -= 1;
|
||||
// }
|
||||
// 71..=100 if network.has_unreceived(replica_id) => {
|
||||
// let ops = network.receive(replica_id);
|
||||
// if !ops.is_empty() {
|
||||
// log::info!(
|
||||
// "peer {} applying {} ops from the network.",
|
||||
// replica_id,
|
||||
// ops.len()
|
||||
// );
|
||||
// buffer.apply_ops(ops, cx).unwrap();
|
||||
// }
|
||||
// }
|
||||
// _ => {}
|
||||
// });
|
||||
|
||||
if mutation_count == 0 && network.is_idle() {
|
||||
break;
|
||||
}
|
||||
}
|
||||
// if mutation_count == 0 && network.is_idle() {
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
|
||||
let first_buffer = buffers[0].read(cx);
|
||||
for buffer in &buffers[1..] {
|
||||
let buffer = buffer.read(cx);
|
||||
assert_eq!(
|
||||
buffer.text(),
|
||||
first_buffer.text(),
|
||||
"Replica {} text != Replica 0 text",
|
||||
buffer.replica_id
|
||||
);
|
||||
assert_eq!(
|
||||
buffer.selection_sets().collect::<HashMap<_, _>>(),
|
||||
first_buffer.selection_sets().collect::<HashMap<_, _>>()
|
||||
);
|
||||
assert_eq!(
|
||||
buffer.all_selection_ranges().collect::<HashMap<_, _>>(),
|
||||
first_buffer
|
||||
.all_selection_ranges()
|
||||
.collect::<HashMap<_, _>>()
|
||||
);
|
||||
}
|
||||
}
|
||||
// let first_buffer = buffers[0].read(cx);
|
||||
// for buffer in &buffers[1..] {
|
||||
// let buffer = buffer.read(cx);
|
||||
// assert_eq!(
|
||||
// buffer.text(),
|
||||
// first_buffer.text(),
|
||||
// "Replica {} text != Replica 0 text",
|
||||
// buffer.replica_id
|
||||
// );
|
||||
// assert_eq!(
|
||||
// buffer.selection_sets().collect::<HashMap<_, _>>(),
|
||||
// first_buffer.selection_sets().collect::<HashMap<_, _>>()
|
||||
// );
|
||||
// assert_eq!(
|
||||
// buffer.all_selection_ranges().collect::<HashMap<_, _>>(),
|
||||
// first_buffer
|
||||
// .all_selection_ranges()
|
||||
// .collect::<HashMap<_, _>>()
|
||||
// );
|
||||
// }
|
||||
// }
|
||||
|
||||
#[derive(Clone)]
|
||||
struct Envelope<T: Clone> {
|
||||
|
|
|
|||
|
|
@ -351,6 +351,19 @@ fn test_contiguous_ranges() {
|
|||
);
|
||||
}
|
||||
|
||||
impl Buffer {
|
||||
pub fn enclosing_bracket_point_ranges<T: ToOffset>(
|
||||
&self,
|
||||
range: Range<T>,
|
||||
) -> Option<(Range<Point>, Range<Point>)> {
|
||||
self.enclosing_bracket_ranges(range).map(|(start, end)| {
|
||||
let point_start = start.start.to_point(self)..start.end.to_point(self);
|
||||
let point_end = end.start.to_point(self)..end.end.to_point(self);
|
||||
(point_start, point_end)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
fn rust_lang() -> Arc<Language> {
|
||||
Arc::new(
|
||||
Language::new(
|
||||
|
|
|
|||
|
|
@ -436,7 +436,7 @@ mod tests {
|
|||
}
|
||||
}
|
||||
_ => {
|
||||
buffer.update(&mut cx, |buffer, cx| buffer.randomly_mutate(&mut rng, cx));
|
||||
buffer.update(&mut cx, |buffer, cx| buffer.randomly_edit(&mut rng, 5, cx));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue