@@ -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,
30− visual_offset_from_block, LineEnding, Position, Range, Rope, RopeGraphemes, RopeSlice,
31− Selection, SmallVec, Tendril, Transaction,
31+ visual_offset_from_block, Deletion, LineEnding, Position, Range, Rope, RopeGraphemes,
32+ RopeReader, RopeSlice, Selection, SmallVec, Tendril, Transaction,
3233};
3334use helix_view::{
34− clipboard::ClipboardType,
3535 document::{FormatterError, Mode, SCRATCH_BUFFER_NAME},
36− editor::{Action, 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
@@ -97,6 +101,13 @@ impl<'a> Context<'a> {
97101 }));
98102 }
99103
104+ /// Call `replace_or_push` on the Compositor
105+ pub fn replace_or_push_layer<T: Component>(&mut self, id: &'static str, component: T) {
106+ self.callback = Some(Box::new(move |compositor: &mut Compositor, _| {
107+ compositor.replace_or_push(id, component);
108+ }));
109+ }
110+
100111 #[inline]
101112 pub fn on_next_key(
102113 &mut self,
@@ -239,6 +250,9 @@ impl MappableCommand {
239250 move_next_long_word_start, "Move to start of next long word",
240251 move_prev_long_word_start, "Move to start of previous long word",
241252 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",
242256 extend_next_word_start, "Extend to start of next word",
243257 extend_prev_word_start, "Extend to start of previous word",
244258 extend_next_word_end, "Extend to end of next word",
@@ -246,6 +260,9 @@ impl MappableCommand {
246260 extend_next_long_word_start, "Extend to start of next long word",
247261 extend_prev_long_word_start, "Extend to start of previous long word",
248262 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",
249266 find_till_char, "Move till next occurrence of char",
250267 find_next_char, "Move to next occurrence of char",
251268 extend_till_char, "Extend till next occurrence of char",
@@ -267,6 +284,7 @@ impl MappableCommand {
267284 select_regex, "Select all regex matches inside selections",
268285 split_selection, "Split selections on regex matches",
269286 split_selection_on_newline, "Split selection on newlines",
287+ merge_selections, "Merge selections",
270288 merge_consecutive_selections, "Merge consecutive selections",
271289 search, "Search for regex pattern",
272290 rsearch, "Reverse search for regex pattern",
@@ -319,7 +337,7 @@ impl MappableCommand {
319337 goto_implementation, "Goto implementation",
320338 goto_file_start, "Goto line number <n> else file start",
321339 goto_file_end, "Goto file end",
322− goto_file, "Goto files in selection",
340+ goto_file, "Goto files/URLs in selection",
323341 goto_file_hsplit, "Goto files in selection (hsplit)",
324342 goto_file_vsplit, "Goto files in selection (vsplit)",
325343 goto_reference, "Goto references",
@@ -351,6 +369,7 @@ impl MappableCommand {
351369 extend_to_line_end, "Extend to line end",
352370 extend_to_line_end_newline, "Extend to line end",
353371 signature_help, "Show signature help",
372+ smart_tab, "Insert tab if all cursors have all whitespace to their left; otherwise, run a separate command.",
354373 insert_tab, "Insert tab char",
355374 insert_newline, "Insert newline char",
356375 delete_char_backward, "Delete previous char",
@@ -365,6 +384,9 @@ impl MappableCommand {
365384 later, "Move forward in history",
366385 commit_undo_checkpoint, "Commit changes to new checkpoint",
367386 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",
368390 yank_joined_to_clipboard, "Join and yank selections to clipboard",
369391 yank_main_selection_to_clipboard, "Yank main selection to clipboard",
370392 yank_joined_to_primary_clipboard, "Join and yank selections to primary clipboard",
@@ -395,6 +417,7 @@ impl MappableCommand {
395417 rotate_selections_backward, "Rotate selections backward",
396418 rotate_selection_contents_forward, "Rotate selection contents forward",
397419 rotate_selection_contents_backward, "Rotate selections contents backward",
420+ reverse_selection_contents, "Reverse selections contents",
398421 expand_selection, "Expand selection to parent syntax node",
399422 shrink_selection, "Shrink selection to previously expanded syntax node",
400423 select_next_sibling, "Select next sibling in syntax tree",
@@ -788,54 +811,50 @@ fn extend_to_line_start(cx: &mut Context) {
788811}
789812
790813fn kill_to_line_start(cx: &mut Context) {
791− let (view, doc) = current!(cx.editor);
792− let text = doc.text().slice(..);
793−
794− let selection = doc.selection(view.id).clone().transform(|range| {
795− let line = range.cursor_line(text);
796− let first_char = text.line_to_char(line);
797− let anchor = range.cursor(text);
798− let head = if anchor == first_char && line != 0 {
799− // select until previous line
800− line_end_char_index(&text, line - 1)
801− } else if let Some(pos) = find_first_non_whitespace_char(text.line(line)) {
802− if first_char + pos < anchor {
803− // select until first non-blank in line if cursor is after it
804− 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+ }
805831 } else {
806832 // select until start of line
807833 first_char
808− }
809− } else {
810− // select until start of line
811− first_char
812− };
813− Range::new(head, anchor)
814− });
815− delete_selection_insert_mode(doc, view, &selection);
816−
817− lsp::signature_help_impl(cx, SignatureHelpInvoked::Automatic);
834+ };
835+ (head, anchor)
836+ },
837+ Direction::Backward,
838+ );
818839}
819840
820841fn kill_to_line_end(cx: &mut Context) {
821− let (view, doc) = current!(cx.editor);
822− let text = doc.text().slice(..);
823−
824− let selection = doc.selection(view.id).clone().transform(|range| {
825− let line = range.cursor_line(text);
826− let line_end_pos = line_end_char_index(&text, line);
827− let pos = range.cursor(text);
828−
829− let mut new_range = range.put_cursor(text, line_end_pos, true);
830− // don't want to remove the line separator itself if the cursor doesn't reach the end of line.
831− if pos != line_end_pos {
832− new_range.head = line_end_pos;
833− }
834− new_range
835− });
836− delete_selection_insert_mode(doc, view, &selection);
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);
837848
838− lsp::signature_help_impl(cx, SignatureHelpInvoked::Automatic);
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+ );
839858}
840859
841860fn goto_first_nonwhitespace(cx: &mut Context) {
@@ -971,6 +990,7 @@ fn align_selections(cx: &mut Context) {
971990
972991 let transaction = Transaction::change(doc.text(), changes.into_iter());
973992 doc.apply(&transaction, view.id);
993+ exit_select_mode(cx);
974994}
975995
976996fn goto_window(cx: &mut Context, align: Align) {
@@ -1062,6 +1082,10 @@ fn move_prev_long_word_start(cx: &mut Context) {
10621082 move_word_impl(cx, movement::move_prev_long_word_start)
10631083}
10641084
1085+fn move_prev_long_word_end(cx: &mut Context) {
1086+ move_word_impl(cx, movement::move_prev_long_word_end)
1087+}
1088+
10651089fn move_next_long_word_end(cx: &mut Context) {
10661090 move_word_impl(cx, movement::move_next_long_word_end)
10671091}
@@ -1086,8 +1110,7 @@ where
10861110 .transform(|range| move_fn(text, range, count, behavior));
10871111 doc.set_selection(view.id, selection);
10881112 };
1089− motion(cx.editor);
1090− cx.editor.last_motion = Some(Motion(Box::new(motion)));
1113+ cx.editor.apply_motion(motion)
10911114}
10921115
10931116fn goto_prev_paragraph(cx: &mut Context) {
@@ -1142,6 +1165,10 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
11421165 let (view, doc) = current_ref!(cx.editor);
11431166 let text = doc.text();
11441167 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();
11451172 let mut paths: Vec<_> = selections
11461173 .iter()
11471174 .map(|r| text.slice(r.from()..r.to()).to_string())
@@ -1169,16 +1196,80 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
11691196 .to_string(),
11701197 );
11711198 }
1199+
11721200 for sel in paths {
11731201 let p = sel.trim();
1174− if !p.is_empty() {
1175− 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) {
11761250 cx.editor.set_error(format!("Open file failed: {:?}", e));
11771251 }
11781252 }
11791253 }
11801254}
11811255
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+
11821273fn extend_word_impl<F>(cx: &mut Context, extend_fn: F)
11831274where
11841275 F: Fn(RopeSlice, Range, usize) -> Range,
@@ -1219,14 +1310,74 @@ fn extend_prev_long_word_start(cx: &mut Context) {
12191310 extend_word_impl(cx, movement::move_prev_long_word_start)
12201311}
12211312
1313+fn extend_prev_long_word_end(cx: &mut Context) {
1314+ extend_word_impl(cx, movement::move_prev_long_word_end)
1315+}
1316+
12221317fn extend_next_long_word_end(cx: &mut Context) {
12231318 extend_word_impl(cx, movement::move_next_long_word_end)
12241319}
12251320
1226−fn will_find_char<F>(cx: &mut Context, search_fn: F, inclusive: bool, extend: bool)
1227−where
1228− F: Fn(RopeSlice, char, usize, usize, bool) -> Option<usize> + 'static,
1229−{
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) {
12301381 // TODO: count is reset to 1 before next key so we move it into the closure here.
12311382 // Would be nice to carry over.
12321383 let count = cx.count();
@@ -1239,13 +1390,9 @@ where
12391390 KeyEvent {
12401391 code: KeyCode::Enter,
12411392 ..
1242− } =>
1243− // TODO: this isn't quite correct when CRLF is involved.
1244− // This hack will work in most cases, since documents don't
1245− // usually mix line endings. But we should fix it eventually
1246− // anyway.
1247− {
1248− doc!(cx.editor).line_ending.as_str().chars().next().unwrap()
1393+ } => {
1394+ find_char_line_ending(cx, count, direction, inclusive, extend);
1395+ return;
12491396 }
12501397
12511398 KeyEvent {
@@ -1258,11 +1405,18 @@ where
12581405 } => ch,
12591406 _ => return,
12601407 };
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+ };
12611418
1262− find_char_impl(cx.editor, &search_fn, inclusive, extend, ch, count);
1263− cx.editor.last_motion = Some(Motion(Box::new(move |editor: &mut Editor| {
1264− find_char_impl(editor, &search_fn, inclusive, true, ch, 1);
1265− })));
1419+ cx.editor.apply_motion(motion);
12661420 })
12671421}
12681422
@@ -1341,46 +1495,39 @@ fn find_prev_char_impl(
13411495}
13421496
13431497fn find_till_char(cx: &mut Context) {
1344− will_find_char(cx, find_next_char_impl, false, false)
1498+ find_char(cx, Direction::Forward, false, false);
13451499}
13461500
13471501fn find_next_char(cx: &mut Context) {
1348− will_find_char(cx, find_next_char_impl, true, false)
1502+ find_char(cx, Direction::Forward, true, false)
13491503}
13501504
13511505fn extend_till_char(cx: &mut Context) {
1352− will_find_char(cx, find_next_char_impl, false, true)
1506+ find_char(cx, Direction::Forward, false, true)
13531507}
13541508
13551509fn extend_next_char(cx: &mut Context) {
1356− will_find_char(cx, find_next_char_impl, true, true)
1510+ find_char(cx, Direction::Forward, true, true)
13571511}
13581512
13591513fn till_prev_char(cx: &mut Context) {
1360− will_find_char(cx, find_prev_char_impl, false, false)
1514+ find_char(cx, Direction::Backward, false, false)
13611515}
13621516
13631517fn find_prev_char(cx: &mut Context) {
1364− will_find_char(cx, find_prev_char_impl, true, false)
1518+ find_char(cx, Direction::Backward, true, false)
13651519}
13661520
13671521fn extend_till_prev_char(cx: &mut Context) {
1368− will_find_char(cx, find_prev_char_impl, false, true)
1522+ find_char(cx, Direction::Backward, false, true)
13691523}
13701524
13711525fn extend_prev_char(cx: &mut Context) {
1372− will_find_char(cx, find_prev_char_impl, true, true)
1526+ find_char(cx, Direction::Backward, true, true)
13731527}
13741528
13751529fn repeat_last_motion(cx: &mut Context) {
1376− let count = cx.count();
1377− let last_motion = cx.editor.last_motion.take();
1378− if let Some(m) = &last_motion {
1379− for _ in 0..count {
1380− m.run(cx.editor);
1381− }
1382− cx.editor.last_motion = last_motion;
1383− }
1530+ cx.editor.repeat_last_motion(cx.count())
13841531}
13851532
13861533fn replace(cx: &mut Context) {
@@ -1447,6 +1594,7 @@ where
14471594 });
14481595
14491596 doc.apply(&transaction, view.id);
1597+ exit_select_mode(cx);
14501598}
14511599
14521600fn switch_case(cx: &mut Context) {
@@ -1688,8 +1836,8 @@ fn select_regex(cx: &mut Context) {
16881836 "select:".into(),
16891837 Some(reg),
16901838 ui::completers::none,
1691− move |editor, regex, event| {
1692− let (view, doc) = current!(editor);
1839+ move |cx, regex, event| {
1840+ let (view, doc) = current!(cx.editor);
16931841 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
16941842 return;
16951843 }
@@ -1710,8 +1858,8 @@ fn split_selection(cx: &mut Context) {
17101858 "split:".into(),
17111859 Some(reg),
17121860 ui::completers::none,
1713− move |editor, regex, event| {
1714− let (view, doc) = current!(editor);
1861+ move |cx, regex, event| {
1862+ let (view, doc) = current!(cx.editor);
17151863 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
17161864 return;
17171865 }
@@ -1733,6 +1881,12 @@ fn split_selection_on_newline(cx: &mut Context) {
17331881 doc.set_selection(view.id, selection);
17341882}
17351883
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+
17361890fn merge_consecutive_selections(cx: &mut Context) {
17371891 let (view, doc) = current!(cx.editor);
17381892 let selection = doc.selection(view.id).clone().merge_consecutive_ranges();
@@ -1828,11 +1982,11 @@ fn search_impl(
18281982
18291983fn search_completions(cx: &mut Context, reg: Option<char>) -> Vec<String> {
18301984 let mut items = reg
1831− .and_then(|reg| cx.editor.registers.get(reg))
1832− .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());
18331987 items.sort_unstable();
18341988 items.dedup();
1835− items.into_iter().cloned().collect()
1989+ items.into_iter().map(|value| value.to_string()).collect()
18361990}
18371991
18381992fn search(cx: &mut Context) {
@@ -1869,12 +2023,14 @@ fn searcher(cx: &mut Context, direction: Direction) {
18692023 .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone())))
18702024 .collect()
18712025 },
1872− move |editor, regex, event| {
1873− 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 {
18742030 return;
18752031 }
18762032 search_impl(
1877− editor,
2033+ cx.editor,
18782034 &contents,
18792035 ®ex,
18802036 Movement::Move,
@@ -1889,11 +2045,13 @@ fn searcher(cx: &mut Context, direction: Direction) {
18892045
18902046fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Direction) {
18912047 let count = cx.count();
2048+ let register = cx
2049+ .register
2050+ .unwrap_or(cx.editor.registers.last_search_register);
18922051 let config = cx.editor.config();
18932052 let scrolloff = config.scrolloff;
1894− let (_, doc) = current!(cx.editor);
1895− let registers = &cx.editor.registers;
1896− 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);
18972055 let contents = doc.text().slice(..).to_string();
18982056 let search_config = &config.search;
18992057 let case_insensitive = if search_config.smart_case {
@@ -1902,7 +2060,7 @@ fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Dir
19022060 false
19032061 };
19042062 let wrap_around = search_config.wrap_around;
1905− if let Ok(regex) = RegexBuilder::new(query)
2063+ if let Ok(regex) = RegexBuilder::new(&query)
19062064 .case_insensitive(case_insensitive)
19072065 .multi_line(true)
19082066 .build()
@@ -1942,6 +2100,7 @@ fn extend_search_prev(cx: &mut Context) {
19422100}
19432101
19442102fn search_selection(cx: &mut Context) {
2103+ let register = cx.register.unwrap_or('/');
19452104 let (view, doc) = current!(cx.editor);
19462105 let contents = doc.text().slice(..);
19472106
@@ -1954,13 +2113,24 @@ fn search_selection(cx: &mut Context) {
19542113 .collect::<Vec<_>>()
19552114 .join("|");
19562115
1957− let msg = format!("register '{}' set to '{}'", '/', ®ex);
1958− cx.editor.registers.push('/', regex);
1959− 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+ }
19602124}
19612125
19622126fn make_search_word_bounded(cx: &mut Context) {
1963− 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) {
19642134 Some(regex) => regex,
19652135 None => return,
19662136 };
@@ -1978,14 +2148,19 @@ fn make_search_word_bounded(cx: &mut Context) {
19782148 if !start_anchored {
19792149 new_regex.push_str("\\b");
19802150 }
1981− new_regex.push_str(regex);
2151+ new_regex.push_str(®ex);
19822152 if !end_anchored {
19832153 new_regex.push_str("\\b");
19842154 }
19852155
1986− let msg = format!("register '{}' set to '{}'", '/', &new_regex);
1987− cx.editor.registers.push('/', new_regex);
1988− 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+ }
19892164}
19902165
19912166fn global_search(cx: &mut Context) {
@@ -2024,13 +2199,11 @@ fn global_search(cx: &mut Context) {
20242199 }
20252200 }
20262201
2027− let (all_matches_sx, all_matches_rx) = tokio::sync::mpsc::unbounded_channel::<FileResult>();
20282202 let config = cx.editor.config();
20292203 let smart_case = config.search.smart_case;
20302204 let file_picker_config = config.file_picker.clone();
20312205
20322206 let reg = cx.register.unwrap_or('/');
2033−
20342207 let completions = search_completions(cx, Some(reg));
20352208 ui::regex_prompt(
20362209 cx,
@@ -2043,43 +2216,67 @@ fn global_search(cx: &mut Context) {
20432216 .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone())))
20442217 .collect()
20452218 },
2046− move |_editor, regex, event| {
2219+ move |cx, regex, event| {
20472220 if event != PromptEvent::Validate {
20482221 return;
20492222 }
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();
20502231
20512232 if let Ok(matcher) = RegexMatcherBuilder::new()
20522233 .case_smart(smart_case)
20532234 .build(regex.as_str())
20542235 {
2055− let searcher = SearcherBuilder::new()
2056− .binary_detection(BinaryDetection::quit(b'\x00'))
2057− .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);
20582244
2059− let search_root = std::env::current_dir()
2060− .expect("Global search error: Failed to get current dir");
20612245 let dedup_symlinks = file_picker_config.deduplicate_links;
20622246 let absolute_root = search_root
20632247 .canonicalize()
20642248 .unwrap_or_else(|_| search_root.clone());
2065−
2066− WalkBuilder::new(search_root)
2067− .hidden(file_picker_config.hidden)
2068− .parents(file_picker_config.parents)
2069− .ignore(file_picker_config.ignore)
2070− .follow_links(file_picker_config.follow_symlinks)
2071− .git_ignore(file_picker_config.git_ignore)
2072− .git_global(file_picker_config.git_global)
2073− .git_exclude(file_picker_config.git_exclude)
2074− .max_depth(file_picker_config.max_depth)
2075− .filter_entry(move |entry| {
2076− filter_picker_entry(entry, &absolute_root, dedup_symlinks)
2077− })
2078− .build_parallel()
2079− .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(|| {
20802276 let mut searcher = searcher.clone();
20812277 let matcher = matcher.clone();
2082− let all_matches_sx = all_matches_sx.clone();
2278+ let injector = injector_.clone();
2279+ let documents = &documents;
20832280 Box::new(move |entry: Result<DirEntry, ignore::Error>| -> WalkState {
20842281 let entry = match entry {
20852282 Ok(entry) => entry,
@@ -2092,17 +2289,39 @@ fn global_search(cx: &mut Context) {
20922289 _ => return WalkState::Continue,
20932290 };
20942291
2095− let result = searcher.search_path(
2096− &matcher,
2097− entry.path(),
2098− sinks::UTF8(|line_num, _| {
2099− all_matches_sx
2100− .send(FileResult::new(entry.path(), line_num as usize - 1))
2101− .unwrap();
2102−
2103− Ok(true)
2104− }),
2105− );
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+ };
21062325
21072326 if let Err(err) = result {
21082327 log::error!(
@@ -2111,67 +2330,66 @@ fn global_search(cx: &mut Context) {
21112330 err
21122331 );
21132332 }
2114− WalkState::Continue
2333+ if stop {
2334+ WalkState::Quit
2335+ } else {
2336+ WalkState::Continue
2337+ }
21152338 })
21162339 });
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+ })
21172387 } else {
21182388 // Otherwise do nothing
21192389 // log::warn!("Global Search Invalid Pattern")
21202390 }
21212391 },
21222392 );
2123−
2124− let current_path = doc_mut!(cx.editor).path().cloned();
2125−
2126− let show_picker = async move {
2127− let all_matches: Vec<FileResult> =
2128− UnboundedReceiverStream::new(all_matches_rx).collect().await;
2129− let call: job::Callback = Callback::EditorCompositor(Box::new(
2130− move |editor: &mut Editor, compositor: &mut Compositor| {
2131− if all_matches.is_empty() {
2132− editor.set_status("No matches found");
2133− return;
2134− }
2135−
2136− let picker = FilePicker::new(
2137− all_matches,
2138− current_path,
2139− move |cx, FileResult { path, line_num }, action| {
2140− match cx.editor.open(path, action) {
2141− Ok(_) => {}
2142− Err(e) => {
2143− cx.editor.set_error(format!(
2144− "Failed to open file '{}': {}",
2145− path.display(),
2146− e
2147− ));
2148− return;
2149− }
2150− }
2151−
2152− let line_num = *line_num;
2153− let (view, doc) = current!(cx.editor);
2154− let text = doc.text();
2155− if line_num >= text.len_lines() {
2156− cx.editor.set_error("The line you jumped to does not exist anymore because the file has changed.");
2157− return;
2158− }
2159− let start = text.line_to_char(line_num);
2160− let end = text.line_to_char((line_num + 1).min(text.len_lines()));
2161−
2162− doc.set_selection(view.id, Selection::single(start, end));
2163− align_view(doc, view, Align::Center);
2164− },
2165− |_editor, FileResult { path, line_num }| {
2166− Some((path.clone().into(), Some((*line_num, *line_num))))
2167− },
2168− );
2169− compositor.push(Box::new(overlaid(picker)));
2170− },
2171− ));
2172− Ok(call)
2173− };
2174− cx.jobs.callback(show_picker);
21752393}
21762394
21772395enum Extend {
@@ -2294,23 +2512,40 @@ enum Operation {
22942512 Change,
22952513}
22962514
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+
22972529fn delete_selection_impl(cx: &mut Context, op: Operation) {
22982530 let (view, doc) = current!(cx.editor);
22992531
23002532 let selection = doc.selection(view.id);
2533+ let only_whole_lines = selection_is_linewise(selection, doc.text());
23012534
23022535 if cx.register != Some('_') {
23032536 // first yank the selection
23042537 let text = doc.text().slice(..);
23052538 let values: Vec<String> = selection.fragments(text).map(Cow::into_owned).collect();
23062539 let reg_name = cx.register.unwrap_or('"');
2307− 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+ }
23082544 };
23092545
23102546 // then delete
2311− let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
2312− (range.from(), range.to(), None)
2313− });
2547+ let transaction =
2548+ Transaction::delete_by_selection(doc.text(), selection, |range| (range.from(), range.to()));
23142549 doc.apply(&transaction, view.id);
23152550
23162551 match op {
@@ -2319,17 +2554,59 @@ fn delete_selection_impl(cx: &mut Context, op: Operation) {
23192554 exit_select_mode(cx);
23202555 }
23212556 Operation::Change => {
2322− enter_insert_mode(cx);
2557+ if only_whole_lines {
2558+ open_above(cx);
2559+ } else {
2560+ enter_insert_mode(cx);
2561+ }
23232562 }
23242563 }
23252564}
23262565
23272566#[inline]
2328−fn delete_selection_insert_mode(doc: &mut Document, view: &mut View, selection: &Selection) {
2329− let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
2330− (range.from(), range.to(), None)
2331− });
2567+fn delete_by_selection_insert_mode(
2568+ cx: &mut Context,
2569+ mut f: impl FnMut(RopeSlice, &Range) -> Deletion,
2570+ direction: Direction,
2571+) {
2572+ let (view, doc) = current!(cx.editor);
2573+ let text = doc.text().slice(..);
2574+ let mut selection = SmallVec::new();
2575+ let mut insert_newline = false;
2576+ let text_len = text.len_chars();
2577+ let mut transaction =
2578+ Transaction::delete_by_selection(doc.text(), doc.selection(view.id), |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)
2594+ });
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);
2609+ lsp::signature_help_impl(cx, SignatureHelpInvoked::Automatic);
23332610}
23342611
23352612fn delete_selection(cx: &mut Context) {
@@ -2403,6 +2680,10 @@ fn insert_mode(cx: &mut Context) {
24032680 .transform(|range| Range::new(range.to(), range.from()));
24042681
24052682 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();
24062687}
24072688
24082689// inserts at the end of each selection
@@ -2439,6 +2720,10 @@ fn append_mode(cx: &mut Context) {
24392720
24402721fn file_picker(cx: &mut Context) {
24412722 let root = find_workspace().0;
2723+ if !root.exists() {
2724+ cx.editor.set_error("Workspace directory does not exist");
2725+ return;
2726+ }
24422727 let picker = ui::file_picker(root, &cx.editor.config());
24432728 cx.push_layer(Box::new(overlaid(picker)));
24442729}
@@ -2459,8 +2744,14 @@ fn file_picker_in_current_buffer_directory(cx: &mut Context) {
24592744 let picker = ui::file_picker(path, &cx.editor.config());
24602745 cx.push_layer(Box::new(overlaid(picker)));
24612746}
2747+
24622748fn file_picker_in_current_directory(cx: &mut Context) {
2463− 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+ }
24642755 let picker = ui::file_picker(cwd, &cx.editor.config());
24652756 cx.push_layer(Box::new(overlaid(picker)));
24662757}
@@ -2519,22 +2810,18 @@ fn buffer_picker(cx: &mut Context) {
25192810 // mru
25202811 items.sort_unstable_by_key(|item| std::cmp::Reverse(item.focused_at));
25212812
2522− let picker = FilePicker::new(
2523− items,
2524− (),
2525− |cx, meta, action| {
2526− cx.editor.switch(meta.id, action);
2527− },
2528− |editor, meta| {
2529− let doc = &editor.documents.get(&meta.id)?;
2530− let &view_id = doc.selections().keys().next()?;
2531− let line = doc
2532− .selection(view_id)
2533− .primary()
2534− .cursor_line(doc.text().slice(..));
2535− Some((meta.id.into(), Some((line, line))))
2536− },
2537− );
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+ });
25382825 cx.push_layer(Box::new(overlaid(picker)));
25392826}
25402827
@@ -2600,7 +2887,7 @@ fn jumplist_picker(cx: &mut Context) {
26002887 }
26012888 };
26022889
2603− let picker = FilePicker::new(
2890+ let picker = Picker::new(
26042891 cx.editor
26052892 .tree
26062893 .views()
@@ -2614,16 +2901,18 @@ fn jumplist_picker(cx: &mut Context) {
26142901 |cx, meta, action| {
26152902 cx.editor.switch(meta.id, action);
26162903 let config = cx.editor.config();
2617− let (view, doc) = current!(cx.editor);
2904+ let (view, doc) = (view_mut!(cx.editor), doc_mut!(cx.editor, &meta.id));
26182905 doc.set_selection(view.id, meta.selection.clone());
2619− view.ensure_cursor_in_view_center(doc, config.scrolloff);
2620− },
2621− |editor, meta| {
2622− let doc = &editor.documents.get(&meta.id)?;
2623− let line = meta.selection.primary().cursor_line(doc.text().slice(..));
2624− 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+ }
26252909 },
2626− );
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+ });
26272916 cx.push_layer(Box::new(overlaid(picker)));
26282917}
26292918
@@ -2657,6 +2946,9 @@ impl ui::menu::Item for MappableCommand {
26572946}
26582947
26592948pub fn command_palette(cx: &mut Context) {
2949+ let register = cx.register;
2950+ let count = cx.count;
2951+
26602952 cx.callback = Some(Box::new(
26612953 move |compositor: &mut Compositor, cx: &mut compositor::Context| {
26622954 let keymap = compositor.find::<ui::EditorView>().unwrap().keymaps.map()
@@ -2674,8 +2966,8 @@ pub fn command_palette(cx: &mut Context) {
26742966
26752967 let picker = Picker::new(commands, keymap, move |cx, command, _action| {
26762968 let mut ctx = Context {
2677− register: None,
2678− count: std::num::NonZeroUsize::new(1),
2969+ register,
2970+ count,
26792971 editor: cx.editor,
26802972 callback: None,
26812973 on_next_key_callback: None,
@@ -2714,24 +3006,88 @@ fn last_picker(cx: &mut Context) {
27143006 }));
27153007}
27163008
2717−// 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.
27183017fn insert_at_line_start(cx: &mut Context) {
2719− goto_first_nonwhitespace(cx);
2720− enter_insert_mode(cx);
3018+ insert_with_indent(cx, IndentFallbackPos::LineStart);
27213019}
27223020
2723−// 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.
27243023fn 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) {
27253030 enter_insert_mode(cx);
3031+
27263032 let (view, doc) = current!(cx.editor);
27273033
2728− let selection = doc.selection(view.id).clone().transform(|range| {
2729− let text = doc.text().slice(..);
2730− let line = range.cursor_line(text);
2731− let pos = line_end_char_index(&text, line);
2732− 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+ }
27333087 });
2734− doc.set_selection(view.id, selection);
3088+
3089+ transaction = transaction.with_selection(Selection::new(ranges, selection.primary_index()));
3090+ doc.apply(&transaction, view.id);
27353091}
27363092
27373093// Creates an LspCallback that waits for formatting changes to be computed. When they're done,
@@ -2802,6 +3158,7 @@ fn open(cx: &mut Context, open: Open) {
28023158 Open::Below => graphemes::prev_grapheme_boundary(text, range.to()),
28033159 Open::Above => range.from(),
28043160 });
3161+
28053162 let new_line = match open {
28063163 // adjust position to the end of the line (next line - 1)
28073164 Open::Below => cursor_line + 1,
@@ -2809,13 +3166,15 @@ fn open(cx: &mut Context, open: Open) {
28093166 Open::Above => cursor_line,
28103167 };
28113168
3169+ let line_num = new_line.saturating_sub(1);
3170+
28123171 // Index to insert newlines after, as well as the char width
28133172 // to use to compensate for those inserted newlines.
28143173 let (line_end_index, line_end_offset_width) = if new_line == 0 {
28153174 (0, 0)
28163175 } else {
28173176 (
2818− line_end_char_index(&doc.text().slice(..), new_line.saturating_sub(1)),
3177+ line_end_char_index(&text, line_num),
28193178 doc.line_ending.len_chars(),
28203179 )
28213180 };
@@ -2823,13 +3182,15 @@ fn open(cx: &mut Context, open: Open) {
28233182 let indent = indent::indent_for_newline(
28243183 doc.language_config(),
28253184 doc.syntax(),
3185+ &doc.config.load().indent_heuristic,
28263186 &doc.indent_style,
28273187 doc.tab_width(),
28283188 text,
2829− new_line.saturating_sub(1),
3189+ line_num,
28303190 line_end_index,
28313191 cursor_line,
28323192 );
3193+
28333194 let indent_len = indent.len();
28343195 let mut text = String::with_capacity(1 + indent_len);
28353196 text.push_str(doc.line_ending.as_str());
@@ -2989,7 +3350,7 @@ fn exit_select_mode(cx: &mut Context) {
29893350
29903351fn goto_first_diag(cx: &mut Context) {
29913352 let (view, doc) = current!(cx.editor);
2992− let selection = match doc.diagnostics().first() {
3353+ let selection = match doc.shown_diagnostics().next() {
29933354 Some(diag) => Selection::single(diag.range.start, diag.range.end),
29943355 None => return,
29953356 };
@@ -2998,7 +3359,7 @@ fn goto_first_diag(cx: &mut Context) {
29983359
29993360fn goto_last_diag(cx: &mut Context) {
30003361 let (view, doc) = current!(cx.editor);
3001− let selection = match doc.diagnostics().last() {
3362+ let selection = match doc.shown_diagnostics().last() {
30023363 Some(diag) => Selection::single(diag.range.start, diag.range.end),
30033364 None => return,
30043365 };
@@ -3014,10 +3375,9 @@ fn goto_next_diag(cx: &mut Context) {
30143375 .cursor(doc.text().slice(..));
30153376
30163377 let diag = doc
3017− .diagnostics()
3018− .iter()
3378+ .shown_diagnostics()
30193379 .find(|diag| diag.range.start > cursor_pos)
3020− .or_else(|| doc.diagnostics().first());
3380+ .or_else(|| doc.shown_diagnostics().next());
30213381
30223382 let selection = match diag {
30233383 Some(diag) => Selection::single(diag.range.start, diag.range.end),
@@ -3035,11 +3395,10 @@ fn goto_prev_diag(cx: &mut Context) {
30353395 .cursor(doc.text().slice(..));
30363396
30373397 let diag = doc
3038− .diagnostics()
3039− .iter()
3398+ .shown_diagnostics()
30403399 .rev()
30413400 .find(|diag| diag.range.start < cursor_pos)
3042− .or_else(|| doc.diagnostics().last());
3401+ .or_else(|| doc.shown_diagnostics().last());
30433402
30443403 let selection = match diag {
30453404 // NOTE: the selection is reversed because we're jumping to the
@@ -3130,8 +3489,7 @@ fn goto_next_change_impl(cx: &mut Context, direction: Direction) {
31303489
31313490 doc.set_selection(view.id, selection)
31323491 };
3133− motion(cx.editor);
3134− cx.editor.last_motion = Some(Motion(Box::new(motion)));
3492+ cx.editor.apply_motion(motion);
31353493}
31363494
31373495/// Returns the [Range] for a [Hunk] in the given text.
@@ -3194,23 +3552,19 @@ pub mod insert {
31943552 use helix_lsp::lsp;
31953553 // if ch matches completion char, trigger completion
31963554 let doc = doc_mut!(cx.editor);
3197− let language_server = match doc.language_server() {
3198− Some(language_server) => language_server,
3199− None => return,
3200− };
3201−
3202− 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+ });
32033564
3204− if let Some(lsp::CompletionOptions {
3205− trigger_characters: Some(triggers),
3206− ..
3207− }) = &capabilities.completion_provider
3208− {
3209− // TODO: what if trigger is multiple chars long
3210− if triggers.iter().any(|trigger| trigger.contains(ch)) {
3211− cx.editor.clear_idle_timer();
3212− super::completion(cx);
3213− }
3565+ if trigger_completion {
3566+ cx.editor.clear_idle_timer();
3567+ super::completion(cx);
32143568 }
32153569 }
32163570
@@ -3218,12 +3572,12 @@ pub mod insert {
32183572 use helix_lsp::lsp;
32193573 // if ch matches signature_help char, trigger
32203574 let doc = doc_mut!(cx.editor);
3221− // The language_server!() macro is not used here since it will
3222− // print an "LSP not active for current buffer" message on
3223− // every keypress.
3224− let language_server = match doc.language_server() {
3225− Some(language_server) => language_server,
3226− 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;
32273581 };
32283582
32293583 let capabilities = language_server.capabilities();
@@ -3262,6 +3616,7 @@ pub mod insert {
32623616 }
32633617
32643618 use helix_core::auto_pairs;
3619+ use helix_view::editor::SmartTabConfig;
32653620
32663621 pub fn insert_char(cx: &mut Context, c: char) {
32673622 let (view, doc) = current_ref!(cx.editor);
@@ -3287,6 +3642,31 @@ pub mod insert {
32873642 }
32883643 }
32893644
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+
32903670 pub fn insert_tab(cx: &mut Context) {
32913671 let (view, doc) = current!(cx.editor);
32923672 // TODO: round out to nearest indentation level (for example a line with 3 spaces should
@@ -3342,6 +3722,7 @@ pub mod insert {
33423722 let indent = indent::indent_for_newline(
33433723 doc.language_config(),
33443724 doc.syntax(),
3725+ &doc.config.load().indent_heuristic,
33453726 &doc.indent_style,
33463727 doc.tab_width(),
33473728 text,
@@ -3415,10 +3796,10 @@ pub mod insert {
34153796 let auto_pairs = doc.auto_pairs(cx.editor);
34163797
34173798 let transaction =
3418− Transaction::change_by_selection(doc.text(), doc.selection(view.id), |range| {
3799+ Transaction::delete_by_selection(doc.text(), doc.selection(view.id), |range| {
34193800 let pos = range.cursor(text);
34203801 if pos == 0 {
3421− return (pos, pos, None);
3802+ return (pos, pos);
34223803 }
34233804 let line_start_pos = text.line_to_char(range.cursor_line(text));
34243805 // consider to delete by indent level if all characters before `pos` are indent units.
@@ -3426,11 +3807,7 @@ pub mod insert {
34263807 if !fragment.is_empty() && fragment.chars().all(|ch| ch == ' ' || ch == '\t') {
34273808 if text.get_char(pos.saturating_sub(1)) == Some('\t') {
34283809 // fast path, delete one char
3429− (
3430− graphemes::nth_prev_grapheme_boundary(text, pos, 1),
3431− pos,
3432− None,
3433− )
3810+ (graphemes::nth_prev_grapheme_boundary(text, pos, 1), pos)
34343811 } else {
34353812 let width: usize = fragment
34363813 .chars()
@@ -3457,7 +3834,7 @@ pub mod insert {
34573834 _ => break,
34583835 }
34593836 }
3460− (start, pos, None) // delete!
3837+ (start, pos) // delete!
34613838 }
34623839 } else {
34633840 match (
@@ -3475,17 +3852,12 @@ pub mod insert {
34753852 (
34763853 graphemes::nth_prev_grapheme_boundary(text, pos, count),
34773854 graphemes::nth_next_grapheme_boundary(text, pos, count),
3478− None,
34793855 )
34803856 }
34813857 _ =>
34823858 // delete 1 char
34833859 {
3484− (
3485− graphemes::nth_prev_grapheme_boundary(text, pos, count),
3486− pos,
3487− None,
3488− )
3860+ (graphemes::nth_prev_grapheme_boundary(text, pos, count), pos)
34893861 }
34903862 }
34913863 }
@@ -3498,50 +3870,40 @@ pub mod insert {
34983870
34993871 pub fn delete_char_forward(cx: &mut Context) {
35003872 let count = cx.count();
3501− let (view, doc) = current!(cx.editor);
3502− let text = doc.text().slice(..);
3503− let transaction =
3504− Transaction::change_by_selection(doc.text(), doc.selection(view.id), |range| {
3873+ delete_by_selection_insert_mode(
3874+ cx,
3875+ |text, range| {
35053876 let pos = range.cursor(text);
3506− (
3507− pos,
3508− graphemes::nth_next_grapheme_boundary(text, pos, count),
3509− None,
3510− )
3511− });
3512− doc.apply(&transaction, view.id);
3513−
3514− lsp::signature_help_impl(cx, SignatureHelpInvoked::Automatic);
3877+ (pos, graphemes::nth_next_grapheme_boundary(text, pos, count))
3878+ },
3879+ Direction::Forward,
3880+ )
35153881 }
35163882
35173883 pub fn delete_word_backward(cx: &mut Context) {
35183884 let count = cx.count();
3519− let (view, doc) = current!(cx.editor);
3520− let text = doc.text().slice(..);
3521−
3522− let selection = doc.selection(view.id).clone().transform(|range| {
3523− let anchor = movement::move_prev_word_start(text, range, count).from();
3524− let next = Range::new(anchor, range.cursor(text));
3525− exclude_cursor(text, next, range)
3526− });
3527− delete_selection_insert_mode(doc, view, &selection);
3528−
3529− lsp::signature_help_impl(cx, SignatureHelpInvoked::Automatic);
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+ );
35303895 }
35313896
35323897 pub fn delete_word_forward(cx: &mut Context) {
35333898 let count = cx.count();
3534− let (view, doc) = current!(cx.editor);
3535− let text = doc.text().slice(..);
3536−
3537− let selection = doc.selection(view.id).clone().transform(|range| {
3538− let head = movement::move_next_word_end(text, range, count).to();
3539− Range::new(range.cursor(text), head)
3540− });
3541−
3542− delete_selection_insert_mode(doc, view, &selection);
3543−
3544− lsp::signature_help_impl(cx, SignatureHelpInvoked::Automatic);
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+ );
35453907 }
35463908}
35473909
@@ -3601,34 +3963,21 @@ fn commit_undo_checkpoint(cx: &mut Context) {
36013963// Yank / Paste
36023964
36033965fn yank(cx: &mut Context) {
3604− let (view, doc) = current!(cx.editor);
3605− let text = doc.text().slice(..);
3606−
3607− let values: Vec<String> = doc
3608− .selection(view.id)
3609− .fragments(text)
3610− .map(Cow::into_owned)
3611− .collect();
3612−
3613− let msg = format!(
3614− "yanked {} selection(s) to register {}",
3615− values.len(),
3616− cx.register.unwrap_or('"')
3617− );
3966+ yank_impl(cx.editor, cx.register.unwrap_or('"'));
3967+ exit_select_mode(cx);
3968+}
36183969
3619− cx.editor
3620− .registers
3621− .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+}
36223974
3623− cx.editor.set_status(msg);
3975+fn yank_to_primary_clipboard(cx: &mut Context) {
3976+ yank_impl(cx.editor, '*');
36243977 exit_select_mode(cx);
36253978}
36263979
3627−fn yank_joined_to_clipboard_impl(
3628− editor: &mut Editor,
3629− separator: &str,
3630− clipboard_type: ClipboardType,
3631−) -> anyhow::Result<()> {
3980+fn yank_impl(editor: &mut Editor, register: char) {
36323981 let (view, doc) = current!(editor);
36333982 let text = doc.text().slice(..);
36343983
@@ -3637,74 +3986,79 @@ fn yank_joined_to_clipboard_impl(
36373986 .fragments(text)
36383987 .map(Cow::into_owned)
36393988 .collect();
3989+ let selections = values.len();
36403990
3641− let clipboard_text = match clipboard_type {
3642− ClipboardType::Clipboard => "system clipboard",
3643− ClipboardType::Selection => "primary clipboard",
3644− };
3645−
3646− let msg = format!(
3647− "joined and yanked {} selection(s) to {}",
3648− values.len(),
3649− clipboard_text,
3650− );
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+}
36513999
3652− 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(..);
36534003
3654− editor
3655− .clipboard_provider
3656− .set_contents(joined, clipboard_type)
3657− .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+ });
36584015
3659− 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+}
36604024
3661− 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);
36624029}
36634030
36644031fn yank_joined_to_clipboard(cx: &mut Context) {
36654032 let line_ending = doc!(cx.editor).line_ending;
3666− let _ =
3667− yank_joined_to_clipboard_impl(cx.editor, line_ending.as_str(), ClipboardType::Clipboard);
4033+ yank_joined_impl(cx.editor, line_ending.as_str(), '+');
36684034 exit_select_mode(cx);
36694035}
36704036
3671−fn yank_main_selection_to_clipboard_impl(
3672− editor: &mut Editor,
3673− clipboard_type: ClipboardType,
3674−) -> 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) {
36754044 let (view, doc) = current!(editor);
36764045 let text = doc.text().slice(..);
36774046
3678− let message_text = match clipboard_type {
3679− ClipboardType::Clipboard => "yanked main selection to system clipboard",
3680− ClipboardType::Selection => "yanked main selection to primary clipboard",
3681− };
4047+ let selection = doc.selection(view.id).primary().fragment(text).to_string();
36824048
3683− let value = doc.selection(view.id).primary().fragment(text);
3684−
3685− if let Err(e) = editor
3686− .clipboard_provider
3687− .set_contents(value.into_owned(), clipboard_type)
3688− {
3689− 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()),
36904052 }
3691−
3692− editor.set_status(message_text);
3693− Ok(())
36944053}
36954054
36964055fn yank_main_selection_to_clipboard(cx: &mut Context) {
3697− let _ = yank_main_selection_to_clipboard_impl(cx.editor, ClipboardType::Clipboard);
3698−}
3699−
3700−fn yank_joined_to_primary_clipboard(cx: &mut Context) {
3701− let line_ending = doc!(cx.editor).line_ending;
3702− let _ =
3703− 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);
37044058}
37054059
37064060fn yank_main_selection_to_primary_clipboard(cx: &mut Context) {
3707− let _ = yank_main_selection_to_clipboard_impl(cx.editor, ClipboardType::Selection);
4061+ yank_primary_selection_impl(cx.editor, '*');
37084062 exit_select_mode(cx);
37094063}
37104064
@@ -3802,146 +4156,99 @@ pub(crate) fn paste_bracketed_value(cx: &mut Context, contents: String) {
38024156 };
38034157 let (view, doc) = current!(cx.editor);
38044158 paste_impl(&[contents], doc, view, paste, count, cx.editor.mode);
3805−}
3806−
3807−fn paste_clipboard_impl(
3808− editor: &mut Editor,
3809− action: Paste,
3810− clipboard_type: ClipboardType,
3811− count: usize,
3812−) -> anyhow::Result<()> {
3813− let (view, doc) = current!(editor);
3814− match editor.clipboard_provider.get_contents(clipboard_type) {
3815− Ok(contents) => {
3816− paste_impl(&[contents], doc, view, action, count, editor.mode);
3817− Ok(())
3818− }
3819− Err(e) => Err(e.context("Couldn't get system clipboard contents")),
3820− }
4159+ exit_select_mode(cx);
38214160}
38224161
38234162fn paste_clipboard_after(cx: &mut Context) {
3824− let _ = paste_clipboard_impl(
3825− cx.editor,
3826− Paste::After,
3827− ClipboardType::Clipboard,
3828− cx.count(),
3829− );
4163+ paste(cx.editor, '+', Paste::After, cx.count());
4164+ exit_select_mode(cx);
38304165}
38314166
38324167fn paste_clipboard_before(cx: &mut Context) {
3833− let _ = paste_clipboard_impl(
3834− cx.editor,
3835− Paste::Before,
3836− ClipboardType::Clipboard,
3837− cx.count(),
3838− );
4168+ paste(cx.editor, '+', Paste::Before, cx.count());
4169+ exit_select_mode(cx);
38394170}
38404171
38414172fn paste_primary_clipboard_after(cx: &mut Context) {
3842− let _ = paste_clipboard_impl(
3843− cx.editor,
3844− Paste::After,
3845− ClipboardType::Selection,
3846− cx.count(),
3847− );
4173+ paste(cx.editor, '*', Paste::After, cx.count());
4174+ exit_select_mode(cx);
38484175}
38494176
38504177fn paste_primary_clipboard_before(cx: &mut Context) {
3851− let _ = paste_clipboard_impl(
3852− cx.editor,
3853− Paste::Before,
3854− ClipboardType::Selection,
3855− cx.count(),
3856− );
4178+ paste(cx.editor, '*', Paste::Before, cx.count());
4179+ exit_select_mode(cx);
38574180}
38584181
38594182fn replace_with_yanked(cx: &mut Context) {
3860− let count = cx.count();
3861− let reg_name = cx.register.unwrap_or('"');
3862− let (view, doc) = current!(cx.editor);
3863− let registers = &mut cx.editor.registers;
3864−
3865− if let Some(values) = registers.read(reg_name) {
3866− if !values.is_empty() {
3867− let repeat = std::iter::repeat(
3868− values
3869− .last()
3870− .map(|value| Tendril::from(&value.repeat(count)))
3871− .unwrap(),
3872− );
3873− let mut values = values
3874− .iter()
3875− .map(|value| Tendril::from(&value.repeat(count)))
3876− .chain(repeat);
3877− let selection = doc.selection(view.id);
3878− let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
3879− if !range.is_empty() {
3880− (range.from(), range.to(), Some(values.next().unwrap()))
3881− } else {
3882− (range.from(), range.to(), None)
3883− }
3884− });
3885−
3886− doc.apply(&transaction, view.id);
3887− exit_select_mode(cx);
3888− }
3889− }
4183+ replace_with_yanked_impl(cx.editor, cx.register.unwrap_or('"'), cx.count());
4184+ exit_select_mode(cx);
38904185}
38914186
3892−fn replace_selections_with_clipboard_impl(
3893− cx: &mut Context,
3894− clipboard_type: ClipboardType,
3895−) -> anyhow::Result<()> {
3896− let count = cx.count();
3897− let (view, doc) = current!(cx.editor);
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();
38984192
3899− match cx.editor.clipboard_provider.get_contents(clipboard_type) {
3900− Ok(contents) => {
3901− let selection = doc.selection(view.id);
3902− let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
3903− (
3904− range.from(),
3905− range.to(),
3906− Some(contents.repeat(count).as_str().into()),
3907− )
3908− });
3909−
3910− doc.apply(&transaction, view.id);
3911− 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)
39124210 }
3913− Err(e) => return Err(e.context("Couldn't get system clipboard contents")),
3914− }
4211+ });
39154212
3916− exit_select_mode(cx);
3917− Ok(())
4213+ doc.apply(&transaction, view.id);
39184214}
39194215
39204216fn replace_selections_with_clipboard(cx: &mut Context) {
3921− let _ = replace_selections_with_clipboard_impl(cx, ClipboardType::Clipboard);
4217+ replace_with_yanked_impl(cx.editor, '+', cx.count());
4218+ exit_select_mode(cx);
39224219}
39234220
39244221fn replace_selections_with_primary_clipboard(cx: &mut Context) {
3925− let _ = replace_selections_with_clipboard_impl(cx, ClipboardType::Selection);
4222+ replace_with_yanked_impl(cx.editor, '*', cx.count());
4223+ exit_select_mode(cx);
39264224}
39274225
3928−fn paste(cx: &mut Context, pos: Paste) {
3929− let count = cx.count();
3930− let reg_name = cx.register.unwrap_or('"');
3931− let (view, doc) = current!(cx.editor);
3932− 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();
39334229
3934− if let Some(values) = registers.read(reg_name) {
3935− paste_impl(values, doc, view, pos, count, cx.editor.mode);
3936− }
4230+ let (view, doc) = current!(editor);
4231+ paste_impl(&values, doc, view, pos, count, editor.mode);
39374232}
39384233
39394234fn paste_after(cx: &mut Context) {
3940− 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);
39414242}
39424243
39434244fn paste_before(cx: &mut Context) {
3944− 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);
39454252}
39464253
39474254fn get_lines(doc: &Document, view_id: ViewId) -> Vec<usize> {
@@ -3980,6 +4287,7 @@ fn indent(cx: &mut Context) {
39804287 }),
39814288 );
39824289 doc.apply(&transaction, view.id);
4290+ exit_select_mode(cx);
39834291}
39844292
39854293fn unindent(cx: &mut Context) {
@@ -4019,71 +4327,76 @@ fn unindent(cx: &mut Context) {
40194327 let transaction = Transaction::change(doc.text(), changes.into_iter());
40204328
40214329 doc.apply(&transaction, view.id);
4330+ exit_select_mode(cx);
40224331}
40234332
40244333fn format_selections(cx: &mut Context) {
40254334 use helix_lsp::{lsp, util::range_to_lsp_range};
40264335
40274336 let (view, doc) = current!(cx.editor);
4337+ let view_id = view.id;
40284338
40294339 // via lsp if available
40304340 // TODO: else via tree-sitter indentation calculations
40314341
4032− let language_server = match doc.language_server() {
4033− Some(language_server) => language_server,
4034− 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;
40354362 };
40364363
4364+ let offset_encoding = language_server.offset_encoding();
40374365 let ranges: Vec<lsp::Range> = doc
4038− .selection(view.id)
4366+ .selection(view_id)
40394367 .iter()
4040− .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))
40414369 .collect();
40424370
4043− if ranges.len() != 1 {
4044− cx.editor
4045− .set_error("format_selections only supports a single selection for now");
4046− return;
4047− }
4048−
40494371 // TODO: handle fails
40504372 // TODO: concurrent map over all ranges
40514373
40524374 let range = ranges[0];
40534375
4054− let request = match language_server.text_document_range_formatting(
4055− doc.identifier(),
4056− range,
4057− lsp::FormattingOptions::default(),
4058− None,
4059− ) {
4060− Some(future) => future,
4061− None => {
4062− cx.editor
4063− .set_error("Language server does not support range formatting");
4064− return;
4065− }
4066− };
4376+ let future = language_server
4377+ .text_document_range_formatting(
4378+ doc.identifier(),
4379+ range,
4380+ lsp::FormattingOptions::default(),
4381+ None,
4382+ )
4383+ .unwrap();
40674384
4068− 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();
40694386
4070− let transaction = helix_lsp::util::generate_transaction_from_edits(
4071− doc.text(),
4072− edits,
4073− language_server.offset_encoding(),
4074− );
4387+ let transaction =
4388+ helix_lsp::util::generate_transaction_from_edits(doc.text(), edits, offset_encoding);
40754389
4076− doc.apply(&transaction, view.id);
4390+ doc.apply(&transaction, view_id);
40774391}
40784392
40794393fn join_selections_impl(cx: &mut Context, select_space: bool) {
40804394 use movement::skip_while;
40814395 let (view, doc) = current!(cx.editor);
40824396 let text = doc.text();
4083− let slice = doc.text().slice(..);
4397+ let slice = text.slice(..);
40844398
40854399 let mut changes = Vec::new();
4086− let fragment = Tendril::from(" ");
40874400
40884401 for selection in doc.selection(view.id) {
40894402 let (start, mut end) = selection.line_range(slice);
@@ -4099,9 +4412,13 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
40994412 let mut end = text.line_to_char(line + 1);
41004413 end = skip_while(slice, end, |ch| matches!(ch, ' ' | '\t')).unwrap_or(end);
41014414
4102− // need to skip from start, not end
4103− let change = (start, end, Some(fragment.clone()));
4104− 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));
41054422 }
41064423 }
41074424
@@ -4113,9 +4430,6 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
41134430 changes.sort_unstable_by_key(|(from, _to, _text)| *from);
41144431 changes.dedup();
41154432
4116− // TODO: joining multiple empty lines should be replaced by a single space.
4117− // need to merge change ranges that touch
4118−
41194433 // select inserted spaces
41204434 let transaction = if select_space {
41214435 let ranges: SmallVec<_> = changes
@@ -4127,9 +4441,9 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
41274441 })
41284442 .collect();
41294443 let selection = Selection::new(ranges, 0);
4130− Transaction::change(doc.text(), changes.into_iter()).with_selection(selection)
4444+ Transaction::change(text, changes.into_iter()).with_selection(selection)
41314445 } else {
4132− Transaction::change(doc.text(), changes.into_iter())
4446+ Transaction::change(text, changes.into_iter())
41334447 };
41344448
41354449 doc.apply(&transaction, view.id);
@@ -4143,8 +4457,8 @@ fn keep_or_remove_selections_impl(cx: &mut Context, remove: bool) {
41434457 if remove { "remove:" } else { "keep:" }.into(),
41444458 Some(reg),
41454459 ui::completers::none,
4146− move |editor, regex, event| {
4147− let (view, doc) = current!(editor);
4460+ move |cx, regex, event| {
4461+ let (view, doc) = current!(cx.editor);
41484462 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
41494463 return;
41504464 }
@@ -4203,21 +4517,53 @@ pub fn completion(cx: &mut Context) {
42034517
42044518 let (view, doc) = current!(cx.editor);
42054519
4206− let language_server = match doc.language_server() {
4207− Some(language_server) => language_server,
4208− None => return,
4520+ let savepoint = if let Some(CompleteAction::Selected { savepoint }) = &cx.editor.last_completion
4521+ {
4522+ savepoint.clone()
4523+ } else {
4524+ doc.savepoint(view)
42094525 };
42104526
4211− let offset_encoding = language_server.offset_encoding();
4212− let text = doc.text().slice(..);
4213− let cursor = doc.selection(view.id).primary().cursor(text);
4214−
4215− let pos = pos_to_lsp_pos(doc.text(), cursor, offset_encoding);
4527+ let text = savepoint.text.clone();
4528+ let cursor = savepoint.cursor();
4529+
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();
42164562
4217− let future = match language_server.completion(doc.identifier(), pos, None) {
4218− Some(future) => future,
4219− None => return,
4220− };
4563+ anyhow::Ok(items)
4564+ }
4565+ })
4566+ .collect();
42214567
42224568 // setup a channel that allows the request to be canceled
42234569 let (tx, rx) = oneshot::channel();
@@ -4226,12 +4572,20 @@ pub fn completion(cx: &mut Context) {
42264572 // and the associated request is automatically dropped
42274573 cx.editor.completion_request_handle = Some(tx);
42284574 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+ };
42294583 tokio::select! {
42304584 biased;
42314585 _ = rx => {
4232− Ok(serde_json::Value::Null)
4586+ Ok(Vec::new())
42334587 }
4234− res = future => {
4588+ res = items_future => {
42354589 res
42364590 }
42374591 }
@@ -4247,7 +4601,6 @@ pub fn completion(cx: &mut Context) {
42474601 iter.reverse();
42484602 let offset = iter.take_while(|ch| chars::char_is_word(*ch)).count();
42494603 let start_offset = cursor.saturating_sub(offset);
4250− let savepoint = doc.savepoint(view);
42514604
42524605 let trigger_doc = doc.id();
42534606 let trigger_view = view.id;
@@ -4266,9 +4619,9 @@ pub fn completion(cx: &mut Context) {
42664619 },
42674620 ));
42684621
4269− cx.callback(
4270− future,
4271− 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| {
42724625 let (view, doc) = current_ref!(editor);
42734626 // check if the completion request is stale.
42744627 //
@@ -4279,16 +4632,6 @@ pub fn completion(cx: &mut Context) {
42794632 return;
42804633 }
42814634
4282− let items = match response {
4283− Some(lsp::CompletionResponse::Array(items)) => items,
4284− // TODO: do something with is_incomplete
4285− Some(lsp::CompletionResponse::List(lsp::CompletionList {
4286− is_incomplete: _is_incomplete,
4287− items,
4288− })) => items,
4289− None => Vec::new(),
4290− };
4291−
42924635 if items.is_empty() {
42934636 // editor.set_error("No completion available");
42944637 return;
@@ -4299,7 +4642,6 @@ pub fn completion(cx: &mut Context) {
42994642 editor,
43004643 savepoint,
43014644 items,
4302− offset_encoding,
43034645 start_offset,
43044646 trigger_offset,
43054647 size,
@@ -4313,8 +4655,9 @@ pub fn completion(cx: &mut Context) {
43134655 {
43144656 compositor.remove(SignatureHelp::ID);
43154657 }
4316− },
4317− );
4658+ };
4659+ Ok(Callback::EditorCompositor(Box::new(call)))
4660+ });
43184661}
43194662
43204663// comments
@@ -4349,7 +4692,13 @@ fn rotate_selections_backward(cx: &mut Context) {
43494692 rotate_selections(cx, Direction::Backward)
43504693}
43514694
4352−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) {
43534702 let count = cx.count;
43544703 let (view, doc) = current!(cx.editor);
43554704 let text = doc.text().slice(..);
@@ -4367,9 +4716,10 @@ fn rotate_selection_contents(cx: &mut Context, direction: Direction) {
43674716
43684717 for chunk in fragments.chunks_mut(group) {
43694718 // TODO: also modify main index
4370− match direction {
4371− Direction::Forward => chunk.rotate_right(1),
4372− 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(),
43734723 };
43744724 }
43754725
@@ -4386,10 +4736,13 @@ fn rotate_selection_contents(cx: &mut Context, direction: Direction) {
43864736}
43874737
43884738fn rotate_selection_contents_forward(cx: &mut Context) {
4389− rotate_selection_contents(cx, Direction::Forward)
4739+ reorder_selection_contents(cx, ReorderStrategy::RotateForward)
43904740}
43914741fn rotate_selection_contents_backward(cx: &mut Context) {
4392− 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)
43934746}
43944747
43954748// tree sitter node selection
@@ -4413,8 +4766,7 @@ fn expand_selection(cx: &mut Context) {
44134766 }
44144767 }
44154768 };
4416− motion(cx.editor);
4417− cx.editor.last_motion = Some(Motion(Box::new(motion)));
4769+ cx.editor.apply_motion(motion);
44184770}
44194771
44204772fn shrink_selection(cx: &mut Context) {
@@ -4438,8 +4790,7 @@ fn shrink_selection(cx: &mut Context) {
44384790 doc.set_selection(view.id, selection);
44394791 }
44404792 };
4441− motion(cx.editor);
4442− cx.editor.last_motion = Some(Motion(Box::new(motion)));
4793+ cx.editor.apply_motion(motion);
44434794}
44444795
44454796fn select_sibling_impl<F>(cx: &mut Context, sibling_fn: &'static F)
@@ -4457,8 +4808,7 @@ where
44574808 doc.set_selection(view.id, selection);
44584809 }
44594810 };
4460− motion(cx.editor);
4461− cx.editor.last_motion = Some(Motion(Box::new(motion)));
4811+ cx.editor.apply_motion(motion);
44624812}
44634813
44644814fn select_next_sibling(cx: &mut Context) {
@@ -4469,22 +4819,68 @@ fn select_prev_sibling(cx: &mut Context) {
44694819 select_sibling_impl(cx, &|node| Node::prev_sibling(&node))
44704820}
44714821
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+
44724865fn match_brackets(cx: &mut Context) {
44734866 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(..);
44744870
4475− if let Some(syntax) = doc.syntax() {
4476− let text = doc.text().slice(..);
4477− let selection = doc.selection(view.id).clone().transform(|range| {
4478− if let Some(pos) =
4479− match_brackets::find_matching_bracket_fuzzy(syntax, doc.text(), range.cursor(text))
4480− {
4481− range.put_cursor(text, pos, cx.editor.mode == Mode::Select)
4482− } else {
4483− range
4484− }
4485− });
4486− doc.set_selection(view.id, selection);
4487− }
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);
44884884}
44894885
44904886//
@@ -4579,17 +4975,19 @@ fn transpose_view(cx: &mut Context) {
45794975 cx.editor.transpose_view()
45804976}
45814977
4582−// split helper, clear it later
4583−fn split(cx: &mut Context, action: Action) {
4584− 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);
45854983 let id = doc.id();
45864984 let selection = doc.selection(view.id).clone();
45874985 let offset = view.offset;
45884986
4589− cx.editor.switch(id, action);
4987+ editor.switch(id, action);
45904988
45914989 // match the selection in the previous view
4592− let (view, doc) = current!(cx.editor);
4990+ let (view, doc) = current!(editor);
45934991 doc.set_selection(view.id, selection);
45944992 // match the view scroll offset (switch doesn't handle this fully
45954993 // since the selection is only matched after the split)
@@ -4597,7 +4995,7 @@ fn split(cx: &mut Context, action: Action) {
45974995}
45984996
45994997fn hsplit(cx: &mut Context) {
4600− split(cx, Action::HorizontalSplit);
4998+ split(cx.editor, Action::HorizontalSplit);
46014999}
46025000
46035001fn hsplit_new(cx: &mut Context) {
@@ -4605,7 +5003,7 @@ fn hsplit_new(cx: &mut Context) {
46055003}
46065004
46075005fn vsplit(cx: &mut Context) {
4608− split(cx, Action::VerticalSplit);
5006+ split(cx.editor, Action::VerticalSplit);
46095007}
46105008
46115009fn vsplit_new(cx: &mut Context) {
@@ -4654,7 +5052,12 @@ fn insert_register(cx: &mut Context) {
46545052 if let Some(ch) = event.char() {
46555053 cx.editor.autoinfo = None;
46565054 cx.register = Some(ch);
4657− paste(cx, Paste::Cursor);
5055+ paste(
5056+ cx.editor,
5057+ cx.register.unwrap_or('"'),
5058+ Paste::Cursor,
5059+ cx.count(),
5060+ );
46585061 }
46595062 })
46605063}
@@ -4738,8 +5141,7 @@ fn goto_ts_object_impl(cx: &mut Context, object: &'static str, direction: Direct
47385141 editor.set_status("Syntax-tree is not available in current buffer");
47395142 }
47405143 };
4741− motion(cx.editor);
4742− cx.editor.last_motion = Some(Motion(Box::new(motion)));
5144+ cx.editor.apply_motion(motion);
47435145}
47445146
47455147fn goto_next_function(cx: &mut Context) {
@@ -4860,8 +5262,7 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
48605262 });
48615263 doc.set_selection(view.id, selection);
48625264 };
4863− textobject(cx.editor);
4864− cx.editor.last_motion = Some(Motion(Box::new(textobject)));
5265+ cx.editor.apply_motion(textobject);
48655266 }
48665267 });
48675268
@@ -4951,11 +5352,18 @@ fn surround_replace(cx: &mut Context) {
49515352 }
49525353 };
49535354
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+
49545362 cx.on_next_key(move |cx, event| {
49555363 let (view, doc) = current!(cx.editor);
49565364 let to = match event.char() {
49575365 Some(to) => to,
4958− None => return,
5366+ None => return doc.set_selection(view.id, selection),
49595367 };
49605368 let (open, close) = surround::get_pair(to);
49615369 let transaction = Transaction::change(
@@ -4966,6 +5374,7 @@ fn surround_replace(cx: &mut Context) {
49665374 (pos, pos + 1, Some(t))
49675375 }),
49685376 );
5377+ doc.set_selection(view.id, selection);
49695378 doc.apply(&transaction, view.id);
49705379 exit_select_mode(cx);
49715380 });
@@ -5114,7 +5523,7 @@ async fn shell_impl_async(
51145523 helix_view::document::to_writer(&mut stdin, (encoding::UTF_8, false), &input)
51155524 .await?;
51165525 }
5117− Ok::<_, anyhow::Error>(())
5526+ anyhow::Ok(())
51185527 });
51195528 let (output, _) = tokio::join! {
51205529 process.wait_with_output(),
@@ -5200,12 +5609,18 @@ fn shell(cx: &mut compositor::Context, cmd: &str, behavior: &ShellBehavior) {
52005609 };
52015610
52025611 // These `usize`s cannot underflow because selection ranges cannot overlap.
5203− // Once the MSRV is 1.66.0 (mixed_integer_ops is stabilized), we can use checked
5204− // arithmetic to assert this.
5205− 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");
52065617 let new_range = Range::new(anchor, anchor + output_len).with_direction(range.direction());
52075618 ranges.push(new_range);
5208− 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");
52095624
52105625 changes.push((from, to, Some(output)));
52115626 }
@@ -5227,7 +5642,7 @@ fn shell_prompt(cx: &mut Context, prompt: Cow<'static, str>, behavior: ShellBeha
52275642 cx,
52285643 prompt,
52295644 Some('|'),
5230− ui::completers::none,
5645+ ui::completers::filename,
52315646 move |cx, input: &str, event: PromptEvent| {
52325647 if event != PromptEvent::Validate {
52335648 return;
@@ -5344,6 +5759,7 @@ fn increment_impl(cx: &mut Context, increment_direction: IncrementDirection) {
53445759 let transaction = Transaction::change(doc.text(), changes.into_iter());
53455760 let transaction = transaction.with_selection(new_selection);
53465761 doc.apply(&transaction, view.id);
5762+ exit_select_mode(cx);
53475763 }
53485764}
53495765
@@ -5362,9 +5778,12 @@ fn record_macro(cx: &mut Context) {
53625778 }
53635779 })
53645780 .collect::<String>();
5365− cx.editor.registers.write(reg, vec![s]);
5366− cx.editor
5367− .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+ }
53685787 } else {
53695788 let reg = cx.register.take().unwrap_or('@');
53705789 cx.editor.macro_recording = Some((reg, Vec::new()));
@@ -5384,8 +5803,14 @@ fn replay_macro(cx: &mut Context) {
53845803 return;
53855804 }
53865805
5387− let keys: Vec<KeyEvent> = if let Some([keys_str]) = cx.editor.registers.read(reg) {
5388− 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) {
53895814 Ok(keys) => keys,
53905815 Err(err) => {
53915816 cx.editor.set_error(format!("Invalid macro: {}", err));