From 702a0491db0fef8ee15cd6fcff3138812da2c2aa Mon Sep 17 00:00:00 2001 From: Nathan Vegdahl Date: Thu, 1 Jul 2021 10:41:20 -0700 Subject: Remove #[allow(unused)] from helix-term, and fix unused imports. Lots of other warning still left. Will address in subsequent commits. --- helix-term/src/application.rs | 31 ++++++++----------------------- helix-term/src/commands.rs | 32 ++++++++++---------------------- helix-term/src/compositor.rs | 1 - helix-term/src/config.rs | 6 +++--- helix-term/src/job.rs | 2 +- helix-term/src/keymap.rs | 4 ---- helix-term/src/lib.rs | 2 -- helix-term/src/ui/completion.rs | 16 +++++----------- helix-term/src/ui/editor.rs | 16 ++++++---------- helix-term/src/ui/markdown.rs | 25 +++++++++++++------------ helix-term/src/ui/menu.rs | 8 +------- helix-term/src/ui/mod.rs | 11 ++++------- helix-term/src/ui/popup.rs | 7 +------ helix-term/src/ui/prompt.rs | 8 +++----- helix-term/src/ui/text.rs | 11 ++--------- 15 files changed, 57 insertions(+), 123 deletions(-) (limited to 'helix-term') 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

