Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'helix-term/src/ui/prompt.rs')
| -rw-r--r-- | helix-term/src/ui/prompt.rs | 213 |
1 files changed, 47 insertions, 166 deletions
diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs index d2448335..702a6e67 100644 --- a/helix-term/src/ui/prompt.rs +++ b/helix-term/src/ui/prompt.rs @@ -1,20 +1,15 @@ use crate::compositor::{Component, Compositor, Context, Event, EventResult}; use crate::{alt, ctrl, key, shift, ui}; -use arc_swap::ArcSwap; use helix_core::syntax; -use helix_view::document::Mode; use helix_view::input::KeyEvent; use helix_view::keyboard::KeyCode; use std::sync::Arc; use std::{borrow::Cow, ops::RangeFrom}; use tui::buffer::Buffer as Surface; -use tui::text::Span; -use tui::widgets::{Block, Widget}; +use tui::widgets::{Block, Borders, Widget}; use helix_core::{ - unicode::segmentation::{GraphemeCursor, UnicodeSegmentation}, - unicode::width::UnicodeWidthStr, - Position, + unicode::segmentation::GraphemeCursor, unicode::width::UnicodeWidthStr, Position, }; use helix_view::{ graphics::{CursorKind, Margin, Rect}, @@ -22,8 +17,7 @@ use helix_view::{ }; type PromptCharHandler = Box<dyn Fn(&mut Prompt, char, &Context)>; - -pub type Completion = (RangeFrom<usize>, Span<'static>); +pub type Completion = (RangeFrom<usize>, Cow<'static, str>); type CompletionFn = Box<dyn FnMut(&Editor, &str) -> Vec<Completion>>; type CallbackFn = Box<dyn FnMut(&mut Context, &str, PromptEvent)>; pub type DocFn = Box<dyn Fn(&str) -> Option<Cow<str>>>; @@ -32,12 +26,6 @@ pub struct Prompt { prompt: Cow<'static, str>, line: String, cursor: usize, - // Fields used for Component callbacks and rendering: - line_area: Rect, - anchor: usize, - truncate_start: bool, - truncate_end: bool, - // --- completion: Vec<Completion>, selection: Option<usize>, history_register: Option<char>, @@ -46,7 +34,7 @@ pub struct Prompt { callback_fn: CallbackFn, pub doc_fn: DocFn, next_char_handler: Option<PromptCharHandler>, - language: Option<(&'static str, Arc<ArcSwap<syntax::Loader>>)>, + language: Option<(&'static str, Arc<syntax::Loader>)>, } #[derive(Clone, Copy, PartialEq, Eq)] @@ -90,10 +78,6 @@ impl Prompt { prompt, line: String::new(), cursor: 0, - line_area: Rect::default(), - anchor: 0, - truncate_start: false, - truncate_end: false, completion: Vec::new(), selection: None, history_register, @@ -106,29 +90,15 @@ impl Prompt { } } - /// Gets the byte index in the input representing the current cursor location. - #[inline] - pub(crate) fn position(&self) -> usize { - self.cursor - } - pub fn with_line(mut self, line: String, editor: &Editor) -> Self { - self.set_line(line, editor); - self - } - - pub fn set_line(&mut self, line: String, editor: &Editor) { let cursor = line.len(); self.line = line; self.cursor = cursor; self.recalculate_completion(editor); + self } - pub fn with_language( - mut self, - language: &'static str, - loader: Arc<ArcSwap<syntax::Loader>>, - ) -> Self { + pub fn with_language(mut self, language: &'static str, loader: Arc<syntax::Loader>) -> Self { self.language = Some((language, loader)); self } @@ -137,23 +107,6 @@ impl Prompt { &self.line } - pub fn with_history_register(&mut self, history_register: Option<char>) -> &mut Self { - self.history_register = history_register; - self - } - - pub(crate) fn history_register(&self) -> Option<char> { - self.history_register - } - - pub(crate) fn first_history_completion<'a>( - &'a self, - editor: &'a Editor, - ) -> Option<Cow<'a, str>> { - self.history_register - .and_then(|reg| editor.registers.first(reg, editor)) - } - pub fn recalculate_completion(&mut self, editor: &Editor) { self.exit_selection(); self.completion = (self.completion_fn)(editor, &self.line); @@ -247,7 +200,15 @@ impl Prompt { position } Movement::StartOfLine => 0, - Movement::EndOfLine => self.line.len(), + Movement::EndOfLine => { + let mut cursor = + GraphemeCursor::new(self.line.len().saturating_sub(1), self.line.len(), false); + if let Ok(Some(pos)) = cursor.next_boundary(&self.line, 0) { + pos + } else { + self.cursor + } + } Movement::None => self.cursor, } } @@ -388,7 +349,7 @@ impl Prompt { let (range, item) = &self.completion[index]; - self.line.replace_range(range.clone(), &item.content); + self.line.replace_range(range.clone(), item); self.move_end(); } @@ -401,7 +362,7 @@ impl Prompt { const BASE_WIDTH: u16 = 30; impl Prompt { - pub fn render_prompt(&mut self, area: Rect, surface: &mut Surface, cx: &mut Context) { + pub fn render_prompt(&self, area: Rect, surface: &mut Surface, cx: &mut Context) { let theme = &cx.editor.theme; let prompt_color = theme.get("ui.text"); let completion_color = theme.get("ui.menu"); @@ -413,7 +374,7 @@ impl Prompt { let max_len = self .completion .iter() - .map(|(_, completion)| completion.content.len() as u16) + .map(|(_, completion)| completion.len() as u16) .max() .unwrap_or(BASE_WIDTH) .max(BASE_WIDTH); @@ -421,8 +382,7 @@ impl Prompt { let cols = std::cmp::max(1, area.width / max_len); let col_width = (area.width.saturating_sub(cols)) / cols; - let height = (self.completion.len() as u16) - .div_ceil(cols) + let height = ((self.completion.len() as u16 + cols - 1) / cols) .min(10) // at most 10 rows (or less) .min(area.height.saturating_sub(1)); @@ -433,7 +393,7 @@ impl Prompt { height, ); - if completion_area.height > 0 && !self.completion.is_empty() { + if !self.completion.is_empty() { let area = completion_area; let background = theme.get("ui.menu"); @@ -452,22 +412,18 @@ impl Prompt { for (i, (_range, completion)) in self.completion.iter().enumerate().skip(offset).take(items) { - let is_selected = Some(i) == self.selection; - - let completion_item_style = if is_selected { - selected_color + let color = if Some(i) == self.selection { + selected_color // TODO: just invert bg } else { - completion_color.patch(completion.style) + completion_color }; - surface.set_stringn( area.x + col * (1 + col_width), area.y + row, - &completion.content, + completion, col_width.saturating_sub(1) as usize, - completion_item_style, + color, ); - row += 1; if row > area.height - 1 { row = 0; @@ -496,11 +452,12 @@ impl Prompt { let background = theme.get("ui.help"); surface.clear_with(area, background); - let block = Block::bordered() + let block = Block::default() // .title(self.title.as_str()) + .borders(Borders::ALL) .border_style(background); - let inner = block.inner(area).inner(Margin::horizontal(1)); + let inner = block.inner(area).inner(&Margin::horizontal(1)); block.render(area, surface); text.render(inner, surface, cx); @@ -511,88 +468,27 @@ impl Prompt { // render buffer text surface.set_string(area.x, area.y + line, &self.prompt, prompt_color); - self.line_area = area - .clip_left(self.prompt.len() as u16) - .clip_top(line) - .clip_right(2); - + let line_area = area.clip_left(self.prompt.len() as u16).clip_top(line); if self.line.is_empty() { // Show the most recently entered value as a suggestion. - if let Some(suggestion) = self.first_history_completion(cx.editor) { - surface.set_string( - self.line_area.x, - self.line_area.y, - suggestion, - suggestion_color, - ); + if let Some(suggestion) = self + .history_register + .and_then(|reg| cx.editor.registers.first(reg, cx.editor)) + { + surface.set_string(line_area.x, line_area.y, suggestion, suggestion_color); } } else if let Some((language, loader)) = self.language.as_ref() { let mut text: ui::text::Text = crate::ui::markdown::highlighted_code_block( &self.line, language, Some(&cx.editor.theme), - &loader.load(), + loader.clone(), None, ) .into(); - text.render(self.line_area, surface, cx); + text.render(line_area, surface, cx); } else { - let line_width = self.line_area.width as usize; - - if self.line.width() < line_width { - self.anchor = 0; - } else if self.cursor <= self.anchor { - // Ensure the grapheme under the cursor is in view. - self.anchor = self.line[..self.cursor] - .grapheme_indices(true) - .next_back() - .map(|(i, _)| i) - .unwrap_or_default(); - } else if self.line[self.anchor..self.cursor].width() > line_width { - // Set the anchor to the last grapheme cluster before the width is exceeded. - let mut width = 0; - self.anchor = self.line[..self.cursor] - .grapheme_indices(true) - .rev() - .find_map(|(idx, g)| { - width += g.width(); - if width > line_width { - Some(idx + g.len()) - } else { - None - } - }) - .unwrap(); - } - - self.truncate_start = self.anchor > 0; - self.truncate_end = self.line[self.anchor..].width() > line_width; - - // if we keep inserting characters just before the end elipsis, we move the anchor - // so that those new characters are displayed - if self.truncate_end && self.line[self.anchor..self.cursor].width() >= line_width { - // Move the anchor forward by one non-zero-width grapheme. - self.anchor += self.line[self.anchor..] - .grapheme_indices(true) - .find_map(|(idx, g)| { - if g.width() > 0 { - Some(idx + g.len()) - } else { - None - } - }) - .unwrap(); - } - - surface.set_string_anchored( - self.line_area.x, - self.line_area.y, - self.truncate_start, - self.truncate_end, - &self.line.as_str()[self.anchor..], - line_width, - |_| prompt_color, - ); + surface.set_string(line_area.x, line_area.y, self.line.clone(), prompt_color); } } } @@ -673,7 +569,8 @@ impl Component for Prompt { self.recalculate_completion(cx.editor); } else { let last_item = self - .first_history_completion(cx.editor) + .history_register + .and_then(|reg| cx.editor.registers.first(reg, cx.editor)) .map(|entry| entry.to_string()) .unwrap_or_else(|| String::from("")); @@ -761,32 +658,16 @@ impl Component for Prompt { self.render_prompt(area, surface, cx) } - fn cursor(&self, area: Rect, editor: &Editor) -> (Option<Position>, CursorKind) { - let area = area - .clip_left(self.prompt.len() as u16) - .clip_right(if self.prompt.is_empty() { 2 } else { 0 }); - - let mut col = area.left() as usize + self.line[self.anchor..self.cursor].width(); - - // ensure the cursor does not go beyond elipses - if self.truncate_end - && self.line[self.anchor..self.cursor].width() >= self.line_area.width as usize - { - col -= 1; - } - - if self.truncate_start && self.cursor == self.anchor { - col += self.line[self.cursor..] - .graphemes(true) - .next() - .map_or(0, |g| g.width()); - } - + fn cursor(&self, area: Rect, _editor: &Editor) -> (Option<Position>, CursorKind) { let line = area.height as usize - 1; - ( - Some(Position::new(area.y as usize + line, col)), - editor.config().cursor_shape.from_mode(Mode::Insert), + Some(Position::new( + area.y as usize + line, + area.x as usize + + self.prompt.len() + + UnicodeWidthStr::width(&self.line[..self.cursor]), + )), + CursorKind::Block, ) } } |