Remove #[allow(unused)] from helix-term, and fix unused imports.

Lots of other warning still left.  Will address in subsequent commits.
pull/400/head
Nathan Vegdahl 3 years ago
parent 79f096963c
commit 702a0491db

@ -1,37 +1,23 @@
use helix_core::syntax; use helix_core::syntax;
use helix_lsp::{lsp, LspProgressMap}; use helix_lsp::{lsp, util::lsp_pos_to_pos, LspProgressMap};
use helix_view::{document::Mode, graphics::Rect, theme, Document, Editor, Theme, View}; use helix_view::{theme, Editor};
use crate::{ use crate::{args::Args, compositor::Compositor, config::Config, job::Jobs, ui};
args::Args,
compositor::Compositor,
config::Config,
job::Jobs,
keymap::Keymaps,
ui::{self, Spinner},
};
use log::{error, info}; use log::error;
use std::{ use std::{
collections::HashMap, io::{stdout, Write},
future::Future,
io::{self, stdout, Stdout, Write},
path::PathBuf,
pin::Pin,
sync::Arc, sync::Arc,
time::Duration,
}; };
use anyhow::{Context, Error}; use anyhow::Error;
use crossterm::{ use crossterm::{
event::{Event, EventStream}, event::{Event, EventStream},
execute, terminal, execute, terminal,
}; };
use futures_util::{future, stream::FuturesUnordered};
pub struct Application { pub struct Application {
compositor: Compositor, compositor: Compositor,
editor: Editor, editor: Editor,
@ -239,10 +225,9 @@ impl Application {
.into_iter() .into_iter()
.filter_map(|diagnostic| { .filter_map(|diagnostic| {
use helix_core::{ use helix_core::{
diagnostic::{Range, Severity, Severity::*}, diagnostic::{Range, Severity::*},
Diagnostic, Diagnostic,
}; };
use helix_lsp::{lsp, util::lsp_pos_to_pos};
use lsp::DiagnosticSeverity; use lsp::DiagnosticSeverity;
let language_server = doc.language_server().unwrap(); let language_server = doc.language_server().unwrap();

@ -1,20 +1,21 @@
use helix_core::{ use helix_core::{
comment, coords_at_pos, find_first_non_whitespace_char, find_root, graphemes, indent, comment, coords_at_pos, find_first_non_whitespace_char, find_root, graphemes, indent,
line_ending::{ line_ending::{
get_line_ending, get_line_ending_of_str, line_end_char_index, rope_end_without_line_ending, get_line_ending_of_str, line_end_char_index, rope_end_without_line_ending,
str_is_line_ending, str_is_line_ending,
}, },
match_brackets, match_brackets,
movement::{self, Direction}, movement::{self, Direction},
object, pos_at_coords, object, pos_at_coords,
regex::{self, Regex}, regex::{self, Regex},
register::{self, Register, Registers}, register::Register,
search, selection, Change, ChangeSet, LineEnding, Position, Range, Rope, RopeGraphemes, search, selection, LineEnding, Position, Range, Rope, RopeGraphemes, RopeSlice, Selection,
RopeSlice, Selection, SmallVec, Tendril, Transaction, DEFAULT_LINE_ENDING, SmallVec, Tendril, Transaction,
}; };
use helix_view::{ use helix_view::{
document::{IndentStyle, Mode}, document::{IndentStyle, Mode},
editor::Action,
input::KeyEvent, input::KeyEvent,
keyboard::KeyCode, keyboard::KeyCode,
view::{View, PADDING}, view::{View, PADDING},
@ -25,19 +26,19 @@ use anyhow::anyhow;
use helix_lsp::{ use helix_lsp::{
lsp, lsp,
util::{lsp_pos_to_pos, lsp_range_to_range, pos_to_lsp_pos, range_to_lsp_range}, util::{lsp_pos_to_pos, lsp_range_to_range, pos_to_lsp_pos, range_to_lsp_range},
LspProgressMap, OffsetEncoding, OffsetEncoding,
}; };
use insert::*; use insert::*;
use movement::Movement; use movement::Movement;
use crate::{ use crate::{
compositor::{self, Callback, Component, Compositor}, compositor::{self, Component, Compositor},
ui::{self, Completion, Picker, Popup, Prompt, PromptEvent}, ui::{self, Picker, Popup, Prompt, PromptEvent},
}; };
use crate::job::{self, Job, JobFuture, Jobs}; use crate::job::{self, Job, Jobs};
use futures_util::{FutureExt, TryFutureExt}; use futures_util::{FutureExt, TryFutureExt};
use std::{fmt, future::Future, path::Display, str::FromStr}; use std::{fmt, future::Future};
use std::{ use std::{
borrow::Cow, borrow::Cow,
@ -1148,7 +1149,6 @@ mod cmd {
cx: &mut compositor::Context, cx: &mut compositor::Context,
path: Option<P>, path: Option<P>,
) -> Result<tokio::task::JoinHandle<Result<(), anyhow::Error>>, anyhow::Error> { ) -> Result<tokio::task::JoinHandle<Result<(), anyhow::Error>>, anyhow::Error> {
use anyhow::anyhow;
let jobs = &mut cx.jobs; let jobs = &mut cx.jobs;
let (view, doc) = current!(cx.editor); let (view, doc) = current!(cx.editor);
@ -1723,7 +1723,6 @@ fn command_mode(cx: &mut Context) {
// simple heuristic: if there's no just one part, complete command name. // simple heuristic: if there's no just one part, complete command name.
// if there's a space, per command completion kicks in. // if there's a space, per command completion kicks in.
if parts.len() <= 1 { if parts.len() <= 1 {
use std::{borrow::Cow, ops::Range};
let end = 0..; let end = 0..;
cmd::TYPABLE_COMMAND_LIST cmd::TYPABLE_COMMAND_LIST
.iter() .iter()
@ -1753,8 +1752,6 @@ fn command_mode(cx: &mut Context) {
} }
}, // completion }, // completion
move |cx: &mut compositor::Context, input: &str, event: PromptEvent| { move |cx: &mut compositor::Context, input: &str, event: PromptEvent| {
use helix_view::editor::Action;
if event != PromptEvent::Validate { if event != PromptEvent::Validate {
return; return;
} }
@ -1792,7 +1789,6 @@ fn file_picker(cx: &mut Context) {
} }
fn buffer_picker(cx: &mut Context) { fn buffer_picker(cx: &mut Context) {
use std::path::{Path, PathBuf};
let current = view!(cx.editor).doc; let current = view!(cx.editor).doc;
let picker = Picker::new( let picker = Picker::new(
@ -1815,7 +1811,6 @@ fn buffer_picker(cx: &mut Context) {
} }
}, },
|editor: &mut Editor, (id, _path): &(DocumentId, Option<PathBuf>), _action| { |editor: &mut Editor, (id, _path): &(DocumentId, Option<PathBuf>), _action| {
use helix_view::editor::Action;
editor.switch(*id, Action::Replace); editor.switch(*id, Action::Replace);
}, },
); );
@ -2145,8 +2140,6 @@ fn goto_impl(
locations: Vec<lsp::Location>, locations: Vec<lsp::Location>,
offset_encoding: OffsetEncoding, offset_encoding: OffsetEncoding,
) { ) {
use helix_view::editor::Action;
push_jump(editor); push_jump(editor);
fn jump_to( fn jump_to(
@ -3181,7 +3174,6 @@ fn completion(cx: &mut Context) {
if items.is_empty() { if items.is_empty() {
return; return;
} }
use crate::compositor::AnyComponent;
let size = compositor.size(); let size = compositor.size();
let ui = compositor let ui = compositor
.find(std::any::type_name::<ui::EditorView>()) .find(std::any::type_name::<ui::EditorView>())
@ -3332,11 +3324,7 @@ fn rotate_view(cx: &mut Context) {
} }
// split helper, clear it later // split helper, clear it later
use helix_view::editor::Action;
use self::cmd::TypableCommand;
fn split(cx: &mut Context, action: Action) { fn split(cx: &mut Context, action: Action) {
use helix_view::editor::Action;
let (view, doc) = current!(cx.editor); let (view, doc) = current!(cx.editor);
let id = doc.id(); let id = doc.id();
let selection = doc.selection(view.id).clone(); let selection = doc.selection(view.id).clone();

@ -2,7 +2,6 @@
// Q: how does this work with popups? // Q: how does this work with popups?
// cursive does compositor.screen_mut().add_layer_at(pos::absolute(x, y), <component>) // cursive does compositor.screen_mut().add_layer_at(pos::absolute(x, y), <component>)
use helix_core::Position; use helix_core::Position;
use helix_lsp::LspProgressMap;
use helix_view::graphics::{CursorKind, Rect}; use helix_view::graphics::{CursorKind, Rect};
use crossterm::event::Event; use crossterm::event::Event;

@ -1,10 +1,10 @@
use anyhow::{Error, Result};
use serde::Deserialize; use serde::Deserialize;
use std::collections::HashMap;
use crate::commands::Command;
use crate::keymap::Keymaps; use crate::keymap::Keymaps;
#[cfg(test)]
use crate::commands::Command;
#[derive(Debug, Default, Clone, PartialEq, Deserialize)] #[derive(Debug, Default, Clone, PartialEq, Deserialize)]
pub struct Config { pub struct Config {
pub theme: Option<String>, pub theme: Option<String>,

@ -3,7 +3,7 @@ use helix_view::Editor;
use crate::compositor::Compositor; use crate::compositor::Compositor;
use futures_util::future::{self, BoxFuture, Future, FutureExt}; use futures_util::future::{self, BoxFuture, Future, FutureExt};
use futures_util::stream::{self, FuturesUnordered, Select, StreamExt}; use futures_util::stream::{FuturesUnordered, StreamExt};
pub type Callback = Box<dyn FnOnce(&mut Editor, &mut Compositor) + Send>; pub type Callback = Box<dyn FnOnce(&mut Editor, &mut Compositor) + Send>;
pub type JobFuture = BoxFuture<'static, anyhow::Result<Option<Callback>>>; pub type JobFuture = BoxFuture<'static, anyhow::Result<Option<Callback>>>;

@ -1,7 +1,5 @@
use crate::commands;
pub use crate::commands::Command; pub use crate::commands::Command;
use crate::config::Config; use crate::config::Config;
use anyhow::{anyhow, Error, Result};
use helix_core::hashmap; use helix_core::hashmap;
use helix_view::{ use helix_view::{
document::Mode, document::Mode,
@ -11,9 +9,7 @@ use helix_view::{
use serde::Deserialize; use serde::Deserialize;
use std::{ use std::{
collections::HashMap, collections::HashMap,
fmt::Display,
ops::{Deref, DerefMut}, ops::{Deref, DerefMut},
str::FromStr,
}; };
// Kakoune-inspired: // Kakoune-inspired:

@ -1,5 +1,3 @@
#![allow(unused)]
#[macro_use] #[macro_use]
extern crate helix_view; extern crate helix_view;

@ -1,19 +1,16 @@
use crate::compositor::{Component, Compositor, Context, EventResult}; use crate::compositor::{Component, Context, EventResult};
use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers}; use crossterm::event::{Event, KeyCode, KeyEvent};
use tui::buffer::Buffer as Surface; use tui::buffer::Buffer as Surface;
use std::borrow::Cow; use std::borrow::Cow;
use helix_core::{Position, Transaction}; use helix_core::Transaction;
use helix_view::{ use helix_view::{graphics::Rect, Editor};
graphics::{Color, Rect, Style},
Editor,
};
use crate::commands; use crate::commands;
use crate::ui::{menu, Markdown, Menu, Popup, PromptEvent}; use crate::ui::{menu, Markdown, Menu, Popup, PromptEvent};
use helix_lsp::lsp; use helix_lsp::{lsp, util};
use lsp::CompletionItem; use lsp::CompletionItem;
impl menu::Item for CompletionItem { impl menu::Item for CompletionItem {
@ -88,8 +85,6 @@ impl Completion {
// always present here // always present here
let item = item.unwrap(); let item = item.unwrap();
use helix_lsp::{lsp, util};
// if more text was entered, remove it // if more text was entered, remove it
let cursor = doc.selection(view.id).cursor(); let cursor = doc.selection(view.id).cursor();
if trigger_offset < cursor { if trigger_offset < cursor {
@ -100,7 +95,6 @@ impl Completion {
doc.apply(&remove, view.id); doc.apply(&remove, view.id);
} }
use helix_lsp::OffsetEncoding;
let transaction = if let Some(edit) = &item.text_edit { let transaction = if let Some(edit) = &item.text_edit {
let edit = match edit { let edit = match edit {
lsp::CompletionTextEdit::Edit(edit) => edit.clone(), lsp::CompletionTextEdit::Edit(edit) => edit.clone(),

@ -1,32 +1,28 @@
use crate::{ use crate::{
commands, commands,
compositor::{Component, Compositor, Context, EventResult}, compositor::{Component, Context, EventResult},
key, key,
keymap::{self, Keymaps}, keymap::Keymaps,
ui::{Completion, ProgressSpinners}, ui::{Completion, ProgressSpinners},
}; };
use helix_core::{ use helix_core::{
coords_at_pos, coords_at_pos,
graphemes::ensure_grapheme_boundary, graphemes::ensure_grapheme_boundary,
syntax::{self, Highlight, HighlightEvent}, syntax::{self, HighlightEvent},
LineEnding, Position, Range, LineEnding, Position, Range,
}; };
use helix_lsp::LspProgressMap;
use helix_view::{ use helix_view::{
document::Mode, document::Mode,
graphics::{Color, CursorKind, Modifier, Rect, Style}, graphics::{CursorKind, Modifier, Rect, Style},
input::KeyEvent, input::KeyEvent,
keyboard::{KeyCode, KeyModifiers}, keyboard::{KeyCode, KeyModifiers},
Document, Editor, Theme, View, Document, Editor, Theme, View,
}; };
use std::borrow::Cow; use std::borrow::Cow;
use crossterm::{ use crossterm::event::Event;
cursor, use tui::buffer::Buffer as Surface;
event::{read, Event, EventStream},
};
use tui::{backend::CrosstermBackend, buffer::Buffer as Surface};
pub struct EditorView { pub struct EditorView {
keymaps: Keymaps, keymaps: Keymaps,

@ -1,13 +1,20 @@
use crate::compositor::{Component, Compositor, Context, EventResult}; use crate::compositor::{Component, Context};
use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers}; use tui::{
use tui::{buffer::Buffer as Surface, text::Text}; 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::{ use helix_view::{
graphics::{Color, Rect, Style}, graphics::{Color, Rect, Style},
Editor, Theme, Theme,
}; };
pub struct Markdown { pub struct Markdown {
@ -33,9 +40,6 @@ fn parse<'a>(
theme: Option<&Theme>, theme: Option<&Theme>,
loader: &syntax::Loader, loader: &syntax::Loader,
) -> tui::text::Text<'a> { ) -> 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}}} // 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 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```";
@ -82,9 +86,6 @@ fn parse<'a>(
// TODO: temp workaround // TODO: temp workaround
if let Some(Tag::CodeBlock(CodeBlockKind::Fenced(language))) = tags.last() { if let Some(Tag::CodeBlock(CodeBlockKind::Fenced(language))) = tags.last() {
if let Some(theme) = theme { if let Some(theme) = theme {
use helix_core::syntax::{self, HighlightEvent, Syntax};
use helix_core::Rope;
let rope = Rope::from(text.as_ref()); let rope = Rope::from(text.as_ref());
let syntax = loader let syntax = loader
.language_config_for_scope(&format!("source.{}", language)) .language_config_for_scope(&format!("source.{}", language))

@ -4,16 +4,10 @@ use tui::{buffer::Buffer as Surface, widgets::Table};
pub use tui::widgets::{Cell, Row}; pub use tui::widgets::{Cell, Row};
use std::borrow::Cow;
use fuzzy_matcher::skim::SkimMatcherV2 as Matcher; use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;
use fuzzy_matcher::FuzzyMatcher; use fuzzy_matcher::FuzzyMatcher;
use helix_core::Position; use helix_view::{graphics::Rect, Editor};
use helix_view::{
graphics::{Color, Rect, Style},
Editor,
};
pub trait Item { pub trait Item {
// TODO: sort_text // TODO: sort_text

@ -20,12 +20,9 @@ pub use text::Text;
use helix_core::regex::Regex; use helix_core::regex::Regex;
use helix_core::register::Registers; use helix_core::register::Registers;
use helix_view::{ use helix_view::{Document, Editor, View};
graphics::{Color, Modifier, Rect, Style},
Document, Editor, View,
};
use std::path::{Path, PathBuf}; use std::path::PathBuf;
pub fn regex_prompt( pub fn regex_prompt(
cx: &mut crate::commands::Context, cx: &mut crate::commands::Context,
@ -133,8 +130,8 @@ pub mod completers {
use fuzzy_matcher::skim::SkimMatcherV2 as Matcher; use fuzzy_matcher::skim::SkimMatcherV2 as Matcher;
use fuzzy_matcher::FuzzyMatcher; use fuzzy_matcher::FuzzyMatcher;
use helix_view::theme; use helix_view::theme;
use std::borrow::Cow;
use std::cmp::Reverse; use std::cmp::Reverse;
use std::{borrow::Cow, sync::Arc};
pub type Completer = fn(&str) -> Vec<Completion>; pub type Completer = fn(&str) -> Vec<Completion>;
@ -208,7 +205,7 @@ pub mod completers {
// Rust's filename handling is really annoying. // Rust's filename handling is really annoying.
use ignore::WalkBuilder; use ignore::WalkBuilder;
use std::path::{Path, PathBuf}; use std::path::Path;
let is_tilde = input.starts_with('~') && input.len() == 1; let is_tilde = input.starts_with('~') && input.len() == 1;
let path = helix_view::document::expand_tilde(Path::new(input)); let path = helix_view::document::expand_tilde(Path::new(input));

@ -2,13 +2,8 @@ use crate::compositor::{Component, Compositor, Context, EventResult};
use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers}; use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers};
use tui::buffer::Buffer as Surface; use tui::buffer::Buffer as Surface;
use std::borrow::Cow;
use helix_core::Position; use helix_core::Position;
use helix_view::{ use helix_view::graphics::Rect;
graphics::{Color, Rect, Style},
Editor,
};
// TODO: share logic with Menu, it's essentially Popup(render_fn), but render fn needs to return // 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>) // a width/height hint. maybe Popup(Box<Component>)

@ -5,13 +5,11 @@ use std::{borrow::Cow, ops::RangeFrom};
use tui::buffer::Buffer as Surface; use tui::buffer::Buffer as Surface;
use helix_core::{ use helix_core::{
unicode::segmentation::{GraphemeCursor, GraphemeIncomplete}, unicode::segmentation::GraphemeCursor, unicode::width::UnicodeWidthStr, Position,
unicode::width::UnicodeWidthStr,
Position,
}; };
use helix_view::{ use helix_view::{
graphics::{Color, CursorKind, Margin, Modifier, Rect, Style}, graphics::{CursorKind, Margin, Rect},
Editor, Theme, Editor,
}; };
pub type Completion = (RangeFrom<usize>, Cow<'static, str>); pub type Completion = (RangeFrom<usize>, Cow<'static, str>);

@ -1,14 +1,7 @@
use crate::compositor::{Component, Compositor, Context, EventResult}; use crate::compositor::{Component, Context};
use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers};
use tui::buffer::Buffer as Surface; use tui::buffer::Buffer as Surface;
use std::borrow::Cow; use helix_view::graphics::Rect;
use helix_core::Position;
use helix_view::{
graphics::{Color, Rect, Style},
Editor,
};
pub struct Text { pub struct Text {
contents: String, contents: String,

Loading…
Cancel
Save