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

Return optional transaction ids when starting/ending a transaction

Browse Source 
If the transaction was nested, we return None. Otherwise we return the transaction id in preparation for editors to maintain their own selection state.
This commit is contained in:
Nathan Sobo
2021-12-10 18:00:09 -07:00
parent c8b43e3078
commit 77defe6e28
6 changed files with 65 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/language/src/buffer.rs
+20 -18
View File
@@ -977,8 +977,7 @@ impl Buffer {
.flat_map(|req| req.selection_set_ids.clone())
.collect::<HashSet<_>>();
self.start_transaction(selection_set_ids.iter().copied())
.unwrap();
self.start_transaction(selection_set_ids.iter().copied());
for (row, indent_column) in &indent_columns {
self.set_indent_column_for_line(*row, *indent_column, cx);
}
@@ -1014,8 +1013,7 @@ impl Buffer {
}
}
self.end_transaction(selection_set_ids.iter().copied(), cx)
.unwrap();
self.end_transaction(selection_set_ids.iter().copied(), cx);
}
fn set_indent_column_for_line(&mut self, row: u32, column: u32, cx: &mut ModelContext<Self>) {
@@ -1055,7 +1053,7 @@ impl Buffer {
pub(crate) fn apply_diff(&mut self, diff: Diff, cx: &mut ModelContext<Self>) -> bool {
if self.version == diff.base_version {
self.start_transaction(None).unwrap();
self.start_transaction(None);
let mut offset = 0;
for (tag, len) in diff.changes {
let range = offset..(offset + len);
@@ -1068,7 +1066,7 @@ impl Buffer {
}
}
}
self.end_transaction(None, cx).unwrap();
self.end_transaction(None, cx);
true
} else {
false
@@ -1095,7 +1093,7 @@ impl Buffer {
pub fn start_transaction(
&mut self,
selection_set_ids: impl IntoIterator<Item = SelectionSetId>,
) -> Result<()> {
) -> Option<TransactionId> {
self.start_transaction_at(selection_set_ids, Instant::now())
}
@@ -1103,7 +1101,7 @@ impl Buffer {
&mut self,
selection_set_ids: impl IntoIterator<Item = SelectionSetId>,
now: Instant,
) -> Result<()> {
) -> Option<TransactionId> {
self.text.start_transaction_at(selection_set_ids, now)
}
@@ -1111,7 +1109,7 @@ impl Buffer {
&mut self,
selection_set_ids: impl IntoIterator<Item = SelectionSetId>,
cx: &mut ModelContext<Self>,
) -> Result<()> {
) -> Option<TransactionId> {
self.end_transaction_at(selection_set_ids, Instant::now(), cx)
}
@@ -1120,12 +1118,16 @@ impl Buffer {
selection_set_ids: impl IntoIterator<Item = SelectionSetId>,
now: Instant,
cx: &mut ModelContext<Self>,
) -> Result<()> {
if let Some(start_version) = self.text.end_transaction_at(selection_set_ids, now) {
) -> Option<TransactionId> {
if let Some((transaction_id, start_version)) =
self.text.end_transaction_at(selection_set_ids, now)
{
let was_dirty = start_version != self.saved_version;
self.did_edit(&start_version, was_dirty, cx);
Some(transaction_id)
} else {
None
}
Ok(())
}
fn update_language_server(&mut self) {
@@ -1210,7 +1212,7 @@ impl Buffer {
return;
}
self.start_transaction(None).unwrap();
self.start_transaction(None);
self.pending_autoindent.take();
let autoindent_request = if autoindent && self.language.is_some() {
let before_edit = self.snapshot();
@@ -1268,7 +1270,7 @@ impl Buffer {
}));
}
self.end_transaction(None, cx).unwrap();
self.end_transaction(None, cx);
self.send_operation(Operation::Buffer(text::Operation::Edit(edit)), cx);
}
@@ -1474,18 +1476,18 @@ impl Buffer {
) where
T: rand::Rng,
{
self.start_transaction(None).unwrap();
self.start_transaction(None);
self.text.randomly_edit(rng, old_range_count);
self.end_transaction(None, cx).unwrap();
self.end_transaction(None, cx);
}
pub fn randomly_mutate<T>(&mut self, rng: &mut T, cx: &mut ModelContext<Self>)
where
T: rand::Rng,
{
self.start_transaction(None).unwrap();
self.start_transaction(None);
self.text.randomly_mutate(rng);
self.end_transaction(None, cx).unwrap();
self.end_transaction(None, cx);
}
}
crates/language/src/tests.rs
+8 -8
View File
@@ -92,15 +92,15 @@ fn test_edit_events(cx: &mut gpui::MutableAppContext) {
buffer.edit(Some(2..4), "XYZ", cx);
// An empty transaction does not emit any events.
buffer.start_transaction(None).unwrap();
buffer.end_transaction(None, cx).unwrap();
buffer.start_transaction(None);
buffer.end_transaction(None, cx);
// A transaction containing two edits emits one edited event.
now += Duration::from_secs(1);
buffer.start_transaction_at(None, now).unwrap();
buffer.start_transaction_at(None, now);
buffer.edit(Some(5..5), "u", cx);
buffer.edit(Some(6..6), "w", cx);
buffer.end_transaction_at(None, now, cx).unwrap();
buffer.end_transaction_at(None, now, cx);
// Undoing a transaction emits one edited event.
buffer.undo(cx);
@@ -167,7 +167,7 @@ async fn test_reparse(mut cx: gpui::TestAppContext) {
// Perform some edits (add parameter and variable reference)
// Parsing doesn't begin until the transaction is complete
buffer.update(&mut cx, |buf, cx| {
buf.start_transaction(None).unwrap();
buf.start_transaction(None);
let offset = buf.text().find(")").unwrap();
buf.edit(vec![offset..offset], "b: C", cx);
@@ -177,7 +177,7 @@ async fn test_reparse(mut cx: gpui::TestAppContext) {
buf.edit(vec![offset..offset], " d; ", cx);
assert!(!buf.is_parsing());
buf.end_transaction(None, cx).unwrap();
buf.end_transaction(None, cx);
assert_eq!(buf.text(), "fn a(b: C) { d; }");
assert!(buf.is_parsing());
});
@@ -342,7 +342,7 @@ fn test_autoindent_moves_selections(cx: &mut MutableAppContext) {
Buffer::new(0, text, cx).with_language(Some(Arc::new(rust_lang())), None, cx);
let selection_set_id = buffer.add_selection_set::<usize>(&[], cx);
buffer.start_transaction(Some(selection_set_id)).unwrap();
buffer.start_transaction(Some(selection_set_id));
buffer.edit_with_autoindent([5..5, 9..9], "\n\n", cx);
buffer
.update_selection_set(
@@ -370,7 +370,7 @@ fn test_autoindent_moves_selections(cx: &mut MutableAppContext) {
// Ending the transaction runs the auto-indent. The selection
// at the start of the auto-indented row is pushed to the right.
buffer.end_transaction(Some(selection_set_id), cx).unwrap();
buffer.end_transaction(Some(selection_set_id), cx);
assert_eq!(buffer.text(), "fn a(\n \n) {}\n\n");
let selection_ranges = buffer
.selection_set(selection_set_id)