@@ -23,17 +23,17 @@ use helix_core::{
2323 regex::{self, Regex, RegexBuilder},
2424 search::{self, CharMatcher},
2525 selection, shellwords, surround,
26+ syntax::LanguageServerFeature,
2627 text_annotations::TextAnnotations,
2728 textobject,
2829 tree_sitter::Node,
2930 unicode::width::UnicodeWidthChar,
3031 visual_offset_from_block, Deletion, LineEnding, Position, Range, Rope, RopeGraphemes,
31− RopeSlice, Selection, SmallVec, Tendril, Transaction,
32+ RopeReader, RopeSlice, Selection, SmallVec, Tendril, Transaction,
3233};
3334use helix_view::{
34− clipboard::ClipboardType,
3535 document::{FormatterError, Mode, SCRATCH_BUFFER_NAME},
36− editor::{Action, CompleteAction, Motion},
36+ editor::{Action, CompleteAction},
3737 info::Info,
3838 input::KeyEvent,
3939 keyboard::KeyCode,
@@ -43,7 +43,6 @@ use helix_view::{
4343};
4444
4545use anyhow::{anyhow, bail, ensure, Context as _};
46−use fuzzy_matcher::FuzzyMatcher;
4746use insert::*;
4847use movement::Movement;
4948
@@ -54,15 +53,20 @@ use crate::{
5453 job::Callback,
5554 keymap::ReverseKeymap,
5655 ui::{
57− self, editor::InsertEvent, lsp::SignatureHelp, overlay::overlaid, FilePicker, Picker,
56+ self, editor::InsertEvent, lsp::SignatureHelp, overlay::overlaid, CompletionItem, Picker,
5857 Popup, Prompt, PromptEvent,
5958 },
6059};
6160
6261use crate::job::{self, Jobs};
63−use futures_util::StreamExt;
64−use std::{collections::HashMap, fmt, future::Future};
65−use std::{collections::HashSet, num::NonZeroUsize};
62+use futures_util::{stream::FuturesUnordered, TryStreamExt};
63+use std::{
64+ collections::{HashMap, HashSet},
65+ fmt,
66+ future::Future,
67+ io::Read,
68+ num::NonZeroUsize,
69+};
6670
6771use std::{
6872 borrow::Cow,
@@ -71,11 +75,11 @@ use std::{
7175
7276use once_cell::sync::Lazy;
7377use serde::de::{self, Deserialize, Deserializer};
78+use url::Url;
7479
7580use grep_regex::RegexMatcherBuilder;
7681use grep_searcher::{sinks, BinaryDetection, SearcherBuilder};
7782use ignore::{DirEntry, WalkBuilder, WalkState};
78−use tokio_stream::wrappers::UnboundedReceiverStream;
7983
8084pub type OnKeyCallback = Box<dyn FnOnce(&mut Context, KeyEvent)>;
8185
@@ -246,6 +250,9 @@ impl MappableCommand {
246250 move_next_long_word_start, "Move to start of next long word",
247251 move_prev_long_word_start, "Move to start of previous long word",
248252 move_next_long_word_end, "Move to end of next long word",
253+ move_prev_long_word_end, "Move to end of previous long word",
254+ move_parent_node_end, "Move to end of the parent node",
255+ move_parent_node_start, "Move to beginning of the parent node",
249256 extend_next_word_start, "Extend to start of next word",
250257 extend_prev_word_start, "Extend to start of previous word",
251258 extend_next_word_end, "Extend to end of next word",
@@ -253,6 +260,9 @@ impl MappableCommand {
253260 extend_next_long_word_start, "Extend to start of next long word",
254261 extend_prev_long_word_start, "Extend to start of previous long word",
255262 extend_next_long_word_end, "Extend to end of next long word",
263+ extend_prev_long_word_end, "Extend to end of prev long word",
264+ extend_parent_node_end, "Extend to end of the parent node",
265+ extend_parent_node_start, "Extend to beginning of the parent node",
256266 find_till_char, "Move till next occurrence of char",
257267 find_next_char, "Move to next occurrence of char",
258268 extend_till_char, "Extend till next occurrence of char",
@@ -274,6 +284,7 @@ impl MappableCommand {
274284 select_regex, "Select all regex matches inside selections",
275285 split_selection, "Split selections on regex matches",
276286 split_selection_on_newline, "Split selection on newlines",
287+ merge_selections, "Merge selections",
277288 merge_consecutive_selections, "Merge consecutive selections",
278289 search, "Search for regex pattern",
279290 rsearch, "Reverse search for regex pattern",
@@ -326,7 +337,7 @@ impl MappableCommand {
326337 goto_implementation, "Goto implementation",
327338 goto_file_start, "Goto line number <n> else file start",
328339 goto_file_end, "Goto file end",
329− goto_file, "Goto files in selection",
340+ goto_file, "Goto files/URLs in selection",
330341 goto_file_hsplit, "Goto files in selection (hsplit)",
331342 goto_file_vsplit, "Goto files in selection (vsplit)",
332343 goto_reference, "Goto references",
@@ -358,6 +369,7 @@ impl MappableCommand {
358369 extend_to_line_end, "Extend to line end",
359370 extend_to_line_end_newline, "Extend to line end",
360371 signature_help, "Show signature help",
372+ smart_tab, "Insert tab if all cursors have all whitespace to their left; otherwise, run a separate command.",
361373 insert_tab, "Insert tab char",
362374 insert_newline, "Insert newline char",
363375 delete_char_backward, "Delete previous char",
@@ -372,6 +384,9 @@ impl MappableCommand {
372384 later, "Move forward in history",
373385 commit_undo_checkpoint, "Commit changes to new checkpoint",
374386 yank, "Yank selection",
387+ yank_to_clipboard, "Yank selections to clipboard",
388+ yank_to_primary_clipboard, "Yank selections to primary clipboard",
389+ yank_joined, "Join and yank selections",
375390 yank_joined_to_clipboard, "Join and yank selections to clipboard",
376391 yank_main_selection_to_clipboard, "Yank main selection to clipboard",
377392 yank_joined_to_primary_clipboard, "Join and yank selections to primary clipboard",
@@ -402,6 +417,7 @@ impl MappableCommand {
402417 rotate_selections_backward, "Rotate selections backward",
403418 rotate_selection_contents_forward, "Rotate selection contents forward",
404419 rotate_selection_contents_backward, "Rotate selections contents backward",
420+ reverse_selection_contents, "Reverse selections contents",
405421 expand_selection, "Expand selection to parent syntax node",
406422 shrink_selection, "Shrink selection to previously expanded syntax node",
407423 select_next_sibling, "Select next sibling in syntax tree",
@@ -795,42 +811,50 @@ fn extend_to_line_start(cx: &mut Context) {
795811}
796812
797813fn kill_to_line_start(cx: &mut Context) {
798− delete_by_selection_insert_mode(cx, move |text, range| {
799− let line = range.cursor_line(text);
800− let first_char = text.line_to_char(line);
801− let anchor = range.cursor(text);
802− let head = if anchor == first_char && line != 0 {
803− // select until previous line
804− line_end_char_index(&text, line - 1)
805− } else if let Some(pos) = find_first_non_whitespace_char(text.line(line)) {
806− if first_char + pos < anchor {
807− // select until first non-blank in line if cursor is after it
808− first_char + pos
814+ delete_by_selection_insert_mode(
815+ cx,
816+ move |text, range| {
817+ let line = range.cursor_line(text);
818+ let first_char = text.line_to_char(line);
819+ let anchor = range.cursor(text);
820+ let head = if anchor == first_char && line != 0 {
821+ // select until previous line
822+ line_end_char_index(&text, line - 1)
823+ } else if let Some(pos) = find_first_non_whitespace_char(text.line(line)) {
824+ if first_char + pos < anchor {
825+ // select until first non-blank in line if cursor is after it
826+ first_char + pos
827+ } else {
828+ // select until start of line
829+ first_char
830+ }
809831 } else {
810832 // select until start of line
811833 first_char
812− }
813− } else {
814− // select until start of line
815− first_char
816− };
817− (head, anchor)
818− });
834+ };
835+ (head, anchor)
836+ },
837+ Direction::Backward,
838+ );
819839}
820840
821841fn kill_to_line_end(cx: &mut Context) {
822− delete_by_selection_insert_mode(cx, |text, range| {
823− let line = range.cursor_line(text);
824− let line_end_pos = line_end_char_index(&text, line);
825− let pos = range.cursor(text);
842+ delete_by_selection_insert_mode(
843+ cx,
844+ |text, range| {
845+ let line = range.cursor_line(text);
846+ let line_end_pos = line_end_char_index(&text, line);
847+ let pos = range.cursor(text);
826848
827− // if the cursor is on the newline char delete that
828− if pos == line_end_pos {
829− (pos, text.line_to_char(line + 1))
830− } else {
831− (pos, line_end_pos)
832− }
833− });
849+ // if the cursor is on the newline char delete that
850+ if pos == line_end_pos {
851+ (pos, text.line_to_char(line + 1))
852+ } else {
853+ (pos, line_end_pos)
854+ }
855+ },
856+ Direction::Forward,
857+ );
834858}
835859
836860fn goto_first_nonwhitespace(cx: &mut Context) {
@@ -966,6 +990,7 @@ fn align_selections(cx: &mut Context) {
966990
967991 let transaction = Transaction::change(doc.text(), changes.into_iter());
968992 doc.apply(&transaction, view.id);
993+ exit_select_mode(cx);
969994}
970995
971996fn goto_window(cx: &mut Context, align: Align) {
@@ -1057,6 +1082,10 @@ fn move_prev_long_word_start(cx: &mut Context) {
10571082 move_word_impl(cx, movement::move_prev_long_word_start)
10581083}
10591084
1085+fn move_prev_long_word_end(cx: &mut Context) {
1086+ move_word_impl(cx, movement::move_prev_long_word_end)
1087+}
1088+
10601089fn move_next_long_word_end(cx: &mut Context) {
10611090 move_word_impl(cx, movement::move_next_long_word_end)
10621091}
@@ -1081,8 +1110,7 @@ where
10811110 .transform(|range| move_fn(text, range, count, behavior));
10821111 doc.set_selection(view.id, selection);
10831112 };
1084− motion(cx.editor);
1085− cx.editor.last_motion = Some(Motion(Box::new(motion)));
1113+ cx.editor.apply_motion(motion)
10861114}
10871115
10881116fn goto_prev_paragraph(cx: &mut Context) {
@@ -1137,6 +1165,10 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
11371165 let (view, doc) = current_ref!(cx.editor);
11381166 let text = doc.text();
11391167 let selections = doc.selection(view.id);
1168+ let rel_path = doc
1169+ .relative_path()
1170+ .map(|path| path.parent().unwrap().to_path_buf())
1171+ .unwrap_or_default();
11401172 let mut paths: Vec<_> = selections
11411173 .iter()
11421174 .map(|r| text.slice(r.from()..r.to()).to_string())
@@ -1164,16 +1196,80 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
11641196 .to_string(),
11651197 );
11661198 }
1199+
11671200 for sel in paths {
11681201 let p = sel.trim();
1169− if !p.is_empty() {
1170− if let Err(e) = cx.editor.open(&PathBuf::from(p), action) {
1202+ if p.is_empty() {
1203+ continue;
1204+ }
1205+
1206+ if let Ok(url) = Url::parse(p) {
1207+ return open_url(cx, url, action);
1208+ }
1209+
1210+ let path = &rel_path.join(p);
1211+ if path.is_dir() {
1212+ let picker = ui::file_picker(path.into(), &cx.editor.config());
1213+ cx.push_layer(Box::new(overlaid(picker)));
1214+ } else if let Err(e) = cx.editor.open(path, action) {
1215+ cx.editor.set_error(format!("Open file failed: {:?}", e));
1216+ }
1217+ }
1218+}
1219+
1220+/// Opens the given url. If the URL points to a valid textual file it is open in helix.
1221+// Otherwise, the file is open using external program.
1222+fn open_url(cx: &mut Context, url: Url, action: Action) {
1223+ let doc = doc!(cx.editor);
1224+ let rel_path = doc
1225+ .relative_path()
1226+ .map(|path| path.parent().unwrap().to_path_buf())
1227+ .unwrap_or_default();
1228+
1229+ if url.scheme() != "file" {
1230+ return open_external_url(cx, url);
1231+ }
1232+
1233+ let content_type = std::fs::File::open(url.path()).and_then(|file| {
1234+ // Read up to 1kb to detect the content type
1235+ let mut read_buffer = Vec::new();
1236+ let n = file.take(1024).read_to_end(&mut read_buffer)?;
1237+ Ok(content_inspector::inspect(&read_buffer[..n]))
1238+ });
1239+
1240+ // we attempt to open binary files - files that can't be open in helix - using external
1241+ // program as well, e.g. pdf files or images
1242+ match content_type {
1243+ Ok(content_inspector::ContentType::BINARY) => open_external_url(cx, url),
1244+ Ok(_) | Err(_) => {
1245+ let path = &rel_path.join(url.path());
1246+ if path.is_dir() {
1247+ let picker = ui::file_picker(path.into(), &cx.editor.config());
1248+ cx.push_layer(Box::new(overlaid(picker)));
1249+ } else if let Err(e) = cx.editor.open(path, action) {
11711250 cx.editor.set_error(format!("Open file failed: {:?}", e));
11721251 }
11731252 }
11741253 }
11751254}
11761255
1256+/// Opens URL in external program.
1257+fn open_external_url(cx: &mut Context, url: Url) {
1258+ let commands = open::commands(url.as_str());
1259+ cx.jobs.callback(async {
1260+ for cmd in commands {
1261+ let mut command = tokio::process::Command::new(cmd.get_program());
1262+ command.args(cmd.get_args());
1263+ if command.output().await.is_ok() {
1264+ return Ok(job::Callback::Editor(Box::new(|_| {})));
1265+ }
1266+ }
1267+ Ok(job::Callback::Editor(Box::new(move |editor| {
1268+ editor.set_error("Opening URL in external program failed")
1269+ })))
1270+ });
1271+}
1272+
11771273fn extend_word_impl<F>(cx: &mut Context, extend_fn: F)
11781274where
11791275 F: Fn(RopeSlice, Range, usize) -> Range,
@@ -1214,14 +1310,74 @@ fn extend_prev_long_word_start(cx: &mut Context) {
12141310 extend_word_impl(cx, movement::move_prev_long_word_start)
12151311}
12161312
1313+fn extend_prev_long_word_end(cx: &mut Context) {
1314+ extend_word_impl(cx, movement::move_prev_long_word_end)
1315+}
1316+
12171317fn extend_next_long_word_end(cx: &mut Context) {
12181318 extend_word_impl(cx, movement::move_next_long_word_end)
12191319}
12201320
1221−fn will_find_char<F>(cx: &mut Context, search_fn: F, inclusive: bool, extend: bool)
1222−where
1223− F: Fn(RopeSlice, char, usize, usize, bool) -> Option<usize> + 'static,
1224−{
1321+/// Separate branch to find_char designed only for `<ret>` char.
1322+//
1323+// This is necessary because the one document can have different line endings inside. And we
1324+// cannot predict what character to find when <ret> is pressed. On the current line it can be `lf`
1325+// but on the next line it can be `crlf`. That's why [`find_char_impl`] cannot be applied here.
1326+fn find_char_line_ending(
1327+ cx: &mut Context,
1328+ count: usize,
1329+ direction: Direction,
1330+ inclusive: bool,
1331+ extend: bool,
1332+) {
1333+ let (view, doc) = current!(cx.editor);
1334+ let text = doc.text().slice(..);
1335+
1336+ let selection = doc.selection(view.id).clone().transform(|range| {
1337+ let cursor = range.cursor(text);
1338+ let cursor_line = range.cursor_line(text);
1339+
1340+ // Finding the line where we're going to find <ret>. Depends mostly on
1341+ // `count`, but also takes into account edge cases where we're already at the end
1342+ // of a line or the beginning of a line
1343+ let find_on_line = match direction {
1344+ Direction::Forward => {
1345+ let on_edge = line_end_char_index(&text, cursor_line) == cursor;
1346+ let line = cursor_line + count - 1 + (on_edge as usize);
1347+ if line >= text.len_lines() - 1 {
1348+ return range;
1349+ } else {
1350+ line
1351+ }
1352+ }
1353+ Direction::Backward => {
1354+ let on_edge = text.line_to_char(cursor_line) == cursor && !inclusive;
1355+ let line = cursor_line as isize - (count as isize - 1 + on_edge as isize);
1356+ if line <= 0 {
1357+ return range;
1358+ } else {
1359+ line as usize
1360+ }
1361+ }
1362+ };
1363+
1364+ let pos = match (direction, inclusive) {
1365+ (Direction::Forward, true) => line_end_char_index(&text, find_on_line),
1366+ (Direction::Forward, false) => line_end_char_index(&text, find_on_line) - 1,
1367+ (Direction::Backward, true) => line_end_char_index(&text, find_on_line - 1),
1368+ (Direction::Backward, false) => text.line_to_char(find_on_line),
1369+ };
1370+
1371+ if extend {
1372+ range.put_cursor(text, pos, true)
1373+ } else {
1374+ Range::point(range.cursor(text)).put_cursor(text, pos, true)
1375+ }
1376+ });
1377+ doc.set_selection(view.id, selection);
1378+}
1379+
1380+fn find_char(cx: &mut Context, direction: Direction, inclusive: bool, extend: bool) {
12251381 // TODO: count is reset to 1 before next key so we move it into the closure here.
12261382 // Would be nice to carry over.
12271383 let count = cx.count();
@@ -1234,13 +1390,9 @@ where
12341390 KeyEvent {
12351391 code: KeyCode::Enter,
12361392 ..
1237− } =>
1238− // TODO: this isn't quite correct when CRLF is involved.
1239− // This hack will work in most cases, since documents don't
1240− // usually mix line endings. But we should fix it eventually
1241− // anyway.
1242− {
1243− doc!(cx.editor).line_ending.as_str().chars().next().unwrap()
1393+ } => {
1394+ find_char_line_ending(cx, count, direction, inclusive, extend);
1395+ return;
12441396 }
12451397
12461398 KeyEvent {
@@ -1253,11 +1405,18 @@ where
12531405 } => ch,
12541406 _ => return,
12551407 };
1408+ let motion = move |editor: &mut Editor| {
1409+ match direction {
1410+ Direction::Forward => {
1411+ find_char_impl(editor, &find_next_char_impl, inclusive, extend, ch, count)
1412+ }
1413+ Direction::Backward => {
1414+ find_char_impl(editor, &find_prev_char_impl, inclusive, extend, ch, count)
1415+ }
1416+ };
1417+ };
12561418
1257− find_char_impl(cx.editor, &search_fn, inclusive, extend, ch, count);
1258− cx.editor.last_motion = Some(Motion(Box::new(move |editor: &mut Editor| {
1259− find_char_impl(editor, &search_fn, inclusive, true, ch, 1);
1260− })));
1419+ cx.editor.apply_motion(motion);
12611420 })
12621421}
12631422
@@ -1336,46 +1495,39 @@ fn find_prev_char_impl(
13361495}
13371496
13381497fn find_till_char(cx: &mut Context) {
1339− will_find_char(cx, find_next_char_impl, false, false)
1498+ find_char(cx, Direction::Forward, false, false);
13401499}
13411500
13421501fn find_next_char(cx: &mut Context) {
1343− will_find_char(cx, find_next_char_impl, true, false)
1502+ find_char(cx, Direction::Forward, true, false)
13441503}
13451504
13461505fn extend_till_char(cx: &mut Context) {
1347− will_find_char(cx, find_next_char_impl, false, true)
1506+ find_char(cx, Direction::Forward, false, true)
13481507}
13491508
13501509fn extend_next_char(cx: &mut Context) {
1351− will_find_char(cx, find_next_char_impl, true, true)
1510+ find_char(cx, Direction::Forward, true, true)
13521511}
13531512
13541513fn till_prev_char(cx: &mut Context) {
1355− will_find_char(cx, find_prev_char_impl, false, false)
1514+ find_char(cx, Direction::Backward, false, false)
13561515}
13571516
13581517fn find_prev_char(cx: &mut Context) {
1359− will_find_char(cx, find_prev_char_impl, true, false)
1518+ find_char(cx, Direction::Backward, true, false)
13601519}
13611520
13621521fn extend_till_prev_char(cx: &mut Context) {
1363− will_find_char(cx, find_prev_char_impl, false, true)
1522+ find_char(cx, Direction::Backward, false, true)
13641523}
13651524
13661525fn extend_prev_char(cx: &mut Context) {
1367− will_find_char(cx, find_prev_char_impl, true, true)
1526+ find_char(cx, Direction::Backward, true, true)
13681527}
13691528
13701529fn repeat_last_motion(cx: &mut Context) {
1371− let count = cx.count();
1372− let last_motion = cx.editor.last_motion.take();
1373− if let Some(m) = &last_motion {
1374− for _ in 0..count {
1375− m.run(cx.editor);
1376− }
1377− cx.editor.last_motion = last_motion;
1378− }
1530+ cx.editor.repeat_last_motion(cx.count())
13791531}
13801532
13811533fn replace(cx: &mut Context) {
@@ -1442,6 +1594,7 @@ where
14421594 });
14431595
14441596 doc.apply(&transaction, view.id);
1597+ exit_select_mode(cx);
14451598}
14461599
14471600fn switch_case(cx: &mut Context) {
@@ -1683,8 +1836,8 @@ fn select_regex(cx: &mut Context) {
16831836 "select:".into(),
16841837 Some(reg),
16851838 ui::completers::none,
1686− move |editor, regex, event| {
1687− let (view, doc) = current!(editor);
1839+ move |cx, regex, event| {
1840+ let (view, doc) = current!(cx.editor);
16881841 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
16891842 return;
16901843 }
@@ -1705,8 +1858,8 @@ fn split_selection(cx: &mut Context) {
17051858 "split:".into(),
17061859 Some(reg),
17071860 ui::completers::none,
1708− move |editor, regex, event| {
1709− let (view, doc) = current!(editor);
1861+ move |cx, regex, event| {
1862+ let (view, doc) = current!(cx.editor);
17101863 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
17111864 return;
17121865 }
@@ -1728,6 +1881,12 @@ fn split_selection_on_newline(cx: &mut Context) {
17281881 doc.set_selection(view.id, selection);
17291882}
17301883
1884+fn merge_selections(cx: &mut Context) {
1885+ let (view, doc) = current!(cx.editor);
1886+ let selection = doc.selection(view.id).clone().merge_ranges();
1887+ doc.set_selection(view.id, selection);
1888+}
1889+
17311890fn merge_consecutive_selections(cx: &mut Context) {
17321891 let (view, doc) = current!(cx.editor);
17331892 let selection = doc.selection(view.id).clone().merge_consecutive_ranges();
@@ -1823,11 +1982,11 @@ fn search_impl(
18231982
18241983fn search_completions(cx: &mut Context, reg: Option<char>) -> Vec<String> {
18251984 let mut items = reg
1826− .and_then(|reg| cx.editor.registers.get(reg))
1827− .map_or(Vec::new(), |reg| reg.read().iter().take(200).collect());
1985+ .and_then(|reg| cx.editor.registers.read(reg, cx.editor))
1986+ .map_or(Vec::new(), |reg| reg.take(200).collect());
18281987 items.sort_unstable();
18291988 items.dedup();
1830− items.into_iter().cloned().collect()
1989+ items.into_iter().map(|value| value.to_string()).collect()
18311990}
18321991
18331992fn search(cx: &mut Context) {
@@ -1864,12 +2023,14 @@ fn searcher(cx: &mut Context, direction: Direction) {
18642023 .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone())))
18652024 .collect()
18662025 },
1867− move |editor, regex, event| {
1868− if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
2026+ move |cx, regex, event| {
2027+ if event == PromptEvent::Validate {
2028+ cx.editor.registers.last_search_register = reg;
2029+ } else if event != PromptEvent::Update {
18692030 return;
18702031 }
18712032 search_impl(
1872− editor,
2033+ cx.editor,
18732034 &contents,
18742035 ®ex,
18752036 Movement::Move,
@@ -1884,11 +2045,13 @@ fn searcher(cx: &mut Context, direction: Direction) {
18842045
18852046fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Direction) {
18862047 let count = cx.count();
2048+ let register = cx
2049+ .register
2050+ .unwrap_or(cx.editor.registers.last_search_register);
18872051 let config = cx.editor.config();
18882052 let scrolloff = config.scrolloff;
1889− let (_, doc) = current!(cx.editor);
1890− let registers = &cx.editor.registers;
1891− if let Some(query) = registers.read('/').and_then(|query| query.last()) {
2053+ if let Some(query) = cx.editor.registers.first(register, cx.editor) {
2054+ let doc = doc!(cx.editor);
18922055 let contents = doc.text().slice(..).to_string();
18932056 let search_config = &config.search;
18942057 let case_insensitive = if search_config.smart_case {
@@ -1897,7 +2060,7 @@ fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Dir
18972060 false
18982061 };
18992062 let wrap_around = search_config.wrap_around;
1900− if let Ok(regex) = RegexBuilder::new(query)
2063+ if let Ok(regex) = RegexBuilder::new(&query)
19012064 .case_insensitive(case_insensitive)
19022065 .multi_line(true)
19032066 .build()
@@ -1937,6 +2100,7 @@ fn extend_search_prev(cx: &mut Context) {
19372100}
19382101
19392102fn search_selection(cx: &mut Context) {
2103+ let register = cx.register.unwrap_or('/');
19402104 let (view, doc) = current!(cx.editor);
19412105 let contents = doc.text().slice(..);
19422106
@@ -1949,13 +2113,24 @@ fn search_selection(cx: &mut Context) {
19492113 .collect::<Vec<_>>()
19502114 .join("|");
19512115
1952− let msg = format!("register '{}' set to '{}'", '/', ®ex);
1953− cx.editor.registers.push('/', regex);
1954− cx.editor.set_status(msg);
2116+ let msg = format!("register '{}' set to '{}'", register, ®ex);
2117+ match cx.editor.registers.push(register, regex) {
2118+ Ok(_) => {
2119+ cx.editor.registers.last_search_register = register;
2120+ cx.editor.set_status(msg)
2121+ }
2122+ Err(err) => cx.editor.set_error(err.to_string()),
2123+ }
19552124}
19562125
19572126fn make_search_word_bounded(cx: &mut Context) {
1958− let regex = match cx.editor.registers.last('/') {
2127+ // Defaults to the active search register instead `/` to be more ergonomic assuming most people
2128+ // would use this command following `search_selection`. This avoids selecting the register
2129+ // twice.
2130+ let register = cx
2131+ .register
2132+ .unwrap_or(cx.editor.registers.last_search_register);
2133+ let regex = match cx.editor.registers.first(register, cx.editor) {
19592134 Some(regex) => regex,
19602135 None => return,
19612136 };
@@ -1973,14 +2148,19 @@ fn make_search_word_bounded(cx: &mut Context) {
19732148 if !start_anchored {
19742149 new_regex.push_str("\\b");
19752150 }
1976− new_regex.push_str(regex);
2151+ new_regex.push_str(®ex);
19772152 if !end_anchored {
19782153 new_regex.push_str("\\b");
19792154 }
19802155
1981− let msg = format!("register '{}' set to '{}'", '/', &new_regex);
1982− cx.editor.registers.push('/', new_regex);
1983− cx.editor.set_status(msg);
2156+ let msg = format!("register '{}' set to '{}'", register, &new_regex);
2157+ match cx.editor.registers.push(register, new_regex) {
2158+ Ok(_) => {
2159+ cx.editor.registers.last_search_register = register;
2160+ cx.editor.set_status(msg)
2161+ }
2162+ Err(err) => cx.editor.set_error(err.to_string()),
2163+ }
19842164}
19852165
19862166fn global_search(cx: &mut Context) {
@@ -2019,13 +2199,11 @@ fn global_search(cx: &mut Context) {
20192199 }
20202200 }
20212201
2022− let (all_matches_sx, all_matches_rx) = tokio::sync::mpsc::unbounded_channel::<FileResult>();
20232202 let config = cx.editor.config();
20242203 let smart_case = config.search.smart_case;
20252204 let file_picker_config = config.file_picker.clone();
20262205
20272206 let reg = cx.register.unwrap_or('/');
2028−
20292207 let completions = search_completions(cx, Some(reg));
20302208 ui::regex_prompt(
20312209 cx,
@@ -2038,43 +2216,67 @@ fn global_search(cx: &mut Context) {
20382216 .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone())))
20392217 .collect()
20402218 },
2041− move |_editor, regex, event| {
2219+ move |cx, regex, event| {
20422220 if event != PromptEvent::Validate {
20432221 return;
20442222 }
2223+ cx.editor.registers.last_search_register = reg;
2224+
2225+ let current_path = doc_mut!(cx.editor).path().cloned();
2226+ let documents: Vec<_> = cx
2227+ .editor
2228+ .documents()
2229+ .map(|doc| (doc.path().cloned(), doc.text().to_owned()))
2230+ .collect();
20452231
20462232 if let Ok(matcher) = RegexMatcherBuilder::new()
20472233 .case_smart(smart_case)
20482234 .build(regex.as_str())
20492235 {
2050− let searcher = SearcherBuilder::new()
2051− .binary_detection(BinaryDetection::quit(b'\x00'))
2052− .build();
2236+ let search_root = helix_loader::current_working_dir();
2237+ if !search_root.exists() {
2238+ cx.editor
2239+ .set_error("Current working directory does not exist");
2240+ return;
2241+ }
2242+
2243+ let (picker, injector) = Picker::stream(current_path);
20532244
2054− let search_root = std::env::current_dir()
2055− .expect("Global search error: Failed to get current dir");
20562245 let dedup_symlinks = file_picker_config.deduplicate_links;
20572246 let absolute_root = search_root
20582247 .canonicalize()
20592248 .unwrap_or_else(|_| search_root.clone());
2060−
2061− WalkBuilder::new(search_root)
2062− .hidden(file_picker_config.hidden)
2063− .parents(file_picker_config.parents)
2064− .ignore(file_picker_config.ignore)
2065− .follow_links(file_picker_config.follow_symlinks)
2066− .git_ignore(file_picker_config.git_ignore)
2067− .git_global(file_picker_config.git_global)
2068− .git_exclude(file_picker_config.git_exclude)
2069− .max_depth(file_picker_config.max_depth)
2070− .filter_entry(move |entry| {
2071− filter_picker_entry(entry, &absolute_root, dedup_symlinks)
2072− })
2073− .build_parallel()
2074− .run(|| {
2249+ let injector_ = injector.clone();
2250+
2251+ std::thread::spawn(move || {
2252+ let searcher = SearcherBuilder::new()
2253+ .binary_detection(BinaryDetection::quit(b'\x00'))
2254+ .build();
2255+
2256+ let mut walk_builder = WalkBuilder::new(search_root);
2257+
2258+ walk_builder
2259+ .hidden(file_picker_config.hidden)
2260+ .parents(file_picker_config.parents)
2261+ .ignore(file_picker_config.ignore)
2262+ .follow_links(file_picker_config.follow_symlinks)
2263+ .git_ignore(file_picker_config.git_ignore)
2264+ .git_global(file_picker_config.git_global)
2265+ .git_exclude(file_picker_config.git_exclude)
2266+ .max_depth(file_picker_config.max_depth)
2267+ .filter_entry(move |entry| {
2268+ filter_picker_entry(entry, &absolute_root, dedup_symlinks)
2269+ });
2270+
2271+ walk_builder
2272+ .add_custom_ignore_filename(helix_loader::config_dir().join("ignore"));
2273+ walk_builder.add_custom_ignore_filename(".helix/ignore");
2274+
2275+ walk_builder.build_parallel().run(|| {
20752276 let mut searcher = searcher.clone();
20762277 let matcher = matcher.clone();
2077− let all_matches_sx = all_matches_sx.clone();
2278+ let injector = injector_.clone();
2279+ let documents = &documents;
20782280 Box::new(move |entry: Result<DirEntry, ignore::Error>| -> WalkState {
20792281 let entry = match entry {
20802282 Ok(entry) => entry,
@@ -2087,17 +2289,39 @@ fn global_search(cx: &mut Context) {
20872289 _ => return WalkState::Continue,
20882290 };
20892291
2090− let result = searcher.search_path(
2091− &matcher,
2092− entry.path(),
2093− sinks::UTF8(|line_num, _| {
2094− all_matches_sx
2095− .send(FileResult::new(entry.path(), line_num as usize - 1))
2096− .unwrap();
2097−
2098− Ok(true)
2099− }),
2100− );
2292+ let mut stop = false;
2293+ let sink = sinks::UTF8(|line_num, _| {
2294+ stop = injector
2295+ .push(FileResult::new(entry.path(), line_num as usize - 1))
2296+ .is_err();
2297+
2298+ Ok(!stop)
2299+ });
2300+ let doc = documents.iter().find(|&(doc_path, _)| {
2301+ doc_path
2302+ .as_ref()
2303+ .map_or(false, |doc_path| doc_path == entry.path())
2304+ });
2305+
2306+ let result = if let Some((_, doc)) = doc {
2307+ // there is already a buffer for this file
2308+ // search the buffer instead of the file because it's faster
2309+ // and captures new edits without requiring a save
2310+ if searcher.multi_line_with_matcher(&matcher) {
2311+ // in this case a continous buffer is required
2312+ // convert the rope to a string
2313+ let text = doc.to_string();
2314+ searcher.search_slice(&matcher, text.as_bytes(), sink)
2315+ } else {
2316+ searcher.search_reader(
2317+ &matcher,
2318+ RopeReader::new(doc.slice(..)),
2319+ sink,
2320+ )
2321+ }
2322+ } else {
2323+ searcher.search_path(&matcher, entry.path(), sink)
2324+ };
21012325
21022326 if let Err(err) = result {
21032327 log::error!(
@@ -2106,67 +2330,66 @@ fn global_search(cx: &mut Context) {
21062330 err
21072331 );
21082332 }
2109− WalkState::Continue
2333+ if stop {
2334+ WalkState::Quit
2335+ } else {
2336+ WalkState::Continue
2337+ }
21102338 })
21112339 });
2340+ });
2341+
2342+ cx.jobs.callback(async move {
2343+ let call = move |_: &mut Editor, compositor: &mut Compositor| {
2344+ let picker = Picker::with_stream(
2345+ picker,
2346+ injector,
2347+ move |cx, FileResult { path, line_num }, action| {
2348+ let doc = match cx.editor.open(path, action) {
2349+ Ok(id) => doc_mut!(cx.editor, &id),
2350+ Err(e) => {
2351+ cx.editor.set_error(format!(
2352+ "Failed to open file '{}': {}",
2353+ path.display(),
2354+ e
2355+ ));
2356+ return;
2357+ }
2358+ };
2359+
2360+ let line_num = *line_num;
2361+ let view = view_mut!(cx.editor);
2362+ let text = doc.text();
2363+ if line_num >= text.len_lines() {
2364+ cx.editor.set_error(
2365+ "The line you jumped to does not exist anymore because the file has changed.",
2366+ );
2367+ return;
2368+ }
2369+ let start = text.line_to_char(line_num);
2370+ let end = text.line_to_char((line_num + 1).min(text.len_lines()));
2371+
2372+ doc.set_selection(view.id, Selection::single(start, end));
2373+ if action.align_view(view, doc.id()) {
2374+ align_view(doc, view, Align::Center);
2375+ }
2376+ },
2377+ )
2378+ .with_preview(
2379+ |_editor, FileResult { path, line_num }| {
2380+ Some((path.clone().into(), Some((*line_num, *line_num))))
2381+ },
2382+ );
2383+ compositor.push(Box::new(overlaid(picker)))
2384+ };
2385+ Ok(Callback::EditorCompositor(Box::new(call)))
2386+ })
21122387 } else {
21132388 // Otherwise do nothing
21142389 // log::warn!("Global Search Invalid Pattern")
21152390 }
21162391 },
21172392 );
2118−
2119− let current_path = doc_mut!(cx.editor).path().cloned();
2120−
2121− let show_picker = async move {
2122− let all_matches: Vec<FileResult> =
2123− UnboundedReceiverStream::new(all_matches_rx).collect().await;
2124− let call: job::Callback = Callback::EditorCompositor(Box::new(
2125− move |editor: &mut Editor, compositor: &mut Compositor| {
2126− if all_matches.is_empty() {
2127− editor.set_status("No matches found");
2128− return;
2129− }
2130−
2131− let picker = FilePicker::new(
2132− all_matches,
2133− current_path,
2134− move |cx, FileResult { path, line_num }, action| {
2135− match cx.editor.open(path, action) {
2136− Ok(_) => {}
2137− Err(e) => {
2138− cx.editor.set_error(format!(
2139− "Failed to open file '{}': {}",
2140− path.display(),
2141− e
2142− ));
2143− return;
2144− }
2145− }
2146−
2147− let line_num = *line_num;
2148− let (view, doc) = current!(cx.editor);
2149− let text = doc.text();
2150− if line_num >= text.len_lines() {
2151− cx.editor.set_error("The line you jumped to does not exist anymore because the file has changed.");
2152− return;
2153− }
2154− let start = text.line_to_char(line_num);
2155− let end = text.line_to_char((line_num + 1).min(text.len_lines()));
2156−
2157− doc.set_selection(view.id, Selection::single(start, end));
2158− align_view(doc, view, Align::Center);
2159− },
2160− |_editor, FileResult { path, line_num }| {
2161− Some((path.clone().into(), Some((*line_num, *line_num))))
2162− },
2163− );
2164− compositor.push(Box::new(overlaid(picker)));
2165− },
2166− ));
2167− Ok(call)
2168− };
2169− cx.jobs.callback(show_picker);
21702393}
21712394
21722395enum Extend {
@@ -2289,17 +2512,35 @@ enum Operation {
22892512 Change,
22902513}
22912514
2515+fn selection_is_linewise(selection: &Selection, text: &Rope) -> bool {
2516+ selection.ranges().iter().all(|range| {
2517+ let text = text.slice(..);
2518+ if range.slice(text).len_lines() < 2 {
2519+ return false;
2520+ }
2521+ // If the start of the selection is at the start of a line and the end at the end of a line.
2522+ let (start_line, end_line) = range.line_range(text);
2523+ let start = text.line_to_char(start_line);
2524+ let end = text.line_to_char((end_line + 1).min(text.len_lines()));
2525+ start == range.from() && end == range.to()
2526+ })
2527+}
2528+
22922529fn delete_selection_impl(cx: &mut Context, op: Operation) {
22932530 let (view, doc) = current!(cx.editor);
22942531
22952532 let selection = doc.selection(view.id);
2533+ let only_whole_lines = selection_is_linewise(selection, doc.text());
22962534
22972535 if cx.register != Some('_') {
22982536 // first yank the selection
22992537 let text = doc.text().slice(..);
23002538 let values: Vec<String> = selection.fragments(text).map(Cow::into_owned).collect();
23012539 let reg_name = cx.register.unwrap_or('"');
2302− cx.editor.registers.write(reg_name, values);
2540+ if let Err(err) = cx.editor.registers.write(reg_name, values) {
2541+ cx.editor.set_error(err.to_string());
2542+ return;
2543+ }
23032544 };
23042545
23052546 // then delete
@@ -2313,7 +2554,11 @@ fn delete_selection_impl(cx: &mut Context, op: Operation) {
23132554 exit_select_mode(cx);
23142555 }
23152556 Operation::Change => {
2316− enter_insert_mode(cx);
2557+ if only_whole_lines {
2558+ open_above(cx);
2559+ } else {
2560+ enter_insert_mode(cx);
2561+ }
23172562 }
23182563 }
23192564}
@@ -2322,13 +2567,44 @@ fn delete_selection_impl(cx: &mut Context, op: Operation) {
23222567fn delete_by_selection_insert_mode(
23232568 cx: &mut Context,
23242569 mut f: impl FnMut(RopeSlice, &Range) -> Deletion,
2570+ direction: Direction,
23252571) {
23262572 let (view, doc) = current!(cx.editor);
23272573 let text = doc.text().slice(..);
2328− let transaction =
2574+ let mut selection = SmallVec::new();
2575+ let mut insert_newline = false;
2576+ let text_len = text.len_chars();
2577+ let mut transaction =
23292578 Transaction::delete_by_selection(doc.text(), doc.selection(view.id), |range| {
2330− f(text, range)
2579+ let (start, end) = f(text, range);
2580+ if direction == Direction::Forward {
2581+ let mut range = *range;
2582+ if range.head > range.anchor {
2583+ insert_newline |= end == text_len;
2584+ // move the cursor to the right so that the selection
2585+ // doesn't shrink when deleting forward (so the text appears to
2586+ // move to left)
2587+ // += 1 is enough here as the range is normalized to grapheme boundaries
2588+ // later anyway
2589+ range.head += 1;
2590+ }
2591+ selection.push(range);
2592+ }
2593+ (start, end)
23312594 });
2595+
2596+ // in case we delete the last character and the cursor would be moved to the EOF char
2597+ // insert a newline, just like when entering append mode
2598+ if insert_newline {
2599+ transaction = transaction.insert_at_eof(doc.line_ending.as_str().into());
2600+ }
2601+
2602+ if direction == Direction::Forward {
2603+ doc.set_selection(
2604+ view.id,
2605+ Selection::new(selection, doc.selection(view.id).primary_index()),
2606+ );
2607+ }
23322608 doc.apply(&transaction, view.id);
23332609 lsp::signature_help_impl(cx, SignatureHelpInvoked::Automatic);
23342610}
@@ -2404,6 +2680,10 @@ fn insert_mode(cx: &mut Context) {
24042680 .transform(|range| Range::new(range.to(), range.from()));
24052681
24062682 doc.set_selection(view.id, selection);
2683+
2684+ // [TODO] temporary workaround until we're not using the idle timer to
2685+ // trigger auto completions any more
2686+ cx.editor.clear_idle_timer();
24072687}
24082688
24092689// inserts at the end of each selection
@@ -2440,6 +2720,10 @@ fn append_mode(cx: &mut Context) {
24402720
24412721fn file_picker(cx: &mut Context) {
24422722 let root = find_workspace().0;
2723+ if !root.exists() {
2724+ cx.editor.set_error("Workspace directory does not exist");
2725+ return;
2726+ }
24432727 let picker = ui::file_picker(root, &cx.editor.config());
24442728 cx.push_layer(Box::new(overlaid(picker)));
24452729}
@@ -2460,8 +2744,14 @@ fn file_picker_in_current_buffer_directory(cx: &mut Context) {
24602744 let picker = ui::file_picker(path, &cx.editor.config());
24612745 cx.push_layer(Box::new(overlaid(picker)));
24622746}
2747+
24632748fn file_picker_in_current_directory(cx: &mut Context) {
2464− let cwd = std::env::current_dir().unwrap_or_else(|_| PathBuf::from("./"));
2749+ let cwd = helix_loader::current_working_dir();
2750+ if !cwd.exists() {
2751+ cx.editor
2752+ .set_error("Current working directory does not exist");
2753+ return;
2754+ }
24652755 let picker = ui::file_picker(cwd, &cx.editor.config());
24662756 cx.push_layer(Box::new(overlaid(picker)));
24672757}
@@ -2520,22 +2810,18 @@ fn buffer_picker(cx: &mut Context) {
25202810 // mru
25212811 items.sort_unstable_by_key(|item| std::cmp::Reverse(item.focused_at));
25222812
2523− let picker = FilePicker::new(
2524− items,
2525− (),
2526− |cx, meta, action| {
2527− cx.editor.switch(meta.id, action);
2528− },
2529− |editor, meta| {
2530− let doc = &editor.documents.get(&meta.id)?;
2531− let &view_id = doc.selections().keys().next()?;
2532− let line = doc
2533− .selection(view_id)
2534− .primary()
2535− .cursor_line(doc.text().slice(..));
2536− Some((meta.id.into(), Some((line, line))))
2537− },
2538− );
2813+ let picker = Picker::new(items, (), |cx, meta, action| {
2814+ cx.editor.switch(meta.id, action);
2815+ })
2816+ .with_preview(|editor, meta| {
2817+ let doc = &editor.documents.get(&meta.id)?;
2818+ let &view_id = doc.selections().keys().next()?;
2819+ let line = doc
2820+ .selection(view_id)
2821+ .primary()
2822+ .cursor_line(doc.text().slice(..));
2823+ Some((meta.id.into(), Some((line, line))))
2824+ });
25392825 cx.push_layer(Box::new(overlaid(picker)));
25402826}
25412827
@@ -2601,7 +2887,7 @@ fn jumplist_picker(cx: &mut Context) {
26012887 }
26022888 };
26032889
2604− let picker = FilePicker::new(
2890+ let picker = Picker::new(
26052891 cx.editor
26062892 .tree
26072893 .views()
@@ -2615,16 +2901,18 @@ fn jumplist_picker(cx: &mut Context) {
26152901 |cx, meta, action| {
26162902 cx.editor.switch(meta.id, action);
26172903 let config = cx.editor.config();
2618− let (view, doc) = current!(cx.editor);
2904+ let (view, doc) = (view_mut!(cx.editor), doc_mut!(cx.editor, &meta.id));
26192905 doc.set_selection(view.id, meta.selection.clone());
2620− view.ensure_cursor_in_view_center(doc, config.scrolloff);
2621− },
2622− |editor, meta| {
2623− let doc = &editor.documents.get(&meta.id)?;
2624− let line = meta.selection.primary().cursor_line(doc.text().slice(..));
2625− Some((meta.path.clone()?.into(), Some((line, line))))
2906+ if action.align_view(view, doc.id()) {
2907+ view.ensure_cursor_in_view_center(doc, config.scrolloff);
2908+ }
26262909 },
2627− );
2910+ )
2911+ .with_preview(|editor, meta| {
2912+ let doc = &editor.documents.get(&meta.id)?;
2913+ let line = meta.selection.primary().cursor_line(doc.text().slice(..));
2914+ Some((meta.id.into(), Some((line, line))))
2915+ });
26282916 cx.push_layer(Box::new(overlaid(picker)));
26292917}
26302918
@@ -2658,6 +2946,9 @@ impl ui::menu::Item for MappableCommand {
26582946}
26592947
26602948pub fn command_palette(cx: &mut Context) {
2949+ let register = cx.register;
2950+ let count = cx.count;
2951+
26612952 cx.callback = Some(Box::new(
26622953 move |compositor: &mut Compositor, cx: &mut compositor::Context| {
26632954 let keymap = compositor.find::<ui::EditorView>().unwrap().keymaps.map()
@@ -2675,8 +2966,8 @@ pub fn command_palette(cx: &mut Context) {
26752966
26762967 let picker = Picker::new(commands, keymap, move |cx, command, _action| {
26772968 let mut ctx = Context {
2678− register: None,
2679− count: std::num::NonZeroUsize::new(1),
2969+ register,
2970+ count,
26802971 editor: cx.editor,
26812972 callback: None,
26822973 on_next_key_callback: None,
@@ -2715,24 +3006,88 @@ fn last_picker(cx: &mut Context) {
27153006 }));
27163007}
27173008
2718−// I inserts at the first nonwhitespace character of each line with a selection
3009+/// Fallback position to use for [`insert_with_indent`].
3010+enum IndentFallbackPos {
3011+ LineStart,
3012+ LineEnd,
3013+}
3014+
3015+// `I` inserts at the first nonwhitespace character of each line with a selection.
3016+// If the line is empty, automatically indent.
27193017fn insert_at_line_start(cx: &mut Context) {
2720− goto_first_nonwhitespace(cx);
2721− enter_insert_mode(cx);
3018+ insert_with_indent(cx, IndentFallbackPos::LineStart);
27223019}
27233020
2724−// A inserts at the end of each line with a selection
3021+// `A` inserts at the end of each line with a selection.
3022+// If the line is empty, automatically indent.
27253023fn insert_at_line_end(cx: &mut Context) {
3024+ insert_with_indent(cx, IndentFallbackPos::LineEnd);
3025+}
3026+
3027+// Enter insert mode and auto-indent the current line if it is empty.
3028+// If the line is not empty, move the cursor to the specified fallback position.
3029+fn insert_with_indent(cx: &mut Context, cursor_fallback: IndentFallbackPos) {
27263030 enter_insert_mode(cx);
3031+
27273032 let (view, doc) = current!(cx.editor);
27283033
2729− let selection = doc.selection(view.id).clone().transform(|range| {
2730− let text = doc.text().slice(..);
2731− let line = range.cursor_line(text);
2732− let pos = line_end_char_index(&text, line);
2733− Range::new(pos, pos)
3034+ let text = doc.text().slice(..);
3035+ let contents = doc.text();
3036+ let selection = doc.selection(view.id);
3037+
3038+ let language_config = doc.language_config();
3039+ let syntax = doc.syntax();
3040+ let tab_width = doc.tab_width();
3041+
3042+ let mut ranges = SmallVec::with_capacity(selection.len());
3043+ let mut offs = 0;
3044+
3045+ let mut transaction = Transaction::change_by_selection(contents, selection, |range| {
3046+ let cursor_line = range.cursor_line(text);
3047+ let cursor_line_start = text.line_to_char(cursor_line);
3048+
3049+ if line_end_char_index(&text, cursor_line) == cursor_line_start {
3050+ // line is empty => auto indent
3051+ let line_end_index = cursor_line_start;
3052+
3053+ let indent = indent::indent_for_newline(
3054+ language_config,
3055+ syntax,
3056+ &doc.config.load().indent_heuristic,
3057+ &doc.indent_style,
3058+ tab_width,
3059+ text,
3060+ cursor_line,
3061+ line_end_index,
3062+ cursor_line,
3063+ );
3064+
3065+ // calculate new selection ranges
3066+ let pos = offs + cursor_line_start;
3067+ let indent_width = indent.chars().count();
3068+ ranges.push(Range::point(pos + indent_width));
3069+ offs += indent_width;
3070+
3071+ (line_end_index, line_end_index, Some(indent.into()))
3072+ } else {
3073+ // move cursor to the fallback position
3074+ let pos = match cursor_fallback {
3075+ IndentFallbackPos::LineStart => {
3076+ find_first_non_whitespace_char(text.line(cursor_line))
3077+ .map(|ws_offset| ws_offset + cursor_line_start)
3078+ .unwrap_or(cursor_line_start)
3079+ }
3080+ IndentFallbackPos::LineEnd => line_end_char_index(&text, cursor_line),
3081+ };
3082+
3083+ ranges.push(range.put_cursor(text, pos + offs, cx.editor.mode == Mode::Select));
3084+
3085+ (cursor_line_start, cursor_line_start, None)
3086+ }
27343087 });
2735− doc.set_selection(view.id, selection);
3088+
3089+ transaction = transaction.with_selection(Selection::new(ranges, selection.primary_index()));
3090+ doc.apply(&transaction, view.id);
27363091}
27373092
27383093// Creates an LspCallback that waits for formatting changes to be computed. When they're done,
@@ -2803,6 +3158,7 @@ fn open(cx: &mut Context, open: Open) {
28033158 Open::Below => graphemes::prev_grapheme_boundary(text, range.to()),
28043159 Open::Above => range.from(),
28053160 });
3161+
28063162 let new_line = match open {
28073163 // adjust position to the end of the line (next line - 1)
28083164 Open::Below => cursor_line + 1,
@@ -2810,13 +3166,15 @@ fn open(cx: &mut Context, open: Open) {
28103166 Open::Above => cursor_line,
28113167 };
28123168
3169+ let line_num = new_line.saturating_sub(1);
3170+
28133171 // Index to insert newlines after, as well as the char width
28143172 // to use to compensate for those inserted newlines.
28153173 let (line_end_index, line_end_offset_width) = if new_line == 0 {
28163174 (0, 0)
28173175 } else {
28183176 (
2819− line_end_char_index(&doc.text().slice(..), new_line.saturating_sub(1)),
3177+ line_end_char_index(&text, line_num),
28203178 doc.line_ending.len_chars(),
28213179 )
28223180 };
@@ -2824,13 +3182,15 @@ fn open(cx: &mut Context, open: Open) {
28243182 let indent = indent::indent_for_newline(
28253183 doc.language_config(),
28263184 doc.syntax(),
3185+ &doc.config.load().indent_heuristic,
28273186 &doc.indent_style,
28283187 doc.tab_width(),
28293188 text,
2830− new_line.saturating_sub(1),
3189+ line_num,
28313190 line_end_index,
28323191 cursor_line,
28333192 );
3193+
28343194 let indent_len = indent.len();
28353195 let mut text = String::with_capacity(1 + indent_len);
28363196 text.push_str(doc.line_ending.as_str());
@@ -2990,7 +3350,7 @@ fn exit_select_mode(cx: &mut Context) {
29903350
29913351fn goto_first_diag(cx: &mut Context) {
29923352 let (view, doc) = current!(cx.editor);
2993− let selection = match doc.diagnostics().first() {
3353+ let selection = match doc.shown_diagnostics().next() {
29943354 Some(diag) => Selection::single(diag.range.start, diag.range.end),
29953355 None => return,
29963356 };
@@ -2999,7 +3359,7 @@ fn goto_first_diag(cx: &mut Context) {
29993359
30003360fn goto_last_diag(cx: &mut Context) {
30013361 let (view, doc) = current!(cx.editor);
3002− let selection = match doc.diagnostics().last() {
3362+ let selection = match doc.shown_diagnostics().last() {
30033363 Some(diag) => Selection::single(diag.range.start, diag.range.end),
30043364 None => return,
30053365 };
@@ -3015,10 +3375,9 @@ fn goto_next_diag(cx: &mut Context) {
30153375 .cursor(doc.text().slice(..));
30163376
30173377 let diag = doc
3018− .diagnostics()
3019− .iter()
3378+ .shown_diagnostics()
30203379 .find(|diag| diag.range.start > cursor_pos)
3021− .or_else(|| doc.diagnostics().first());
3380+ .or_else(|| doc.shown_diagnostics().next());
30223381
30233382 let selection = match diag {
30243383 Some(diag) => Selection::single(diag.range.start, diag.range.end),
@@ -3036,11 +3395,10 @@ fn goto_prev_diag(cx: &mut Context) {
30363395 .cursor(doc.text().slice(..));
30373396
30383397 let diag = doc
3039− .diagnostics()
3040− .iter()
3398+ .shown_diagnostics()
30413399 .rev()
30423400 .find(|diag| diag.range.start < cursor_pos)
3043− .or_else(|| doc.diagnostics().last());
3401+ .or_else(|| doc.shown_diagnostics().last());
30443402
30453403 let selection = match diag {
30463404 // NOTE: the selection is reversed because we're jumping to the
@@ -3131,8 +3489,7 @@ fn goto_next_change_impl(cx: &mut Context, direction: Direction) {
31313489
31323490 doc.set_selection(view.id, selection)
31333491 };
3134− motion(cx.editor);
3135− cx.editor.last_motion = Some(Motion(Box::new(motion)));
3492+ cx.editor.apply_motion(motion);
31363493}
31373494
31383495/// Returns the [Range] for a [Hunk] in the given text.
@@ -3195,23 +3552,19 @@ pub mod insert {
31953552 use helix_lsp::lsp;
31963553 // if ch matches completion char, trigger completion
31973554 let doc = doc_mut!(cx.editor);
3198− let language_server = match doc.language_server() {
3199− Some(language_server) => language_server,
3200− None => return,
3201− };
3202−
3203− let capabilities = language_server.capabilities();
3555+ let trigger_completion = doc
3556+ .language_servers_with_feature(LanguageServerFeature::Completion)
3557+ .any(|ls| {
3558+ // TODO: what if trigger is multiple chars long
3559+ matches!(&ls.capabilities().completion_provider, Some(lsp::CompletionOptions {
3560+ trigger_characters: Some(triggers),
3561+ ..
3562+ }) if triggers.iter().any(|trigger| trigger.contains(ch)))
3563+ });
32043564
3205− if let Some(lsp::CompletionOptions {
3206− trigger_characters: Some(triggers),
3207− ..
3208− }) = &capabilities.completion_provider
3209− {
3210− // TODO: what if trigger is multiple chars long
3211− if triggers.iter().any(|trigger| trigger.contains(ch)) {
3212− cx.editor.clear_idle_timer();
3213− super::completion(cx);
3214− }
3565+ if trigger_completion {
3566+ cx.editor.clear_idle_timer();
3567+ super::completion(cx);
32153568 }
32163569 }
32173570
@@ -3219,12 +3572,12 @@ pub mod insert {
32193572 use helix_lsp::lsp;
32203573 // if ch matches signature_help char, trigger
32213574 let doc = doc_mut!(cx.editor);
3222− // The language_server!() macro is not used here since it will
3223− // print an "LSP not active for current buffer" message on
3224− // every keypress.
3225− let language_server = match doc.language_server() {
3226− Some(language_server) => language_server,
3227− None => return,
3575+ // TODO support multiple language servers (not just the first that is found), likely by merging UI somehow
3576+ let Some(language_server) = doc
3577+ .language_servers_with_feature(LanguageServerFeature::SignatureHelp)
3578+ .next()
3579+ else {
3580+ return;
32283581 };
32293582
32303583 let capabilities = language_server.capabilities();
@@ -3263,6 +3616,7 @@ pub mod insert {
32633616 }
32643617
32653618 use helix_core::auto_pairs;
3619+ use helix_view::editor::SmartTabConfig;
32663620
32673621 pub fn insert_char(cx: &mut Context, c: char) {
32683622 let (view, doc) = current_ref!(cx.editor);
@@ -3288,6 +3642,31 @@ pub mod insert {
32883642 }
32893643 }
32903644
3645+ pub fn smart_tab(cx: &mut Context) {
3646+ let (view, doc) = current_ref!(cx.editor);
3647+ let view_id = view.id;
3648+
3649+ if matches!(
3650+ cx.editor.config().smart_tab,
3651+ Some(SmartTabConfig { enable: true, .. })
3652+ ) {
3653+ let cursors_after_whitespace = doc.selection(view_id).ranges().iter().all(|range| {
3654+ let cursor = range.cursor(doc.text().slice(..));
3655+ let current_line_num = doc.text().char_to_line(cursor);
3656+ let current_line_start = doc.text().line_to_char(current_line_num);
3657+ let left = doc.text().slice(current_line_start..cursor);
3658+ left.chars().all(|c| c.is_whitespace())
3659+ });
3660+
3661+ if !cursors_after_whitespace {
3662+ move_parent_node_end(cx);
3663+ return;
3664+ }
3665+ }
3666+
3667+ insert_tab(cx);
3668+ }
3669+
32913670 pub fn insert_tab(cx: &mut Context) {
32923671 let (view, doc) = current!(cx.editor);
32933672 // TODO: round out to nearest indentation level (for example a line with 3 spaces should
@@ -3343,6 +3722,7 @@ pub mod insert {
33433722 let indent = indent::indent_for_newline(
33443723 doc.language_config(),
33453724 doc.syntax(),
3725+ &doc.config.load().indent_heuristic,
33463726 &doc.indent_style,
33473727 doc.tab_width(),
33483728 text,
@@ -3490,28 +3870,40 @@ pub mod insert {
34903870
34913871 pub fn delete_char_forward(cx: &mut Context) {
34923872 let count = cx.count();
3493− delete_by_selection_insert_mode(cx, |text, range| {
3494− let pos = range.cursor(text);
3495− (pos, graphemes::nth_next_grapheme_boundary(text, pos, count))
3496− })
3873+ delete_by_selection_insert_mode(
3874+ cx,
3875+ |text, range| {
3876+ let pos = range.cursor(text);
3877+ (pos, graphemes::nth_next_grapheme_boundary(text, pos, count))
3878+ },
3879+ Direction::Forward,
3880+ )
34973881 }
34983882
34993883 pub fn delete_word_backward(cx: &mut Context) {
35003884 let count = cx.count();
3501− delete_by_selection_insert_mode(cx, |text, range| {
3502− let anchor = movement::move_prev_word_start(text, *range, count).from();
3503− let next = Range::new(anchor, range.cursor(text));
3504− let range = exclude_cursor(text, next, *range);
3505− (range.from(), range.to())
3506− });
3885+ delete_by_selection_insert_mode(
3886+ cx,
3887+ |text, range| {
3888+ let anchor = movement::move_prev_word_start(text, *range, count).from();
3889+ let next = Range::new(anchor, range.cursor(text));
3890+ let range = exclude_cursor(text, next, *range);
3891+ (range.from(), range.to())
3892+ },
3893+ Direction::Backward,
3894+ );
35073895 }
35083896
35093897 pub fn delete_word_forward(cx: &mut Context) {
35103898 let count = cx.count();
3511− delete_by_selection_insert_mode(cx, |text, range| {
3512− let head = movement::move_next_word_end(text, *range, count).to();
3513− (range.cursor(text), head)
3514− });
3899+ delete_by_selection_insert_mode(
3900+ cx,
3901+ |text, range| {
3902+ let head = movement::move_next_word_end(text, *range, count).to();
3903+ (range.cursor(text), head)
3904+ },
3905+ Direction::Forward,
3906+ );
35153907 }
35163908}
35173909
@@ -3571,34 +3963,21 @@ fn commit_undo_checkpoint(cx: &mut Context) {
35713963// Yank / Paste
35723964
35733965fn yank(cx: &mut Context) {
3574− let (view, doc) = current!(cx.editor);
3575− let text = doc.text().slice(..);
3576−
3577− let values: Vec<String> = doc
3578− .selection(view.id)
3579− .fragments(text)
3580− .map(Cow::into_owned)
3581− .collect();
3582−
3583− let msg = format!(
3584− "yanked {} selection(s) to register {}",
3585− values.len(),
3586− cx.register.unwrap_or('"')
3587− );
3966+ yank_impl(cx.editor, cx.register.unwrap_or('"'));
3967+ exit_select_mode(cx);
3968+}
35883969
3589− cx.editor
3590− .registers
3591− .write(cx.register.unwrap_or('"'), values);
3970+fn yank_to_clipboard(cx: &mut Context) {
3971+ yank_impl(cx.editor, '+');
3972+ exit_select_mode(cx);
3973+}
35923974
3593− cx.editor.set_status(msg);
3975+fn yank_to_primary_clipboard(cx: &mut Context) {
3976+ yank_impl(cx.editor, '*');
35943977 exit_select_mode(cx);
35953978}
35963979
3597−fn yank_joined_to_clipboard_impl(
3598− editor: &mut Editor,
3599− separator: &str,
3600− clipboard_type: ClipboardType,
3601−) -> anyhow::Result<()> {
3980+fn yank_impl(editor: &mut Editor, register: char) {
36023981 let (view, doc) = current!(editor);
36033982 let text = doc.text().slice(..);
36043983
@@ -3607,74 +3986,79 @@ fn yank_joined_to_clipboard_impl(
36073986 .fragments(text)
36083987 .map(Cow::into_owned)
36093988 .collect();
3989+ let selections = values.len();
36103990
3611− let clipboard_text = match clipboard_type {
3612− ClipboardType::Clipboard => "system clipboard",
3613− ClipboardType::Selection => "primary clipboard",
3614− };
3615−
3616− let msg = format!(
3617− "joined and yanked {} selection(s) to {}",
3618− values.len(),
3619− clipboard_text,
3620− );
3991+ match editor.registers.write(register, values) {
3992+ Ok(_) => editor.set_status(format!(
3993+ "yanked {selections} selection{} to register {register}",
3994+ if selections == 1 { "" } else { "s" }
3995+ )),
3996+ Err(err) => editor.set_error(err.to_string()),
3997+ }
3998+}
36213999
3622− let joined = values.join(separator);
4000+fn yank_joined_impl(editor: &mut Editor, separator: &str, register: char) {
4001+ let (view, doc) = current!(editor);
4002+ let text = doc.text().slice(..);
36234003
3624− editor
3625− .clipboard_provider
3626− .set_contents(joined, clipboard_type)
3627− .context("Couldn't set system clipboard content")?;
4004+ let selection = doc.selection(view.id);
4005+ let selections = selection.len();
4006+ let joined = selection
4007+ .fragments(text)
4008+ .fold(String::new(), |mut acc, fragment| {
4009+ if !acc.is_empty() {
4010+ acc.push_str(separator);
4011+ }
4012+ acc.push_str(&fragment);
4013+ acc
4014+ });
36284015
3629− editor.set_status(msg);
4016+ match editor.registers.write(register, vec![joined]) {
4017+ Ok(_) => editor.set_status(format!(
4018+ "joined and yanked {selections} selection{} to register {register}",
4019+ if selections == 1 { "" } else { "s" }
4020+ )),
4021+ Err(err) => editor.set_error(err.to_string()),
4022+ }
4023+}
36304024
3631− Ok(())
4025+fn yank_joined(cx: &mut Context) {
4026+ let separator = doc!(cx.editor).line_ending.as_str();
4027+ yank_joined_impl(cx.editor, separator, cx.register.unwrap_or('"'));
4028+ exit_select_mode(cx);
36324029}
36334030
36344031fn yank_joined_to_clipboard(cx: &mut Context) {
36354032 let line_ending = doc!(cx.editor).line_ending;
3636− let _ =
3637− yank_joined_to_clipboard_impl(cx.editor, line_ending.as_str(), ClipboardType::Clipboard);
4033+ yank_joined_impl(cx.editor, line_ending.as_str(), '+');
36384034 exit_select_mode(cx);
36394035}
36404036
3641−fn yank_main_selection_to_clipboard_impl(
3642− editor: &mut Editor,
3643− clipboard_type: ClipboardType,
3644−) -> anyhow::Result<()> {
4037+fn yank_joined_to_primary_clipboard(cx: &mut Context) {
4038+ let line_ending = doc!(cx.editor).line_ending;
4039+ yank_joined_impl(cx.editor, line_ending.as_str(), '*');
4040+ exit_select_mode(cx);
4041+}
4042+
4043+fn yank_primary_selection_impl(editor: &mut Editor, register: char) {
36454044 let (view, doc) = current!(editor);
36464045 let text = doc.text().slice(..);
36474046
3648− let message_text = match clipboard_type {
3649− ClipboardType::Clipboard => "yanked main selection to system clipboard",
3650− ClipboardType::Selection => "yanked main selection to primary clipboard",
3651− };
3652−
3653− let value = doc.selection(view.id).primary().fragment(text);
4047+ let selection = doc.selection(view.id).primary().fragment(text).to_string();
36544048
3655− if let Err(e) = editor
3656− .clipboard_provider
3657− .set_contents(value.into_owned(), clipboard_type)
3658− {
3659− bail!("Couldn't set system clipboard content: {}", e);
4049+ match editor.registers.write(register, vec![selection]) {
4050+ Ok(_) => editor.set_status(format!("yanked primary selection to register {register}",)),
4051+ Err(err) => editor.set_error(err.to_string()),
36604052 }
3661−
3662− editor.set_status(message_text);
3663− Ok(())
36644053}
36654054
36664055fn yank_main_selection_to_clipboard(cx: &mut Context) {
3667− let _ = yank_main_selection_to_clipboard_impl(cx.editor, ClipboardType::Clipboard);
3668−}
3669−
3670−fn yank_joined_to_primary_clipboard(cx: &mut Context) {
3671− let line_ending = doc!(cx.editor).line_ending;
3672− let _ =
3673− yank_joined_to_clipboard_impl(cx.editor, line_ending.as_str(), ClipboardType::Selection);
4056+ yank_primary_selection_impl(cx.editor, '+');
4057+ exit_select_mode(cx);
36744058}
36754059
36764060fn yank_main_selection_to_primary_clipboard(cx: &mut Context) {
3677− let _ = yank_main_selection_to_clipboard_impl(cx.editor, ClipboardType::Selection);
4061+ yank_primary_selection_impl(cx.editor, '*');
36784062 exit_select_mode(cx);
36794063}
36804064
@@ -3772,146 +4156,99 @@ pub(crate) fn paste_bracketed_value(cx: &mut Context, contents: String) {
37724156 };
37734157 let (view, doc) = current!(cx.editor);
37744158 paste_impl(&[contents], doc, view, paste, count, cx.editor.mode);
3775−}
3776−
3777−fn paste_clipboard_impl(
3778− editor: &mut Editor,
3779− action: Paste,
3780− clipboard_type: ClipboardType,
3781− count: usize,
3782−) -> anyhow::Result<()> {
3783− let (view, doc) = current!(editor);
3784− match editor.clipboard_provider.get_contents(clipboard_type) {
3785− Ok(contents) => {
3786− paste_impl(&[contents], doc, view, action, count, editor.mode);
3787− Ok(())
3788− }
3789− Err(e) => Err(e.context("Couldn't get system clipboard contents")),
3790− }
4159+ exit_select_mode(cx);
37914160}
37924161
37934162fn paste_clipboard_after(cx: &mut Context) {
3794− let _ = paste_clipboard_impl(
3795− cx.editor,
3796− Paste::After,
3797− ClipboardType::Clipboard,
3798− cx.count(),
3799− );
4163+ paste(cx.editor, '+', Paste::After, cx.count());
4164+ exit_select_mode(cx);
38004165}
38014166
38024167fn paste_clipboard_before(cx: &mut Context) {
3803− let _ = paste_clipboard_impl(
3804− cx.editor,
3805− Paste::Before,
3806− ClipboardType::Clipboard,
3807− cx.count(),
3808− );
4168+ paste(cx.editor, '+', Paste::Before, cx.count());
4169+ exit_select_mode(cx);
38094170}
38104171
38114172fn paste_primary_clipboard_after(cx: &mut Context) {
3812− let _ = paste_clipboard_impl(
3813− cx.editor,
3814− Paste::After,
3815− ClipboardType::Selection,
3816− cx.count(),
3817− );
4173+ paste(cx.editor, '*', Paste::After, cx.count());
4174+ exit_select_mode(cx);
38184175}
38194176
38204177fn paste_primary_clipboard_before(cx: &mut Context) {
3821− let _ = paste_clipboard_impl(
3822− cx.editor,
3823− Paste::Before,
3824− ClipboardType::Selection,
3825− cx.count(),
3826− );
4178+ paste(cx.editor, '*', Paste::Before, cx.count());
4179+ exit_select_mode(cx);
38274180}
38284181
38294182fn replace_with_yanked(cx: &mut Context) {
3830− let count = cx.count();
3831− let reg_name = cx.register.unwrap_or('"');
3832− let (view, doc) = current!(cx.editor);
3833− let registers = &mut cx.editor.registers;
3834−
3835− if let Some(values) = registers.read(reg_name) {
3836− if !values.is_empty() {
3837− let repeat = std::iter::repeat(
3838− values
3839− .last()
3840− .map(|value| Tendril::from(&value.repeat(count)))
3841− .unwrap(),
3842− );
3843− let mut values = values
3844− .iter()
3845− .map(|value| Tendril::from(&value.repeat(count)))
3846− .chain(repeat);
3847− let selection = doc.selection(view.id);
3848− let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
3849− if !range.is_empty() {
3850− (range.from(), range.to(), Some(values.next().unwrap()))
3851− } else {
3852− (range.from(), range.to(), None)
3853− }
3854− });
3855−
3856− doc.apply(&transaction, view.id);
3857− exit_select_mode(cx);
3858− }
3859− }
4183+ replace_with_yanked_impl(cx.editor, cx.register.unwrap_or('"'), cx.count());
4184+ exit_select_mode(cx);
38604185}
38614186
3862−fn replace_selections_with_clipboard_impl(
3863− cx: &mut Context,
3864− clipboard_type: ClipboardType,
3865−) -> anyhow::Result<()> {
3866− let count = cx.count();
3867− let (view, doc) = current!(cx.editor);
3868−
3869− match cx.editor.clipboard_provider.get_contents(clipboard_type) {
3870− Ok(contents) => {
3871− let selection = doc.selection(view.id);
3872− let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
3873− (
3874− range.from(),
3875− range.to(),
3876− Some(contents.repeat(count).as_str().into()),
3877− )
3878− });
4187+fn replace_with_yanked_impl(editor: &mut Editor, register: char, count: usize) {
4188+ let Some(values) = editor.registers
4189+ .read(register, editor)
4190+ .filter(|values| values.len() > 0) else { return };
4191+ let values: Vec<_> = values.map(|value| value.to_string()).collect();
38794192
3880− doc.apply(&transaction, view.id);
3881− doc.append_changes_to_history(view);
4193+ let (view, doc) = current!(editor);
4194+ let repeat = std::iter::repeat(
4195+ values
4196+ .last()
4197+ .map(|value| Tendril::from(&value.repeat(count)))
4198+ .unwrap(),
4199+ );
4200+ let mut values = values
4201+ .iter()
4202+ .map(|value| Tendril::from(&value.repeat(count)))
4203+ .chain(repeat);
4204+ let selection = doc.selection(view.id);
4205+ let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
4206+ if !range.is_empty() {
4207+ (range.from(), range.to(), Some(values.next().unwrap()))
4208+ } else {
4209+ (range.from(), range.to(), None)
38824210 }
3883− Err(e) => return Err(e.context("Couldn't get system clipboard contents")),
3884− }
4211+ });
38854212
3886− exit_select_mode(cx);
3887− Ok(())
4213+ doc.apply(&transaction, view.id);
38884214}
38894215
38904216fn replace_selections_with_clipboard(cx: &mut Context) {
3891− let _ = replace_selections_with_clipboard_impl(cx, ClipboardType::Clipboard);
4217+ replace_with_yanked_impl(cx.editor, '+', cx.count());
4218+ exit_select_mode(cx);
38924219}
38934220
38944221fn replace_selections_with_primary_clipboard(cx: &mut Context) {
3895− let _ = replace_selections_with_clipboard_impl(cx, ClipboardType::Selection);
4222+ replace_with_yanked_impl(cx.editor, '*', cx.count());
4223+ exit_select_mode(cx);
38964224}
38974225
3898−fn paste(cx: &mut Context, pos: Paste) {
3899− let count = cx.count();
3900− let reg_name = cx.register.unwrap_or('"');
3901− let (view, doc) = current!(cx.editor);
3902− let registers = &mut cx.editor.registers;
4226+fn paste(editor: &mut Editor, register: char, pos: Paste, count: usize) {
4227+ let Some(values) = editor.registers.read(register, editor) else { return };
4228+ let values: Vec<_> = values.map(|value| value.to_string()).collect();
39034229
3904− if let Some(values) = registers.read(reg_name) {
3905− paste_impl(values, doc, view, pos, count, cx.editor.mode);
3906− }
4230+ let (view, doc) = current!(editor);
4231+ paste_impl(&values, doc, view, pos, count, editor.mode);
39074232}
39084233
39094234fn paste_after(cx: &mut Context) {
3910− paste(cx, Paste::After)
4235+ paste(
4236+ cx.editor,
4237+ cx.register.unwrap_or('"'),
4238+ Paste::After,
4239+ cx.count(),
4240+ );
4241+ exit_select_mode(cx);
39114242}
39124243
39134244fn paste_before(cx: &mut Context) {
3914− paste(cx, Paste::Before)
4245+ paste(
4246+ cx.editor,
4247+ cx.register.unwrap_or('"'),
4248+ Paste::Before,
4249+ cx.count(),
4250+ );
4251+ exit_select_mode(cx);
39154252}
39164253
39174254fn get_lines(doc: &Document, view_id: ViewId) -> Vec<usize> {
@@ -3950,6 +4287,7 @@ fn indent(cx: &mut Context) {
39504287 }),
39514288 );
39524289 doc.apply(&transaction, view.id);
4290+ exit_select_mode(cx);
39534291}
39544292
39554293fn unindent(cx: &mut Context) {
@@ -3989,71 +4327,76 @@ fn unindent(cx: &mut Context) {
39894327 let transaction = Transaction::change(doc.text(), changes.into_iter());
39904328
39914329 doc.apply(&transaction, view.id);
4330+ exit_select_mode(cx);
39924331}
39934332
39944333fn format_selections(cx: &mut Context) {
39954334 use helix_lsp::{lsp, util::range_to_lsp_range};
39964335
39974336 let (view, doc) = current!(cx.editor);
4337+ let view_id = view.id;
39984338
39994339 // via lsp if available
40004340 // TODO: else via tree-sitter indentation calculations
40014341
4002− let language_server = match doc.language_server() {
4003− Some(language_server) => language_server,
4004− None => return,
4342+ if doc.selection(view_id).len() != 1 {
4343+ cx.editor
4344+ .set_error("format_selections only supports a single selection for now");
4345+ return;
4346+ }
4347+
4348+ // TODO extra LanguageServerFeature::FormatSelections?
4349+ // maybe such that LanguageServerFeature::Format contains it as well
4350+ let Some(language_server) = doc
4351+ .language_servers_with_feature(LanguageServerFeature::Format)
4352+ .find(|ls| {
4353+ matches!(
4354+ ls.capabilities().document_range_formatting_provider,
4355+ Some(lsp::OneOf::Left(true) | lsp::OneOf::Right(_))
4356+ )
4357+ })
4358+ else {
4359+ cx.editor
4360+ .set_error("No configured language server supports range formatting");
4361+ return;
40054362 };
40064363
4364+ let offset_encoding = language_server.offset_encoding();
40074365 let ranges: Vec<lsp::Range> = doc
4008− .selection(view.id)
4366+ .selection(view_id)
40094367 .iter()
4010− .map(|range| range_to_lsp_range(doc.text(), *range, language_server.offset_encoding()))
4368+ .map(|range| range_to_lsp_range(doc.text(), *range, offset_encoding))
40114369 .collect();
40124370
4013− if ranges.len() != 1 {
4014− cx.editor
4015− .set_error("format_selections only supports a single selection for now");
4016− return;
4017− }
4018−
40194371 // TODO: handle fails
40204372 // TODO: concurrent map over all ranges
40214373
40224374 let range = ranges[0];
40234375
4024− let request = match language_server.text_document_range_formatting(
4025− doc.identifier(),
4026− range,
4027− lsp::FormattingOptions::default(),
4028− None,
4029− ) {
4030− Some(future) => future,
4031− None => {
4032− cx.editor
4033− .set_error("Language server does not support range formatting");
4034− return;
4035− }
4036− };
4376+ let future = language_server
4377+ .text_document_range_formatting(
4378+ doc.identifier(),
4379+ range,
4380+ lsp::FormattingOptions::default(),
4381+ None,
4382+ )
4383+ .unwrap();
40374384
4038− let edits = tokio::task::block_in_place(|| helix_lsp::block_on(request)).unwrap_or_default();
4385+ let edits = tokio::task::block_in_place(|| helix_lsp::block_on(future)).unwrap_or_default();
40394386
4040− let transaction = helix_lsp::util::generate_transaction_from_edits(
4041− doc.text(),
4042− edits,
4043− language_server.offset_encoding(),
4044− );
4387+ let transaction =
4388+ helix_lsp::util::generate_transaction_from_edits(doc.text(), edits, offset_encoding);
40454389
4046− doc.apply(&transaction, view.id);
4390+ doc.apply(&transaction, view_id);
40474391}
40484392
40494393fn join_selections_impl(cx: &mut Context, select_space: bool) {
40504394 use movement::skip_while;
40514395 let (view, doc) = current!(cx.editor);
40524396 let text = doc.text();
4053− let slice = doc.text().slice(..);
4397+ let slice = text.slice(..);
40544398
40554399 let mut changes = Vec::new();
4056− let fragment = Tendril::from(" ");
40574400
40584401 for selection in doc.selection(view.id) {
40594402 let (start, mut end) = selection.line_range(slice);
@@ -4069,9 +4412,13 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
40694412 let mut end = text.line_to_char(line + 1);
40704413 end = skip_while(slice, end, |ch| matches!(ch, ' ' | '\t')).unwrap_or(end);
40714414
4072− // need to skip from start, not end
4073− let change = (start, end, Some(fragment.clone()));
4074− changes.push(change);
4415+ let separator = if end == line_end_char_index(&slice, line + 1) {
4416+ // the joining line contains only space-characters => don't include a whitespace when joining
4417+ None
4418+ } else {
4419+ Some(Tendril::from(" "))
4420+ };
4421+ changes.push((start, end, separator));
40754422 }
40764423 }
40774424
@@ -4083,9 +4430,6 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
40834430 changes.sort_unstable_by_key(|(from, _to, _text)| *from);
40844431 changes.dedup();
40854432
4086− // TODO: joining multiple empty lines should be replaced by a single space.
4087− // need to merge change ranges that touch
4088−
40894433 // select inserted spaces
40904434 let transaction = if select_space {
40914435 let ranges: SmallVec<_> = changes
@@ -4097,9 +4441,9 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
40974441 })
40984442 .collect();
40994443 let selection = Selection::new(ranges, 0);
4100− Transaction::change(doc.text(), changes.into_iter()).with_selection(selection)
4444+ Transaction::change(text, changes.into_iter()).with_selection(selection)
41014445 } else {
4102− Transaction::change(doc.text(), changes.into_iter())
4446+ Transaction::change(text, changes.into_iter())
41034447 };
41044448
41054449 doc.apply(&transaction, view.id);
@@ -4113,8 +4457,8 @@ fn keep_or_remove_selections_impl(cx: &mut Context, remove: bool) {
41134457 if remove { "remove:" } else { "keep:" }.into(),
41144458 Some(reg),
41154459 ui::completers::none,
4116− move |editor, regex, event| {
4117− let (view, doc) = current!(editor);
4460+ move |cx, regex, event| {
4461+ let (view, doc) = current!(cx.editor);
41184462 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
41194463 return;
41204464 }
@@ -4180,21 +4524,46 @@ pub fn completion(cx: &mut Context) {
41804524 doc.savepoint(view)
41814525 };
41824526
4183− let language_server = match doc.language_server() {
4184− Some(language_server) => language_server,
4185− None => return,
4186− };
4187−
4188− let offset_encoding = language_server.offset_encoding();
41894527 let text = savepoint.text.clone();
41904528 let cursor = savepoint.cursor();
41914529
4192− let pos = pos_to_lsp_pos(&text, cursor, offset_encoding);
4530+ let mut seen_language_servers = HashSet::new();
4531+
4532+ let mut futures: FuturesUnordered<_> = doc
4533+ .language_servers_with_feature(LanguageServerFeature::Completion)
4534+ .filter(|ls| seen_language_servers.insert(ls.id()))
4535+ .map(|language_server| {
4536+ let language_server_id = language_server.id();
4537+ let offset_encoding = language_server.offset_encoding();
4538+ let pos = pos_to_lsp_pos(&text, cursor, offset_encoding);
4539+ let doc_id = doc.identifier();
4540+ let completion_request = language_server.completion(doc_id, pos, None).unwrap();
4541+
4542+ async move {
4543+ let json = completion_request.await?;
4544+ let response: Option<lsp::CompletionResponse> = serde_json::from_value(json)?;
4545+
4546+ let items = match response {
4547+ Some(lsp::CompletionResponse::Array(items)) => items,
4548+ // TODO: do something with is_incomplete
4549+ Some(lsp::CompletionResponse::List(lsp::CompletionList {
4550+ is_incomplete: _is_incomplete,
4551+ items,
4552+ })) => items,
4553+ None => Vec::new(),
4554+ }
4555+ .into_iter()
4556+ .map(|item| CompletionItem {
4557+ item,
4558+ language_server_id,
4559+ resolved: false,
4560+ })
4561+ .collect();
41934562
4194− let future = match language_server.completion(doc.identifier(), pos, None) {
4195− Some(future) => future,
4196− None => return,
4197− };
4563+ anyhow::Ok(items)
4564+ }
4565+ })
4566+ .collect();
41984567
41994568 // setup a channel that allows the request to be canceled
42004569 let (tx, rx) = oneshot::channel();
@@ -4203,12 +4572,20 @@ pub fn completion(cx: &mut Context) {
42034572 // and the associated request is automatically dropped
42044573 cx.editor.completion_request_handle = Some(tx);
42054574 let future = async move {
4575+ let items_future = async move {
4576+ let mut items = Vec::new();
4577+ // TODO if one completion request errors, all other completion requests are discarded (even if they're valid)
4578+ while let Some(mut lsp_items) = futures.try_next().await? {
4579+ items.append(&mut lsp_items);
4580+ }
4581+ anyhow::Ok(items)
4582+ };
42064583 tokio::select! {
42074584 biased;
42084585 _ = rx => {
4209− Ok(serde_json::Value::Null)
4586+ Ok(Vec::new())
42104587 }
4211− res = future => {
4588+ res = items_future => {
42124589 res
42134590 }
42144591 }
@@ -4242,9 +4619,9 @@ pub fn completion(cx: &mut Context) {
42424619 },
42434620 ));
42444621
4245− cx.callback(
4246− future,
4247− move |editor, compositor, response: Option<lsp::CompletionResponse>| {
4622+ cx.jobs.callback(async move {
4623+ let items = future.await?;
4624+ let call = move |editor: &mut Editor, compositor: &mut Compositor| {
42484625 let (view, doc) = current_ref!(editor);
42494626 // check if the completion request is stale.
42504627 //
@@ -4255,16 +4632,6 @@ pub fn completion(cx: &mut Context) {
42554632 return;
42564633 }
42574634
4258− let items = match response {
4259− Some(lsp::CompletionResponse::Array(items)) => items,
4260− // TODO: do something with is_incomplete
4261− Some(lsp::CompletionResponse::List(lsp::CompletionList {
4262− is_incomplete: _is_incomplete,
4263− items,
4264− })) => items,
4265− None => Vec::new(),
4266− };
4267−
42684635 if items.is_empty() {
42694636 // editor.set_error("No completion available");
42704637 return;
@@ -4275,7 +4642,6 @@ pub fn completion(cx: &mut Context) {
42754642 editor,
42764643 savepoint,
42774644 items,
4278− offset_encoding,
42794645 start_offset,
42804646 trigger_offset,
42814647 size,
@@ -4289,8 +4655,9 @@ pub fn completion(cx: &mut Context) {
42894655 {
42904656 compositor.remove(SignatureHelp::ID);
42914657 }
4292− },
4293− );
4658+ };
4659+ Ok(Callback::EditorCompositor(Box::new(call)))
4660+ });
42944661}
42954662
42964663// comments
@@ -4325,7 +4692,13 @@ fn rotate_selections_backward(cx: &mut Context) {
43254692 rotate_selections(cx, Direction::Backward)
43264693}
43274694
4328−fn rotate_selection_contents(cx: &mut Context, direction: Direction) {
4695+enum ReorderStrategy {
4696+ RotateForward,
4697+ RotateBackward,
4698+ Reverse,
4699+}
4700+
4701+fn reorder_selection_contents(cx: &mut Context, strategy: ReorderStrategy) {
43294702 let count = cx.count;
43304703 let (view, doc) = current!(cx.editor);
43314704 let text = doc.text().slice(..);
@@ -4343,9 +4716,10 @@ fn rotate_selection_contents(cx: &mut Context, direction: Direction) {
43434716
43444717 for chunk in fragments.chunks_mut(group) {
43454718 // TODO: also modify main index
4346− match direction {
4347− Direction::Forward => chunk.rotate_right(1),
4348− Direction::Backward => chunk.rotate_left(1),
4719+ match strategy {
4720+ ReorderStrategy::RotateForward => chunk.rotate_right(1),
4721+ ReorderStrategy::RotateBackward => chunk.rotate_left(1),
4722+ ReorderStrategy::Reverse => chunk.reverse(),
43494723 };
43504724 }
43514725
@@ -4362,10 +4736,13 @@ fn rotate_selection_contents(cx: &mut Context, direction: Direction) {
43624736}
43634737
43644738fn rotate_selection_contents_forward(cx: &mut Context) {
4365− rotate_selection_contents(cx, Direction::Forward)
4739+ reorder_selection_contents(cx, ReorderStrategy::RotateForward)
43664740}
43674741fn rotate_selection_contents_backward(cx: &mut Context) {
4368− rotate_selection_contents(cx, Direction::Backward)
4742+ reorder_selection_contents(cx, ReorderStrategy::RotateBackward)
4743+}
4744+fn reverse_selection_contents(cx: &mut Context) {
4745+ reorder_selection_contents(cx, ReorderStrategy::Reverse)
43694746}
43704747
43714748// tree sitter node selection
@@ -4389,8 +4766,7 @@ fn expand_selection(cx: &mut Context) {
43894766 }
43904767 }
43914768 };
4392− motion(cx.editor);
4393− cx.editor.last_motion = Some(Motion(Box::new(motion)));
4769+ cx.editor.apply_motion(motion);
43944770}
43954771
43964772fn shrink_selection(cx: &mut Context) {
@@ -4414,8 +4790,7 @@ fn shrink_selection(cx: &mut Context) {
44144790 doc.set_selection(view.id, selection);
44154791 }
44164792 };
4417− motion(cx.editor);
4418− cx.editor.last_motion = Some(Motion(Box::new(motion)));
4793+ cx.editor.apply_motion(motion);
44194794}
44204795
44214796fn select_sibling_impl<F>(cx: &mut Context, sibling_fn: &'static F)
@@ -4433,8 +4808,7 @@ where
44334808 doc.set_selection(view.id, selection);
44344809 }
44354810 };
4436− motion(cx.editor);
4437− cx.editor.last_motion = Some(Motion(Box::new(motion)));
4811+ cx.editor.apply_motion(motion);
44384812}
44394813
44404814fn select_next_sibling(cx: &mut Context) {
@@ -4445,22 +4819,68 @@ fn select_prev_sibling(cx: &mut Context) {
44454819 select_sibling_impl(cx, &|node| Node::prev_sibling(&node))
44464820}
44474821
4822+fn move_node_bound_impl(cx: &mut Context, dir: Direction, movement: Movement) {
4823+ let motion = move |editor: &mut Editor| {
4824+ let (view, doc) = current!(editor);
4825+
4826+ if let Some(syntax) = doc.syntax() {
4827+ let text = doc.text().slice(..);
4828+ let current_selection = doc.selection(view.id);
4829+
4830+ let selection = movement::move_parent_node_end(
4831+ syntax,
4832+ text,
4833+ current_selection.clone(),
4834+ dir,
4835+ movement,
4836+ );
4837+
4838+ doc.set_selection(view.id, selection);
4839+
4840+ // [TODO] temporary workaround until we're not using the idle timer to
4841+ // trigger auto completions any more
4842+ editor.clear_idle_timer();
4843+ }
4844+ };
4845+
4846+ cx.editor.apply_motion(motion);
4847+}
4848+
4849+pub fn move_parent_node_end(cx: &mut Context) {
4850+ move_node_bound_impl(cx, Direction::Forward, Movement::Move)
4851+}
4852+
4853+pub fn move_parent_node_start(cx: &mut Context) {
4854+ move_node_bound_impl(cx, Direction::Backward, Movement::Move)
4855+}
4856+
4857+pub fn extend_parent_node_end(cx: &mut Context) {
4858+ move_node_bound_impl(cx, Direction::Forward, Movement::Extend)
4859+}
4860+
4861+pub fn extend_parent_node_start(cx: &mut Context) {
4862+ move_node_bound_impl(cx, Direction::Backward, Movement::Extend)
4863+}
4864+
44484865fn match_brackets(cx: &mut Context) {
44494866 let (view, doc) = current!(cx.editor);
4867+ let is_select = cx.editor.mode == Mode::Select;
4868+ let text = doc.text();
4869+ let text_slice = text.slice(..);
44504870
4451− if let Some(syntax) = doc.syntax() {
4452− let text = doc.text().slice(..);
4453− let selection = doc.selection(view.id).clone().transform(|range| {
4454− if let Some(pos) =
4455− match_brackets::find_matching_bracket_fuzzy(syntax, doc.text(), range.cursor(text))
4456− {
4457− range.put_cursor(text, pos, cx.editor.mode == Mode::Select)
4458− } else {
4459− range
4460− }
4461− });
4462− doc.set_selection(view.id, selection);
4463− }
4871+ let selection = doc.selection(view.id).clone().transform(|range| {
4872+ let pos = range.cursor(text_slice);
4873+ if let Some(matched_pos) = doc.syntax().map_or_else(
4874+ || match_brackets::find_matching_bracket_plaintext(text.slice(..), pos),
4875+ |syntax| match_brackets::find_matching_bracket_fuzzy(syntax, text.slice(..), pos),
4876+ ) {
4877+ range.put_cursor(text_slice, matched_pos, is_select)
4878+ } else {
4879+ range
4880+ }
4881+ });
4882+
4883+ doc.set_selection(view.id, selection);
44644884}
44654885
44664886//
@@ -4555,17 +4975,19 @@ fn transpose_view(cx: &mut Context) {
45554975 cx.editor.transpose_view()
45564976}
45574977
4558−// split helper, clear it later
4559−fn split(cx: &mut Context, action: Action) {
4560− let (view, doc) = current!(cx.editor);
4978+/// Open a new split in the given direction specified by the action.
4979+///
4980+/// Maintain the current view (both the cursor's position and view in document).
4981+fn split(editor: &mut Editor, action: Action) {
4982+ let (view, doc) = current!(editor);
45614983 let id = doc.id();
45624984 let selection = doc.selection(view.id).clone();
45634985 let offset = view.offset;
45644986
4565− cx.editor.switch(id, action);
4987+ editor.switch(id, action);
45664988
45674989 // match the selection in the previous view
4568− let (view, doc) = current!(cx.editor);
4990+ let (view, doc) = current!(editor);
45694991 doc.set_selection(view.id, selection);
45704992 // match the view scroll offset (switch doesn't handle this fully
45714993 // since the selection is only matched after the split)
@@ -4573,7 +4995,7 @@ fn split(cx: &mut Context, action: Action) {
45734995}
45744996
45754997fn hsplit(cx: &mut Context) {
4576− split(cx, Action::HorizontalSplit);
4998+ split(cx.editor, Action::HorizontalSplit);
45774999}
45785000
45795001fn hsplit_new(cx: &mut Context) {
@@ -4581,7 +5003,7 @@ fn hsplit_new(cx: &mut Context) {
45815003}
45825004
45835005fn vsplit(cx: &mut Context) {
4584− split(cx, Action::VerticalSplit);
5006+ split(cx.editor, Action::VerticalSplit);
45855007}
45865008
45875009fn vsplit_new(cx: &mut Context) {
@@ -4630,7 +5052,12 @@ fn insert_register(cx: &mut Context) {
46305052 if let Some(ch) = event.char() {
46315053 cx.editor.autoinfo = None;
46325054 cx.register = Some(ch);
4633− paste(cx, Paste::Cursor);
5055+ paste(
5056+ cx.editor,
5057+ cx.register.unwrap_or('"'),
5058+ Paste::Cursor,
5059+ cx.count(),
5060+ );
46345061 }
46355062 })
46365063}
@@ -4714,8 +5141,7 @@ fn goto_ts_object_impl(cx: &mut Context, object: &'static str, direction: Direct
47145141 editor.set_status("Syntax-tree is not available in current buffer");
47155142 }
47165143 };
4717− motion(cx.editor);
4718− cx.editor.last_motion = Some(Motion(Box::new(motion)));
5144+ cx.editor.apply_motion(motion);
47195145}
47205146
47215147fn goto_next_function(cx: &mut Context) {
@@ -4836,8 +5262,7 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
48365262 });
48375263 doc.set_selection(view.id, selection);
48385264 };
4839− textobject(cx.editor);
4840− cx.editor.last_motion = Some(Motion(Box::new(textobject)));
5265+ cx.editor.apply_motion(textobject);
48415266 }
48425267 });
48435268
@@ -4927,11 +5352,18 @@ fn surround_replace(cx: &mut Context) {
49275352 }
49285353 };
49295354
5355+ let selection = selection.clone();
5356+ let ranges: SmallVec<[Range; 1]> = change_pos.iter().map(|&p| Range::point(p)).collect();
5357+ doc.set_selection(
5358+ view.id,
5359+ Selection::new(ranges, selection.primary_index() * 2),
5360+ );
5361+
49305362 cx.on_next_key(move |cx, event| {
49315363 let (view, doc) = current!(cx.editor);
49325364 let to = match event.char() {
49335365 Some(to) => to,
4934− None => return,
5366+ None => return doc.set_selection(view.id, selection),
49355367 };
49365368 let (open, close) = surround::get_pair(to);
49375369 let transaction = Transaction::change(
@@ -4942,6 +5374,7 @@ fn surround_replace(cx: &mut Context) {
49425374 (pos, pos + 1, Some(t))
49435375 }),
49445376 );
5377+ doc.set_selection(view.id, selection);
49455378 doc.apply(&transaction, view.id);
49465379 exit_select_mode(cx);
49475380 });
@@ -5090,7 +5523,7 @@ async fn shell_impl_async(
50905523 helix_view::document::to_writer(&mut stdin, (encoding::UTF_8, false), &input)
50915524 .await?;
50925525 }
5093− Ok::<_, anyhow::Error>(())
5526+ anyhow::Ok(())
50945527 });
50955528 let (output, _) = tokio::join! {
50965529 process.wait_with_output(),
@@ -5176,12 +5609,18 @@ fn shell(cx: &mut compositor::Context, cmd: &str, behavior: &ShellBehavior) {
51765609 };
51775610
51785611 // These `usize`s cannot underflow because selection ranges cannot overlap.
5179− // Once the MSRV is 1.66.0 (mixed_integer_ops is stabilized), we can use checked
5180− // arithmetic to assert this.
5181− let anchor = (to as isize + offset - deleted_len as isize) as usize;
5612+ let anchor = to
5613+ .checked_add_signed(offset)
5614+ .expect("Selection ranges cannot overlap")
5615+ .checked_sub(deleted_len)
5616+ .expect("Selection ranges cannot overlap");
51825617 let new_range = Range::new(anchor, anchor + output_len).with_direction(range.direction());
51835618 ranges.push(new_range);
5184− offset = offset + output_len as isize - deleted_len as isize;
5619+ offset = offset
5620+ .checked_add_unsigned(output_len)
5621+ .expect("Selection ranges cannot overlap")
5622+ .checked_sub_unsigned(deleted_len)
5623+ .expect("Selection ranges cannot overlap");
51855624
51865625 changes.push((from, to, Some(output)));
51875626 }
@@ -5203,7 +5642,7 @@ fn shell_prompt(cx: &mut Context, prompt: Cow<'static, str>, behavior: ShellBeha
52035642 cx,
52045643 prompt,
52055644 Some('|'),
5206− ui::completers::none,
5645+ ui::completers::filename,
52075646 move |cx, input: &str, event: PromptEvent| {
52085647 if event != PromptEvent::Validate {
52095648 return;
@@ -5320,6 +5759,7 @@ fn increment_impl(cx: &mut Context, increment_direction: IncrementDirection) {
53205759 let transaction = Transaction::change(doc.text(), changes.into_iter());
53215760 let transaction = transaction.with_selection(new_selection);
53225761 doc.apply(&transaction, view.id);
5762+ exit_select_mode(cx);
53235763 }
53245764}
53255765
@@ -5338,9 +5778,12 @@ fn record_macro(cx: &mut Context) {
53385778 }
53395779 })
53405780 .collect::<String>();
5341− cx.editor.registers.write(reg, vec![s]);
5342− cx.editor
5343− .set_status(format!("Recorded to register [{}]", reg));
5781+ match cx.editor.registers.write(reg, vec![s]) {
5782+ Ok(_) => cx
5783+ .editor
5784+ .set_status(format!("Recorded to register [{}]", reg)),
5785+ Err(err) => cx.editor.set_error(err.to_string()),
5786+ }
53445787 } else {
53455788 let reg = cx.register.take().unwrap_or('@');
53465789 cx.editor.macro_recording = Some((reg, Vec::new()));
@@ -5360,8 +5803,14 @@ fn replay_macro(cx: &mut Context) {
53605803 return;
53615804 }
53625805
5363− let keys: Vec<KeyEvent> = if let Some([keys_str]) = cx.editor.registers.read(reg) {
5364− match helix_view::input::parse_macro(keys_str) {
5806+ let keys: Vec<KeyEvent> = if let Some(keys) = cx
5807+ .editor
5808+ .registers
5809+ .read(reg, cx.editor)
5810+ .filter(|values| values.len() == 1)
5811+ .map(|mut values| values.next().unwrap())
5812+ {
5813+ match helix_view::input::parse_macro(&keys) {
53655814 Ok(keys) => keys,
53665815 Err(err) => {
53675816 cx.editor.set_error(format!("Invalid macro: {}", err));