Fix unused variable, parameter, and mut warnings in helix-term.
This commit is contained in:
Nathan Vegdahl
parent
702a0491db
commit
efa3389b6a
12 changed files with 112 additions and 118 deletions
|
|
@ -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<theme::Loader>,
|
||||
|
||||
// Currently never read from. Remove the `allow(dead_code)` when
|
||||
// that changes.
|
||||
#[allow(dead_code)]
|
||||
syn_loader: Arc<syntax::Loader>,
|
||||
|
||||
jobs: Jobs,
|
||||
|
|
@ -33,7 +40,7 @@ pub struct Application {
|
|||
}
|
||||
|
||||
impl Application {
|
||||
pub fn new(mut args: Args, mut config: Config) -> Result<Self, Error> {
|
||||
pub fn new(args: Args, mut config: Config) -> Result<Self, Error> {
|
||||
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,
|
||||
|
|
|
|||
|
|
@ -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<dyn Component>) {
|
||||
pub fn push_layer(&mut self, component: Box<dyn Component>) {
|
||||
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<Completer>,
|
||||
}
|
||||
|
||||
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<P>,
|
||||
) -> Result<tokio::task::JoinHandle<Result<(), anyhow::Error>>, 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::<helix_core::history::UndoKind>() {
|
||||
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::<helix_core::history::UndoKind>() {
|
||||
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<Output = helix_lsp::util::LspFormatting> + Send + 'static,
|
||||
) -> anyhow::Result<job::Callback> {
|
||||
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<lsp::SignatureHelp>| {
|
||||
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);
|
||||
|
||||
|
|
|
|||
|
|
@ -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<Position>, CursorKind) {
|
||||
fn cursor(&self, _area: Rect, _ctx: &Editor) -> (Option<Position>, 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<Self, Error> {
|
||||
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");
|
||||
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ impl Completion {
|
|||
trigger_offset: usize,
|
||||
) -> Self {
|
||||
// let items: Vec<CompletionItem> = Vec::new();
|
||||
let mut menu = Menu::new(items, move |editor: &mut Editor, item, event| {
|
||||
let menu = Menu::new(items, move |editor: &mut Editor, item, event| {
|
||||
match event {
|
||||
PromptEvent::Abort => {}
|
||||
PromptEvent::Validate => {
|
||||
|
|
|
|||
|
|
@ -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<Position>, CursorKind) {
|
||||
fn cursor(&self, _area: Rect, editor: &Editor) -> (Option<Position>, CursorKind) {
|
||||
// match view.doc.mode() {
|
||||
// Mode::Insert => write!(stdout, "\x1B[6 q"),
|
||||
// mode => write!(stdout, "\x1B[2 q"),
|
||||
|
|
|
|||
|
|
@ -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<B: FromIterator<Self::Item>>(self) -> B\nwhere\n Self: Sized,\n```\n\n---\n\nTransforms an iterator into a collection.\n\n`collect()` can take anything iterable, and turn it into a relevant\ncollection. This is one of the more powerful methods in the standard\nlibrary, used in a variety of contexts.\n\nThe most basic pattern in which `collect()` is used is to turn one\ncollection into another. You take a collection, call [`iter`](https://doc.rust-lang.org/nightly/core/iter/traits/iterator/trait.Iterator.html) on it,\ndo a bunch of transformations, and then `collect()` at the end.\n\n`collect()` can also create instances of types that are not typical\ncollections. For example, a [`String`](https://doc.rust-lang.org/nightly/core/iter/std/string/struct.String.html) can be built from [`char`](type@char)s,\nand an iterator of [`Result<T, E>`](https://doc.rust-lang.org/nightly/core/result/enum.Result.html) items can be collected\ninto `Result<Collection<T>, E>`. See the examples below for more.\n\nBecause `collect()` is so general, it can cause problems with type\ninference. As such, `collect()` is one of the few times you'll see\nthe syntax affectionately known as the 'turbofish': `::<>`. This\nhelps the inference algorithm understand specifically which collection\nyou're trying to collect into.\n\n# Examples\n\nBasic usage:\n\n```rust\nlet a = [1, 2, 3];\n\nlet doubled: Vec<i32> = a.iter()\n .map(|&x| x * 2)\n .collect();\n\nassert_eq!(vec![2, 4, 6], doubled);\n```\n\nNote that we needed the `: Vec<i32>` on the left-hand side. This is because\nwe could collect into, for example, a [`VecDeque<T>`](https://doc.rust-lang.org/nightly/core/iter/std/collections/struct.VecDeque.html) instead:\n\n```rust\nuse std::collections::VecDeque;\n\nlet a = [1, 2, 3];\n\nlet doubled: VecDeque<i32> = a.iter().map(|&x| x * 2).collect();\n\nassert_eq!(2, doubled[0]);\nassert_eq!(4, doubled[1]);\nassert_eq!(6, doubled[2]);\n```\n\nUsing the 'turbofish' instead of annotating `doubled`:\n\n```rust\nlet a = [1, 2, 3];\n\nlet doubled = a.iter().map(|x| x * 2).collect::<Vec<i32>>();\n\nassert_eq!(vec![2, 4, 6], doubled);\n```\n\nBecause `collect()` only cares about what you're collecting into, you can\nstill use a partial type hint, `_`, with the turbofish:\n\n```rust\nlet a = [1, 2, 3];\n\nlet doubled = a.iter().map(|x| x * 2).collect::<Vec<_>>();\n\nassert_eq!(vec![2, 4, 6], doubled);\n```\n\nUsing `collect()` to make a [`String`](https://doc.rust-lang.org/nightly/core/iter/std/string/struct.String.html):\n\n```rust\nlet chars = ['g', 'd', 'k', 'k', 'n'];\n\nlet hello: String = chars.iter()\n .map(|&x| x as u8)\n .map(|x| (x + 1) as char)\n .collect();\n\nassert_eq!(\"hello\", hello);\n```\n\nIf you have a list of [`Result<T, E>`](https://doc.rust-lang.org/nightly/core/result/enum.Result.html)s, you can use `collect()` to\nsee if any of them failed:\n\n```rust\nlet results = [Ok(1), Err(\"nope\"), Ok(3), Err(\"bad\")];\n\nlet result: Result<Vec<_>, &str> = results.iter().cloned().collect();\n\n// gives us the first error\nassert_eq!(Err(\"nope\"), result);\n\nlet results = [Ok(1), Ok(3)];\n\nlet result: Result<Vec<_>, &str> = results.iter().cloned().collect();\n\n// gives us the list of answers\nassert_eq!(Ok(vec![1, 3]), result);\n```";
|
||||
// // also 2021-03-04T16:33:58.553 helix_lsp::transport [INFO] <- {"contents":{"kind":"markdown","value":"\n```rust\ncore::num\n```\n\n```rust\npub const fn saturating_sub(self, rhs:Self) ->Self\n```\n\n---\n\n```rust\n```"},"range":{"end":{"character":61,"line":101},"start":{"character":47,"line":101}}}
|
||||
// let text = "\n```rust\ncore::iter::traits::iterator::Iterator\n```\n\n```rust\nfn collect<B: FromIterator<Self::Item>>(self) -> B\nwhere\n Self: Sized,\n```\n\n---\n\nTransforms an iterator into a collection.\n\n`collect()` can take anything iterable, and turn it into a relevant\ncollection. This is one of the more powerful methods in the standard\nlibrary, used in a variety of contexts.\n\nThe most basic pattern in which `collect()` is used is to turn one\ncollection into another. You take a collection, call [`iter`](https://doc.rust-lang.org/nightly/core/iter/traits/iterator/trait.Iterator.html) on it,\ndo a bunch of transformations, and then `collect()` at the end.\n\n`collect()` can also create instances of types that are not typical\ncollections. For example, a [`String`](https://doc.rust-lang.org/nightly/core/iter/std/string/struct.String.html) can be built from [`char`](type@char)s,\nand an iterator of [`Result<T, E>`](https://doc.rust-lang.org/nightly/core/result/enum.Result.html) items can be collected\ninto `Result<Collection<T>, E>`. See the examples below for more.\n\nBecause `collect()` is so general, it can cause problems with type\ninference. As such, `collect()` is one of the few times you'll see\nthe syntax affectionately known as the 'turbofish': `::<>`. This\nhelps the inference algorithm understand specifically which collection\nyou're trying to collect into.\n\n# Examples\n\nBasic usage:\n\n```rust\nlet a = [1, 2, 3];\n\nlet doubled: Vec<i32> = a.iter()\n .map(|&x| x * 2)\n .collect();\n\nassert_eq!(vec![2, 4, 6], doubled);\n```\n\nNote that we needed the `: Vec<i32>` on the left-hand side. This is because\nwe could collect into, for example, a [`VecDeque<T>`](https://doc.rust-lang.org/nightly/core/iter/std/collections/struct.VecDeque.html) instead:\n\n```rust\nuse std::collections::VecDeque;\n\nlet a = [1, 2, 3];\n\nlet doubled: VecDeque<i32> = a.iter().map(|&x| x * 2).collect();\n\nassert_eq!(2, doubled[0]);\nassert_eq!(4, doubled[1]);\nassert_eq!(6, doubled[2]);\n```\n\nUsing the 'turbofish' instead of annotating `doubled`:\n\n```rust\nlet a = [1, 2, 3];\n\nlet doubled = a.iter().map(|x| x * 2).collect::<Vec<i32>>();\n\nassert_eq!(vec![2, 4, 6], doubled);\n```\n\nBecause `collect()` only cares about what you're collecting into, you can\nstill use a partial type hint, `_`, with the turbofish:\n\n```rust\nlet a = [1, 2, 3];\n\nlet doubled = a.iter().map(|x| x * 2).collect::<Vec<_>>();\n\nassert_eq!(vec![2, 4, 6], doubled);\n```\n\nUsing `collect()` to make a [`String`](https://doc.rust-lang.org/nightly/core/iter/std/string/struct.String.html):\n\n```rust\nlet chars = ['g', 'd', 'k', 'k', 'n'];\n\nlet hello: String = chars.iter()\n .map(|&x| x as u8)\n .map(|x| (x + 1) as char)\n .collect();\n\nassert_eq!(\"hello\", hello);\n```\n\nIf you have a list of [`Result<T, E>`](https://doc.rust-lang.org/nightly/core/result/enum.Result.html)s, you can use `collect()` to\nsee if any of them failed:\n\n```rust\nlet results = [Ok(1), Err(\"nope\"), Ok(3), Err(\"bad\")];\n\nlet result: Result<Vec<_>, &str> = results.iter().cloned().collect();\n\n// gives us the first error\nassert_eq!(Err(\"nope\"), result);\n\nlet results = [Ok(1), Ok(3)];\n\nlet result: Result<Vec<_>, &str> = results.iter().cloned().collect();\n\n// gives us the list of answers\nassert_eq!(Ok(vec![1, 3]), result);\n```";
|
||||
|
||||
let mut options = Options::empty();
|
||||
options.insert(Options::ENABLE_STRIKETHROUGH);
|
||||
|
|
@ -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));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,7 +58,6 @@ impl<T: Item> Menu<T> {
|
|||
pub fn score(&mut self, pattern: &str) {
|
||||
// need to borrow via pattern match otherwise it complains about simultaneous borrow
|
||||
let Self {
|
||||
ref mut options,
|
||||
ref mut matcher,
|
||||
ref mut matches,
|
||||
..
|
||||
|
|
@ -291,7 +290,7 @@ impl<T: Item + 'static> Component for Menu<T> {
|
|||
// )
|
||||
// }
|
||||
|
||||
for (i, option) in (scroll..(scroll + win_height).min(len)).enumerate() {
|
||||
for (i, _) in (scroll..(scroll + win_height).min(len)).enumerate() {
|
||||
let is_marked = i >= scroll_line && i < scroll_line + scroll_height;
|
||||
|
||||
if is_marked {
|
||||
|
|
|
|||
|
|
@ -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<PathBuf> {
|
|||
.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
|
||||
|
|
|
|||
|
|
@ -43,8 +43,8 @@ impl<T> Picker<T> {
|
|||
) -> Self {
|
||||
let prompt = Prompt::new(
|
||||
"".to_string(),
|
||||
|pattern: &str| Vec::new(),
|
||||
|editor: &mut Context, pattern: &str, event: PromptEvent| {
|
||||
|_pattern: &str| Vec::new(),
|
||||
|_editor: &mut Context, _pattern: &str, _event: PromptEvent| {
|
||||
//
|
||||
},
|
||||
);
|
||||
|
|
@ -69,7 +69,6 @@ impl<T> Picker<T> {
|
|||
pub fn score(&mut self) {
|
||||
// need to borrow via pattern match otherwise it complains about simultaneous borrow
|
||||
let Self {
|
||||
ref mut options,
|
||||
ref mut matcher,
|
||||
ref mut matches,
|
||||
ref filters,
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ impl<T: Component> Component for Popup<T> {
|
|||
fn handle_event(&mut self, event: Event, cx: &mut Context) -> EventResult {
|
||||
let key = match event {
|
||||
Event::Key(event) => event,
|
||||
Event::Resize(width, height) => {
|
||||
Event::Resize(_, _) => {
|
||||
// TODO: calculate inner area, call component's handle_event with that area
|
||||
return EventResult::Ignored;
|
||||
}
|
||||
|
|
@ -94,7 +94,7 @@ impl<T: Component> Component for Popup<T> {
|
|||
// tab/enter/ctrl-k or whatever will confirm the selection/ ctrl-n/ctrl-p for scroll.
|
||||
}
|
||||
|
||||
fn required_size(&mut self, viewport: (u16, u16)) -> Option<(u16, u16)> {
|
||||
fn required_size(&mut self, _viewport: (u16, u16)) -> Option<(u16, u16)> {
|
||||
let (width, height) = self
|
||||
.contents
|
||||
.required_size((120, 26)) // max width, max height
|
||||
|
|
@ -130,7 +130,6 @@ impl<T: Component> Component for Popup<T> {
|
|||
rel_y += 1 // position below point
|
||||
}
|
||||
|
||||
let area = Rect::new(rel_x, rel_y, width, height);
|
||||
// clip to viewport
|
||||
let area = viewport.intersection(Rect::new(rel_x, rel_y, width, height));
|
||||
|
||||
|
|
|
|||
|
|
@ -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<Position>, CursorKind) {
|
||||
fn cursor(&self, area: Rect, _editor: &Editor) -> (Option<Position>, CursorKind) {
|
||||
let line = area.height as usize - 1;
|
||||
(
|
||||
Some(Position::new(
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue