aboutsummaryrefslogtreecommitdiff
path: root/helix-core/src
diff options
context:
space:
mode:
Diffstat (limited to 'helix-core/src')
-rw-r--r--helix-core/src/comment.rs2
-rw-r--r--helix-core/src/history.rs4
-rw-r--r--helix-core/src/syntax.rs5
-rw-r--r--helix-core/src/transaction.rs8
4 files changed, 10 insertions, 9 deletions
diff --git a/helix-core/src/comment.rs b/helix-core/src/comment.rs
index 9109e2d6..969d4d92 100644
--- a/helix-core/src/comment.rs
+++ b/helix-core/src/comment.rs
@@ -67,7 +67,7 @@ pub fn toggle_line_comments(state: &State) -> Transaction {
}
}
}
- Transaction::change(state, changes.into_iter())
+ Transaction::change(&state.doc, changes.into_iter())
}
#[cfg(test)]
diff --git a/helix-core/src/history.rs b/helix-core/src/history.rs
index 99de3f7c..c92c2a89 100644
--- a/helix-core/src/history.rs
+++ b/helix-core/src/history.rs
@@ -96,7 +96,7 @@ mod test {
let mut state = State::new(doc);
let transaction1 =
- Transaction::change(&state, vec![(5, 5, Some(" world!".into()))].into_iter());
+ Transaction::change(&state.doc, vec![(5, 5, Some(" world!".into()))].into_iter());
// Need to commit before applying!
history.commit_revision(&transaction1, &state);
@@ -106,7 +106,7 @@ mod test {
// ---
let transaction2 =
- Transaction::change(&state, vec![(6, 11, Some("世界".into()))].into_iter());
+ Transaction::change(&state.doc, vec![(6, 11, Some("世界".into()))].into_iter());
// Need to commit before applying!
history.commit_revision(&transaction2, &state);
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 2ad06bef..3d665953 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -1591,7 +1591,7 @@ fn test_input_edits() {
let mut state = State::new("hello world!\ntest 123".into());
let transaction = Transaction::change(
- &state,
+ &state.doc,
vec![(6, 11, Some("test".into())), (12, 17, None)].into_iter(),
);
let edits = LanguageLayer::generate_edits(state.doc.slice(..), &transaction.changes);
@@ -1621,7 +1621,8 @@ fn test_input_edits() {
// Testing with the official example from tree-sitter
let mut state = State::new("fn test() {}".into());
- let transaction = Transaction::change(&state, vec![(8, 8, Some("a: u32".into()))].into_iter());
+ let transaction =
+ Transaction::change(&state.doc, vec![(8, 8, Some("a: u32".into()))].into_iter());
let edits = LanguageLayer::generate_edits(state.doc.slice(..), &transaction.changes);
transaction.apply(&mut state);
diff --git a/helix-core/src/transaction.rs b/helix-core/src/transaction.rs
index bd605305..dbc5d588 100644
--- a/helix-core/src/transaction.rs
+++ b/helix-core/src/transaction.rs
@@ -459,11 +459,11 @@ impl Transaction {
}
/// Generate a transaction from a set of changes.
- pub fn change<I>(state: &State, changes: I) -> Self
+ pub fn change<I>(doc: &Rope, changes: I) -> Self
where
I: IntoIterator<Item = Change> + ExactSizeIterator,
{
- let len = state.doc.len_chars();
+ let len = doc.len_chars();
let acc = Vec::with_capacity(2 * changes.len() + 1);
let mut changeset = ChangeSet { changes: acc, len };
@@ -494,7 +494,7 @@ impl Transaction {
where
F: FnMut(&Range) -> Change,
{
- Self::change(state, state.selection.ranges().iter().map(f))
+ Self::change(&state.doc, state.selection.ranges().iter().map(f))
}
/// Insert text at each selection head.
@@ -617,7 +617,7 @@ mod test {
fn transaction_change() {
let mut state = State::new("hello world!\ntest 123".into());
let transaction = Transaction::change(
- &state,
+ &state.doc,
// (1, 1, None) is a useless 0-width delete
vec![(1, 1, None), (6, 11, Some("void".into())), (12, 17, None)].into_iter(),
);