2020-06-05 09:02:10 +04:00
|
|
|
use crate::graphemes::{nth_next_grapheme_boundary, nth_prev_grapheme_boundary, RopeGraphemes};
|
2020-09-22 13:23:48 +04:00
|
|
|
use crate::syntax::LOADER;
|
2020-09-19 18:16:00 +04:00
|
|
|
use crate::{Position, Range, Rope, RopeSlice, Selection, Syntax};
|
2020-09-07 06:28:52 +04:00
|
|
|
use anyhow::Error;
|
|
|
|
|
|
|
|
use std::path::PathBuf;
|
2020-05-25 08:02:21 +04:00
|
|
|
|
2020-09-21 13:24:16 +04:00
|
|
|
#[derive(Copy, Clone, PartialEq, Eq, Hash)]
|
2020-09-05 17:01:05 +04:00
|
|
|
pub enum Mode {
|
|
|
|
Normal,
|
|
|
|
Insert,
|
2020-10-05 01:47:37 +04:00
|
|
|
Goto,
|
2020-09-05 17:01:05 +04:00
|
|
|
}
|
|
|
|
|
2020-05-25 08:02:21 +04:00
|
|
|
/// A state represents the current editor state of a single buffer.
|
|
|
|
pub struct State {
|
2020-09-19 18:16:00 +04:00
|
|
|
// TODO: fields should be private but we need to refactor commands.rs first
|
2020-09-07 06:28:52 +04:00
|
|
|
/// Path to file on disk.
|
2020-09-19 18:16:00 +04:00
|
|
|
pub path: Option<PathBuf>,
|
|
|
|
pub doc: Rope,
|
|
|
|
pub selection: Selection,
|
|
|
|
pub mode: Mode,
|
2020-09-17 09:57:49 +04:00
|
|
|
|
2020-10-01 13:44:12 +04:00
|
|
|
pub restore_cursor: bool,
|
|
|
|
|
2020-09-17 09:57:49 +04:00
|
|
|
//
|
|
|
|
pub syntax: Option<Syntax>,
|
2020-05-25 08:02:21 +04:00
|
|
|
}
|
|
|
|
|
2020-06-01 12:42:28 +04:00
|
|
|
#[derive(Copy, Clone, PartialEq, Eq)]
|
|
|
|
pub enum Direction {
|
|
|
|
Forward,
|
|
|
|
Backward,
|
|
|
|
}
|
|
|
|
#[derive(Copy, Clone, PartialEq, Eq)]
|
|
|
|
pub enum Granularity {
|
|
|
|
Character,
|
|
|
|
Word,
|
|
|
|
Line,
|
|
|
|
// LineBoundary
|
|
|
|
}
|
|
|
|
|
2020-05-25 08:02:21 +04:00
|
|
|
impl State {
|
2020-05-28 09:45:44 +04:00
|
|
|
#[must_use]
|
2020-09-07 06:28:52 +04:00
|
|
|
pub fn new(doc: Rope) -> Self {
|
2020-05-25 08:02:21 +04:00
|
|
|
Self {
|
2020-09-07 06:28:52 +04:00
|
|
|
path: None,
|
2020-06-01 12:42:28 +04:00
|
|
|
doc,
|
2020-05-25 08:02:21 +04:00
|
|
|
selection: Selection::single(0, 0),
|
2020-09-05 17:01:05 +04:00
|
|
|
mode: Mode::Normal,
|
2020-10-01 13:44:12 +04:00
|
|
|
restore_cursor: false,
|
2020-10-04 12:15:43 +04:00
|
|
|
syntax: None,
|
2020-05-25 08:02:21 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-09-22 13:23:48 +04:00
|
|
|
// TODO: passing scopes here is awkward
|
|
|
|
pub fn load(path: PathBuf, scopes: &[String]) -> Result<Self, Error> {
|
2020-09-07 06:28:52 +04:00
|
|
|
use std::{env, fs::File, io::BufReader, path::PathBuf};
|
|
|
|
let _current_dir = env::current_dir()?;
|
|
|
|
|
|
|
|
let doc = Rope::from_reader(BufReader::new(File::open(path.clone())?))?;
|
|
|
|
|
|
|
|
// TODO: create if not found
|
|
|
|
|
|
|
|
let mut state = Self::new(doc);
|
2020-09-17 09:57:49 +04:00
|
|
|
|
2020-09-22 13:23:48 +04:00
|
|
|
if let Some(language_config) = LOADER.language_config_for_file_name(path.as_path()) {
|
|
|
|
let highlight_config = language_config.highlight_config(scopes).unwrap().unwrap();
|
|
|
|
// TODO: config.configure(scopes) is now delayed, is that ok?
|
2020-09-17 09:57:49 +04:00
|
|
|
|
2020-09-22 13:23:48 +04:00
|
|
|
let syntax = Syntax::new(&state.doc, highlight_config.clone());
|
2020-09-17 09:57:49 +04:00
|
|
|
|
2020-09-22 13:23:48 +04:00
|
|
|
state.syntax = Some(syntax);
|
|
|
|
};
|
2020-09-17 09:57:49 +04:00
|
|
|
|
2020-09-22 13:23:48 +04:00
|
|
|
state.path = Some(path);
|
2020-09-17 09:57:49 +04:00
|
|
|
|
2020-09-07 06:28:52 +04:00
|
|
|
Ok(state)
|
|
|
|
}
|
|
|
|
|
|
|
|
// TODO: doc/selection accessors
|
2020-05-25 08:02:21 +04:00
|
|
|
|
2020-09-14 14:50:46 +04:00
|
|
|
// TODO: be able to take either Rope or RopeSlice
|
|
|
|
#[inline]
|
|
|
|
pub fn doc(&self) -> &Rope {
|
|
|
|
&self.doc
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
|
|
|
pub fn selection(&self) -> &Selection {
|
|
|
|
&self.selection
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
|
|
|
pub fn mode(&self) -> Mode {
|
|
|
|
self.mode
|
|
|
|
}
|
|
|
|
|
2020-09-19 06:55:15 +04:00
|
|
|
#[inline]
|
|
|
|
pub fn path(&self) -> Option<&PathBuf> {
|
|
|
|
self.path.as_ref()
|
|
|
|
}
|
|
|
|
|
2020-09-14 14:50:46 +04:00
|
|
|
// pub fn doc<R>(&self, range: R) -> RopeSlice
|
|
|
|
// where
|
|
|
|
// R: std::ops::RangeBounds<usize>,
|
|
|
|
// {
|
|
|
|
// self.doc.slice(range)
|
|
|
|
// }
|
|
|
|
|
2020-05-28 12:47:35 +04:00
|
|
|
// update/transact:
|
|
|
|
// update(desc) => transaction ? transaction.doc() for applied doc
|
|
|
|
// transaction.apply(doc)
|
|
|
|
// doc.transact(fn -> ... end)
|
|
|
|
|
2020-05-25 08:02:21 +04:00
|
|
|
// replaceSelection (transaction that replaces selection)
|
|
|
|
// changeByRange
|
|
|
|
// changes
|
|
|
|
// slice
|
|
|
|
//
|
|
|
|
// getters:
|
|
|
|
// tabSize
|
|
|
|
// indentUnit
|
|
|
|
// languageDataAt()
|
|
|
|
//
|
|
|
|
// config:
|
|
|
|
// indentation
|
|
|
|
// tabSize
|
|
|
|
// lineUnit
|
|
|
|
// syntax
|
|
|
|
// foldable
|
|
|
|
// changeFilter/transactionFilter
|
2020-06-01 12:42:28 +04:00
|
|
|
|
2020-09-09 10:48:25 +04:00
|
|
|
// TODO: move that accepts a boundary matcher fn/list, we keep incrementing until we hit
|
|
|
|
// a boundary
|
|
|
|
|
|
|
|
// TODO: edits, does each keypress trigger a full command? I guess it's adding to the same
|
|
|
|
// transaction
|
|
|
|
// There should be three pieces of the state: current transaction, the original doc, "preview"
|
|
|
|
// of the new state.
|
|
|
|
// 1. apply the newly generated keypress as a transaction
|
|
|
|
// 2. compose onto a ongoing transaction
|
|
|
|
// 3. on insert mode leave, that transaction gets stored into undo history
|
|
|
|
|
2020-06-01 12:42:28 +04:00
|
|
|
pub fn move_pos(
|
|
|
|
&self,
|
|
|
|
pos: usize,
|
|
|
|
dir: Direction,
|
|
|
|
granularity: Granularity,
|
2020-06-07 19:15:39 +04:00
|
|
|
count: usize,
|
2020-06-01 12:42:28 +04:00
|
|
|
) -> usize {
|
2020-09-07 06:28:52 +04:00
|
|
|
let text = &self.doc;
|
2020-06-01 12:42:28 +04:00
|
|
|
match (dir, granularity) {
|
|
|
|
(Direction::Backward, Granularity::Character) => {
|
2020-09-28 20:11:17 +04:00
|
|
|
// Clamp to line
|
|
|
|
let line = text.char_to_line(pos);
|
|
|
|
let start = text.line_to_char(line);
|
|
|
|
std::cmp::max(
|
|
|
|
nth_prev_grapheme_boundary(&text.slice(..), pos, count),
|
|
|
|
start,
|
|
|
|
)
|
2020-06-01 12:42:28 +04:00
|
|
|
}
|
|
|
|
(Direction::Forward, Granularity::Character) => {
|
2020-09-28 20:11:17 +04:00
|
|
|
// Clamp to line
|
|
|
|
let line = text.char_to_line(pos);
|
2020-09-29 12:49:19 +04:00
|
|
|
// Line end is pos at the start of next line - 1
|
|
|
|
// subtract another 1 because the line ends with \n
|
|
|
|
let end = text.line_to_char(line + 1).saturating_sub(2);
|
2020-09-28 20:11:17 +04:00
|
|
|
std::cmp::min(nth_next_grapheme_boundary(&text.slice(..), pos, count), end)
|
2020-06-01 12:42:28 +04:00
|
|
|
}
|
2020-09-24 14:16:35 +04:00
|
|
|
(Direction::Forward, Granularity::Word) => {
|
|
|
|
Self::move_next_word_start(&text.slice(..), pos)
|
|
|
|
}
|
|
|
|
(Direction::Backward, Granularity::Word) => {
|
|
|
|
Self::move_prev_word_start(&text.slice(..), pos)
|
|
|
|
}
|
2020-06-07 19:15:39 +04:00
|
|
|
(_, Granularity::Line) => move_vertically(&text.slice(..), dir, pos, count),
|
2020-06-01 12:42:28 +04:00
|
|
|
_ => pos,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-09-24 14:16:35 +04:00
|
|
|
pub fn move_next_word_start(slice: &RopeSlice, mut pos: usize) -> usize {
|
|
|
|
// TODO: confirm it's fine without using graphemes, I think it should be
|
|
|
|
let ch = slice.char(pos);
|
|
|
|
let next = slice.char(pos.saturating_add(1));
|
|
|
|
if categorize(ch) != categorize(next) {
|
|
|
|
pos += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
// refetch
|
|
|
|
let ch = slice.char(pos);
|
|
|
|
|
|
|
|
if is_word(ch) {
|
|
|
|
skip_over_next(slice, &mut pos, is_word);
|
|
|
|
} else if ch.is_ascii_punctuation() {
|
|
|
|
skip_over_next(slice, &mut pos, |ch| ch.is_ascii_punctuation());
|
|
|
|
}
|
|
|
|
|
|
|
|
// TODO: don't include newline?
|
|
|
|
skip_over_next(slice, &mut pos, |ch| ch.is_ascii_whitespace());
|
|
|
|
|
|
|
|
pos
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn move_prev_word_start(slice: &RopeSlice, mut pos: usize) -> usize {
|
|
|
|
// TODO: confirm it's fine without using graphemes, I think it should be
|
|
|
|
let ch = slice.char(pos);
|
|
|
|
let prev = slice.char(pos.saturating_sub(1)); // TODO: just return original pos if at start
|
|
|
|
|
|
|
|
if categorize(ch) != categorize(prev) {
|
|
|
|
pos -= 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
// TODO: skip while eol
|
|
|
|
|
|
|
|
// TODO: don't include newline?
|
|
|
|
skip_over_prev(slice, &mut pos, |ch| ch.is_ascii_whitespace());
|
|
|
|
|
|
|
|
// refetch
|
|
|
|
let ch = slice.char(pos);
|
|
|
|
|
|
|
|
if is_word(ch) {
|
|
|
|
skip_over_prev(slice, &mut pos, is_word);
|
|
|
|
} else if ch.is_ascii_punctuation() {
|
|
|
|
skip_over_prev(slice, &mut pos, |ch| ch.is_ascii_punctuation());
|
|
|
|
}
|
|
|
|
|
|
|
|
pos.saturating_add(1)
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn move_next_word_end(slice: &RopeSlice, mut pos: usize, _count: usize) -> usize {
|
|
|
|
// TODO: confirm it's fine without using graphemes, I think it should be
|
|
|
|
let ch = slice.char(pos);
|
|
|
|
let next = slice.char(pos.saturating_add(1));
|
|
|
|
if categorize(ch) != categorize(next) {
|
|
|
|
pos += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
// TODO: don't include newline?
|
|
|
|
skip_over_next(slice, &mut pos, |ch| ch.is_ascii_whitespace());
|
|
|
|
|
|
|
|
// refetch
|
|
|
|
let ch = slice.char(pos);
|
|
|
|
|
|
|
|
if is_word(ch) {
|
|
|
|
skip_over_next(slice, &mut pos, is_word);
|
|
|
|
} else if ch.is_ascii_punctuation() {
|
|
|
|
skip_over_next(slice, &mut pos, |ch| ch.is_ascii_punctuation());
|
|
|
|
}
|
|
|
|
|
|
|
|
pos.saturating_sub(1)
|
|
|
|
}
|
|
|
|
|
2020-06-01 12:42:28 +04:00
|
|
|
pub fn move_selection(
|
|
|
|
&self,
|
|
|
|
dir: Direction,
|
|
|
|
granularity: Granularity,
|
2020-06-07 19:15:39 +04:00
|
|
|
count: usize,
|
2020-06-01 12:42:28 +04:00
|
|
|
) -> Selection {
|
|
|
|
// TODO: move all selections according to normal cursor move semantics by collapsing it
|
|
|
|
// into cursors and moving them vertically
|
|
|
|
|
2020-09-13 18:38:54 +04:00
|
|
|
self.selection.transform(|range| {
|
2020-06-01 12:42:28 +04:00
|
|
|
// let pos = if !range.is_empty() {
|
|
|
|
// // if selection already exists, bump it to the start or end of current select first
|
|
|
|
// if dir == Direction::Backward {
|
|
|
|
// range.from()
|
|
|
|
// } else {
|
|
|
|
// range.to()
|
|
|
|
// }
|
|
|
|
// } else {
|
2020-06-07 19:15:39 +04:00
|
|
|
let pos = self.move_pos(range.head, dir, granularity, count);
|
2020-06-01 12:42:28 +04:00
|
|
|
// };
|
2020-09-19 18:16:00 +04:00
|
|
|
Range::new(pos, pos)
|
2020-09-13 18:38:54 +04:00
|
|
|
})
|
2020-06-01 12:42:28 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
pub fn extend_selection(
|
|
|
|
&self,
|
|
|
|
dir: Direction,
|
|
|
|
granularity: Granularity,
|
2020-06-07 19:15:39 +04:00
|
|
|
count: usize,
|
2020-06-01 12:42:28 +04:00
|
|
|
) -> Selection {
|
2020-09-13 18:38:54 +04:00
|
|
|
self.selection.transform(|range| {
|
2020-06-07 19:15:39 +04:00
|
|
|
let pos = self.move_pos(range.head, dir, granularity, count);
|
2020-09-19 18:16:00 +04:00
|
|
|
Range::new(range.anchor, pos)
|
2020-09-13 18:38:54 +04:00
|
|
|
})
|
2020-06-01 12:42:28 +04:00
|
|
|
}
|
2020-05-25 08:02:21 +04:00
|
|
|
}
|
2020-06-05 09:02:10 +04:00
|
|
|
|
|
|
|
/// Convert a character index to (line, column) coordinates.
|
2020-09-17 09:57:49 +04:00
|
|
|
pub fn coords_at_pos(text: &RopeSlice, pos: usize) -> Position {
|
2020-06-05 09:02:10 +04:00
|
|
|
let line = text.char_to_line(pos);
|
|
|
|
let line_start = text.line_to_char(line);
|
2020-09-04 13:18:59 +04:00
|
|
|
let col = text.slice(line_start..pos).len_chars();
|
2020-09-17 09:57:49 +04:00
|
|
|
Position::new(line, col)
|
2020-06-05 09:02:10 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Convert (line, column) coordinates to a character index.
|
2020-09-17 09:57:49 +04:00
|
|
|
pub fn pos_at_coords(text: &RopeSlice, coords: Position) -> usize {
|
|
|
|
let Position { row, col } = coords;
|
|
|
|
let line_start = text.line_to_char(row);
|
2020-06-05 09:02:10 +04:00
|
|
|
nth_next_grapheme_boundary(text, line_start, col)
|
|
|
|
}
|
|
|
|
|
2020-06-07 19:15:39 +04:00
|
|
|
fn move_vertically(text: &RopeSlice, dir: Direction, pos: usize, count: usize) -> usize {
|
2020-09-17 09:57:49 +04:00
|
|
|
let Position { row, col } = coords_at_pos(text, pos);
|
2020-06-07 19:08:21 +04:00
|
|
|
|
|
|
|
let new_line = match dir {
|
2020-09-17 09:57:49 +04:00
|
|
|
Direction::Backward => row.saturating_sub(count),
|
|
|
|
Direction::Forward => std::cmp::min(row.saturating_add(count), text.len_lines() - 1),
|
2020-06-07 19:08:21 +04:00
|
|
|
};
|
|
|
|
|
2020-09-04 13:18:59 +04:00
|
|
|
// convert to 0-indexed, subtract another 1 because len_chars() counts \n
|
|
|
|
let new_line_len = text.line(new_line).len_chars().saturating_sub(2);
|
2020-06-07 19:08:21 +04:00
|
|
|
|
|
|
|
let new_col = if new_line_len < col {
|
|
|
|
// TODO: preserve horiz here
|
|
|
|
new_line_len
|
|
|
|
} else {
|
|
|
|
col
|
|
|
|
};
|
|
|
|
|
2020-09-17 09:57:49 +04:00
|
|
|
pos_at_coords(text, Position::new(new_line, new_col))
|
2020-06-07 19:08:21 +04:00
|
|
|
}
|
|
|
|
|
2020-09-24 14:16:35 +04:00
|
|
|
// used for by-word movement
|
|
|
|
|
|
|
|
fn is_word(ch: char) -> bool {
|
|
|
|
ch.is_alphanumeric() || ch == '_'
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Debug, Eq, PartialEq)]
|
|
|
|
enum Category {
|
|
|
|
Whitespace,
|
|
|
|
EOL,
|
|
|
|
Word,
|
|
|
|
Punctuation,
|
|
|
|
}
|
|
|
|
fn categorize(ch: char) -> Category {
|
|
|
|
if ch == '\n' {
|
|
|
|
Category::EOL
|
|
|
|
} else if ch.is_ascii_whitespace() {
|
|
|
|
Category::Whitespace
|
|
|
|
} else if ch.is_ascii_punctuation() {
|
|
|
|
Category::Punctuation
|
|
|
|
} else if ch.is_ascii_alphanumeric() {
|
|
|
|
Category::Word
|
|
|
|
} else {
|
|
|
|
unreachable!()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn skip_over_next<F>(slice: &RopeSlice, pos: &mut usize, fun: F)
|
|
|
|
where
|
|
|
|
F: Fn(char) -> bool,
|
|
|
|
{
|
|
|
|
let mut chars = slice.chars_at(*pos);
|
|
|
|
|
2020-09-29 13:02:27 +04:00
|
|
|
for ch in chars {
|
2020-09-24 14:16:35 +04:00
|
|
|
if !fun(ch) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
*pos += 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn skip_over_prev<F>(slice: &RopeSlice, pos: &mut usize, fun: F)
|
|
|
|
where
|
|
|
|
F: Fn(char) -> bool,
|
|
|
|
{
|
|
|
|
// need to +1 so that prev() includes current char
|
|
|
|
let mut chars = slice.chars_at(*pos + 1);
|
|
|
|
|
|
|
|
while let Some(ch) = chars.prev() {
|
|
|
|
if !fun(ch) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
*pos -= 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-05 09:02:10 +04:00
|
|
|
#[cfg(test)]
|
|
|
|
mod test {
|
|
|
|
use super::*;
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_coords_at_pos() {
|
|
|
|
let text = Rope::from("ḧëḷḷö\nẅöṛḷḋ");
|
2020-09-17 09:57:49 +04:00
|
|
|
assert_eq!(coords_at_pos(&text.slice(..), 0), (0, 0).into());
|
|
|
|
assert_eq!(coords_at_pos(&text.slice(..), 5), (0, 5).into()); // position on \n
|
|
|
|
assert_eq!(coords_at_pos(&text.slice(..), 6), (1, 0).into()); // position on w
|
|
|
|
assert_eq!(coords_at_pos(&text.slice(..), 7), (1, 1).into()); // position on o
|
|
|
|
assert_eq!(coords_at_pos(&text.slice(..), 10), (1, 4).into()); // position on d
|
2020-06-05 09:02:10 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_pos_at_coords() {
|
|
|
|
let text = Rope::from("ḧëḷḷö\nẅöṛḷḋ");
|
2020-09-17 09:57:49 +04:00
|
|
|
assert_eq!(pos_at_coords(&text.slice(..), (0, 0).into()), 0);
|
|
|
|
assert_eq!(pos_at_coords(&text.slice(..), (0, 5).into()), 5); // position on \n
|
|
|
|
assert_eq!(pos_at_coords(&text.slice(..), (1, 0).into()), 6); // position on w
|
|
|
|
assert_eq!(pos_at_coords(&text.slice(..), (1, 1).into()), 7); // position on o
|
|
|
|
assert_eq!(pos_at_coords(&text.slice(..), (1, 4).into()), 10); // position on d
|
2020-06-05 09:02:10 +04:00
|
|
|
}
|
2020-06-07 19:08:21 +04:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_vertical_move() {
|
|
|
|
let text = Rope::from("abcd\nefg\nwrs");
|
2020-09-17 09:57:49 +04:00
|
|
|
let pos = pos_at_coords(&text.slice(..), (0, 4).into());
|
2020-06-07 19:08:21 +04:00
|
|
|
let slice = text.slice(..);
|
|
|
|
|
|
|
|
assert_eq!(
|
|
|
|
coords_at_pos(&slice, move_vertically(&slice, Direction::Forward, pos, 1)),
|
2020-09-17 09:57:49 +04:00
|
|
|
(1, 2).into()
|
2020-06-07 19:08:21 +04:00
|
|
|
);
|
|
|
|
}
|
2020-06-05 09:02:10 +04:00
|
|
|
}
|