aboutsummaryrefslogtreecommitdiff
path: root/helix-term/src/ui
diff options
context:
space:
mode:
Diffstat (limited to 'helix-term/src/ui')
-rw-r--r--helix-term/src/ui/completion.rs18
-rw-r--r--helix-term/src/ui/editor.rs25
-rw-r--r--helix-term/src/ui/markdown.rs35
-rw-r--r--helix-term/src/ui/menu.rs11
-rw-r--r--helix-term/src/ui/mod.rs25
-rw-r--r--helix-term/src/ui/picker.rs5
-rw-r--r--helix-term/src/ui/popup.rs12
-rw-r--r--helix-term/src/ui/prompt.rs42
-rw-r--r--helix-term/src/ui/text.rs15
9 files changed, 75 insertions, 113 deletions
diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index 74a82dab..be6db42c 100644
--- a/helix-term/src/ui/completion.rs
+++ b/helix-term/src/ui/completion.rs
@@ -1,19 +1,16 @@
-use crate::compositor::{Component, Compositor, Context, EventResult};
-use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers};
+use crate::compositor::{Component, Context, EventResult};
+use crossterm::event::{Event, KeyCode, KeyEvent};
use tui::buffer::Buffer as Surface;
use std::borrow::Cow;
-use helix_core::{Position, Transaction};
-use helix_view::{
- graphics::{Color, Rect, Style},
- Editor,
-};
+use helix_core::Transaction;
+use helix_view::{graphics::Rect, Editor};
use crate::commands;
use crate::ui::{menu, Markdown, Menu, Popup, PromptEvent};
-use helix_lsp::lsp;
+use helix_lsp::{lsp, util};
use lsp::CompletionItem;
impl menu::Item for CompletionItem {
@@ -79,7 +76,7 @@ impl Completion {
trigger_offset: usize,
) -> Self {
// let items: Vec<CompletionItem> = Vec::new();
- let mut menu = Menu::new(items, move |editor: &mut Editor, item, event| {
+ let menu = Menu::new(items, move |editor: &mut Editor, item, event| {
match event {
PromptEvent::Abort => {}
PromptEvent::Validate => {
@@ -88,8 +85,6 @@ impl Completion {
// always present here
let item = item.unwrap();
- use helix_lsp::{lsp, util};
-
// if more text was entered, remove it
let cursor = doc.selection(view.id).cursor();
if trigger_offset < cursor {
@@ -100,7 +95,6 @@ impl Completion {
doc.apply(&remove, view.id);
}
- use helix_lsp::OffsetEncoding;
let transaction = if let Some(edit) = &item.text_edit {
let edit = match edit {
lsp::CompletionTextEdit::Edit(edit) => edit.clone(),
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index d2925e35..138456ca 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -1,32 +1,28 @@
use crate::{
commands,
- compositor::{Component, Compositor, Context, EventResult},
+ compositor::{Component, Context, EventResult},
key,
- keymap::{self, Keymaps},
+ keymap::Keymaps,
ui::{Completion, ProgressSpinners},
};
use helix_core::{
coords_at_pos,
graphemes::ensure_grapheme_boundary_next,
- syntax::{self, Highlight, HighlightEvent},
+ syntax::{self, HighlightEvent},
LineEnding, Position, Range,
};
-use helix_lsp::LspProgressMap;
use helix_view::{
document::Mode,
- graphics::{Color, CursorKind, Modifier, Rect, Style},
+ graphics::{CursorKind, Modifier, Rect, Style},
input::KeyEvent,
keyboard::{KeyCode, KeyModifiers},
Document, Editor, Theme, View,
};
use std::borrow::Cow;
-use crossterm::{
- cursor,
- event::{read, Event, EventStream},
-};
-use tui::{backend::CrosstermBackend, buffer::Buffer as Surface};
+use crossterm::event::Event;
+use tui::buffer::Buffer as Surface;
pub struct EditorView {
keymaps: Keymaps,
@@ -396,7 +392,7 @@ impl EditorView {
viewport: Rect,
surface: &mut Surface,
theme: &Theme,
- is_focused: bool,
+ _is_focused: bool,
) {
use helix_core::diagnostic::Severity;
use tui::{
@@ -406,7 +402,6 @@ impl EditorView {
};
let cursor = doc.selection(view.id).cursor();
- let line = doc.text().char_to_line(cursor);
let diagnostics = doc.diagnostics().iter().filter(|diagnostic| {
diagnostic.range.start <= cursor && diagnostic.range.end >= cursor
@@ -612,7 +607,7 @@ impl Component for EditorView {
// clear status
cx.editor.status_msg = None;
- let (view, doc) = current!(cx.editor);
+ let (_, doc) = current!(cx.editor);
let mode = doc.mode();
let mut cxt = commands::Context {
@@ -709,7 +704,7 @@ impl Component for EditorView {
}
}
- fn render(&self, mut area: Rect, surface: &mut Surface, cx: &mut Context) {
+ fn render(&self, area: Rect, surface: &mut Surface, cx: &mut Context) {
// clear with background color
surface.set_style(area, cx.editor.theme.get("ui.background"));
@@ -745,7 +740,7 @@ impl Component for EditorView {
}
}
- fn cursor(&self, area: Rect, editor: &Editor) -> (Option<Position>, CursorKind) {
+ fn cursor(&self, _area: Rect, editor: &Editor) -> (Option<Position>, CursorKind) {
// match view.doc.mode() {
// Mode::Insert => write!(stdout, "\x1B[6 q"),
// mode => write!(stdout, "\x1B[2 q"),
diff --git a/helix-term/src/ui/markdown.rs b/helix-term/src/ui/markdown.rs
index 36d570cd..6c79ca67 100644
--- a/helix-term/src/ui/markdown.rs
+++ b/helix-term/src/ui/markdown.rs
@@ -1,13 +1,20 @@
-use crate::compositor::{Component, Compositor, Context, EventResult};
-use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers};
-use tui::{buffer::Buffer as Surface, text::Text};
+use crate::compositor::{Component, Context};
+use tui::{
+ buffer::Buffer as Surface,
+ text::{Span, Spans, Text},
+};
+
+use std::sync::Arc;
-use std::{borrow::Cow, sync::Arc};
+use pulldown_cmark::{CodeBlockKind, CowStr, Event, Options, Parser, Tag};
-use helix_core::{syntax, Position};
+use helix_core::{
+ syntax::{self, HighlightEvent, Syntax},
+ Rope,
+};
use helix_view::{
graphics::{Color, Rect, Style},
- Editor, Theme,
+ Theme,
};
pub struct Markdown {
@@ -33,11 +40,8 @@ fn parse<'a>(
theme: Option<&Theme>,
loader: &syntax::Loader,
) -> tui::text::Text<'a> {
- use pulldown_cmark::{CodeBlockKind, CowStr, Event, Options, Parser, Tag};
- use tui::text::{Span, Spans, Text};
-
- // also 2021-03-04T16:33:58.553 helix_lsp::transport [INFO] <- {"contents":{"kind":"markdown","value":"\n```rust\ncore::num\n```\n\n```rust\npub const fn saturating_sub(self, rhs:Self) ->Self\n```\n\n---\n\n```rust\n```"},"range":{"end":{"character":61,"line":101},"start":{"character":47,"line":101}}}
- let text = "\n```rust\ncore::iter::traits::iterator::Iterator\n```\n\n```rust\nfn collect<B: FromIterator<Self::Item>>(self) -> B\nwhere\n Self: Sized,\n```\n\n---\n\nTransforms an iterator into a collection.\n\n`collect()` can take anything iterable, and turn it into a relevant\ncollection. This is one of the more powerful methods in the standard\nlibrary, used in a variety of contexts.\n\nThe most basic pattern in which `collect()` is used is to turn one\ncollection into another. You take a collection, call [`iter`](https://doc.rust-lang.org/nightly/core/iter/traits/iterator/trait.Iterator.html) on it,\ndo a bunch of transformations, and then `collect()` at the end.\n\n`collect()` can also create instances of types that are not typical\ncollections. For example, a [`String`](https://doc.rust-lang.org/nightly/core/iter/std/string/struct.String.html) can be built from [`char`](type@char)s,\nand an iterator of [`Result<T, E>`](https://doc.rust-lang.org/nightly/core/result/enum.Result.html) items can be collected\ninto `Result<Collection<T>, E>`. See the examples below for more.\n\nBecause `collect()` is so general, it can cause problems with type\ninference. As such, `collect()` is one of the few times you'll see\nthe syntax affectionately known as the 'turbofish': `::<>`. This\nhelps the inference algorithm understand specifically which collection\nyou're trying to collect into.\n\n# Examples\n\nBasic usage:\n\n```rust\nlet a = [1, 2, 3];\n\nlet doubled: Vec<i32> = a.iter()\n .map(|&x| x * 2)\n .collect();\n\nassert_eq!(vec![2, 4, 6], doubled);\n```\n\nNote that we needed the `: Vec<i32>` on the left-hand side. This is because\nwe could collect into, for example, a [`VecDeque<T>`](https://doc.rust-lang.org/nightly/core/iter/std/collections/struct.VecDeque.html) instead:\n\n```rust\nuse std::collections::VecDeque;\n\nlet a = [1, 2, 3];\n\nlet doubled: VecDeque<i32> = a.iter().map(|&x| x * 2).collect();\n\nassert_eq!(2, doubled[0]);\nassert_eq!(4, doubled[1]);\nassert_eq!(6, doubled[2]);\n```\n\nUsing the 'turbofish' instead of annotating `doubled`:\n\n```rust\nlet a = [1, 2, 3];\n\nlet doubled = a.iter().map(|x| x * 2).collect::<Vec<i32>>();\n\nassert_eq!(vec![2, 4, 6], doubled);\n```\n\nBecause `collect()` only cares about what you're collecting into, you can\nstill use a partial type hint, `_`, with the turbofish:\n\n```rust\nlet a = [1, 2, 3];\n\nlet doubled = a.iter().map(|x| x * 2).collect::<Vec<_>>();\n\nassert_eq!(vec![2, 4, 6], doubled);\n```\n\nUsing `collect()` to make a [`String`](https://doc.rust-lang.org/nightly/core/iter/std/string/struct.String.html):\n\n```rust\nlet chars = ['g', 'd', 'k', 'k', 'n'];\n\nlet hello: String = chars.iter()\n .map(|&x| x as u8)\n .map(|x| (x + 1) as char)\n .collect();\n\nassert_eq!(\"hello\", hello);\n```\n\nIf you have a list of [`Result<T, E>`](https://doc.rust-lang.org/nightly/core/result/enum.Result.html)s, you can use `collect()` to\nsee if any of them failed:\n\n```rust\nlet results = [Ok(1), Err(\"nope\"), Ok(3), Err(\"bad\")];\n\nlet result: Result<Vec<_>, &str> = results.iter().cloned().collect();\n\n// gives us the first error\nassert_eq!(Err(\"nope\"), result);\n\nlet results = [Ok(1), Ok(3)];\n\nlet result: Result<Vec<_>, &str> = results.iter().cloned().collect();\n\n// gives us the list of answers\nassert_eq!(Ok(vec![1, 3]), result);\n```";
+ // // also 2021-03-04T16:33:58.553 helix_lsp::transport [INFO] <- {"contents":{"kind":"markdown","value":"\n```rust\ncore::num\n```\n\n```rust\npub const fn saturating_sub(self, rhs:Self) ->Self\n```\n\n---\n\n```rust\n```"},"range":{"end":{"character":61,"line":101},"start":{"character":47,"line":101}}}
+ // let text = "\n```rust\ncore::iter::traits::iterator::Iterator\n```\n\n```rust\nfn collect<B: FromIterator<Self::Item>>(self) -> B\nwhere\n Self: Sized,\n```\n\n---\n\nTransforms an iterator into a collection.\n\n`collect()` can take anything iterable, and turn it into a relevant\ncollection. This is one of the more powerful methods in the standard\nlibrary, used in a variety of contexts.\n\nThe most basic pattern in which `collect()` is used is to turn one\ncollection into another. You take a collection, call [`iter`](https://doc.rust-lang.org/nightly/core/iter/traits/iterator/trait.Iterator.html) on it,\ndo a bunch of transformations, and then `collect()` at the end.\n\n`collect()` can also create instances of types that are not typical\ncollections. For example, a [`String`](https://doc.rust-lang.org/nightly/core/iter/std/string/struct.String.html) can be built from [`char`](type@char)s,\nand an iterator of [`Result<T, E>`](https://doc.rust-lang.org/nightly/core/result/enum.Result.html) items can be collected\ninto `Result<Collection<T>, E>`. See the examples below for more.\n\nBecause `collect()` is so general, it can cause problems with type\ninference. As such, `collect()` is one of the few times you'll see\nthe syntax affectionately known as the 'turbofish': `::<>`. This\nhelps the inference algorithm understand specifically which collection\nyou're trying to collect into.\n\n# Examples\n\nBasic usage:\n\n```rust\nlet a = [1, 2, 3];\n\nlet doubled: Vec<i32> = a.iter()\n .map(|&x| x * 2)\n .collect();\n\nassert_eq!(vec![2, 4, 6], doubled);\n```\n\nNote that we needed the `: Vec<i32>` on the left-hand side. This is because\nwe could collect into, for example, a [`VecDeque<T>`](https://doc.rust-lang.org/nightly/core/iter/std/collections/struct.VecDeque.html) instead:\n\n```rust\nuse std::collections::VecDeque;\n\nlet a = [1, 2, 3];\n\nlet doubled: VecDeque<i32> = a.iter().map(|&x| x * 2).collect();\n\nassert_eq!(2, doubled[0]);\nassert_eq!(4, doubled[1]);\nassert_eq!(6, doubled[2]);\n```\n\nUsing the 'turbofish' instead of annotating `doubled`:\n\n```rust\nlet a = [1, 2, 3];\n\nlet doubled = a.iter().map(|x| x * 2).collect::<Vec<i32>>();\n\nassert_eq!(vec![2, 4, 6], doubled);\n```\n\nBecause `collect()` only cares about what you're collecting into, you can\nstill use a partial type hint, `_`, with the turbofish:\n\n```rust\nlet a = [1, 2, 3];\n\nlet doubled = a.iter().map(|x| x * 2).collect::<Vec<_>>();\n\nassert_eq!(vec![2, 4, 6], doubled);\n```\n\nUsing `collect()` to make a [`String`](https://doc.rust-lang.org/nightly/core/iter/std/string/struct.String.html):\n\n```rust\nlet chars = ['g', 'd', 'k', 'k', 'n'];\n\nlet hello: String = chars.iter()\n .map(|&x| x as u8)\n .map(|x| (x + 1) as char)\n .collect();\n\nassert_eq!(\"hello\", hello);\n```\n\nIf you have a list of [`Result<T, E>`](https://doc.rust-lang.org/nightly/core/result/enum.Result.html)s, you can use `collect()` to\nsee if any of them failed:\n\n```rust\nlet results = [Ok(1), Err(\"nope\"), Ok(3), Err(\"bad\")];\n\nlet result: Result<Vec<_>, &str> = results.iter().cloned().collect();\n\n// gives us the first error\nassert_eq!(Err(\"nope\"), result);\n\nlet results = [Ok(1), Ok(3)];\n\nlet result: Result<Vec<_>, &str> = results.iter().cloned().collect();\n\n// gives us the list of answers\nassert_eq!(Ok(vec![1, 3]), result);\n```";
let mut options = Options::empty();
options.insert(Options::ENABLE_STRIKETHROUGH);
@@ -82,16 +86,13 @@ fn parse<'a>(
// TODO: temp workaround
if let Some(Tag::CodeBlock(CodeBlockKind::Fenced(language))) = tags.last() {
if let Some(theme) = theme {
- use helix_core::syntax::{self, HighlightEvent, Syntax};
- use helix_core::Rope;
-
let rope = Rope::from(text.as_ref());
let syntax = loader
.language_config_for_scope(&format!("source.{}", language))
.and_then(|config| config.highlight_config(theme.scopes()))
.map(|config| Syntax::new(&rope, config));
- if let Some(mut syntax) = syntax {
+ if let Some(syntax) = syntax {
// if we have a syntax available, highlight_iter and generate spans
let mut highlights = Vec::new();
@@ -141,13 +142,13 @@ fn parse<'a>(
}
} else {
for line in text.lines() {
- let mut span = Span::styled(line.to_string(), code_style);
+ let span = Span::styled(line.to_string(), code_style);
lines.push(Spans::from(span));
}
}
} else {
for line in text.lines() {
- let mut span = Span::styled(line.to_string(), code_style);
+ let span = Span::styled(line.to_string(), code_style);
lines.push(Spans::from(span));
}
}
diff --git a/helix-term/src/ui/menu.rs b/helix-term/src/ui/menu.rs
index bf18b92b..226c1135 100644
--- a/helix-term/src/ui/menu.rs
+++ b/helix-term/src/ui/menu.rs
@@ -4,16 +4,10 @@ use tui::{buffer::Buffer as Surface, widgets::Table};
pub use tui::widgets::{Cell, Row};
-use std::borrow::Cow;
-
use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;
use fuzzy_matcher::FuzzyMatcher;
-use helix_core::Position;
-use helix_view::{
- graphics::{Color, Rect, Style},
- Editor,
-};
+use helix_view::{graphics::Rect, Editor};
pub trait Item {
// TODO: sort_text
@@ -64,7 +58,6 @@ impl<T: Item> Menu<T> {
pub fn score(&mut self, pattern: &str) {
// need to borrow via pattern match otherwise it complains about simultaneous borrow
let Self {
- ref mut options,
ref mut matcher,
ref mut matches,
..
@@ -297,7 +290,7 @@ impl<T: Item + 'static> Component for Menu<T> {
// )
// }
- for (i, option) in (scroll..(scroll + win_height).min(len)).enumerate() {
+ for (i, _) in (scroll..(scroll + win_height).min(len)).enumerate() {
let is_marked = i >= scroll_line && i < scroll_line + scroll_height;
if is_marked {
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 2d4cf9cf..7111c968 100644
--- a/helix-term/src/ui/mod.rs
+++ b/helix-term/src/ui/mod.rs
@@ -20,12 +20,9 @@ pub use text::Text;
use helix_core::regex::Regex;
use helix_core::register::Registers;
-use helix_view::{
- graphics::{Color, Modifier, Rect, Style},
- Document, Editor, View,
-};
+use helix_view::{Document, Editor, View};
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
pub fn regex_prompt(
cx: &mut crate::commands::Context,
@@ -38,7 +35,7 @@ pub fn regex_prompt(
Prompt::new(
prompt,
- |input: &str| Vec::new(), // this is fine because Vec::new() doesn't allocate
+ |_input: &str| Vec::new(), // this is fine because Vec::new() doesn't allocate
move |cx: &mut crate::compositor::Context, input: &str, event: PromptEvent| {
match event {
PromptEvent::Abort => {
@@ -121,7 +118,7 @@ pub fn file_picker(root: PathBuf) -> Picker<PathBuf> {
.into()
},
move |editor: &mut Editor, path: &PathBuf, action| {
- let document_id = editor
+ editor
.open(path.into(), action)
.expect("editor.open failed");
},
@@ -133,8 +130,8 @@ pub mod completers {
use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;
use fuzzy_matcher::FuzzyMatcher;
use helix_view::theme;
+ use std::borrow::Cow;
use std::cmp::Reverse;
- use std::{borrow::Cow, sync::Arc};
pub type Completer = fn(&str) -> Vec<Completion>;
@@ -154,7 +151,7 @@ pub mod completers {
let mut matches: Vec<_> = names
.into_iter()
- .filter_map(|(range, name)| {
+ .filter_map(|(_range, name)| {
matcher.fuzzy_match(&name, input).map(|score| (name, score))
})
.collect();
@@ -208,7 +205,7 @@ pub mod completers {
// Rust's filename handling is really annoying.
use ignore::WalkBuilder;
- use std::path::{Path, PathBuf};
+ use std::path::Path;
let is_tilde = input.starts_with('~') && input.len() == 1;
let path = helix_view::document::expand_tilde(Path::new(input));
@@ -229,7 +226,7 @@ pub mod completers {
(path, file_name)
};
- let end = (input.len()..);
+ let end = input.len()..;
let mut files: Vec<_> = WalkBuilder::new(dir.clone())
.max_depth(Some(1))
@@ -242,7 +239,7 @@ pub mod completers {
return None;
}
- let is_dir = entry.file_type().map_or(false, |entry| entry.is_dir());
+ //let is_dir = entry.file_type().map_or(false, |entry| entry.is_dir());
let path = entry.path();
let mut path = if is_tilde {
@@ -274,14 +271,14 @@ pub mod completers {
// inefficient, but we need to calculate the scores, filter out None, then sort.
let mut matches: Vec<_> = files
.into_iter()
- .filter_map(|(range, file)| {
+ .filter_map(|(_range, file)| {
matcher
.fuzzy_match(&file, &file_name)
.map(|score| (file, score))
})
.collect();
- let range = ((input.len().saturating_sub(file_name.len()))..);
+ let range = (input.len().saturating_sub(file_name.len()))..;
matches.sort_unstable_by_key(|(_file, score)| Reverse(*score));
files = matches
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index 15e6b062..d7fc9d86 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -43,8 +43,8 @@ impl<T> Picker<T> {
) -> Self {
let prompt = Prompt::new(
"".to_string(),
- |pattern: &str| Vec::new(),
- |editor: &mut Context, pattern: &str, event: PromptEvent| {
+ |_pattern: &str| Vec::new(),
+ |_editor: &mut Context, _pattern: &str, _event: PromptEvent| {
//
},
);
@@ -69,7 +69,6 @@ impl<T> Picker<T> {
pub fn score(&mut self) {
// need to borrow via pattern match otherwise it complains about simultaneous borrow
let Self {
- ref mut options,
ref mut matcher,
ref mut matches,
ref filters,
diff --git a/helix-term/src/ui/popup.rs b/helix-term/src/ui/popup.rs
index af72735c..29ffb4ad 100644
--- a/helix-term/src/ui/popup.rs
+++ b/helix-term/src/ui/popup.rs
@@ -2,13 +2,8 @@ use crate::compositor::{Component, Compositor, Context, EventResult};
use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers};
use tui::buffer::Buffer as Surface;
-use std::borrow::Cow;
-
use helix_core::Position;
-use helix_view::{
- graphics::{Color, Rect, Style},
- Editor,
-};
+use helix_view::graphics::Rect;
// TODO: share logic with Menu, it's essentially Popup(render_fn), but render fn needs to return
// a width/height hint. maybe Popup(Box<Component>)
@@ -57,7 +52,7 @@ impl<T: Component> Component for Popup<T> {
fn handle_event(&mut self, event: Event, cx: &mut Context) -> EventResult {
let key = match event {
Event::Key(event) => event,
- Event::Resize(width, height) => {
+ Event::Resize(_, _) => {
// TODO: calculate inner area, call component's handle_event with that area
return EventResult::Ignored;
}
@@ -99,7 +94,7 @@ impl<T: Component> Component for Popup<T> {
// tab/enter/ctrl-k or whatever will confirm the selection/ ctrl-n/ctrl-p for scroll.
}
- fn required_size(&mut self, viewport: (u16, u16)) -> Option<(u16, u16)> {
+ fn required_size(&mut self, _viewport: (u16, u16)) -> Option<(u16, u16)> {
let (width, height) = self
.contents
.required_size((120, 26)) // max width, max height
@@ -135,7 +130,6 @@ impl<T: Component> Component for Popup<T> {
rel_y += 1 // position below point
}
- let area = Rect::new(rel_x, rel_y, width, height);
// clip to viewport
let area = viewport.intersection(Rect::new(rel_x, rel_y, width, height));
diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index 6bb1b006..a4cb26f7 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -5,13 +5,11 @@ use std::{borrow::Cow, ops::RangeFrom};
use tui::buffer::Buffer as Surface;
use helix_core::{
- unicode::segmentation::{GraphemeCursor, GraphemeIncomplete},
- unicode::width::UnicodeWidthStr,
- Position,
+ unicode::segmentation::GraphemeCursor, unicode::width::UnicodeWidthStr, Position,
};
use helix_view::{
- graphics::{Color, CursorKind, Margin, Modifier, Rect, Style},
- Editor, Theme,
+ graphics::{CursorKind, Margin, Rect},
+ Editor,
};
pub type Completion = (RangeFrom<usize>, Cow<'static, str>);
@@ -399,6 +397,22 @@ impl Component for Prompt {
return close_fn;
}
KeyEvent {
+ code: KeyCode::Left,
+ modifiers: KeyModifiers::ALT,
+ }
+ | KeyEvent {
+ code: KeyCode::Char('b'),
+ modifiers: KeyModifiers::ALT,
+ } => self.move_cursor(Movement::BackwardWord(1)),
+ KeyEvent {
+ code: KeyCode::Right,
+ modifiers: KeyModifiers::ALT,
+ }
+ | KeyEvent {
+ code: KeyCode::Char('f'),
+ modifiers: KeyModifiers::ALT,
+ } => self.move_cursor(Movement::ForwardWord(1)),
+ KeyEvent {
code: KeyCode::Char('f'),
modifiers: KeyModifiers::CONTROL,
}
@@ -431,22 +445,6 @@ impl Component for Prompt {
modifiers: KeyModifiers::CONTROL,
} => self.move_start(),
KeyEvent {
- code: KeyCode::Left,
- modifiers: KeyModifiers::ALT,
- }
- | KeyEvent {
- code: KeyCode::Char('b'),
- modifiers: KeyModifiers::ALT,
- } => self.move_cursor(Movement::BackwardWord(1)),
- KeyEvent {
- code: KeyCode::Right,
- modifiers: KeyModifiers::ALT,
- }
- | KeyEvent {
- code: KeyCode::Char('f'),
- modifiers: KeyModifiers::ALT,
- } => self.move_cursor(Movement::ForwardWord(1)),
- KeyEvent {
code: KeyCode::Char('w'),
modifiers: KeyModifiers::CONTROL,
} => self.delete_word_backwards(),
@@ -494,7 +492,7 @@ impl Component for Prompt {
self.render_prompt(area, surface, cx)
}
- fn cursor(&self, area: Rect, editor: &Editor) -> (Option<Position>, CursorKind) {
+ fn cursor(&self, area: Rect, _editor: &Editor) -> (Option<Position>, CursorKind) {
let line = area.height as usize - 1;
(
Some(Position::new(
diff --git a/helix-term/src/ui/text.rs b/helix-term/src/ui/text.rs
index 7c491841..249cf89e 100644
--- a/helix-term/src/ui/text.rs
+++ b/helix-term/src/ui/text.rs
@@ -1,14 +1,7 @@
-use crate::compositor::{Component, Compositor, Context, EventResult};
-use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers};
+use crate::compositor::{Component, Context};
use tui::buffer::Buffer as Surface;
-use std::borrow::Cow;
-
-use helix_core::Position;
-use helix_view::{
- graphics::{Color, Rect, Style},
- Editor,
-};
+use helix_view::graphics::Rect;
pub struct Text {
contents: String,
@@ -20,12 +13,10 @@ impl Text {
}
}
impl Component for Text {
- fn render(&self, area: Rect, surface: &mut Surface, cx: &mut Context) {
+ fn render(&self, area: Rect, surface: &mut Surface, _cx: &mut Context) {
use tui::widgets::{Paragraph, Widget, Wrap};
let contents = tui::text::Text::from(self.contents.clone());
- let style = cx.editor.theme.get("ui.text");
-
let par = Paragraph::new(contents).wrap(Wrap { trim: false });
// .scroll(x, y) offsets
generated by cgit v1.2.3-70-g09d2 (git 2.47.1) at 2024-12-29 05:42:20 +0000