From 5103dc96173afaa1c0793db56f60ec1fef1e0fc3 Mon Sep 17 00:00:00 2001 From: Blaž Hrastnik Date: Thu, 10 Dec 2020 18:13:42 +0900 Subject: move commands and keymap back to terminal. Command needs to be able to deal with UI. We'll separate it again later on. --- helix-term/src/commands.rs | 682 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 682 insertions(+) create mode 100644 helix-term/src/commands.rs (limited to 'helix-term/src/commands.rs') diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs new file mode 100644 index 00000000..a791f243 --- /dev/null +++ b/helix-term/src/commands.rs @@ -0,0 +1,682 @@ +use helix_core::{ + graphemes, + indent::TAB_WIDTH, + regex::Regex, + register, selection, + state::{Direction, Granularity, State}, + ChangeSet, Range, Selection, Tendril, Transaction, +}; + +use once_cell::sync::Lazy; + +use crate::prompt::Prompt; + +use helix_view::{ + document::Mode, + view::{View, PADDING}, +}; + +pub struct Context<'a, 'b> { + pub count: usize, + pub view: &'a mut View, + pub executor: &'a smol::Executor<'b>, +} + +/// A command is a function that takes the current state and a count, and does a side-effect on the +/// state (usually by creating and applying a transaction). +pub type Command = fn(cx: &mut Context); + +pub fn move_char_left(cx: &mut Context) { + let selection = + cx.view + .doc + .state + .move_selection(Direction::Backward, Granularity::Character, cx.count); + cx.view.doc.set_selection(selection); +} + +pub fn move_char_right(cx: &mut Context) { + let selection = + cx.view + .doc + .state + .move_selection(Direction::Forward, Granularity::Character, cx.count); + cx.view.doc.set_selection(selection); +} + +pub fn move_line_up(cx: &mut Context) { + let selection = + cx.view + .doc + .state + .move_selection(Direction::Backward, Granularity::Line, cx.count); + cx.view.doc.set_selection(selection); +} + +pub fn move_line_down(cx: &mut Context) { + let selection = + cx.view + .doc + .state + .move_selection(Direction::Forward, Granularity::Line, cx.count); + cx.view.doc.set_selection(selection); +} + +pub fn move_line_end(cx: &mut Context) { + let lines = selection_lines(&cx.view.doc.state); + + let positions = lines + .into_iter() + .map(|index| { + // adjust all positions to the end of the line. + + // Line end is pos at the start of next line - 1 + // subtract another 1 because the line ends with \n + cx.view.doc.text().line_to_char(index + 1).saturating_sub(2) + }) + .map(|pos| Range::new(pos, pos)); + + let selection = Selection::new(positions.collect(), 0); + + cx.view.doc.set_selection(selection); +} + +pub fn move_line_start(cx: &mut Context) { + let lines = selection_lines(&cx.view.doc.state); + + let positions = lines + .into_iter() + .map(|index| { + // adjust all positions to the start of the line. + cx.view.doc.text().line_to_char(index) + }) + .map(|pos| Range::new(pos, pos)); + + let selection = Selection::new(positions.collect(), 0); + + cx.view.doc.set_selection(selection); +} + +pub fn move_next_word_start(cx: &mut Context) { + let pos = cx.view.doc.state.move_pos( + cx.view.doc.selection().cursor(), + Direction::Forward, + Granularity::Word, + cx.count, + ); + + cx.view.doc.set_selection(Selection::point(pos)); +} + +pub fn move_prev_word_start(cx: &mut Context) { + let pos = cx.view.doc.state.move_pos( + cx.view.doc.selection().cursor(), + Direction::Backward, + Granularity::Word, + cx.count, + ); + + cx.view.doc.set_selection(Selection::point(pos)); +} + +pub fn move_next_word_end(cx: &mut Context) { + let pos = State::move_next_word_end( + &cx.view.doc.text().slice(..), + cx.view.doc.selection().cursor(), + cx.count, + ); + + cx.view.doc.set_selection(Selection::point(pos)); +} + +pub fn move_file_start(cx: &mut Context) { + cx.view.doc.set_selection(Selection::point(0)); + + cx.view.doc.mode = Mode::Normal; +} + +pub fn move_file_end(cx: &mut Context) { + let text = &cx.view.doc.text(); + let last_line = text.line_to_char(text.len_lines().saturating_sub(2)); + cx.view.doc.set_selection(Selection::point(last_line)); + + cx.view.doc.mode = Mode::Normal; +} + +pub fn check_cursor_in_view(view: &View) -> bool { + let cursor = view.doc.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) { + return false; + } + true +} + +pub fn page_up(cx: &mut Context) { + if cx.view.first_line < PADDING { + return; + } + + cx.view.first_line = cx.view.first_line.saturating_sub(cx.view.size.1 as usize); + + if !check_cursor_in_view(cx.view) { + let text = cx.view.doc.text(); + let pos = text.line_to_char(cx.view.last_line().saturating_sub(PADDING)); + cx.view.doc.set_selection(Selection::point(pos)); + } +} + +pub fn page_down(cx: &mut Context) { + cx.view.first_line += cx.view.size.1 as usize + PADDING; + + if cx.view.first_line < cx.view.doc.text().len_lines() { + let text = cx.view.doc.text(); + let pos = text.line_to_char(cx.view.first_line as usize); + cx.view.doc.set_selection(Selection::point(pos)); + } +} + +pub fn half_page_up(cx: &mut Context) { + if cx.view.first_line < PADDING { + return; + } + + cx.view.first_line = cx + .view + .first_line + .saturating_sub(cx.view.size.1 as usize / 2); + + if !check_cursor_in_view(cx.view) { + let text = &cx.view.doc.text(); + let pos = text.line_to_char(cx.view.last_line() - PADDING); + cx.view.doc.set_selection(Selection::point(pos)); + } +} + +pub fn half_page_down(cx: &mut Context) { + let lines = cx.view.doc.text().len_lines(); + if cx.view.first_line < lines.saturating_sub(cx.view.size.1 as usize) { + cx.view.first_line += cx.view.size.1 as usize / 2; + } + if !check_cursor_in_view(cx.view) { + let text = cx.view.doc.text(); + let pos = text.line_to_char(cx.view.first_line as usize); + cx.view.doc.set_selection(Selection::point(pos)); + } +} +// avoid select by default by having a visual mode switch that makes movements into selects + +pub fn extend_char_left(cx: &mut Context) { + let selection = + cx.view + .doc + .state + .extend_selection(Direction::Backward, Granularity::Character, cx.count); + cx.view.doc.set_selection(selection); +} + +pub fn extend_char_right(cx: &mut Context) { + let selection = + cx.view + .doc + .state + .extend_selection(Direction::Forward, Granularity::Character, cx.count); + cx.view.doc.set_selection(selection); +} + +pub fn extend_line_up(cx: &mut Context) { + let selection = + cx.view + .doc + .state + .extend_selection(Direction::Backward, Granularity::Line, cx.count); + cx.view.doc.set_selection(selection); +} + +pub fn extend_line_down(cx: &mut Context) { + let selection = + cx.view + .doc + .state + .extend_selection(Direction::Forward, Granularity::Line, cx.count); + cx.view.doc.set_selection(selection); +} + +pub fn split_selection_on_newline(cx: &mut Context) { + let text = &cx.view.doc.text().slice(..); + // only compile the regex once + #[allow(clippy::trivial_regex)] + static REGEX: Lazy = Lazy::new(|| Regex::new(r"\n").unwrap()); + let selection = selection::split_on_matches(text, cx.view.doc.selection(), ®EX); + cx.view.doc.set_selection(selection); +} + +pub fn select_line(cx: &mut Context) { + // TODO: count + let pos = cx.view.doc.selection().primary(); + let text = cx.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); + + cx.view.doc.set_selection(Selection::single(start, end)); +} + +pub fn delete_selection(cx: &mut Context) { + let transaction = Transaction::change_by_selection(&cx.view.doc.state, |range| { + (range.from(), range.to() + 1, None) + }); + cx.view.doc.apply(&transaction); + + append_changes_to_history(cx); +} + +pub fn change_selection(cx: &mut Context) { + delete_selection(cx); + insert_mode(cx); +} + +pub fn collapse_selection(cx: &mut Context) { + let selection = cx + .view + .doc + .selection() + .transform(|range| Range::new(range.head, range.head)); + + cx.view.doc.set_selection(selection); +} + +pub fn flip_selections(cx: &mut Context) { + let selection = cx + .view + .doc + .selection() + .transform(|range| Range::new(range.head, range.anchor)); + + cx.view.doc.set_selection(selection); +} + +fn enter_insert_mode(cx: &mut Context) { + cx.view.doc.mode = Mode::Insert; + + append_changes_to_history(cx); +} +// inserts at the start of each selection +pub fn insert_mode(cx: &mut Context) { + enter_insert_mode(cx); + + let selection = cx + .view + .doc + .selection() + .transform(|range| Range::new(range.to(), range.from())); + cx.view.doc.set_selection(selection); +} + +// inserts at the end of each selection +pub fn append_mode(cx: &mut Context) { + enter_insert_mode(cx); + cx.view.doc.restore_cursor = true; + + // TODO: as transaction + let text = &cx.view.doc.text().slice(..); + let selection = cx.view.doc.selection().transform(|range| { + // TODO: to() + next char + Range::new( + range.from(), + graphemes::next_grapheme_boundary(text, range.to()), + ) + }); + cx.view.doc.set_selection(selection); +} + +// TODO: I, A, o and O can share a lot of the primitives. +pub fn command_mode(_cx: &mut Context) { + unimplemented!() +} + +// calculate line numbers for each selection range +fn selection_lines(state: &State) -> Vec { + let mut lines = state + .selection + .ranges() + .iter() + .map(|range| state.doc.char_to_line(range.head)) + .collect::>(); + + lines.sort_unstable(); // sorting by usize so _unstable is preferred + lines.dedup(); + + lines +} + +// I inserts at the start of each line with a selection +pub fn prepend_to_line(cx: &mut Context) { + enter_insert_mode(cx); + + move_line_start(cx); +} + +// A inserts at the end of each line with a selection +pub fn append_to_line(cx: &mut Context) { + enter_insert_mode(cx); + + move_line_end(cx); +} + +// o inserts a new line after each line with a selection +pub fn open_below(cx: &mut Context) { + enter_insert_mode(cx); + + let lines = selection_lines(&cx.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. + cx.view.doc.text().line_to_char(index + 1) + }) + .collect(); + + // TODO: use same logic as insert_newline for indentation + let changes = positions.iter().copied().map(|index| + // generate changes + (index, index, Some(Tendril::from_char('\n')))); + + // TODO: count actually inserts "n" new lines and starts editing on all of them. + // TODO: append "count" newlines and modify cursors to those lines + + let selection = Selection::new( + positions + .iter() + .copied() + .map(|pos| Range::new(pos, pos)) + .collect(), + 0, + ); + + let transaction = Transaction::change(&cx.view.doc.state, changes).with_selection(selection); + + cx.view.doc.apply(&transaction); +} + +// O inserts a new line before each line with a selection + +fn append_changes_to_history(cx: &mut Context) { + if cx.view.doc.changes.is_empty() { + return; + } + + let new_changeset = ChangeSet::new(cx.view.doc.text()); + let changes = std::mem::replace(&mut cx.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(cx.view.doc.selection().clone()); + + // increment document version + // TODO: needs to happen on undo/redo too + cx.view.doc.version += 1; + + // TODO: trigger lsp/documentDidChange with changes + + // HAXX: we need to reconstruct the state as it was before the changes.. + let old_state = std::mem::replace(&mut cx.view.doc.old_state, cx.view.doc.state.clone()); + // TODO: take transaction by value? + cx.view + .doc + .history + .commit_revision(&transaction, &old_state); + + // TODO: notify LSP of changes +} + +pub fn normal_mode(cx: &mut Context) { + cx.view.doc.mode = Mode::Normal; + + append_changes_to_history(cx); + + // if leaving append mode, move cursor back by 1 + if cx.view.doc.restore_cursor { + let text = &cx.view.doc.text().slice(..); + let selection = cx.view.doc.selection().transform(|range| { + Range::new( + range.from(), + graphemes::prev_grapheme_boundary(text, range.to()), + ) + }); + cx.view.doc.set_selection(selection); + + cx.view.doc.restore_cursor = false; + } +} + +pub fn goto_mode(cx: &mut Context) { + cx.view.doc.mode = Mode::Goto; +} + +// NOTE: Transactions in this module get appended to history when we switch back to normal mode. +pub mod insert { + use super::*; + // TODO: insert means add text just before cursor, on exit we should be on the last letter. + pub fn insert_char(cx: &mut Context, c: char) { + let c = Tendril::from_char(c); + let transaction = Transaction::insert(&cx.view.doc.state, c); + + cx.view.doc.apply(&transaction); + } + + pub fn insert_tab(cx: &mut Context) { + insert_char(cx, '\t'); + } + + pub fn insert_newline(cx: &mut Context) { + let transaction = Transaction::change_by_selection(&cx.view.doc.state, |range| { + let indent_level = helix_core::indent::suggested_indent_for_pos( + cx.view.doc.syntax.as_ref(), + &cx.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())) + }); + cx.view.doc.apply(&transaction); + } + + // TODO: handle indent-aware delete + pub fn delete_char_backward(cx: &mut Context) { + let text = &cx.view.doc.text().slice(..); + let transaction = Transaction::change_by_selection(&cx.view.doc.state, |range| { + ( + graphemes::nth_prev_grapheme_boundary(text, range.head, cx.count), + range.head, + None, + ) + }); + cx.view.doc.apply(&transaction); + } + + pub fn delete_char_forward(cx: &mut Context) { + let text = &cx.view.doc.text().slice(..); + let transaction = Transaction::change_by_selection(&cx.view.doc.state, |range| { + ( + range.head, + graphemes::nth_next_grapheme_boundary(text, range.head, cx.count), + None, + ) + }); + cx.view.doc.apply(&transaction); + } +} + +pub fn insert_char_prompt(prompt: &mut Prompt, c: char) { + prompt.insert_char(c); +} + +// Undo / Redo + +pub fn undo(cx: &mut Context) { + if let Some(revert) = cx.view.doc.history.undo() { + cx.view.doc.version += 1; + cx.view.doc.apply(&revert); + } + + // TODO: each command could simply return a Option, then the higher level handles storing it? +} + +pub fn redo(cx: &mut Context) { + if let Some(transaction) = cx.view.doc.history.redo() { + cx.view.doc.version += 1; + cx.view.doc.apply(&transaction); + } +} + +// Yank / Paste + +pub fn yank(cx: &mut Context) { + // TODO: should selections be made end inclusive? + let values = cx + .view + .doc + .state + .selection() + .fragments(&cx.view.doc.text().slice(..)) + .map(|cow| cow.into_owned()) + .collect(); + + // TODO: allow specifying reg + let reg = '"'; + register::set(reg, values); +} + +pub fn paste(cx: &mut Context) { + // TODO: allow specifying reg + let reg = '"'; + if let Some(values) = register::get(reg) { + let repeat = std::iter::repeat( + values + .last() + .map(|value| Tendril::from_slice(value)) + .unwrap(), + ); + + // TODO: if any of values ends \n it's linewise paste + // + // p => paste after + // P => paste before + // alt-p => paste every yanked selection after selected text + // alt-P => paste every yanked selection before selected text + // R => replace selected text with yanked text + // alt-R => replace selected text with every yanked text + // + // append => insert at next line + // insert => insert at start of line + // replace => replace + // default insert + + let linewise = values.iter().any(|value| value.ends_with('\n')); + + let mut values = values.into_iter().map(Tendril::from).chain(repeat); + + 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 = cx.view.doc.text(); + Transaction::change_by_selection(&cx.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(&cx.view.doc.state, |range| { + (range.head + 1, range.head + 1, Some(values.next().unwrap())) + }) + }; + + cx.view.doc.apply(&transaction); + append_changes_to_history(cx); + } +} + +fn get_lines(view: &View) -> Vec { + let mut lines = Vec::new(); + + // Get all line numbers + for range in view.doc.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) + } + } + lines.sort_unstable(); // sorting by usize so _unstable is preferred + lines.dedup(); + lines +} + +pub fn indent(cx: &mut Context) { + let lines = get_lines(cx.view); + + // Indent by one level + let indent = Tendril::from(" ".repeat(TAB_WIDTH)); + + let transaction = Transaction::change( + &cx.view.doc.state, + lines.into_iter().map(|line| { + let pos = cx.view.doc.text().line_to_char(line); + (pos, pos, Some(indent.clone())) + }), + ); + cx.view.doc.apply(&transaction); + append_changes_to_history(cx); +} + +pub fn unindent(cx: &mut Context) { + let lines = get_lines(cx.view); + let mut changes = Vec::with_capacity(lines.len()); + + for line_idx in lines { + let line = cx.view.doc.text().line(line_idx); + let mut width = 0; + + for ch in line.chars() { + match ch { + ' ' => width += 1, + '\t' => width = (width / TAB_WIDTH + 1) * TAB_WIDTH, + _ => break, + } + + if width >= TAB_WIDTH { + break; + } + } + + if width > 0 { + let start = cx.view.doc.text().line_to_char(line_idx); + changes.push((start, start + width, None)) + } + } + + let transaction = Transaction::change(&cx.view.doc.state, changes.into_iter()); + + cx.view.doc.apply(&transaction); + append_changes_to_history(cx); +} + +pub fn indent_selection(_cx: &mut Context) { + // loop over each line and recompute proper indentation + unimplemented!() +} + +// + +pub fn save(cx: &mut Context) { + // Spawns an async task to actually do the saving. This way we prevent blocking. + + // TODO: handle save errors somehow? + cx.executor.spawn(cx.view.doc.save()).detach(); +} -- cgit v1.2.3-70-g09d2 From ada3f92c5b96e4c66f5647c4ac2487f3903692b3 Mon Sep 17 00:00:00 2001 From: Blaž Hrastnik Date: Fri, 11 Dec 2020 18:25:09 +0900 Subject: wip: Getting the new prompt to render in a new layer. --- helix-term/src/application.rs | 182 +++++++++++++----------------------------- helix-term/src/commands.rs | 57 ++++++++++++- helix-term/src/compositor.rs | 36 ++++++--- helix-term/src/prompt.rs | 29 +++++-- 4 files changed, 159 insertions(+), 145 deletions(-) (limited to 'helix-term/src/commands.rs') diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs index 8c454b5d..35d698d1 100644 --- a/helix-term/src/application.rs +++ b/helix-term/src/application.rs @@ -42,16 +42,15 @@ type Terminal = tui::Terminal>; const BASE_WIDTH: u16 = 30; pub struct Application<'a> { - prompt: Option, - compositor: Compositor, + editor: Editor, renderer: Renderer, executor: &'a smol::Executor<'a>, language_server: helix_lsp::Client, } -pub(crate) struct Renderer { +pub struct Renderer { size: (u16, u16), terminal: Terminal, surface: Surface, @@ -263,6 +262,11 @@ impl Renderer { self.surface .set_string(1, self.size.1 - 2, mode, self.text_color); + if let Some(path) = view.doc.path() { + self.surface + .set_string(6, self.size.1 - 2, path.to_string_lossy(), self.text_color); + } + self.surface.set_string( self.size.0 - 10, self.size.1 - 2, @@ -271,7 +275,7 @@ impl Renderer { ); } - pub fn render_prompt(&mut self, view: &View, prompt: &Prompt, theme: &Theme) { + pub fn render_prompt(&mut self, prompt: &Prompt, theme: &Theme) { // completion if !prompt.completion.is_empty() { // TODO: find out better way of clearing individual lines of the screen @@ -343,15 +347,6 @@ impl Renderer { let pos = if let Some(prompt) = prompt { Position::new(self.size.0 as usize, 2 + prompt.cursor) } else { - if let Some(path) = view.doc.path() { - self.surface.set_string( - 6, - self.size.1 - 1, - path.to_string_lossy(), - self.text_color, - ); - } - let cursor = view.doc.state.selection().cursor(); let mut pos = view @@ -367,146 +362,77 @@ impl Renderer { } struct EditorView { - editor: Editor, - prompt: Option, // TODO: this is None for now, make a layer keymap: Keymaps, } impl EditorView { - fn new(editor: Editor) -> Self { + fn new() -> Self { Self { - editor, - prompt: None, keymap: keymap::default(), } } } +use crate::compositor::Context; + impl Component for EditorView { - fn handle_event(&mut self, event: Event, executor: &smol::Executor) -> EventResult { + fn handle_event(&mut self, event: Event, cx: &mut Context) -> EventResult { match event { Event::Resize(width, height) => { // TODO: simplistic ensure cursor in view for now // TODO: loop over views - if let Some(view) = self.editor.view_mut() { + if let Some(view) = cx.editor.view_mut() { view.size = (width, height); view.ensure_cursor_in_view() }; EventResult::Consumed(None) } Event::Key(event) => { - if let Some(view) = self.editor.view_mut() { + if let Some(view) = cx.editor.view_mut() { let keys = vec![event]; // TODO: sequences (`gg`) + let mode = view.doc.mode(); // TODO: handle count other than 1 - match view.doc.mode() { + let mut cx = commands::Context { + view, + executor: cx.executor, + count: 1, + callback: None, + }; + + match mode { Mode::Insert => { if let Some(command) = self.keymap[&Mode::Insert].get(&keys) { - let mut cx = commands::Context { - view, - executor, - count: 1, - }; - command(&mut cx); } else if let KeyEvent { code: KeyCode::Char(c), .. } = event { - let mut cx = commands::Context { - view, - executor, - count: 1, - }; commands::insert::insert_char(&mut cx, c); } - view.ensure_cursor_in_view(); } Mode::Normal => { - if let &[KeyEvent { - code: KeyCode::Char(':'), - .. - }] = keys.as_slice() - { - let prompt = Prompt::new( - ":".to_owned(), - |_input: &str| { - // TODO: i need this duplicate list right now to avoid borrow checker issues - let command_list = vec![ - String::from("q"), - String::from("aaa"), - String::from("bbb"), - String::from("ccc"), - String::from("ddd"), - String::from("eee"), - String::from("averylongcommandaverylongcommandaverylongcommandaverylongcommandaverylongcommand"), - String::from("q"), - String::from("aaa"), - String::from("bbb"), - String::from("ccc"), - String::from("ddd"), - String::from("eee"), - String::from("q"), - String::from("aaa"), - String::from("bbb"), - String::from("ccc"), - String::from("ddd"), - String::from("eee"), - String::from("q"), - String::from("aaa"), - String::from("bbb"), - String::from("ccc"), - String::from("ddd"), - String::from("eee"), - String::from("q"), - String::from("aaa"), - String::from("bbb"), - String::from("ccc"), - String::from("ddd"), - String::from("eee"), - ]; - command_list - .into_iter() - .filter(|command| command.contains(_input)) - .collect() - }, // completion - |editor: &mut Editor, input: &str| match input { - "q" => editor.should_close = true, - _ => (), - }, - ); - - self.prompt = Some(prompt); - - // HAXX: special casing for command mode - } else if let Some(command) = self.keymap[&Mode::Normal].get(&keys) { - let mut cx = commands::Context { - view, - executor, - count: 1, - }; + if let Some(command) = self.keymap[&Mode::Normal].get(&keys) { command(&mut cx); // TODO: simplistic ensure cursor in view for now - view.ensure_cursor_in_view(); } } mode => { if let Some(command) = self.keymap[&mode].get(&keys) { - let mut cx = commands::Context { - view, - executor, - count: 1, - }; command(&mut cx); // TODO: simplistic ensure cursor in view for now - view.ensure_cursor_in_view(); } } } - EventResult::Consumed(None) + // appease borrowck + let callback = cx.callback.take(); + + view.ensure_cursor_in_view(); + + EventResult::Consumed(callback) } else { EventResult::Ignored } @@ -514,19 +440,19 @@ impl Component for EditorView { Event::Mouse(_) => EventResult::Ignored, } } - fn render(&mut self, renderer: &mut Renderer) { + fn render(&mut self, renderer: &mut Renderer, cx: &mut Context) { const OFFSET: u16 = 7; // 1 diagnostic + 5 linenr + 1 gutter let viewport = Rect::new(OFFSET, 0, renderer.size.0, renderer.size.1 - 2); // - 2 for statusline and prompt // SAFETY: we cheat around the view_mut() borrow because it doesn't allow us to also borrow // theme. Theme is immutable mutating view won't disrupt theme_ref. - let theme_ref = unsafe { &*(&self.editor.theme as *const Theme) }; - if let Some(view) = self.editor.view_mut() { + let theme_ref = unsafe { &*(&cx.editor.theme as *const Theme) }; + if let Some(view) = cx.editor.view_mut() { renderer.render_view(view, viewport, theme_ref); } // TODO: drop unwrap - renderer.render_cursor(self.editor.view().unwrap(), self.prompt.as_ref(), viewport); + renderer.render_cursor(cx.editor.view().unwrap(), None, viewport); } } @@ -540,11 +466,12 @@ impl<'a> Application<'a> { } let mut compositor = Compositor::new(); - compositor.push(Box::new(EditorView::new(editor))); + compositor.push(Box::new(EditorView::new())); let language_server = helix_lsp::Client::start(&executor, "rust-analyzer", &[]); let mut app = Self { + editor, renderer, // TODO; move to state compositor, @@ -558,7 +485,11 @@ impl<'a> Application<'a> { fn render(&mut self) { self.renderer.surface.reset(); // reset is faster than allocating new empty surface - self.compositor.render(&mut self.renderer); // viewport, + let mut cx = crate::compositor::Context { + editor: &mut self.editor, + executor: &self.executor, + }; + self.compositor.render(&mut self.renderer, &mut cx); // viewport, self.renderer.draw_and_swap(); } @@ -569,17 +500,16 @@ impl<'a> Application<'a> { self.language_server.initialize().await.unwrap(); // TODO: temp // self.language_server - // .text_document_did_open(&self.editor.view().unwrap().doc) + // .text_document_did_open(&cx.editor.view().unwrap().doc) // .await // .unwrap(); self.render(); loop { - // TODO: - // if self.editor.should_close { - // break; - // } + if self.editor.should_close { + break; + } use futures_util::{select, FutureExt}; select! { @@ -594,26 +524,26 @@ impl<'a> Application<'a> { } pub fn handle_terminal_events(&mut self, event: Option>) { + let mut cx = crate::compositor::Context { + editor: &mut self.editor, + executor: &self.executor, + }; // Handle key events - match event { + let should_redraw = match event { Some(Ok(Event::Resize(width, height))) => { self.renderer.resize(width, height); - // TODO: use the response self.compositor - .handle_event(Event::Resize(width, height), self.executor); - - self.render(); - } - Some(Ok(event)) => { - // TODO: use the response - self.compositor.handle_event(event, self.executor); - - self.render(); + .handle_event(Event::Resize(width, height), &mut cx) } + Some(Ok(event)) => self.compositor.handle_event(event, &mut cx), Some(Err(x)) => panic!(x), None => panic!(), }; + + if should_redraw { + self.render(); + } } pub async fn handle_language_server_message(&mut self, call: Option) { diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index a791f243..04482ef7 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -9,17 +9,21 @@ use helix_core::{ use once_cell::sync::Lazy; +use crate::compositor::Compositor; use crate::prompt::Prompt; use helix_view::{ document::Mode, view::{View, PADDING}, + Editor, }; pub struct Context<'a, 'b> { pub count: usize, pub view: &'a mut View, pub executor: &'a smol::Executor<'b>, + + pub callback: Option, } /// A command is a function that takes the current state and a count, and does a side-effect on the @@ -333,8 +337,57 @@ pub fn append_mode(cx: &mut Context) { } // TODO: I, A, o and O can share a lot of the primitives. -pub fn command_mode(_cx: &mut Context) { - unimplemented!() +pub fn command_mode(cx: &mut Context) { + cx.callback = Some(Box::new(|compositor: &mut Compositor| { + let prompt = Prompt::new( + ":".to_owned(), + |_input: &str| { + // TODO: i need this duplicate list right now to avoid borrow checker issues + let command_list = vec![ + String::from("q"), + String::from("aaa"), + String::from("bbb"), + String::from("ccc"), + String::from("ddd"), + String::from("eee"), + String::from("averylongcommandaverylongcommandaverylongcommandaverylongcommandaverylongcommand"), + String::from("q"), + String::from("aaa"), + String::from("bbb"), + String::from("ccc"), + String::from("ddd"), + String::from("eee"), + String::from("q"), + String::from("aaa"), + String::from("bbb"), + String::from("ccc"), + String::from("ddd"), + String::from("eee"), + String::from("q"), + String::from("aaa"), + String::from("bbb"), + String::from("ccc"), + String::from("ddd"), + String::from("eee"), + String::from("q"), + String::from("aaa"), + String::from("bbb"), + String::from("ccc"), + String::from("ddd"), + String::from("eee"), + ]; + command_list + .into_iter() + .filter(|command| command.contains(_input)) + .collect() + }, // completion + |editor: &mut Editor, input: &str| match input { + "q" => editor.should_close = true, + _ => (), + }, + ); + compositor.push(Box::new(prompt)); + })); } // calculate line numbers for each selection range diff --git a/helix-term/src/compositor.rs b/helix-term/src/compositor.rs index 158a8b28..3cf6bf03 100644 --- a/helix-term/src/compositor.rs +++ b/helix-term/src/compositor.rs @@ -18,7 +18,7 @@ use crossterm::event::Event; use smol::Executor; use tui::buffer::Buffer as Surface; -pub(crate) type Callback = Box; +pub type Callback = Box; // --> EventResult should have a callback that takes a context with methods like .popup(), // .prompt() etc. That way we can abstract it from the renderer. @@ -29,14 +29,21 @@ pub(crate) type Callback = Box; // If Compositor was specified in the callback that's then problematic because of // Cursive-inspired -pub(crate) enum EventResult { +pub enum EventResult { Ignored, Consumed(Option), } -pub(crate) trait Component { +use helix_view::{Editor, View}; +// shared with commands.rs +pub struct Context<'a, 'b> { + pub editor: &'a mut Editor, + pub executor: &'a smol::Executor<'b>, +} + +pub trait Component { /// Process input events, return true if handled. - fn handle_event(&mut self, event: Event, executor: &Executor) -> EventResult; + fn handle_event(&mut self, event: Event, ctx: &mut Context) -> EventResult; // , args: () /// Should redraw? Useful for saving redraw cycles if we know component didn't change. @@ -44,7 +51,7 @@ pub(crate) trait Component { true } - fn render(&mut self, renderer: &mut Renderer); + fn render(&mut self, renderer: &mut Renderer, ctx: &mut Context); } // struct Editor { }; @@ -94,7 +101,7 @@ pub(crate) trait Component { // // 2) Alternatively, //} -pub(crate) struct Compositor { +pub struct Compositor { layers: Vec>, } @@ -111,17 +118,24 @@ impl Compositor { self.layers.pop(); } - pub fn handle_event(&mut self, event: Event, executor: &Executor) -> () { + pub fn handle_event(&mut self, event: Event, cx: &mut Context) -> bool { // TODO: custom focus if let Some(layer) = self.layers.last_mut() { - layer.handle_event(event, executor); - // return should_update + return match layer.handle_event(event, cx) { + EventResult::Consumed(Some(callback)) => { + callback(self); + true + } + EventResult::Consumed(None) => true, + EventResult::Ignored => false, + }; } + false } - pub fn render(&mut self, renderer: &mut Renderer) { + pub fn render(&mut self, renderer: &mut Renderer, cx: &mut Context) { for layer in &mut self.layers { - layer.render(renderer) + layer.render(renderer, cx) } } } diff --git a/helix-term/src/prompt.rs b/helix-term/src/prompt.rs index 4a39f2ec..689eac66 100644 --- a/helix-term/src/prompt.rs +++ b/helix-term/src/prompt.rs @@ -1,5 +1,9 @@ -use crate::Editor; -use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; +use crate::{ + application::Renderer, + compositor::{Component, Context, EventResult}, +}; +use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers}; +use helix_view::Editor; use std::string::String; pub struct Prompt { @@ -79,9 +83,16 @@ impl Prompt { pub fn exit_selection(&mut self) { self.completion_selection_index = None; } +} + +impl Component for Prompt { + fn handle_event(&mut self, event: Event, cx: &mut Context) -> EventResult { + let event = match event { + Event::Key(event) => event, + _ => return EventResult::Ignored, + }; - pub fn handle_event(&mut self, key_event: KeyEvent, editor: &mut Editor) { - match key_event { + match event { KeyEvent { code: KeyCode::Char(c), modifiers: KeyModifiers::NONE, @@ -112,7 +123,7 @@ impl Prompt { KeyEvent { code: KeyCode::Enter, .. - } => (self.callback_fn)(editor, &self.line), + } => (self.callback_fn)(cx.editor, &self.line), KeyEvent { code: KeyCode::Tab, .. } => self.change_completion_selection(), @@ -121,6 +132,12 @@ impl Prompt { modifiers: KeyModifiers::CONTROL, } => self.exit_selection(), _ => (), - } + }; + + EventResult::Consumed(None) + } + + fn render(&mut self, renderer: &mut Renderer, cx: &mut Context) { + renderer.render_prompt(self, &cx.editor.theme) } } -- cgit v1.2.3-70-g09d2 From 7dc24a25ba148a9cd7c936e02cc03873ed6a467b Mon Sep 17 00:00:00 2001 From: Blaž Hrastnik Date: Sun, 13 Dec 2020 13:35:30 +0900 Subject: Move ui modules under a ui:: namespace. --- helix-term/src/application.rs | 33 ++--- helix-term/src/commands.rs | 2 +- helix-term/src/editor_view.rs | 327 ------------------------------------------ helix-term/src/helix.log | 0 helix-term/src/main.rs | 3 +- helix-term/src/prompt.rs | 211 --------------------------- helix-term/src/ui/editor.rs | 327 ++++++++++++++++++++++++++++++++++++++++++ helix-term/src/ui/mod.rs | 14 ++ helix-term/src/ui/prompt.rs | 212 +++++++++++++++++++++++++++ 9 files changed, 564 insertions(+), 565 deletions(-) delete mode 100644 helix-term/src/editor_view.rs create mode 100644 helix-term/src/helix.log delete mode 100644 helix-term/src/prompt.rs create mode 100644 helix-term/src/ui/editor.rs create mode 100644 helix-term/src/ui/mod.rs create mode 100644 helix-term/src/ui/prompt.rs (limited to 'helix-term/src/commands.rs') diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs index c25871c7..dc37612a 100644 --- a/helix-term/src/application.rs +++ b/helix-term/src/application.rs @@ -2,9 +2,8 @@ use clap::ArgMatches as Args; use helix_view::{document::Mode, Document, Editor, Theme, View}; -use crate::compositor::{Component, Compositor, EventResult}; -use crate::editor_view::EditorView; -use crate::prompt::Prompt; +use crate::compositor::Compositor; +use crate::ui; use log::{debug, info}; @@ -19,18 +18,11 @@ use smol::prelude::*; use anyhow::Error; use crossterm::{ - cursor, - event::{read, Event, EventStream, KeyCode, KeyEvent}, - execute, queue, - terminal::{self, disable_raw_mode, enable_raw_mode}, + event::{Event, EventStream}, + execute, terminal, }; -use tui::{ - backend::CrosstermBackend, - buffer::Buffer as Surface, - layout::Rect, - style::{Color, Modifier, Style}, -}; +use tui::{backend::CrosstermBackend, layout::Rect}; type Terminal = crate::terminal::Terminal>; @@ -43,12 +35,6 @@ pub struct Application { language_server: helix_lsp::Client, } -// TODO: temp -#[inline(always)] -pub fn text_color() -> Style { - Style::default().fg(Color::Rgb(219, 191, 239)) // lilac -} - impl Application { pub fn new(mut args: Args, executor: &'static smol::Executor<'static>) -> Result { let backend = CrosstermBackend::new(stdout()); @@ -61,14 +47,13 @@ impl Application { } let mut compositor = Compositor::new(); - compositor.push(Box::new(EditorView::new())); + compositor.push(Box::new(ui::EditorView::new())); let language_server = helix_lsp::Client::start(&executor, "rust-analyzer", &[]); let mut app = Self { editor, terminal, - // TODO; move to state compositor, executor, @@ -213,7 +198,7 @@ impl Application { } pub async fn run(&mut self) -> Result<(), Error> { - enable_raw_mode()?; + terminal::enable_raw_mode()?; let mut stdout = stdout(); @@ -223,7 +208,7 @@ impl Application { let hook = std::panic::take_hook(); std::panic::set_hook(Box::new(move |info| { execute!(std::io::stdout(), terminal::LeaveAlternateScreen); - disable_raw_mode(); + terminal::disable_raw_mode(); hook(info); })); @@ -234,7 +219,7 @@ impl Application { execute!(stdout, terminal::LeaveAlternateScreen)?; - disable_raw_mode()?; + terminal::disable_raw_mode()?; Ok(()) } diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index 04482ef7..b345d2e8 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -10,7 +10,7 @@ use helix_core::{ use once_cell::sync::Lazy; use crate::compositor::Compositor; -use crate::prompt::Prompt; +use crate::ui::Prompt; use helix_view::{ document::Mode, diff --git a/helix-term/src/editor_view.rs b/helix-term/src/editor_view.rs deleted file mode 100644 index b778e79b..00000000 --- a/helix-term/src/editor_view.rs +++ /dev/null @@ -1,327 +0,0 @@ -use crate::application::text_color; -use crate::commands; -use crate::compositor::{Component, Compositor, EventResult}; -use crate::keymap::{self, Keymaps}; -use crossterm::{ - cursor, - event::{read, Event, EventStream, KeyCode, KeyEvent}, -}; -use helix_view::{document::Mode, Document, Editor, Theme, View}; -use std::borrow::Cow; -use tui::{ - backend::CrosstermBackend, - buffer::Buffer as Surface, - layout::Rect, - style::{Color, Modifier, Style}, -}; - -use helix_core::{indent::TAB_WIDTH, syntax::HighlightEvent, Position, Range, State}; - -pub struct EditorView { - keymap: Keymaps, -} - -const OFFSET: u16 = 7; // 1 diagnostic + 5 linenr + 1 gutter - -impl EditorView { - pub fn new() -> Self { - Self { - keymap: keymap::default(), - } - } - pub fn render_view( - &self, - view: &mut View, - viewport: Rect, - surface: &mut Surface, - theme: &Theme, - ) { - let area = Rect::new(OFFSET, 0, viewport.width - OFFSET, viewport.height - 2); // - 2 for statusline and prompt - self.render_buffer(view, area, surface, theme); - let area = Rect::new(0, viewport.height - 2, viewport.width, 1); - self.render_statusline(view, area, surface, theme); - } - - // TODO: ideally not &mut View but highlights require it because of cursor cache - pub fn render_buffer( - &self, - view: &mut View, - viewport: Rect, - surface: &mut Surface, - theme: &Theme, - ) { - // clear with background color - surface.set_style(viewport, theme.get("ui.background")); - - // TODO: inefficient, should feed chunks.iter() to tree_sitter.parse_with(|offset, pos|) - let source_code = view.doc.text().to_string(); - - let last_line = view.last_line(); - - let range = { - // calculate viewport byte ranges - let start = view.doc.text().line_to_byte(view.first_line); - let end = view.doc.text().line_to_byte(last_line) - + view.doc.text().line(last_line).len_bytes(); - - start..end - }; - - // TODO: range doesn't actually restrict source, just highlight range - // TODO: cache highlight results - // TODO: only recalculate when state.doc is actually modified - let highlights: Vec<_> = match view.doc.syntax.as_mut() { - Some(syntax) => { - syntax - .highlight_iter(source_code.as_bytes(), Some(range), None, |_| None) - .unwrap() - .collect() // TODO: we collect here to avoid double borrow, fix later - } - None => vec![Ok(HighlightEvent::Source { - start: range.start, - end: range.end, - })], - }; - let mut spans = Vec::new(); - let mut visual_x = 0; - let mut line = 0u16; - let visible_selections: Vec = view - .doc - .state - .selection() - .ranges() - .iter() - // TODO: limit selection to one in viewport - // .filter(|range| !range.is_empty()) // && range.overlaps(&Range::new(start, end + 1)) - .copied() - .collect(); - - 'outer: for event in highlights { - match event.unwrap() { - HighlightEvent::HighlightStart(span) => { - spans.push(span); - } - HighlightEvent::HighlightEnd => { - spans.pop(); - } - HighlightEvent::Source { start, end } => { - // TODO: filter out spans out of viewport for now.. - - let start = view.doc.text().byte_to_char(start); - let end = view.doc.text().byte_to_char(end); // <-- index 744, len 743 - - let text = view.doc.text().slice(start..end); - - use helix_core::graphemes::{grapheme_width, RopeGraphemes}; - - let style = match spans.first() { - Some(span) => theme.get(theme.scopes()[span.0].as_str()), - None => Style::default().fg(Color::Rgb(164, 160, 232)), // lavender - }; - - // TODO: we could render the text to a surface, then cache that, that - // way if only the selection/cursor changes we can copy from cache - // and paint the new cursor. - - let mut char_index = start; - - // iterate over range char by char - for grapheme in RopeGraphemes::new(&text) { - // TODO: track current char_index - - if grapheme == "\n" { - visual_x = 0; - line += 1; - - // TODO: with proper iter this shouldn't be necessary - if line >= viewport.height { - break 'outer; - } - } else if grapheme == "\t" { - visual_x += (TAB_WIDTH as u16); - } else { - // Cow will prevent allocations if span contained in a single slice - // which should really be the majority case - let grapheme = Cow::from(grapheme); - let width = grapheme_width(&grapheme) as u16; - - // TODO: this should really happen as an after pass - let style = if visible_selections - .iter() - .any(|range| range.contains(char_index)) - { - // cedar - style.clone().bg(Color::Rgb(128, 47, 0)) - } else { - style - }; - - let style = if visible_selections - .iter() - .any(|range| range.head == char_index) - { - style.clone().bg(Color::Rgb(255, 255, 255)) - } else { - style - }; - - // ugh, improve with a traverse method - // or interleave highlight spans with selection and diagnostic spans - let style = if view.doc.diagnostics.iter().any(|diagnostic| { - diagnostic.range.0 <= char_index && diagnostic.range.1 > char_index - }) { - style.clone().add_modifier(Modifier::UNDERLINED) - } else { - style - }; - - // TODO: paint cursor heads except primary - - surface.set_string( - viewport.x + visual_x, - viewport.y + line, - grapheme, - style, - ); - - visual_x += width; - } - - char_index += 1; - } - } - } - } - - let style: Style = theme.get("ui.linenr"); - let warning: Style = theme.get("warning"); - let last_line = view.last_line(); - for (i, line) in (view.first_line..last_line).enumerate() { - if view.doc.diagnostics.iter().any(|d| d.line == line) { - surface.set_stringn(0, i as u16, "●", 1, warning); - } - - surface.set_stringn(1, i as u16, format!("{:>5}", line + 1), 5, style); - } - } - - pub fn render_statusline( - &self, - view: &View, - viewport: Rect, - surface: &mut Surface, - theme: &Theme, - ) { - let mode = match view.doc.mode() { - Mode::Insert => "INS", - Mode::Normal => "NOR", - Mode::Goto => "GOTO", - }; - // statusline - surface.set_style( - Rect::new(0, viewport.y, viewport.width, 1), - theme.get("ui.statusline"), - ); - surface.set_string(1, viewport.y, mode, text_color()); - - if let Some(path) = view.doc.path() { - surface.set_string(6, viewport.y, path.to_string_lossy(), text_color()); - } - - surface.set_string( - viewport.width - 10, - viewport.y, - format!("{}", view.doc.diagnostics.len()), - text_color(), - ); - } -} - -use crate::compositor::Context; - -impl Component for EditorView { - fn handle_event(&mut self, event: Event, cx: &mut Context) -> EventResult { - match event { - Event::Resize(width, height) => { - // TODO: simplistic ensure cursor in view for now - // TODO: loop over views - if let Some(view) = cx.editor.view_mut() { - view.size = (width, height); - view.ensure_cursor_in_view() - }; - EventResult::Consumed(None) - } - Event::Key(event) => { - if let Some(view) = cx.editor.view_mut() { - let keys = vec![event]; - // TODO: sequences (`gg`) - let mode = view.doc.mode(); - // TODO: handle count other than 1 - let mut cx = commands::Context { - view, - executor: cx.executor, - count: 1, - callback: None, - }; - - match mode { - Mode::Insert => { - if let Some(command) = self.keymap[&Mode::Insert].get(&keys) { - command(&mut cx); - } else if let KeyEvent { - code: KeyCode::Char(c), - .. - } = event - { - commands::insert::insert_char(&mut cx, c); - } - } - mode => { - if let Some(command) = self.keymap[&mode].get(&keys) { - command(&mut cx); - - // TODO: simplistic ensure cursor in view for now - } - } - } - // appease borrowck - let callback = cx.callback.take(); - - view.ensure_cursor_in_view(); - - EventResult::Consumed(callback) - } else { - EventResult::Ignored - } - } - Event::Mouse(_) => EventResult::Ignored, - } - } - - fn render(&self, area: Rect, surface: &mut Surface, cx: &mut Context) { - // SAFETY: we cheat around the view_mut() borrow because it doesn't allow us to also borrow - // theme. Theme is immutable mutating view won't disrupt theme_ref. - let theme_ref = unsafe { &*(&cx.editor.theme as *const Theme) }; - if let Some(view) = cx.editor.view_mut() { - self.render_view(view, area, surface, theme_ref); - } - - // TODO: drop unwrap - } - - fn cursor_position(&self, area: Rect, ctx: &mut Context) -> Option { - // match view.doc.mode() { - // Mode::Insert => write!(stdout, "\x1B[6 q"), - // mode => write!(stdout, "\x1B[2 q"), - // }; - let view = ctx.editor.view().unwrap(); - let cursor = view.doc.state.selection().cursor(); - - let mut pos = view - .screen_coords_at_pos(&view.doc.text().slice(..), cursor) - .expect("Cursor is out of bounds."); - pos.col += area.x as usize + OFFSET as usize; - pos.row += area.y as usize; - Some(pos) - } -} diff --git a/helix-term/src/helix.log b/helix-term/src/helix.log new file mode 100644 index 00000000..e69de29b diff --git a/helix-term/src/main.rs b/helix-term/src/main.rs index 63fbe52d..f350b4c1 100644 --- a/helix-term/src/main.rs +++ b/helix-term/src/main.rs @@ -3,10 +3,9 @@ mod application; mod commands; mod compositor; -mod editor_view; mod keymap; -mod prompt; mod terminal; +mod ui; use application::Application; diff --git a/helix-term/src/prompt.rs b/helix-term/src/prompt.rs deleted file mode 100644 index 7f473ebc..00000000 --- a/helix-term/src/prompt.rs +++ /dev/null @@ -1,211 +0,0 @@ -use crate::compositor::{Component, Context, EventResult}; -use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers}; -use helix_core::Position; -use helix_view::Editor; -use helix_view::Theme; -use std::string::String; - -pub struct Prompt { - pub prompt: String, - pub line: String, - pub cursor: usize, - pub completion: Vec, - pub should_close: bool, - pub completion_selection_index: Option, - completion_fn: Box Vec>, - callback_fn: Box, -} - -impl Prompt { - pub fn new( - prompt: String, - mut completion_fn: impl FnMut(&str) -> Vec + 'static, - callback_fn: impl FnMut(&mut Editor, &str) + 'static, - ) -> Prompt { - Prompt { - prompt, - line: String::new(), - cursor: 0, - completion: completion_fn(""), - should_close: false, - completion_selection_index: None, - completion_fn: Box::new(completion_fn), - callback_fn: Box::new(callback_fn), - } - } - - pub fn insert_char(&mut self, c: char) { - self.line.insert(self.cursor, c); - self.cursor += 1; - self.completion = (self.completion_fn)(&self.line); - self.exit_selection(); - } - - pub fn move_char_left(&mut self) { - if self.cursor > 0 { - self.cursor -= 1; - } - } - - pub fn move_char_right(&mut self) { - if self.cursor < self.line.len() { - self.cursor += 1; - } - } - - pub fn move_start(&mut self) { - self.cursor = 0; - } - - pub fn move_end(&mut self) { - self.cursor = self.line.len(); - } - - pub fn delete_char_backwards(&mut self) { - if self.cursor > 0 { - self.line.remove(self.cursor - 1); - self.cursor -= 1; - self.completion = (self.completion_fn)(&self.line); - } - self.exit_selection(); - } - - pub fn change_completion_selection(&mut self) { - if self.completion.is_empty() { - return; - } - let index = - self.completion_selection_index.map(|i| i + 1).unwrap_or(0) % self.completion.len(); - self.completion_selection_index = Some(index); - self.line = self.completion[index].clone(); - } - pub fn exit_selection(&mut self) { - self.completion_selection_index = None; - } -} - -use tui::{ - buffer::Buffer as Surface, - layout::Rect, - style::{Color, Modifier, Style}, -}; - -const BASE_WIDTH: u16 = 30; -use crate::application::text_color; - -impl Prompt { - pub fn render_prompt(&self, area: Rect, surface: &mut Surface, theme: &Theme) { - // completion - if !self.completion.is_empty() { - // TODO: find out better way of clearing individual lines of the screen - let mut row = 0; - let mut col = 0; - let max_col = area.width / BASE_WIDTH; - let col_height = ((self.completion.len() as u16 + max_col - 1) / max_col); - - for i in (3..col_height + 3) { - surface.set_string( - 0, - area.height - i as u16, - " ".repeat(area.width as usize), - text_color(), - ); - } - surface.set_style( - Rect::new(0, area.height - col_height - 2, area.width, col_height), - theme.get("ui.statusline"), - ); - for (i, command) in self.completion.iter().enumerate() { - let color = if self.completion_selection_index.is_some() - && i == self.completion_selection_index.unwrap() - { - Style::default().bg(Color::Rgb(104, 060, 232)) - } else { - text_color() - }; - surface.set_stringn( - 1 + col * BASE_WIDTH, - area.height - col_height - 2 + row, - &command, - BASE_WIDTH as usize - 1, - color, - ); - row += 1; - if row > col_height - 1 { - row = 0; - col += 1; - } - if col > max_col { - break; - } - } - } - // render buffer text - surface.set_string(1, area.height - 1, &self.prompt, text_color()); - surface.set_string(2, area.height - 1, &self.line, text_color()); - } -} - -impl Component for Prompt { - fn handle_event(&mut self, event: Event, cx: &mut Context) -> EventResult { - let event = match event { - Event::Key(event) => event, - _ => return EventResult::Ignored, - }; - - match event { - KeyEvent { - code: KeyCode::Char(c), - modifiers: KeyModifiers::NONE, - } => self.insert_char(c), - KeyEvent { - code: KeyCode::Esc, .. - } => self.should_close = true, - KeyEvent { - code: KeyCode::Right, - .. - } => self.move_char_right(), - KeyEvent { - code: KeyCode::Left, - .. - } => self.move_char_left(), - KeyEvent { - code: KeyCode::Char('e'), - modifiers: KeyModifiers::CONTROL, - } => self.move_end(), - KeyEvent { - code: KeyCode::Char('a'), - modifiers: KeyModifiers::CONTROL, - } => self.move_start(), - KeyEvent { - code: KeyCode::Backspace, - modifiers: KeyModifiers::NONE, - } => self.delete_char_backwards(), - KeyEvent { - code: KeyCode::Enter, - .. - } => (self.callback_fn)(cx.editor, &self.line), - KeyEvent { - code: KeyCode::Tab, .. - } => self.change_completion_selection(), - KeyEvent { - code: KeyCode::Char('q'), - modifiers: KeyModifiers::CONTROL, - } => self.exit_selection(), - _ => (), - }; - - EventResult::Consumed(None) - } - - fn render(&self, area: Rect, surface: &mut Surface, cx: &mut Context) { - self.render_prompt(area, surface, &cx.editor.theme) - } - - fn cursor_position(&self, area: Rect, ctx: &mut Context) -> Option { - Some(Position::new( - area.height as usize - 1, - area.x as usize + 2 + self.cursor, - )) - } -} diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs new file mode 100644 index 00000000..ceb5a442 --- /dev/null +++ b/helix-term/src/ui/editor.rs @@ -0,0 +1,327 @@ +use crate::commands; +use crate::compositor::{Component, Compositor, Context, EventResult}; +use crate::keymap::{self, Keymaps}; +use crate::ui::text_color; + +use helix_core::{indent::TAB_WIDTH, syntax::HighlightEvent, Position, Range, State}; +use helix_view::{document::Mode, Document, Editor, Theme, View}; +use std::borrow::Cow; + +use crossterm::{ + cursor, + event::{read, Event, EventStream, KeyCode, KeyEvent}, +}; +use tui::{ + backend::CrosstermBackend, + buffer::Buffer as Surface, + layout::Rect, + style::{Color, Modifier, Style}, +}; + +pub struct EditorView { + keymap: Keymaps, +} + +const OFFSET: u16 = 7; // 1 diagnostic + 5 linenr + 1 gutter + +impl EditorView { + pub fn new() -> Self { + Self { + keymap: keymap::default(), + } + } + pub fn render_view( + &self, + view: &mut View, + viewport: Rect, + surface: &mut Surface, + theme: &Theme, + ) { + let area = Rect::new(OFFSET, 0, viewport.width - OFFSET, viewport.height - 2); // - 2 for statusline and prompt + self.render_buffer(view, area, surface, theme); + let area = Rect::new(0, viewport.height - 2, viewport.width, 1); + self.render_statusline(view, area, surface, theme); + } + + // TODO: ideally not &mut View but highlights require it because of cursor cache + pub fn render_buffer( + &self, + view: &mut View, + viewport: Rect, + surface: &mut Surface, + theme: &Theme, + ) { + // clear with background color + surface.set_style(viewport, theme.get("ui.background")); + + // TODO: inefficient, should feed chunks.iter() to tree_sitter.parse_with(|offset, pos|) + let source_code = view.doc.text().to_string(); + + let last_line = view.last_line(); + + let range = { + // calculate viewport byte ranges + let start = view.doc.text().line_to_byte(view.first_line); + let end = view.doc.text().line_to_byte(last_line) + + view.doc.text().line(last_line).len_bytes(); + + start..end + }; + + // TODO: range doesn't actually restrict source, just highlight range + // TODO: cache highlight results + // TODO: only recalculate when state.doc is actually modified + let highlights: Vec<_> = match view.doc.syntax.as_mut() { + Some(syntax) => { + syntax + .highlight_iter(source_code.as_bytes(), Some(range), None, |_| None) + .unwrap() + .collect() // TODO: we collect here to avoid double borrow, fix later + } + None => vec![Ok(HighlightEvent::Source { + start: range.start, + end: range.end, + })], + }; + let mut spans = Vec::new(); + let mut visual_x = 0; + let mut line = 0u16; + let visible_selections: Vec = view + .doc + .state + .selection() + .ranges() + .iter() + // TODO: limit selection to one in viewport + // .filter(|range| !range.is_empty()) // && range.overlaps(&Range::new(start, end + 1)) + .copied() + .collect(); + + 'outer: for event in highlights { + match event.unwrap() { + HighlightEvent::HighlightStart(span) => { + spans.push(span); + } + HighlightEvent::HighlightEnd => { + spans.pop(); + } + HighlightEvent::Source { start, end } => { + // TODO: filter out spans out of viewport for now.. + + let start = view.doc.text().byte_to_char(start); + let end = view.doc.text().byte_to_char(end); // <-- index 744, len 743 + + let text = view.doc.text().slice(start..end); + + use helix_core::graphemes::{grapheme_width, RopeGraphemes}; + + let style = match spans.first() { + Some(span) => theme.get(theme.scopes()[span.0].as_str()), + None => Style::default().fg(Color::Rgb(164, 160, 232)), // lavender + }; + + // TODO: we could render the text to a surface, then cache that, that + // way if only the selection/cursor changes we can copy from cache + // and paint the new cursor. + + let mut char_index = start; + + // iterate over range char by char + for grapheme in RopeGraphemes::new(&text) { + // TODO: track current char_index + + if grapheme == "\n" { + visual_x = 0; + line += 1; + + // TODO: with proper iter this shouldn't be necessary + if line >= viewport.height { + break 'outer; + } + } else if grapheme == "\t" { + visual_x += (TAB_WIDTH as u16); + } else { + // Cow will prevent allocations if span contained in a single slice + // which should really be the majority case + let grapheme = Cow::from(grapheme); + let width = grapheme_width(&grapheme) as u16; + + // TODO: this should really happen as an after pass + let style = if visible_selections + .iter() + .any(|range| range.contains(char_index)) + { + // cedar + style.clone().bg(Color::Rgb(128, 47, 0)) + } else { + style + }; + + let style = if visible_selections + .iter() + .any(|range| range.head == char_index) + { + style.clone().bg(Color::Rgb(255, 255, 255)) + } else { + style + }; + + // ugh, improve with a traverse method + // or interleave highlight spans with selection and diagnostic spans + let style = if view.doc.diagnostics.iter().any(|diagnostic| { + diagnostic.range.0 <= char_index && diagnostic.range.1 > char_index + }) { + style.clone().add_modifier(Modifier::UNDERLINED) + } else { + style + }; + + // TODO: paint cursor heads except primary + + surface.set_string( + viewport.x + visual_x, + viewport.y + line, + grapheme, + style, + ); + + visual_x += width; + } + + char_index += 1; + } + } + } + } + + let style: Style = theme.get("ui.linenr"); + let warning: Style = theme.get("warning"); + let last_line = view.last_line(); + for (i, line) in (view.first_line..last_line).enumerate() { + if view.doc.diagnostics.iter().any(|d| d.line == line) { + surface.set_stringn(0, i as u16, "●", 1, warning); + } + + surface.set_stringn(1, i as u16, format!("{:>5}", line + 1), 5, style); + } + } + + pub fn render_statusline( + &self, + view: &View, + viewport: Rect, + surface: &mut Surface, + theme: &Theme, + ) { + let text_color = text_color(); + let mode = match view.doc.mode() { + Mode::Insert => "INS", + Mode::Normal => "NOR", + Mode::Goto => "GOTO", + }; + // statusline + surface.set_style( + Rect::new(0, viewport.y, viewport.width, 1), + theme.get("ui.statusline"), + ); + surface.set_string(1, viewport.y, mode, text_color); + + if let Some(path) = view.doc.path() { + surface.set_string(6, viewport.y, path.to_string_lossy(), text_color); + } + + surface.set_string( + viewport.width - 10, + viewport.y, + format!("{}", view.doc.diagnostics.len()), + text_color, + ); + } +} + +impl Component for EditorView { + fn handle_event(&mut self, event: Event, cx: &mut Context) -> EventResult { + match event { + Event::Resize(width, height) => { + // TODO: simplistic ensure cursor in view for now + // TODO: loop over views + if let Some(view) = cx.editor.view_mut() { + view.size = (width, height); + view.ensure_cursor_in_view() + }; + EventResult::Consumed(None) + } + Event::Key(event) => { + if let Some(view) = cx.editor.view_mut() { + let keys = vec![event]; + // TODO: sequences (`gg`) + let mode = view.doc.mode(); + // TODO: handle count other than 1 + let mut cx = commands::Context { + view, + executor: cx.executor, + count: 1, + callback: None, + }; + + match mode { + Mode::Insert => { + if let Some(command) = self.keymap[&Mode::Insert].get(&keys) { + command(&mut cx); + } else if let KeyEvent { + code: KeyCode::Char(c), + .. + } = event + { + commands::insert::insert_char(&mut cx, c); + } + } + mode => { + if let Some(command) = self.keymap[&mode].get(&keys) { + command(&mut cx); + + // TODO: simplistic ensure cursor in view for now + } + } + } + // appease borrowck + let callback = cx.callback.take(); + + view.ensure_cursor_in_view(); + + EventResult::Consumed(callback) + } else { + EventResult::Ignored + } + } + Event::Mouse(_) => EventResult::Ignored, + } + } + + fn render(&self, area: Rect, surface: &mut Surface, cx: &mut Context) { + // SAFETY: we cheat around the view_mut() borrow because it doesn't allow us to also borrow + // theme. Theme is immutable mutating view won't disrupt theme_ref. + let theme_ref = unsafe { &*(&cx.editor.theme as *const Theme) }; + if let Some(view) = cx.editor.view_mut() { + self.render_view(view, area, surface, theme_ref); + } + + // TODO: drop unwrap + } + + fn cursor_position(&self, area: Rect, ctx: &mut Context) -> Option { + // match view.doc.mode() { + // Mode::Insert => write!(stdout, "\x1B[6 q"), + // mode => write!(stdout, "\x1B[2 q"), + // }; + let view = ctx.editor.view().unwrap(); + let cursor = view.doc.state.selection().cursor(); + + let mut pos = view + .screen_coords_at_pos(&view.doc.text().slice(..), cursor) + .expect("Cursor is out of bounds."); + pos.col += area.x as usize + OFFSET as usize; + pos.row += area.y as usize; + Some(pos) + } +} diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs new file mode 100644 index 00000000..bc79e09c --- /dev/null +++ b/helix-term/src/ui/mod.rs @@ -0,0 +1,14 @@ +mod editor; +mod prompt; + +pub use editor::EditorView; +pub use prompt::Prompt; + +pub use tui::layout::Rect; +pub use tui::style::{Color, Modifier, Style}; + +// TODO: temp +#[inline(always)] +pub fn text_color() -> Style { + Style::default().fg(Color::Rgb(219, 191, 239)) // lilac +} diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs new file mode 100644 index 00000000..071cac90 --- /dev/null +++ b/helix-term/src/ui/prompt.rs @@ -0,0 +1,212 @@ +use crate::compositor::{Component, Context, EventResult}; +use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers}; +use helix_core::Position; +use helix_view::Editor; +use helix_view::Theme; +use std::string::String; + +pub struct Prompt { + pub prompt: String, + pub line: String, + pub cursor: usize, + pub completion: Vec, + pub should_close: bool, + pub completion_selection_index: Option, + completion_fn: Box Vec>, + callback_fn: Box, +} + +impl Prompt { + pub fn new( + prompt: String, + mut completion_fn: impl FnMut(&str) -> Vec + 'static, + callback_fn: impl FnMut(&mut Editor, &str) + 'static, + ) -> Prompt { + Prompt { + prompt, + line: String::new(), + cursor: 0, + completion: completion_fn(""), + should_close: false, + completion_selection_index: None, + completion_fn: Box::new(completion_fn), + callback_fn: Box::new(callback_fn), + } + } + + pub fn insert_char(&mut self, c: char) { + self.line.insert(self.cursor, c); + self.cursor += 1; + self.completion = (self.completion_fn)(&self.line); + self.exit_selection(); + } + + pub fn move_char_left(&mut self) { + if self.cursor > 0 { + self.cursor -= 1; + } + } + + pub fn move_char_right(&mut self) { + if self.cursor < self.line.len() { + self.cursor += 1; + } + } + + pub fn move_start(&mut self) { + self.cursor = 0; + } + + pub fn move_end(&mut self) { + self.cursor = self.line.len(); + } + + pub fn delete_char_backwards(&mut self) { + if self.cursor > 0 { + self.line.remove(self.cursor - 1); + self.cursor -= 1; + self.completion = (self.completion_fn)(&self.line); + } + self.exit_selection(); + } + + pub fn change_completion_selection(&mut self) { + if self.completion.is_empty() { + return; + } + let index = + self.completion_selection_index.map(|i| i + 1).unwrap_or(0) % self.completion.len(); + self.completion_selection_index = Some(index); + self.line = self.completion[index].clone(); + } + pub fn exit_selection(&mut self) { + self.completion_selection_index = None; + } +} + +use tui::{ + buffer::Buffer as Surface, + layout::Rect, + style::{Color, Modifier, Style}, +}; + +const BASE_WIDTH: u16 = 30; +use crate::ui::text_color; + +impl Prompt { + pub fn render_prompt(&self, area: Rect, surface: &mut Surface, theme: &Theme) { + let text_color = text_color(); + // completion + if !self.completion.is_empty() { + // TODO: find out better way of clearing individual lines of the screen + let mut row = 0; + let mut col = 0; + let max_col = area.width / BASE_WIDTH; + let col_height = ((self.completion.len() as u16 + max_col - 1) / max_col); + + for i in (3..col_height + 3) { + surface.set_string( + 0, + area.height - i as u16, + " ".repeat(area.width as usize), + text_color, + ); + } + surface.set_style( + Rect::new(0, area.height - col_height - 2, area.width, col_height), + theme.get("ui.statusline"), + ); + for (i, command) in self.completion.iter().enumerate() { + let color = if self.completion_selection_index.is_some() + && i == self.completion_selection_index.unwrap() + { + Style::default().bg(Color::Rgb(104, 060, 232)) + } else { + text_color + }; + surface.set_stringn( + 1 + col * BASE_WIDTH, + area.height - col_height - 2 + row, + &command, + BASE_WIDTH as usize - 1, + color, + ); + row += 1; + if row > col_height - 1 { + row = 0; + col += 1; + } + if col > max_col { + break; + } + } + } + // render buffer text + surface.set_string(1, area.height - 1, &self.prompt, text_color); + surface.set_string(2, area.height - 1, &self.line, text_color); + } +} + +impl Component for Prompt { + fn handle_event(&mut self, event: Event, cx: &mut Context) -> EventResult { + let event = match event { + Event::Key(event) => event, + _ => return EventResult::Ignored, + }; + + match event { + KeyEvent { + code: KeyCode::Char(c), + modifiers: KeyModifiers::NONE, + } => self.insert_char(c), + KeyEvent { + code: KeyCode::Esc, .. + } => self.should_close = true, + KeyEvent { + code: KeyCode::Right, + .. + } => self.move_char_right(), + KeyEvent { + code: KeyCode::Left, + .. + } => self.move_char_left(), + KeyEvent { + code: KeyCode::Char('e'), + modifiers: KeyModifiers::CONTROL, + } => self.move_end(), + KeyEvent { + code: KeyCode::Char('a'), + modifiers: KeyModifiers::CONTROL, + } => self.move_start(), + KeyEvent { + code: KeyCode::Backspace, + modifiers: KeyModifiers::NONE, + } => self.delete_char_backwards(), + KeyEvent { + code: KeyCode::Enter, + .. + } => (self.callback_fn)(cx.editor, &self.line), + KeyEvent { + code: KeyCode::Tab, .. + } => self.change_completion_selection(), + KeyEvent { + code: KeyCode::Char('q'), + modifiers: KeyModifiers::CONTROL, + } => self.exit_selection(), + _ => (), + }; + + EventResult::Consumed(None) + } + + fn render(&self, area: Rect, surface: &mut Surface, cx: &mut Context) { + self.render_prompt(area, surface, &cx.editor.theme) + } + + fn cursor_position(&self, area: Rect, ctx: &mut Context) -> Option { + Some(Position::new( + area.height as usize - 1, + area.x as usize + 2 + self.cursor, + )) + } +} -- cgit v1.2.3-70-g09d2