, ) -> Result>, 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), _action| { - use helix_view::editor::Action; editor.switch(*id, Action::Replace); }, ); @@ -2145,8 +2140,6 @@ fn goto_impl( locations: Vec, 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::()) @@ -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), ) 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, 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; pub type JobFuture = BoxFuture<'static, anyhow::Result>>; 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>(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`](https://doc.rust-lang.org/nightly/core/result/enum.Result.html) items can be collected\ninto `Result, 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 = 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` on the left-hand side. This is because\nwe could collect into, for example, a [`VecDeque`](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 = 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::>();\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::>();\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`](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, &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, &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; @@ -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) 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, 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, -- cgit v1.2.3-70-g09d2 From efa3389b6aa4e07982e1e902b0173d1daa4a301e Mon Sep 17 00:00:00 2001 From: Nathan Vegdahl Date: Thu, 1 Jul 2021 11:57:12 -0700 Subject: Fix unused variable, parameter, and `mut` warnings in helix-term. --- helix-term/src/application.rs | 19 ++++--- helix-term/src/commands.rs | 114 ++++++++++++++++++++-------------------- helix-term/src/compositor.rs | 11 ++-- helix-term/src/ui/completion.rs | 2 +- helix-term/src/ui/editor.rs | 9 ++-- helix-term/src/ui/markdown.rs | 10 ++-- helix-term/src/ui/menu.rs | 3 +- helix-term/src/ui/mod.rs | 14 ++--- helix-term/src/ui/picker.rs | 5 +- helix-term/src/ui/popup.rs | 5 +- helix-term/src/ui/prompt.rs | 34 ++++++------ helix-term/src/ui/text.rs | 4 +- 12 files changed, 112 insertions(+), 118 deletions(-) (limited to 'helix-term') diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs index 1939e88c..e75b0ecb 100644 --- a/helix-term/src/application.rs +++ b/helix-term/src/application.rs @@ -25,7 +25,14 @@ pub struct Application { // TODO should be separate to take only part of the config config: Config, + // Currently never read from. Remove the `allow(dead_code)` when + // that changes. + #[allow(dead_code)] theme_loader: Arc, + + // Currently never read from. Remove the `allow(dead_code)` when + // that changes. + #[allow(dead_code)] syn_loader: Arc, jobs: Jobs, @@ -33,7 +40,7 @@ pub struct Application { } impl Application { - pub fn new(mut args: Args, mut config: Config) -> Result { + pub fn new(args: Args, mut config: Config) -> Result { use helix_view::editor::Action; let mut compositor = Compositor::new()?; let size = compositor.size(); @@ -66,7 +73,7 @@ impl Application { let mut editor = Editor::new(size, theme_loader.clone(), syn_loader.clone()); - let mut editor_view = Box::new(ui::EditorView::new(std::mem::take(&mut config.keys))); + let editor_view = Box::new(ui::EditorView::new(std::mem::take(&mut config.keys))); compositor.push(editor_view); if !args.files.is_empty() { @@ -91,7 +98,7 @@ impl Application { editor.set_theme(theme); - let mut app = Self { + let app = Self { compositor, editor, @@ -357,14 +364,10 @@ impl Application { self.editor.set_status(status); } } - _ => unreachable!(), } } Call::MethodCall(helix_lsp::jsonrpc::MethodCall { - method, - params, - jsonrpc, - id, + method, params, id, .. }) => { let call = match MethodCall::parse(&method, params) { Some(call) => call, diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index e3accaeb..8e5816e9 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -60,7 +60,7 @@ pub struct Context<'a> { impl<'a> Context<'a> { /// Push a new component onto the compositor. - pub fn push_layer(&mut self, mut component: Box) { + pub fn push_layer(&mut self, component: Box) { self.callback = Some(Box::new(|compositor: &mut Compositor| { compositor.push(component) })); @@ -493,7 +493,7 @@ fn extend_next_word_start(cx: &mut Context) { let (view, doc) = current!(cx.editor); let text = doc.text().slice(..); - let selection = doc.selection(view.id).transform(|mut range| { + let selection = doc.selection(view.id).transform(|range| { let word = movement::move_next_word_start(text, range, count); let pos = word.head; Range::new(range.anchor, pos) @@ -507,7 +507,7 @@ fn extend_prev_word_start(cx: &mut Context) { let (view, doc) = current!(cx.editor); let text = doc.text().slice(..); - let selection = doc.selection(view.id).transform(|mut range| { + let selection = doc.selection(view.id).transform(|range| { let word = movement::move_prev_word_start(text, range, count); let pos = word.head; Range::new(range.anchor, pos) @@ -520,7 +520,7 @@ fn extend_next_word_end(cx: &mut Context) { let (view, doc) = current!(cx.editor); let text = doc.text().slice(..); - let selection = doc.selection(view.id).transform(|mut range| { + let selection = doc.selection(view.id).transform(|range| { let word = movement::move_next_word_end(text, range, count); let pos = word.head; Range::new(range.anchor, pos) @@ -571,7 +571,7 @@ where let (view, doc) = current!(cx.editor); let text = doc.text().slice(..); - let selection = doc.selection(view.id).transform(|mut range| { + let selection = doc.selection(view.id).transform(|range| { search_fn(text, ch, range.head, count, inclusive).map_or(range, |pos| { if extend { Range::new(range.anchor, pos) @@ -929,7 +929,7 @@ fn search_impl(doc: &mut Document, view: &mut View, contents: &str, regex: &Rege // TODO: use one function for search vs extend fn search(cx: &mut Context) { - let (view, doc) = current!(cx.editor); + let (_, doc) = current!(cx.editor); // TODO: could probably share with select_on_matches? @@ -937,7 +937,6 @@ fn search(cx: &mut Context) { // feed chunks into the regex yet let contents = doc.text().slice(..).to_string(); - let view_id = view.id; let prompt = ui::regex_prompt( cx, "search:".to_string(), @@ -989,7 +988,7 @@ fn extend_line(cx: &mut Context) { let line_start = text.char_to_line(pos.anchor); let start = text.line_to_char(line_start); let line_end = text.char_to_line(pos.head); - let mut end = line_end_char_index(&text.slice(..), line_end); + let mut end = line_end_char_index(&text.slice(..), line_end + count.saturating_sub(1)); if pos.anchor == start && pos.head == end && line_end < (text.len_lines() - 2) { end = line_end_char_index(&text.slice(..), line_end + 1); @@ -1012,7 +1011,6 @@ fn delete_selection_impl(reg: &mut Register, doc: &mut Document, view_id: ViewId let transaction = Transaction::change_by_selection(doc.text(), doc.selection(view_id), |range| { let alltext = doc.text().slice(..); - let line = alltext.char_to_line(range.head); let max_to = rope_end_without_line_ending(&alltext); let to = std::cmp::min(max_to, range.to() + 1); (range.from(), to, None) @@ -1119,7 +1117,7 @@ mod cmd { pub completer: Option, } - fn quit(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) { + fn quit(cx: &mut compositor::Context, _args: &[&str], _event: PromptEvent) { // last view and we have unsaved changes if cx.editor.tree.views().count() == 1 && buffers_remaining_impl(cx.editor) { return; @@ -1128,12 +1126,12 @@ mod cmd { .close(view!(cx.editor).id, /* close_buffer */ false); } - fn force_quit(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) { + fn force_quit(cx: &mut compositor::Context, _args: &[&str], _event: PromptEvent) { cx.editor .close(view!(cx.editor).id, /* close_buffer */ false); } - fn open(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) { + fn open(cx: &mut compositor::Context, args: &[&str], _event: PromptEvent) { match args.get(0) { Some(path) => { // TODO: handle error @@ -1150,7 +1148,7 @@ mod cmd { path: Option

, ) -> Result>, anyhow::Error> { let jobs = &mut cx.jobs; - let (view, doc) = current!(cx.editor); + let (_, doc) = current!(cx.editor); if let Some(path) = path { if let Err(err) = doc.set_path(path.as_ref()) { @@ -1174,7 +1172,7 @@ mod cmd { Ok(tokio::spawn(doc.format_and_save(fmt))) } - fn write(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) { + fn write(cx: &mut compositor::Context, args: &[&str], _event: PromptEvent) { match write_impl(cx, args.first()) { Err(e) => cx.editor.set_error(e.to_string()), Ok(handle) => { @@ -1184,11 +1182,11 @@ mod cmd { }; } - fn new_file(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) { + fn new_file(cx: &mut compositor::Context, _args: &[&str], _event: PromptEvent) { cx.editor.new_file(Action::Replace); } - fn format(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) { + fn format(cx: &mut compositor::Context, _args: &[&str], _event: PromptEvent) { let (_, doc) = current!(cx.editor); if let Some(format) = doc.format() { @@ -1198,7 +1196,7 @@ mod cmd { } } - fn set_indent_style(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) { + fn set_indent_style(cx: &mut compositor::Context, args: &[&str], _event: PromptEvent) { use IndentStyle::*; // If no argument, report current indent style. @@ -1236,7 +1234,7 @@ mod cmd { } /// Sets or reports the current document's line ending setting. - fn set_line_ending(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) { + fn set_line_ending(cx: &mut compositor::Context, args: &[&str], _event: PromptEvent) { use LineEnding::*; // If no argument, report current line ending setting. @@ -1275,7 +1273,7 @@ mod cmd { } } - fn earlier(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) { + fn earlier(cx: &mut compositor::Context, args: &[&str], _event: PromptEvent) { let uk = match args.join(" ").parse::() { Ok(uk) => uk, Err(msg) => { @@ -1287,7 +1285,7 @@ mod cmd { doc.earlier(view.id, uk) } - fn later(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) { + fn later(cx: &mut compositor::Context, args: &[&str], _event: PromptEvent) { let uk = match args.join(" ").parse::() { Ok(uk) => uk, Err(msg) => { @@ -1315,7 +1313,6 @@ mod cmd { } fn force_write_quit(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) { - let (view, doc) = current!(cx.editor); match write_impl(cx, args.first()) { Ok(handle) => { if let Err(e) = helix_lsp::block_on(handle) { @@ -1357,15 +1354,15 @@ mod cmd { fn write_all_impl( editor: &mut Editor, - args: &[&str], - event: PromptEvent, + _args: &[&str], + _event: PromptEvent, quit: bool, force: bool, ) { let mut errors = String::new(); // save all documents - for (id, mut doc) in &mut editor.documents { + for (_, doc) in &mut editor.documents { if doc.path().is_none() { errors.push_str("cannot write a buffer without a filename\n"); continue; @@ -1399,7 +1396,7 @@ mod cmd { write_all_impl(&mut cx.editor, args, event, true, true) } - fn quit_all_impl(editor: &mut Editor, args: &[&str], event: PromptEvent, force: bool) { + fn quit_all_impl(editor: &mut Editor, _args: &[&str], _event: PromptEvent, force: bool) { if !force && buffers_remaining_impl(editor) { return; } @@ -1419,7 +1416,7 @@ mod cmd { quit_all_impl(&mut cx.editor, args, event, true) } - fn theme(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) { + fn theme(cx: &mut compositor::Context, args: &[&str], _event: PromptEvent) { let theme = if let Some(theme) = args.first() { theme } else { @@ -1430,11 +1427,15 @@ mod cmd { cx.editor.set_theme_from_name(theme); } - fn yank_main_selection_to_clipboard(cx: &mut compositor::Context, _: &[&str], _: PromptEvent) { + fn yank_main_selection_to_clipboard( + cx: &mut compositor::Context, + _args: &[&str], + _event: PromptEvent, + ) { yank_main_selection_to_clipboard_impl(&mut cx.editor); } - fn yank_joined_to_clipboard(cx: &mut compositor::Context, args: &[&str], _: PromptEvent) { + fn yank_joined_to_clipboard(cx: &mut compositor::Context, args: &[&str], _event: PromptEvent) { let (_, doc) = current!(cx.editor); let separator = args .first() @@ -1443,15 +1444,19 @@ mod cmd { yank_joined_to_clipboard_impl(&mut cx.editor, separator); } - fn paste_clipboard_after(cx: &mut compositor::Context, _: &[&str], _: PromptEvent) { + fn paste_clipboard_after(cx: &mut compositor::Context, _args: &[&str], _event: PromptEvent) { paste_clipboard_impl(&mut cx.editor, Paste::After); } - fn paste_clipboard_before(cx: &mut compositor::Context, _: &[&str], _: PromptEvent) { + fn paste_clipboard_before(cx: &mut compositor::Context, _args: &[&str], _event: PromptEvent) { paste_clipboard_impl(&mut cx.editor, Paste::After); } - fn replace_selections_with_clipboard(cx: &mut compositor::Context, _: &[&str], _: PromptEvent) { + fn replace_selections_with_clipboard( + cx: &mut compositor::Context, + _args: &[&str], + _event: PromptEvent, + ) { let (view, doc) = current!(cx.editor); match cx.editor.clipboard_provider.get_contents() { @@ -1470,12 +1475,12 @@ mod cmd { } } - fn show_clipboard_provider(cx: &mut compositor::Context, _: &[&str], _: PromptEvent) { + fn show_clipboard_provider(cx: &mut compositor::Context, _args: &[&str], _event: PromptEvent) { cx.editor .set_status(cx.editor.clipboard_provider.name().into()); } - fn change_current_directory(cx: &mut compositor::Context, args: &[&str], _: PromptEvent) { + fn change_current_directory(cx: &mut compositor::Context, args: &[&str], _event: PromptEvent) { let dir = match args.first() { Some(dir) => dir, None => { @@ -1503,7 +1508,7 @@ mod cmd { } } - fn show_current_directory(cx: &mut compositor::Context, args: &[&str], _: PromptEvent) { + fn show_current_directory(cx: &mut compositor::Context, _args: &[&str], _event: PromptEvent) { match std::env::current_dir() { Ok(cwd) => cx .editor @@ -1836,7 +1841,7 @@ fn symbol_picker(cx: &mut Context) { nested_to_flat(list, file, child); } } - let (view, doc) = current!(cx.editor); + let (_, doc) = current!(cx.editor); let language_server = match doc.language_server() { Some(language_server) => language_server, @@ -1927,7 +1932,7 @@ async fn make_format_callback( format: impl Future + Send + 'static, ) -> anyhow::Result { let format = format.await; - let call: job::Callback = Box::new(move |editor: &mut Editor, compositor: &mut Compositor| { + let call: job::Callback = Box::new(move |editor: &mut Editor, _compositor: &mut Compositor| { let view_id = view!(editor).id; if let Some(doc) = editor.document_mut(doc_id) { if doc.version() == doc_version { @@ -2101,9 +2106,6 @@ fn goto_mode(cx: &mut Context) { (_, 't') | (_, 'm') | (_, 'b') => { let (view, doc) = current!(cx.editor); - let pos = doc.selection(view.id).cursor(); - let line = doc.text().char_to_line(pos); - let scrolloff = PADDING.min(view.area.height as usize / 2); // TODO: user pref let last_line = view.last_line(doc); @@ -2152,7 +2154,7 @@ fn goto_impl( .uri .to_file_path() .expect("unable to convert URI to filepath"); - let id = editor.open(path, action).expect("editor.open failed"); + let _id = editor.open(path, action).expect("editor.open failed"); let (view, doc) = current!(editor); let definition_pos = location.range.start; // TODO: convert inside server @@ -2174,7 +2176,7 @@ fn goto_impl( editor.set_error("No definition found.".to_string()); } _locations => { - let mut picker = ui::Picker::new( + let picker = ui::Picker::new( locations, |location| { let file = location.uri.as_str(); @@ -2341,9 +2343,8 @@ fn goto_pos(editor: &mut Editor, pos: usize) { fn goto_first_diag(cx: &mut Context) { let editor = &mut cx.editor; - let (view, doc) = current!(editor); + let (_, doc) = current!(editor); - let cursor_pos = doc.selection(view.id).cursor(); let diag = if let Some(diag) = doc.diagnostics().first() { diag.range.start } else { @@ -2355,9 +2356,8 @@ fn goto_first_diag(cx: &mut Context) { fn goto_last_diag(cx: &mut Context) { let editor = &mut cx.editor; - let (view, doc) = current!(editor); + let (_, doc) = current!(editor); - let cursor_pos = doc.selection(view.id).cursor(); let diag = if let Some(diag) = doc.diagnostics().last() { diag.range.start } else { @@ -2429,8 +2429,8 @@ fn signature_help(cx: &mut Context) { cx.callback( future, - move |editor: &mut Editor, - compositor: &mut Compositor, + move |_editor: &mut Editor, + _compositor: &mut Compositor, response: Option| { if let Some(signature_help) = response { log::info!("{:?}", signature_help); @@ -3002,8 +3002,10 @@ fn format_selections(cx: &mut Context) { .map(|range| range_to_lsp_range(doc.text(), *range, language_server.offset_encoding())) .collect(); - for range in ranges { - let language_server = match doc.language_server() { + // TODO: all of the TODO's and commented code inside the loop, + // to make this actually work. + for _range in ranges { + let _language_server = match doc.language_server() { Some(language_server) => language_server, None => return, }; @@ -3051,7 +3053,7 @@ fn join_selections(cx: &mut Context) { changes.reserve(lines.len()); for line in lines { - let mut start = line_end_char_index(&slice, line); + let start = line_end_char_index(&slice, line); let mut end = text.line_to_char(line + 1); end = skip_while(slice, end, |ch| matches!(ch, ' ' | '\t')).unwrap_or(end); @@ -3227,7 +3229,7 @@ fn hover(cx: &mut Context) { // skip if contents empty let contents = ui::Markdown::new(contents, editor.syn_loader.clone()); - let mut popup = Popup::new(contents); + let popup = Popup::new(contents); compositor.push(Box::new(popup)); } }, @@ -3271,7 +3273,7 @@ fn match_brackets(cx: &mut Context) { fn jump_forward(cx: &mut Context) { let count = cx.count(); - let (view, doc) = current!(cx.editor); + let (view, _doc) = current!(cx.editor); if let Some((id, selection)) = view.jumps.forward(count) { view.doc = *id; @@ -3480,10 +3482,7 @@ fn match_mode(cx: &mut Context) { 'm' => match_brackets(cx), 's' => surround_add(cx), 'r' => surround_replace(cx), - 'd' => { - surround_delete(cx); - let (view, doc) = current!(cx.editor); - } + 'd' => surround_delete(cx), _ => (), } } @@ -3505,9 +3504,8 @@ fn surround_add(cx: &mut Context) { let (open, close) = surround::get_pair(ch); let mut changes = Vec::new(); - for (i, range) in selection.iter().enumerate() { + for range in selection.iter() { let from = range.from(); - let line = text.char_to_line(range.to()); let max_to = rope_end_without_line_ending(&text); let to = std::cmp::min(range.to() + 1, max_to); diff --git a/helix-term/src/compositor.rs b/helix-term/src/compositor.rs index 46da04be..c3d6dee0 100644 --- a/helix-term/src/compositor.rs +++ b/helix-term/src/compositor.rs @@ -35,7 +35,7 @@ pub struct Context<'a> { pub trait Component: Any + AnyComponent { /// Process input events, return true if handled. - fn handle_event(&mut self, event: Event, ctx: &mut Context) -> EventResult { + fn handle_event(&mut self, _event: Event, _ctx: &mut Context) -> EventResult { EventResult::Ignored } // , args: () @@ -49,13 +49,13 @@ pub trait Component: Any + AnyComponent { fn render(&self, area: Rect, frame: &mut Surface, ctx: &mut Context); /// Get cursor position and cursor kind. - fn cursor(&self, area: Rect, ctx: &Editor) -> (Option, CursorKind) { + fn cursor(&self, _area: Rect, _ctx: &Editor) -> (Option, CursorKind) { (None, CursorKind::Hidden) } /// May be used by the parent component to compute the child area. /// viewport is the maximum allowed area, and the child should stay within those bounds. - fn required_size(&mut self, viewport: (u16, u16)) -> Option<(u16, u16)> { + fn required_size(&mut self, _viewport: (u16, u16)) -> Option<(u16, u16)> { // TODO: for scrolling, the scroll wrapper should place a size + offset on the Context // that way render can use it None @@ -79,7 +79,7 @@ pub struct Compositor { impl Compositor { pub fn new() -> Result { let backend = CrosstermBackend::new(stdout()); - let mut terminal = Terminal::new(backend)?; + let terminal = Terminal::new(backend)?; Ok(Self { layers: Vec::new(), terminal, @@ -124,8 +124,7 @@ impl Compositor { } pub fn render(&mut self, cx: &mut Context) { - let area = self - .terminal + self.terminal .autoresize() .expect("Unable to determine terminal size"); diff --git a/helix-term/src/ui/completion.rs b/helix-term/src/ui/completion.rs index 5b418f75..be6db42c 100644 --- a/helix-term/src/ui/completion.rs +++ b/helix-term/src/ui/completion.rs @@ -76,7 +76,7 @@ impl Completion { trigger_offset: usize, ) -> Self { // let items: Vec = 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 => { diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs index 70f81af9..14c34493 100644 --- a/helix-term/src/ui/editor.rs +++ b/helix-term/src/ui/editor.rs @@ -392,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::{ @@ -402,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 @@ -608,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 { @@ -705,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")); @@ -741,7 +740,7 @@ impl Component for EditorView { } } - fn cursor(&self, area: Rect, editor: &Editor) -> (Option, CursorKind) { + fn cursor(&self, _area: Rect, editor: &Editor) -> (Option, 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 a1f1e5ea..6c79ca67 100644 --- a/helix-term/src/ui/markdown.rs +++ b/helix-term/src/ui/markdown.rs @@ -40,8 +40,8 @@ fn parse<'a>( theme: Option<&Theme>, loader: &syntax::Loader, ) -> tui::text::Text<'a> { - // 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>(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`](https://doc.rust-lang.org/nightly/core/result/enum.Result.html) items can be collected\ninto `Result, 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 = 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` on the left-hand side. This is because\nwe could collect into, for example, a [`VecDeque`](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 = 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::>();\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::>();\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`](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, &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, &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>(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`](https://doc.rust-lang.org/nightly/core/result/enum.Result.html) items can be collected\ninto `Result, 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 = 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` on the left-hand side. This is because\nwe could collect into, for example, a [`VecDeque`](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 = 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::>();\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::>();\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`](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, &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, &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); @@ -92,7 +92,7 @@ fn parse<'a>( .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(); @@ -142,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 cb8b6723..226c1135 100644 --- a/helix-term/src/ui/menu.rs +++ b/helix-term/src/ui/menu.rs @@ -58,7 +58,6 @@ impl Menu { 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, .. @@ -291,7 +290,7 @@ impl Component for Menu { // ) // } - 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 86ec7615..7111c968 100644 --- a/helix-term/src/ui/mod.rs +++ b/helix-term/src/ui/mod.rs @@ -35,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 => { @@ -118,7 +118,7 @@ pub fn file_picker(root: PathBuf) -> Picker { .into() }, move |editor: &mut Editor, path: &PathBuf, action| { - let document_id = editor + editor .open(path.into(), action) .expect("editor.open failed"); }, @@ -151,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(); @@ -226,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)) @@ -239,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 { @@ -271,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 Picker { ) -> 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 Picker { 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 fc178af0..29ffb4ad 100644 --- a/helix-term/src/ui/popup.rs +++ b/helix-term/src/ui/popup.rs @@ -52,7 +52,7 @@ impl Component for Popup { 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; } @@ -94,7 +94,7 @@ impl Component for Popup { // 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 @@ -130,7 +130,6 @@ impl Component for Popup { 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 f7c3c685..a4cb26f7 100644 --- a/helix-term/src/ui/prompt.rs +++ b/helix-term/src/ui/prompt.rs @@ -396,6 +396,22 @@ impl Component for Prompt { (self.callback_fn)(cx, &self.line, PromptEvent::Abort); 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, @@ -428,22 +444,6 @@ impl Component for Prompt { code: KeyCode::Char('a'), 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, @@ -492,7 +492,7 @@ impl Component for Prompt { self.render_prompt(area, surface, cx) } - fn cursor(&self, area: Rect, editor: &Editor) -> (Option, CursorKind) { + fn cursor(&self, area: Rect, _editor: &Editor) -> (Option, 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 0d7cd0ed..249cf89e 100644 --- a/helix-term/src/ui/text.rs +++ b/helix-term/src/ui/text.rs @@ -13,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 -- cgit v1.2.3-70-g09d2 From 0b2d51cf5a840b6e34d360b34c116bb981b5058e Mon Sep 17 00:00:00 2001 From: Nathan Vegdahl Date: Thu, 1 Jul 2021 12:08:00 -0700 Subject: Fix unused `Result` warnings in helix-term. --- helix-term/src/application.rs | 11 +++++++---- helix-term/src/commands.rs | 6 ++++-- helix-term/src/compositor.rs | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) (limited to 'helix-term') diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs index e75b0ecb..9622ad91 100644 --- a/helix-term/src/application.rs +++ b/helix-term/src/application.rs @@ -447,17 +447,20 @@ impl Application { // Exit the alternate screen and disable raw mode before panicking let hook = std::panic::take_hook(); std::panic::set_hook(Box::new(move |info| { - execute!(std::io::stdout(), terminal::LeaveAlternateScreen); - terminal::disable_raw_mode(); + // We can't handle errors properly inside this closure. And it's + // probably not a good idea to `unwrap()` inside a panic handler. + // So we just ignore the `Result`s. + let _ = execute!(std::io::stdout(), terminal::LeaveAlternateScreen); + let _ = terminal::disable_raw_mode(); hook(info); })); self.event_loop().await; - self.editor.close_language_servers(None).await; + self.editor.close_language_servers(None).await?; // reset cursor shape - write!(stdout, "\x1B[2 q"); + write!(stdout, "\x1B[2 q")?; execute!(stdout, terminal::LeaveAlternateScreen)?; diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index 8e5816e9..a3799e7e 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -1135,7 +1135,7 @@ mod cmd { match args.get(0) { Some(path) => { // TODO: handle error - cx.editor.open(path.into(), Action::Replace); + let _ = cx.editor.open(path.into(), Action::Replace); } None => { cx.editor.set_error("wrong argument count".to_string()); @@ -1367,7 +1367,9 @@ mod cmd { errors.push_str("cannot write a buffer without a filename\n"); continue; } - helix_lsp::block_on(tokio::spawn(doc.save())); + + // TODO: handle error. + let _ = helix_lsp::block_on(tokio::spawn(doc.save())); } editor.set_error(errors); diff --git a/helix-term/src/compositor.rs b/helix-term/src/compositor.rs index c3d6dee0..5fcb552a 100644 --- a/helix-term/src/compositor.rs +++ b/helix-term/src/compositor.rs @@ -141,7 +141,7 @@ impl Compositor { let (pos, kind) = self.cursor(area, cx.editor); let pos = pos.map(|pos| (pos.col as u16, pos.row as u16)); - self.terminal.draw(pos, kind); + self.terminal.draw(pos, kind).unwrap(); } pub fn cursor(&self, area: Rect, editor: &Editor) -> (Option, CursorKind) { -- cgit v1.2.3-70-g09d2