@@ -60,7 +60,7 @@ pub struct Context<'a> {
6060
6161impl<'a> Context<'a> {
6262 /// Push a new component onto the compositor.
63− pub fn push_layer(&mut self, mut component: Box<dyn Component>) {
63+ pub fn push_layer(&mut self, component: Box<dyn Component>) {
6464 self.callback = Some(Box::new(|compositor: &mut Compositor| {
6565 compositor.push(component)
6666 }));
@@ -493,7 +493,7 @@ fn extend_next_word_start(cx: &mut Context) {
493493 let (view, doc) = current!(cx.editor);
494494 let text = doc.text().slice(..);
495495
496− let selection = doc.selection(view.id).transform(|mut range| {
496+ let selection = doc.selection(view.id).transform(|range| {
497497 let word = movement::move_next_word_start(text, range, count);
498498 let pos = word.head;
499499 Range::new(range.anchor, pos)
@@ -507,7 +507,7 @@ fn extend_prev_word_start(cx: &mut Context) {
507507 let (view, doc) = current!(cx.editor);
508508 let text = doc.text().slice(..);
509509
510− let selection = doc.selection(view.id).transform(|mut range| {
510+ let selection = doc.selection(view.id).transform(|range| {
511511 let word = movement::move_prev_word_start(text, range, count);
512512 let pos = word.head;
513513 Range::new(range.anchor, pos)
@@ -520,7 +520,7 @@ fn extend_next_word_end(cx: &mut Context) {
520520 let (view, doc) = current!(cx.editor);
521521 let text = doc.text().slice(..);
522522
523− let selection = doc.selection(view.id).transform(|mut range| {
523+ let selection = doc.selection(view.id).transform(|range| {
524524 let word = movement::move_next_word_end(text, range, count);
525525 let pos = word.head;
526526 Range::new(range.anchor, pos)
@@ -571,7 +571,7 @@ where
571571 let (view, doc) = current!(cx.editor);
572572 let text = doc.text().slice(..);
573573
574− let selection = doc.selection(view.id).transform(|mut range| {
574+ let selection = doc.selection(view.id).transform(|range| {
575575 search_fn(text, ch, range.head, count, inclusive).map_or(range, |pos| {
576576 if extend {
577577 Range::new(range.anchor, pos)
@@ -929,7 +929,7 @@ fn search_impl(doc: &mut Document, view: &mut View, contents: &str, regex: &Rege
929929
930930// TODO: use one function for search vs extend
931931fn search(cx: &mut Context) {
932− let (view, doc) = current!(cx.editor);
932+ let (_, doc) = current!(cx.editor);
933933
934934 // TODO: could probably share with select_on_matches?
935935
@@ -937,7 +937,6 @@ fn search(cx: &mut Context) {
937937 // feed chunks into the regex yet
938938 let contents = doc.text().slice(..).to_string();
939939
940− let view_id = view.id;
941940 let prompt = ui::regex_prompt(
942941 cx,
943942 "search:".to_string(),
@@ -989,7 +988,7 @@ fn extend_line(cx: &mut Context) {
989988 let line_start = text.char_to_line(pos.anchor);
990989 let start = text.line_to_char(line_start);
991990 let line_end = text.char_to_line(pos.head);
992− let mut end = line_end_char_index(&text.slice(..), line_end);
991+ let mut end = line_end_char_index(&text.slice(..), line_end + count.saturating_sub(1));
993992
994993 if pos.anchor == start && pos.head == end && line_end < (text.len_lines() - 2) {
995994 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
10121011 let transaction =
10131012 Transaction::change_by_selection(doc.text(), doc.selection(view_id), |range| {
10141013 let alltext = doc.text().slice(..);
1015− let line = alltext.char_to_line(range.head);
10161014 let max_to = rope_end_without_line_ending(&alltext);
10171015 let to = std::cmp::min(max_to, range.to() + 1);
10181016 (range.from(), to, None)
@@ -1119,7 +1117,7 @@ mod cmd {
11191117 pub completer: Option<Completer>,
11201118 }
11211119
1122− fn quit(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) {
1120+ fn quit(cx: &mut compositor::Context, _args: &[&str], _event: PromptEvent) {
11231121 // last view and we have unsaved changes
11241122 if cx.editor.tree.views().count() == 1 && buffers_remaining_impl(cx.editor) {
11251123 return;
@@ -1128,12 +1126,12 @@ mod cmd {
11281126 .close(view!(cx.editor).id, /* close_buffer */ false);
11291127 }
11301128
1131− fn force_quit(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) {
1129+ fn force_quit(cx: &mut compositor::Context, _args: &[&str], _event: PromptEvent) {
11321130 cx.editor
11331131 .close(view!(cx.editor).id, /* close_buffer */ false);
11341132 }
11351133
1136− fn open(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) {
1134+ fn open(cx: &mut compositor::Context, args: &[&str], _event: PromptEvent) {
11371135 match args.get(0) {
11381136 Some(path) => {
11391137 // TODO: handle error
@@ -1150,7 +1148,7 @@ mod cmd {
11501148 path: Option<P>,
11511149 ) -> Result<tokio::task::JoinHandle<Result<(), anyhow::Error>>, anyhow::Error> {
11521150 let jobs = &mut cx.jobs;
1153− let (view, doc) = current!(cx.editor);
1151+ let (_, doc) = current!(cx.editor);
11541152
11551153 if let Some(path) = path {
11561154 if let Err(err) = doc.set_path(path.as_ref()) {
@@ -1174,7 +1172,7 @@ mod cmd {
11741172 Ok(tokio::spawn(doc.format_and_save(fmt)))
11751173 }
11761174
1177− fn write(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) {
1175+ fn write(cx: &mut compositor::Context, args: &[&str], _event: PromptEvent) {
11781176 match write_impl(cx, args.first()) {
11791177 Err(e) => cx.editor.set_error(e.to_string()),
11801178 Ok(handle) => {
@@ -1184,11 +1182,11 @@ mod cmd {
11841182 };
11851183 }
11861184
1187− fn new_file(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) {
1185+ fn new_file(cx: &mut compositor::Context, _args: &[&str], _event: PromptEvent) {
11881186 cx.editor.new_file(Action::Replace);
11891187 }
11901188
1191− fn format(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) {
1189+ fn format(cx: &mut compositor::Context, _args: &[&str], _event: PromptEvent) {
11921190 let (_, doc) = current!(cx.editor);
11931191
11941192 if let Some(format) = doc.format() {
@@ -1198,7 +1196,7 @@ mod cmd {
11981196 }
11991197 }
12001198
1201− fn set_indent_style(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) {
1199+ fn set_indent_style(cx: &mut compositor::Context, args: &[&str], _event: PromptEvent) {
12021200 use IndentStyle::*;
12031201
12041202 // If no argument, report current indent style.
@@ -1236,7 +1234,7 @@ mod cmd {
12361234 }
12371235
12381236 /// Sets or reports the current document's line ending setting.
1239− fn set_line_ending(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) {
1237+ fn set_line_ending(cx: &mut compositor::Context, args: &[&str], _event: PromptEvent) {
12401238 use LineEnding::*;
12411239
12421240 // If no argument, report current line ending setting.
@@ -1275,7 +1273,7 @@ mod cmd {
12751273 }
12761274 }
12771275
1278− fn earlier(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) {
1276+ fn earlier(cx: &mut compositor::Context, args: &[&str], _event: PromptEvent) {
12791277 let uk = match args.join(" ").parse::<helix_core::history::UndoKind>() {
12801278 Ok(uk) => uk,
12811279 Err(msg) => {
@@ -1287,7 +1285,7 @@ mod cmd {
12871285 doc.earlier(view.id, uk)
12881286 }
12891287
1290− fn later(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) {
1288+ fn later(cx: &mut compositor::Context, args: &[&str], _event: PromptEvent) {
12911289 let uk = match args.join(" ").parse::<helix_core::history::UndoKind>() {
12921290 Ok(uk) => uk,
12931291 Err(msg) => {
@@ -1315,7 +1313,6 @@ mod cmd {
13151313 }
13161314
13171315 fn force_write_quit(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) {
1318− let (view, doc) = current!(cx.editor);
13191316 match write_impl(cx, args.first()) {
13201317 Ok(handle) => {
13211318 if let Err(e) = helix_lsp::block_on(handle) {
@@ -1357,15 +1354,15 @@ mod cmd {
13571354
13581355 fn write_all_impl(
13591356 editor: &mut Editor,
1360− args: &[&str],
1361− event: PromptEvent,
1357+ _args: &[&str],
1358+ _event: PromptEvent,
13621359 quit: bool,
13631360 force: bool,
13641361 ) {
13651362 let mut errors = String::new();
13661363
13671364 // save all documents
1368− for (id, mut doc) in &mut editor.documents {
1365+ for (_, doc) in &mut editor.documents {
13691366 if doc.path().is_none() {
13701367 errors.push_str("cannot write a buffer without a filename\n");
13711368 continue;
@@ -1399,7 +1396,7 @@ mod cmd {
13991396 write_all_impl(&mut cx.editor, args, event, true, true)
14001397 }
14011398
1402− fn quit_all_impl(editor: &mut Editor, args: &[&str], event: PromptEvent, force: bool) {
1399+ fn quit_all_impl(editor: &mut Editor, _args: &[&str], _event: PromptEvent, force: bool) {
14031400 if !force && buffers_remaining_impl(editor) {
14041401 return;
14051402 }
@@ -1419,7 +1416,7 @@ mod cmd {
14191416 quit_all_impl(&mut cx.editor, args, event, true)
14201417 }
14211418
1422− fn theme(cx: &mut compositor::Context, args: &[&str], event: PromptEvent) {
1419+ fn theme(cx: &mut compositor::Context, args: &[&str], _event: PromptEvent) {
14231420 let theme = if let Some(theme) = args.first() {
14241421 theme
14251422 } else {
@@ -1430,11 +1427,15 @@ mod cmd {
14301427 cx.editor.set_theme_from_name(theme);
14311428 }
14321429
1433− fn yank_main_selection_to_clipboard(cx: &mut compositor::Context, _: &[&str], _: PromptEvent) {
1430+ fn yank_main_selection_to_clipboard(
1431+ cx: &mut compositor::Context,
1432+ _args: &[&str],
1433+ _event: PromptEvent,
1434+ ) {
14341435 yank_main_selection_to_clipboard_impl(&mut cx.editor);
14351436 }
14361437
1437− fn yank_joined_to_clipboard(cx: &mut compositor::Context, args: &[&str], _: PromptEvent) {
1438+ fn yank_joined_to_clipboard(cx: &mut compositor::Context, args: &[&str], _event: PromptEvent) {
14381439 let (_, doc) = current!(cx.editor);
14391440 let separator = args
14401441 .first()
@@ -1443,15 +1444,19 @@ mod cmd {
14431444 yank_joined_to_clipboard_impl(&mut cx.editor, separator);
14441445 }
14451446
1446− fn paste_clipboard_after(cx: &mut compositor::Context, _: &[&str], _: PromptEvent) {
1447+ fn paste_clipboard_after(cx: &mut compositor::Context, _args: &[&str], _event: PromptEvent) {
14471448 paste_clipboard_impl(&mut cx.editor, Paste::After);
14481449 }
14491450
1450− fn paste_clipboard_before(cx: &mut compositor::Context, _: &[&str], _: PromptEvent) {
1451+ fn paste_clipboard_before(cx: &mut compositor::Context, _args: &[&str], _event: PromptEvent) {
14511452 paste_clipboard_impl(&mut cx.editor, Paste::After);
14521453 }
14531454
1454− fn replace_selections_with_clipboard(cx: &mut compositor::Context, _: &[&str], _: PromptEvent) {
1455+ fn replace_selections_with_clipboard(
1456+ cx: &mut compositor::Context,
1457+ _args: &[&str],
1458+ _event: PromptEvent,
1459+ ) {
14551460 let (view, doc) = current!(cx.editor);
14561461
14571462 match cx.editor.clipboard_provider.get_contents() {
@@ -1470,12 +1475,12 @@ mod cmd {
14701475 }
14711476 }
14721477
1473− fn show_clipboard_provider(cx: &mut compositor::Context, _: &[&str], _: PromptEvent) {
1478+ fn show_clipboard_provider(cx: &mut compositor::Context, _args: &[&str], _event: PromptEvent) {
14741479 cx.editor
14751480 .set_status(cx.editor.clipboard_provider.name().into());
14761481 }
14771482
1478− fn change_current_directory(cx: &mut compositor::Context, args: &[&str], _: PromptEvent) {
1483+ fn change_current_directory(cx: &mut compositor::Context, args: &[&str], _event: PromptEvent) {
14791484 let dir = match args.first() {
14801485 Some(dir) => dir,
14811486 None => {
@@ -1503,7 +1508,7 @@ mod cmd {
15031508 }
15041509 }
15051510
1506− fn show_current_directory(cx: &mut compositor::Context, args: &[&str], _: PromptEvent) {
1511+ fn show_current_directory(cx: &mut compositor::Context, _args: &[&str], _event: PromptEvent) {
15071512 match std::env::current_dir() {
15081513 Ok(cwd) => cx
15091514 .editor
@@ -1836,7 +1841,7 @@ fn symbol_picker(cx: &mut Context) {
18361841 nested_to_flat(list, file, child);
18371842 }
18381843 }
1839− let (view, doc) = current!(cx.editor);
1844+ let (_, doc) = current!(cx.editor);
18401845
18411846 let language_server = match doc.language_server() {
18421847 Some(language_server) => language_server,
@@ -1927,7 +1932,7 @@ async fn make_format_callback(
19271932 format: impl Future<Output = helix_lsp::util::LspFormatting> + Send + 'static,
19281933) -> anyhow::Result<job::Callback> {
19291934 let format = format.await;
1930− let call: job::Callback = Box::new(move |editor: &mut Editor, compositor: &mut Compositor| {
1935+ let call: job::Callback = Box::new(move |editor: &mut Editor, _compositor: &mut Compositor| {
19311936 let view_id = view!(editor).id;
19321937 if let Some(doc) = editor.document_mut(doc_id) {
19331938 if doc.version() == doc_version {
@@ -2101,9 +2106,6 @@ fn goto_mode(cx: &mut Context) {
21012106 (_, 't') | (_, 'm') | (_, 'b') => {
21022107 let (view, doc) = current!(cx.editor);
21032108
2104− let pos = doc.selection(view.id).cursor();
2105− let line = doc.text().char_to_line(pos);
2106−
21072109 let scrolloff = PADDING.min(view.area.height as usize / 2); // TODO: user pref
21082110
21092111 let last_line = view.last_line(doc);
@@ -2152,7 +2154,7 @@ fn goto_impl(
21522154 .uri
21532155 .to_file_path()
21542156 .expect("unable to convert URI to filepath");
2155− let id = editor.open(path, action).expect("editor.open failed");
2157+ let _id = editor.open(path, action).expect("editor.open failed");
21562158 let (view, doc) = current!(editor);
21572159 let definition_pos = location.range.start;
21582160 // TODO: convert inside server
@@ -2174,7 +2176,7 @@ fn goto_impl(
21742176 editor.set_error("No definition found.".to_string());
21752177 }
21762178 _locations => {
2177− let mut picker = ui::Picker::new(
2179+ let picker = ui::Picker::new(
21782180 locations,
21792181 |location| {
21802182 let file = location.uri.as_str();
@@ -2341,9 +2343,8 @@ fn goto_pos(editor: &mut Editor, pos: usize) {
23412343
23422344fn goto_first_diag(cx: &mut Context) {
23432345 let editor = &mut cx.editor;
2344− let (view, doc) = current!(editor);
2346+ let (_, doc) = current!(editor);
23452347
2346− let cursor_pos = doc.selection(view.id).cursor();
23472348 let diag = if let Some(diag) = doc.diagnostics().first() {
23482349 diag.range.start
23492350 } else {
@@ -2355,9 +2356,8 @@ fn goto_first_diag(cx: &mut Context) {
23552356
23562357fn goto_last_diag(cx: &mut Context) {
23572358 let editor = &mut cx.editor;
2358− let (view, doc) = current!(editor);
2359+ let (_, doc) = current!(editor);
23592360
2360− let cursor_pos = doc.selection(view.id).cursor();
23612361 let diag = if let Some(diag) = doc.diagnostics().last() {
23622362 diag.range.start
23632363 } else {
@@ -2429,8 +2429,8 @@ fn signature_help(cx: &mut Context) {
24292429
24302430 cx.callback(
24312431 future,
2432− move |editor: &mut Editor,
2433− compositor: &mut Compositor,
2432+ move |_editor: &mut Editor,
2433+ _compositor: &mut Compositor,
24342434 response: Option<lsp::SignatureHelp>| {
24352435 if let Some(signature_help) = response {
24362436 log::info!("{:?}", signature_help);
@@ -3002,8 +3002,10 @@ fn format_selections(cx: &mut Context) {
30023002 .map(|range| range_to_lsp_range(doc.text(), *range, language_server.offset_encoding()))
30033003 .collect();
30043004
3005− for range in ranges {
3006− let language_server = match doc.language_server() {
3005+ // TODO: all of the TODO's and commented code inside the loop,
3006+ // to make this actually work.
3007+ for _range in ranges {
3008+ let _language_server = match doc.language_server() {
30073009 Some(language_server) => language_server,
30083010 None => return,
30093011 };
@@ -3051,7 +3053,7 @@ fn join_selections(cx: &mut Context) {
30513053 changes.reserve(lines.len());
30523054
30533055 for line in lines {
3054− let mut start = line_end_char_index(&slice, line);
3056+ let start = line_end_char_index(&slice, line);
30553057 let mut end = text.line_to_char(line + 1);
30563058 end = skip_while(slice, end, |ch| matches!(ch, ' ' | '\t')).unwrap_or(end);
30573059
@@ -3227,7 +3229,7 @@ fn hover(cx: &mut Context) {
32273229 // skip if contents empty
32283230
32293231 let contents = ui::Markdown::new(contents, editor.syn_loader.clone());
3230− let mut popup = Popup::new(contents);
3232+ let popup = Popup::new(contents);
32313233 compositor.push(Box::new(popup));
32323234 }
32333235 },
@@ -3271,7 +3273,7 @@ fn match_brackets(cx: &mut Context) {
32713273
32723274fn jump_forward(cx: &mut Context) {
32733275 let count = cx.count();
3274− let (view, doc) = current!(cx.editor);
3276+ let (view, _doc) = current!(cx.editor);
32753277
32763278 if let Some((id, selection)) = view.jumps.forward(count) {
32773279 view.doc = *id;
@@ -3480,10 +3482,7 @@ fn match_mode(cx: &mut Context) {
34803482 'm' => match_brackets(cx),
34813483 's' => surround_add(cx),
34823484 'r' => surround_replace(cx),
3483− 'd' => {
3484− surround_delete(cx);
3485− let (view, doc) = current!(cx.editor);
3486− }
3485+ 'd' => surround_delete(cx),
34873486 _ => (),
34883487 }
34893488 }
@@ -3505,9 +3504,8 @@ fn surround_add(cx: &mut Context) {
35053504 let (open, close) = surround::get_pair(ch);
35063505
35073506 let mut changes = Vec::new();
3508− for (i, range) in selection.iter().enumerate() {
3507+ for range in selection.iter() {
35093508 let from = range.from();
3510− let line = text.char_to_line(range.to());
35113509 let max_to = rope_end_without_line_ending(&text);
35123510 let to = std::cmp::min(range.to() + 1, max_to);
35133511