aboutsummaryrefslogtreecommitdiff
path: root/helix-view/src/commands.rs
diff options
context:
space:
mode:
Diffstat (limited to 'helix-view/src/commands.rs')
-rw-r--r--helix-view/src/commands.rs255
1 files changed, 136 insertions, 119 deletions
diff --git a/helix-view/src/commands.rs b/helix-view/src/commands.rs
index e29d070e..b5350ff4 100644
--- a/helix-view/src/commands.rs
+++ b/helix-view/src/commands.rs
@@ -3,12 +3,13 @@ use helix_core::{
indent::TAB_WIDTH,
regex::Regex,
register, selection,
- state::{Direction, Granularity, Mode, State},
+ state::{Direction, Granularity, State},
ChangeSet, Range, Selection, Tendril, Transaction,
};
use once_cell::sync::Lazy;
use crate::{
+ document::Mode,
prompt::Prompt,
view::{View, PADDING},
};
@@ -19,36 +20,40 @@ pub type Command = fn(view: &mut View, count: usize);
pub fn move_char_left(view: &mut View, count: usize) {
// TODO: use a transaction
- let selection = view
- .state
- .move_selection(Direction::Backward, Granularity::Character, count);
- view.state.selection = selection;
+ let selection =
+ view.doc
+ .state
+ .move_selection(Direction::Backward, Granularity::Character, count);
+ view.doc.state.selection = selection;
}
pub fn move_char_right(view: &mut View, count: usize) {
// TODO: use a transaction
- view.state.selection =
- view.state
+ view.doc.state.selection =
+ view.doc
+ .state
.move_selection(Direction::Forward, Granularity::Character, count);
}
pub fn move_line_up(view: &mut View, count: usize) {
// TODO: use a transaction
- view.state.selection = view
- .state
- .move_selection(Direction::Backward, Granularity::Line, count);
+ view.doc.state.selection =
+ view.doc
+ .state
+ .move_selection(Direction::Backward, Granularity::Line, count);
}
pub fn move_line_down(view: &mut View, count: usize) {
// TODO: use a transaction
- view.state.selection = view
- .state
- .move_selection(Direction::Forward, Granularity::Line, count);
+ view.doc.state.selection =
+ view.doc
+ .state
+ .move_selection(Direction::Forward, Granularity::Line, count);
}
pub fn move_line_end(view: &mut View, _count: usize) {
// TODO: use a transaction
- let lines = selection_lines(&view.state);
+ let lines = selection_lines(&view.doc.state);
let positions = lines
.into_iter()
@@ -57,89 +62,89 @@ pub fn move_line_end(view: &mut View, _count: usize) {
// Line end is pos at the start of next line - 1
// subtract another 1 because the line ends with \n
- view.state.doc.line_to_char(index + 1).saturating_sub(2)
+ view.doc.text().line_to_char(index + 1).saturating_sub(2)
})
.map(|pos| Range::new(pos, pos));
let selection = Selection::new(positions.collect(), 0);
- let transaction = Transaction::new(&mut view.state).with_selection(selection);
+ let transaction = Transaction::new(&mut view.doc.state).with_selection(selection);
- transaction.apply(&mut view.state);
+ view.doc.apply(&transaction);
}
pub fn move_line_start(view: &mut View, _count: usize) {
- let lines = selection_lines(&view.state);
+ let lines = selection_lines(&view.doc.state);
let positions = lines
.into_iter()
.map(|index| {
// adjust all positions to the start of the line.
- view.state.doc.line_to_char(index)
+ view.doc.text().line_to_char(index)
})
.map(|pos| Range::new(pos, pos));
let selection = Selection::new(positions.collect(), 0);
- let transaction = Transaction::new(&mut view.state).with_selection(selection);
+ let transaction = Transaction::new(&mut view.doc.state).with_selection(selection);
- transaction.apply(&mut view.state);
+ view.doc.apply(&transaction);
}
pub fn move_next_word_start(view: &mut View, count: usize) {
- let pos = view.state.move_pos(
- view.state.selection.cursor(),
+ let pos = view.doc.state.move_pos(
+ view.doc.state.selection.cursor(),
Direction::Forward,
Granularity::Word,
count,
);
// TODO: use a transaction
- view.state.selection = Selection::single(pos, pos);
+ view.doc.state.selection = Selection::single(pos, pos);
}
pub fn move_prev_word_start(view: &mut View, count: usize) {
- let pos = view.state.move_pos(
- view.state.selection.cursor(),
+ let pos = view.doc.state.move_pos(
+ view.doc.state.selection.cursor(),
Direction::Backward,
Granularity::Word,
count,
);
// TODO: use a transaction
- view.state.selection = Selection::single(pos, pos);
+ view.doc.state.selection = Selection::single(pos, pos);
}
pub fn move_next_word_end(view: &mut View, count: usize) {
let pos = State::move_next_word_end(
- &view.state.doc().slice(..),
- view.state.selection.cursor(),
+ &view.doc.text().slice(..),
+ view.doc.state.selection.cursor(),
count,
);
// TODO: use a transaction
- view.state.selection = Selection::single(pos, pos);
+ view.doc.state.selection = Selection::single(pos, pos);
}
pub fn move_file_start(view: &mut View, _count: usize) {
// TODO: use a transaction
- view.state.selection = Selection::single(0, 0);
+ view.doc.state.selection = Selection::single(0, 0);
- view.state.mode = Mode::Normal;
+ view.doc.mode = Mode::Normal;
}
pub fn move_file_end(view: &mut View, _count: usize) {
// TODO: use a transaction
- let text = &view.state.doc;
+ let text = &view.doc.text();
let last_line = text.line_to_char(text.len_lines().saturating_sub(2));
- view.state.selection = Selection::single(last_line, last_line);
+ view.doc.state.selection = Selection::single(last_line, last_line);
- view.state.mode = Mode::Normal;
+ view.doc.mode = Mode::Normal;
}
pub fn check_cursor_in_view(view: &mut View) -> bool {
- let cursor = view.state.selection().cursor();
- let line = view.state.doc().char_to_line(cursor);
+ let cursor = view.doc.state.selection().cursor();
+ let line = view.doc.text().char_to_line(cursor);
let document_end = view.first_line + view.size.1.saturating_sub(1) as usize;
if (line > document_end.saturating_sub(PADDING)) | (line < view.first_line + PADDING) {
@@ -156,19 +161,19 @@ pub fn page_up(view: &mut View, _count: usize) {
view.first_line = view.first_line.saturating_sub(view.size.1 as usize);
if !check_cursor_in_view(view) {
- let text = view.state.doc();
+ let text = view.doc.text();
let pos = text.line_to_char(view.last_line().saturating_sub(PADDING));
- view.state.selection = Selection::single(pos, pos);
+ view.doc.state.selection = Selection::single(pos, pos);
}
}
pub fn page_down(view: &mut View, _count: usize) {
view.first_line += view.size.1 as usize + PADDING;
- if view.first_line < view.state.doc().len_lines() {
- let text = view.state.doc();
+ if view.first_line < view.doc.text().len_lines() {
+ let text = view.doc.text();
let pos = text.line_to_char(view.first_line as usize);
- view.state.selection = Selection::single(pos, pos);
+ view.doc.state.selection = Selection::single(pos, pos);
}
}
@@ -180,79 +185,84 @@ pub fn half_page_up(view: &mut View, _count: usize) {
view.first_line = view.first_line.saturating_sub(view.size.1 as usize / 2);
if !check_cursor_in_view(view) {
- let text = &view.state.doc;
+ let text = &view.doc.text();
let pos = text.line_to_char(view.last_line() - PADDING);
- view.state.selection = Selection::single(pos, pos);
+ view.doc.state.selection = Selection::single(pos, pos);
}
}
pub fn half_page_down(view: &mut View, _count: usize) {
- let lines = view.state.doc().len_lines();
+ let lines = view.doc.text().len_lines();
if view.first_line < lines.saturating_sub(view.size.1 as usize) {
view.first_line += view.size.1 as usize / 2;
}
if !check_cursor_in_view(view) {
- let text = view.state.doc();
+ let text = view.doc.text();
let pos = text.line_to_char(view.first_line as usize);
- view.state.selection = Selection::single(pos, pos);
+ view.doc.state.selection = Selection::single(pos, pos);
}
}
// avoid select by default by having a visual mode switch that makes movements into selects
pub fn extend_char_left(view: &mut View, count: usize) {
// TODO: use a transaction
- let selection = view
- .state
- .extend_selection(Direction::Backward, Granularity::Character, count);
- view.state.selection = selection;
+ let selection =
+ view.doc
+ .state
+ .extend_selection(Direction::Backward, Granularity::Character, count);
+ view.doc.state.selection = selection;
}
pub fn extend_char_right(view: &mut View, count: usize) {
// TODO: use a transaction
- view.state.selection =
- view.state
+ view.doc.state.selection =
+ view.doc
+ .state
.extend_selection(Direction::Forward, Granularity::Character, count);
}
pub fn extend_line_up(view: &mut View, count: usize) {
// TODO: use a transaction
- view.state.selection =
- view.state
+ view.doc.state.selection =
+ view.doc
+ .state
.extend_selection(Direction::Backward, Granularity::Line, count);
}
pub fn extend_line_down(view: &mut View, count: usize) {
// TODO: use a transaction
- view.state.selection =
- view.state
+ view.doc.state.selection =
+ view.doc
+ .state
.extend_selection(Direction::Forward, Granularity::Line, count);
}
pub fn split_selection_on_newline(view: &mut View, _count: usize) {
- let text = &view.state.doc.slice(..);
+ let text = &view.doc.text().slice(..);
// only compile the regex once
#[allow(clippy::trivial_regex)]
static REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"\n").unwrap());
// TODO: use a transaction
- view.state.selection = selection::split_on_matches(text, view.state.selection(), &REGEX)
+ view.doc.state.selection = selection::split_on_matches(text, view.doc.state.selection(), &REGEX)
}
pub fn select_line(view: &mut View, _count: usize) {
// TODO: count
- let pos = view.state.selection().primary();
- let text = view.state.doc();
+ let pos = view.doc.state.selection().primary();
+ let text = view.doc.text();
let line = text.char_to_line(pos.head);
let start = text.line_to_char(line);
let end = text.line_to_char(line + 1).saturating_sub(1);
// TODO: use a transaction
- view.state.selection = Selection::single(start, end);
+ view.doc.state.selection = Selection::single(start, end);
}
pub fn delete_selection(view: &mut View, _count: usize) {
- let transaction =
- Transaction::change_by_selection(&view.state, |range| (range.from(), range.to() + 1, None));
- transaction.apply(&mut view.state);
+ let transaction = Transaction::change_by_selection(&view.doc.state, |range| {
+ (range.from(), range.to() + 1, None)
+ });
+ view.doc.apply(&transaction);
append_changes_to_history(view);
}
@@ -263,21 +273,23 @@ pub fn change_selection(view: &mut View, count: usize) {
}
pub fn collapse_selection(view: &mut View, _count: usize) {
- view.state.selection = view
+ view.doc.state.selection = view
+ .doc
.state
.selection
.transform(|range| Range::new(range.head, range.head))
}
pub fn flip_selections(view: &mut View, _count: usize) {
- view.state.selection = view
+ view.doc.state.selection = view
+ .doc
.state
.selection
.transform(|range| Range::new(range.head, range.anchor))
}
fn enter_insert_mode(view: &mut View) {
- view.state.mode = Mode::Insert;
+ view.doc.mode = Mode::Insert;
append_changes_to_history(view);
}
@@ -285,7 +297,8 @@ fn enter_insert_mode(view: &mut View) {
pub fn insert_mode(view: &mut View, _count: usize) {
enter_insert_mode(view);
- view.state.selection = view
+ view.doc.state.selection = view
+ .doc
.state
.selection
.transform(|range| Range::new(range.to(), range.from()))
@@ -294,11 +307,11 @@ pub fn insert_mode(view: &mut View, _count: usize) {
// inserts at the end of each selection
pub fn append_mode(view: &mut View, _count: usize) {
enter_insert_mode(view);
- view.state.restore_cursor = true;
+ view.doc.restore_cursor = true;
// TODO: as transaction
- let text = &view.state.doc.slice(..);
- view.state.selection = view.state.selection.transform(|range| {
+ let text = &view.doc.text().slice(..);
+ view.doc.state.selection = view.doc.state.selection.transform(|range| {
// TODO: to() + next char
Range::new(
range.from(),
@@ -346,13 +359,13 @@ pub fn append_to_line(view: &mut View, count: usize) {
pub fn open_below(view: &mut View, _count: usize) {
enter_insert_mode(view);
- let lines = selection_lines(&view.state);
+ let lines = selection_lines(&view.doc.state);
let positions: Vec<_> = lines
.into_iter()
.map(|index| {
// adjust all positions to the end of the line/start of the next one.
- view.state.doc.line_to_char(index + 1)
+ view.doc.text().line_to_char(index + 1)
})
.collect();
@@ -373,63 +386,63 @@ pub fn open_below(view: &mut View, _count: usize) {
0,
);
- let transaction = Transaction::change(&view.state, changes).with_selection(selection);
+ let transaction = Transaction::change(&view.doc.state, changes).with_selection(selection);
- transaction.apply(&mut view.state);
+ view.doc.apply(&transaction);
}
// O inserts a new line before each line with a selection
fn append_changes_to_history(view: &mut View) {
- if view.state.changes.is_empty() {
+ if view.doc.changes.is_empty() {
return;
}
- let new_changeset = ChangeSet::new(view.state.doc());
- let changes = std::mem::replace(&mut view.state.changes, new_changeset);
+ let new_changeset = ChangeSet::new(view.doc.text());
+ let changes = std::mem::replace(&mut view.doc.changes, new_changeset);
// Instead of doing this messy merge we could always commit, and based on transaction
// annotations either add a new layer or compose into the previous one.
- let transaction = Transaction::from(changes).with_selection(view.state.selection().clone());
+ let transaction = Transaction::from(changes).with_selection(view.doc.state.selection().clone());
// increment document version
// TODO: needs to happen on undo/redo too
- view.state.version += 1;
+ view.doc.version += 1;
// TODO: trigger lsp/documentDidChange with changes
// HAXX: we need to reconstruct the state as it was before the changes..
- let (doc, selection) = view.state.old_state.take().unwrap();
+ let (doc, selection) = view.doc.old_state.take().unwrap();
let mut old_state = State::new(doc);
old_state.selection = selection;
// TODO: take transaction by value?
- view.history.commit_revision(&transaction, &old_state);
+ view.doc.history.commit_revision(&transaction, &old_state);
// HAXX
- view.state.old_state = Some((view.state.doc().clone(), view.state.selection.clone()));
+ view.doc.old_state = Some((view.doc.text().clone(), view.doc.state.selection.clone()));
}
pub fn normal_mode(view: &mut View, _count: usize) {
- view.state.mode = Mode::Normal;
+ view.doc.mode = Mode::Normal;
append_changes_to_history(view);
// if leaving append mode, move cursor back by 1
- if view.state.restore_cursor {
- let text = &view.state.doc.slice(..);
- view.state.selection = view.state.selection.transform(|range| {
+ if view.doc.restore_cursor {
+ let text = &view.doc.text().slice(..);
+ view.doc.state.selection = view.doc.state.selection.transform(|range| {
Range::new(
range.from(),
graphemes::prev_grapheme_boundary(text, range.to()),
)
});
- view.state.restore_cursor = false;
+ view.doc.restore_cursor = false;
}
}
pub fn goto_mode(view: &mut View, _count: usize) {
- view.state.mode = Mode::Goto;
+ view.doc.mode = Mode::Goto;
}
// NOTE: Transactions in this module get appended to history when we switch back to normal mode.
@@ -438,9 +451,9 @@ pub mod insert {
// TODO: insert means add text just before cursor, on exit we should be on the last letter.
pub fn insert_char(view: &mut View, c: char) {
let c = Tendril::from_char(c);
- let transaction = Transaction::insert(&view.state, c);
+ let transaction = Transaction::insert(&view.doc.state, c);
- transaction.apply(&mut view.state);
+ view.doc.apply(&transaction);
}
pub fn insert_tab(view: &mut View, _count: usize) {
@@ -448,41 +461,44 @@ pub mod insert {
}
pub fn insert_newline(view: &mut View, _count: usize) {
- let transaction = Transaction::change_by_selection(&view.state, |range| {
- let indent_level =
- helix_core::indent::suggested_indent_for_pos(&view.state, range.head);
+ let transaction = Transaction::change_by_selection(&view.doc.state, |range| {
+ let indent_level = helix_core::indent::suggested_indent_for_pos(
+ view.doc.syntax.as_ref(),
+ &view.doc.state,
+ range.head,
+ );
let indent = " ".repeat(TAB_WIDTH).repeat(indent_level);
let mut text = String::with_capacity(1 + indent.len());
text.push('\n');
text.push_str(&indent);
(range.head, range.head, Some(text.into()))
});
- transaction.apply(&mut view.state);
+ view.doc.apply(&transaction);
}
// TODO: handle indent-aware delete
pub fn delete_char_backward(view: &mut View, count: usize) {
- let text = &view.state.doc.slice(..);
- let transaction = Transaction::change_by_selection(&view.state, |range| {
+ let text = &view.doc.text().slice(..);
+ let transaction = Transaction::change_by_selection(&view.doc.state, |range| {
(
graphemes::nth_prev_grapheme_boundary(text, range.head, count),
range.head,
None,
)
});
- transaction.apply(&mut view.state);
+ view.doc.apply(&transaction);
}
pub fn delete_char_forward(view: &mut View, count: usize) {
- let text = &view.state.doc.slice(..);
- let transaction = Transaction::change_by_selection(&view.state, |range| {
+ let text = &view.doc.text().slice(..);
+ let transaction = Transaction::change_by_selection(&view.doc.state, |range| {
(
range.head,
graphemes::nth_next_grapheme_boundary(text, range.head, count),
None,
)
});
- transaction.apply(&mut view.state);
+ view.doc.apply(&transaction);
}
}
@@ -493,13 +509,13 @@ pub fn insert_char_prompt(prompt: &mut Prompt, c: char) {
// Undo / Redo
pub fn undo(view: &mut View, _count: usize) {
- view.history.undo(&mut view.state);
+ view.doc.history.undo(&mut view.doc.state);
// TODO: each command could simply return a Option<transaction>, then the higher level handles storing it?
}
pub fn redo(view: &mut View, _count: usize) {
- view.history.redo(&mut view.state);
+ view.doc.history.redo(&mut view.doc.state);
}
// Yank / Paste
@@ -507,9 +523,10 @@ pub fn redo(view: &mut View, _count: usize) {
pub fn yank(view: &mut View, _count: usize) {
// TODO: should selections be made end inclusive?
let values = view
+ .doc
.state
.selection()
- .fragments(&view.state.doc().slice(..))
+ .fragments(&view.doc.text().slice(..))
.map(|cow| cow.into_owned())
.collect();
@@ -550,18 +567,18 @@ pub fn paste(view: &mut View, _count: usize) {
let transaction = if linewise {
// paste on the next line
// TODO: can simply take a range + modifier and compute the right pos without ifs
- let text = view.state.doc();
- Transaction::change_by_selection(&view.state, |range| {
+ let text = view.doc.text();
+ Transaction::change_by_selection(&view.doc.state, |range| {
let line_end = text.line_to_char(text.char_to_line(range.head) + 1);
(line_end, line_end, Some(values.next().unwrap()))
})
} else {
- Transaction::change_by_selection(&view.state, |range| {
+ Transaction::change_by_selection(&view.doc.state, |range| {
(range.head + 1, range.head + 1, Some(values.next().unwrap()))
})
};
- transaction.apply(&mut view.state);
+ view.doc.apply(&transaction);
append_changes_to_history(view);
}
}
@@ -570,9 +587,9 @@ fn get_lines(view: &View) -> Vec<usize> {
let mut lines = Vec::new();
// Get all line numbers
- for range in view.state.selection.ranges() {
- let start = view.state.doc.char_to_line(range.from());
- let end = view.state.doc.char_to_line(range.to());
+ for range in view.doc.state.selection.ranges() {
+ let start = view.doc.text().char_to_line(range.from());
+ let end = view.doc.text().char_to_line(range.to());
for line in start..=end {
lines.push(line)
@@ -590,13 +607,13 @@ pub fn indent(view: &mut View, _count: usize) {
let indent = Tendril::from(" ".repeat(TAB_WIDTH));
let transaction = Transaction::change(
- &view.state,
+ &view.doc.state,
lines.into_iter().map(|line| {
- let pos = view.state.doc.line_to_char(line);
+ let pos = view.doc.text().line_to_char(line);
(pos, pos, Some(indent.clone()))
}),
);
- transaction.apply(&mut view.state);
+ view.doc.apply(&transaction);
append_changes_to_history(view);
}
@@ -605,7 +622,7 @@ pub fn unindent(view: &mut View, _count: usize) {
let mut changes = Vec::with_capacity(lines.len());
for line_idx in lines {
- let line = view.state.doc.line(line_idx);
+ let line = view.doc.text().line(line_idx);
let mut width = 0;
for ch in line.chars() {
@@ -621,14 +638,14 @@ pub fn unindent(view: &mut View, _count: usize) {
}
if width > 0 {
- let start = view.state.doc.line_to_char(line_idx);
+ let start = view.doc.text().line_to_char(line_idx);
changes.push((start, start + width, None))
}
}
- let transaction = Transaction::change(&view.state, changes.into_iter());
+ let transaction = Transaction::change(&view.doc.state, changes.into_iter());
- transaction.apply(&mut view.state);
+ view.doc.apply(&transaction);
append_changes_to_history(view);
}
generated by cgit v1.2.3-70-g09d2 (git 2.47.1) at 2024-12-26 20:00:08 +0000