summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--helix-term/src/application.rs31
-rw-r--r--helix-term/src/commands.rs32
-rw-r--r--helix-term/src/compositor.rs1
-rw-r--r--helix-term/src/config.rs6
-rw-r--r--helix-term/src/job.rs2
-rw-r--r--helix-term/src/keymap.rs4
-rw-r--r--helix-term/src/lib.rs2
-rw-r--r--helix-term/src/ui/completion.rs16
-rw-r--r--helix-term/src/ui/editor.rs16
-rw-r--r--helix-term/src/ui/markdown.rs25
-rw-r--r--helix-term/src/ui/menu.rs8
-rw-r--r--helix-term/src/ui/mod.rs11
-rw-r--r--helix-term/src/ui/popup.rs7
-rw-r--r--helix-term/src/ui/prompt.rs8
-rw-r--r--helix-term/src/ui/text.rs11
15 files changed, 57 insertions, 123 deletions
diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 3d20e1b3..1939e88c 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -1,37 +1,23 @@
use helix_core::syntax;
-use helix_lsp::{lsp, LspProgressMap};
-use helix_view::{document::Mode, graphics::Rect, theme, Document, Editor, Theme, View};
-
-use crate::{
- args::Args,
- compositor::Compositor,
- config::Config,
- job::Jobs,
- keymap::Keymaps,
- ui::{self, Spinner},
-};
+use helix_lsp::{lsp, util::lsp_pos_to_pos, LspProgressMap};
+use helix_view::{theme, Editor};
+
+use crate::{args::Args, compositor::Compositor, config::Config, job::Jobs, ui};
-use log::{error, info};
+use log::error;
use std::{
- collections::HashMap,
- future::Future,
- io::{self, stdout, Stdout, Write},
- path::PathBuf,
- pin::Pin,
+ io::{stdout, Write},
sync::Arc,
- time::Duration,
};
-use anyhow::{Context, Error};
+use anyhow::Error;
use crossterm::{
event::{Event, EventStream},
execute, terminal,
};
-use futures_util::{future, stream::FuturesUnordered};
-
pub struct Application {
compositor: Compositor,
editor: Editor,
@@ -239,10 +225,9 @@ impl Application {
.into_iter()
.filter_map(|diagnostic| {
use helix_core::{
- diagnostic::{Range, Severity, Severity::*},
+ diagnostic::{Range, Severity::*},
Diagnostic,
};
- use helix_lsp::{lsp, util::lsp_pos_to_pos};
use lsp::DiagnosticSeverity;
let language_server = doc.language_server().unwrap();
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index fa251ff0..e3accaeb 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1,20 +1,21 @@
use helix_core::{
comment, coords_at_pos, find_first_non_whitespace_char, find_root, graphemes, indent,
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,
},
match_brackets,
movement::{self, Direction},
object, pos_at_coords,
regex::{self, Regex},
- register::{self, Register, Registers},
- search, selection, Change, ChangeSet, LineEnding, Position, Range, Rope, RopeGraphemes,
- RopeSlice, Selection, SmallVec, Tendril, Transaction, DEFAULT_LINE_ENDING,
+ register::Register,
+ search, selection, LineEnding, Position, Range, Rope, RopeGraphemes, RopeSlice, Selection,
+ SmallVec, Tendril, Transaction,
};
use helix_view::{
document::{IndentStyle, Mode},
+ editor::Action,
input::KeyEvent,
keyboard::KeyCode,
view::{View, PADDING},
@@ -25,19 +26,19 @@ use anyhow::anyhow;
use helix_lsp::{
lsp,
util::{lsp_pos_to_pos, lsp_range_to_range, pos_to_lsp_pos, range_to_lsp_range},
- LspProgressMap, OffsetEncoding,
+ OffsetEncoding,
};
use insert::*;
use movement::Movement;
use crate::{
- compositor::{self, Callback, Component, Compositor},
- ui::{self, Completion, Picker, Popup, Prompt, PromptEvent},
+ compositor::{self, Component, Compositor},
+ 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 std::{fmt, future::Future, path::Display, str::FromStr};
+use std::{fmt, future::Future};
use std::{
borrow::Cow,
@@ -1148,7 +1149,6 @@ mod cmd {
cx: &mut compositor::Context,
path: Option<P>,
) -> Result<tokio::task::JoinHandle<Result<(), anyhow::Error>>, anyhow::Error> {
- use anyhow::anyhow;
let jobs = &mut cx.jobs;
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.
// if there's a space, per command completion kicks in.
if parts.len() <= 1 {
- use std::{borrow::Cow, ops::Range};
let end = 0..;
cmd::TYPABLE_COMMAND_LIST
.iter()
@@ -1753,8 +1752,6 @@ fn command_mode(cx: &mut Context) {
}
}, // completion
move |cx: &mut compositor::Context, input: &str, event: PromptEvent| {
- use helix_view::editor::Action;
-
if event != PromptEvent::Validate {
return;
}
@@ -1792,7 +1789,6 @@ fn file_picker(cx: &mut Context) {
}
fn buffer_picker(cx: &mut Context) {
- use std::path::{Path, PathBuf};
let current = view!(cx.editor).doc;
let picker = Picker::new(
@@ -1815,7 +1811,6 @@ fn buffer_picker(cx: &mut Context) {
}
},
|editor: &mut Editor, (id, _path): &(DocumentId, Option<PathBuf>), _action| {
- use helix_view::editor::Action;
editor.switch(*id, Action::Replace);
},
);
@@ -2145,8 +2140,6 @@ fn goto_impl(
locations: Vec<lsp::Location>,
offset_encoding: OffsetEncoding,
) {
- use helix_view::editor::Action;
-
push_jump(editor);
fn jump_to(
@@ -3181,7 +3174,6 @@ fn completion(cx: &mut Context) {
if items.is_empty() {
return;
}
- use crate::compositor::AnyComponent;
let size = compositor.size();
let ui = compositor
.find(std::any::type_name::<ui::EditorView>())
@@ -3332,11 +3324,7 @@ fn rotate_view(cx: &mut Context) {
}
// split helper, clear it later
-use helix_view::editor::Action;
-
-use self::cmd::TypableCommand;
fn split(cx: &mut Context, action: Action) {
- use helix_view::editor::Action;
let (view, doc) = current!(cx.editor);
let id = doc.id();
let selection = doc.selection(view.id).clone();
diff --git a/helix-term/src/compositor.rs b/helix-term/src/compositor.rs
index ba8c4bc7..46da04be 100644
--- a/helix-term/src/compositor.rs
+++ b/helix-term/src/compositor.rs
@@ -2,7 +2,6 @@
// Q: how does this work with popups?
// cursive does compositor.screen_mut().add_layer_at(pos::absolute(x, y), <component>)
use helix_core::Position;
-use helix_lsp::LspProgressMap;
use helix_view::graphics::{CursorKind, Rect};
use crossterm::event::Event;
diff --git a/helix-term/src/config.rs b/helix-term/src/config.rs
index 3c05144a..b5ccbdfb 100644
--- a/helix-term/src/config.rs
+++ b/helix-term/src/config.rs
@@ -1,10 +1,10 @@
-use anyhow::{Error, Result};
use serde::Deserialize;
-use std::collections::HashMap;
-use crate::commands::Command;
use crate::keymap::Keymaps;
+#[cfg(test)]
+use crate::commands::Command;
+
#[derive(Debug, Default, Clone, PartialEq, Deserialize)]
pub struct Config {
pub theme: Option<String>,
diff --git a/helix-term/src/job.rs b/helix-term/src/job.rs
index 4b59c81c..c2873513 100644
--- a/helix-term/src/job.rs
+++ b/helix-term/src/job.rs
@@ -3,7 +3,7 @@ use helix_view::Editor;
use crate::compositor::Compositor;
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 JobFuture = BoxFuture<'static, anyhow::Result<Option<Callback>>>;
diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index 22731d16..53588a2b 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -1,7 +1,5 @@
-use crate::commands;
pub use crate::commands::Command;
use crate::config::Config;
-use anyhow::{anyhow, Error, Result};
use helix_core::hashmap;
use helix_view::{
document::Mode,
@@ -11,9 +9,7 @@ use helix_view::{
use serde::Deserialize;
use std::{
collections::HashMap,
- fmt::Display,
ops::{Deref, DerefMut},
- str::FromStr,
};
// Kakoune-inspired:
diff --git a/helix-term/src/lib.rs b/helix-term/src/lib.rs
index 3f288188..f5e3a8cd 100644
--- a/helix-term/src/lib.rs
+++ b/helix-term/src/lib.rs
@@ -1,5 +1,3 @@
-#![allow(unused)]
-
#[macro_use]
extern crate helix_view;
diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs
index 74a82dab..5b418f75 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 {
@@ -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 b55a830e..70f81af9 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,
- 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,
diff --git a/helix-term/src/ui/markdown.rs b/helix-term/src/ui/markdown.rs
index 36d570cd..a1f1e5ea 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,9 +40,6 @@ 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```";
@@ -82,9 +86,6 @@ 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))
diff --git a/helix-term/src/ui/menu.rs b/helix-term/src/ui/menu.rs
index bf18b92b..cb8b6723 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
diff --git a/helix-term/src/ui/mod.rs b/helix-term/src/ui/mod.rs
index 2d4cf9cf..86ec7615 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,
@@ -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>;
@@ -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));
diff --git a/helix-term/src/ui/popup.rs b/helix-term/src/ui/popup.rs
index af72735c..fc178af0 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>)
diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index 6bb1b006..f7c3c685 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>);
diff --git a/helix-term/src/ui/text.rs b/helix-term/src/ui/text.rs
index 7c491841..0d7cd0ed 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,
generated by cgit v1.2.3-70-g09d2 (git 2.47.1) at 2024-12-23 20:21:13 +0000