mirror/ helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix synced 2024-05-20 15:56:05 +02:00
Code Issues

Abstract Transaction::change from change_by_selection.

This commit is contained in:
Blaž Hrastnik 2020-09-13 15:48:15 +09:00
parent 593f33dca6
commit d86f0feafc
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
helix-core/src/transaction.rs
View File

@ -1,5 +1,9 @@
use crate::{Rope, Selection, SelectionRange, State, Tendril};
// TODO: make Change enum internal and export this as the public Change type
/// (from, to, replacement)
type Change2 = (usize, usize, Option<Tendril>);
// TODO: divided into three different operations, I sort of like having just
// Splice { extent, Option<text>, distance } better.
// insert: Splice { extent: 0, text: Some("a"), distance: 2 }
@ -342,15 +346,11 @@ pub fn apply(&self, state: &mut State) -> bool {
true
}
pub fn change_by_selection<F>(state: &State, f: F) -> Self
where
F: Fn(&SelectionRange) -> (usize, usize, Option<Tendril>),
{
/// Generate a transaction from a set of changes.
// TODO: take an owned iter instead of Vec
pub fn change(state: &State, changes: Vec<Change2>) -> Self {
let len = state.doc.len_chars();
let ranges = state.selection.ranges();
let mut acc = Vec::with_capacity(2 * ranges.len() + 1);
let changes = ranges.iter().map(f);
let mut acc = Vec::with_capacity(2 * changes.len() + 1);
// TODO: verify ranges are ordered and not overlapping.
@ -370,6 +370,14 @@ pub fn change_by_selection<F>(state: &State, f: F) -> Self
Self::from(ChangeSet { changes: acc, len })
}
/// Generate a transaction with a change per selection range.
pub fn change_by_selection<F>(state: &State, f: F) -> Self
where
F: Fn(&SelectionRange) -> Change2,
{
Self::change(state, state.selection.ranges.iter().map(f).collect())
}
/// Insert text at each selection head.
pub fn insert(state: &State, text: Tendril) -> Self {
Self::change_by_selection(state, |range| (range.head, range.head, Some(text.clone())))