@@ -29,12 +29,11 @@ use helix_core::{
2929 tree_sitter::Node,
3030 unicode::width::UnicodeWidthChar,
3131 visual_offset_from_block, Deletion, LineEnding, Position, Range, Rope, RopeGraphemes,
32− RopeSlice, Selection, SmallVec, Tendril, Transaction,
32+ RopeReader, RopeSlice, Selection, SmallVec, Tendril, Transaction,
3333};
3434use helix_view::{
35− clipboard::ClipboardType,
3635 document::{FormatterError, Mode, SCRATCH_BUFFER_NAME},
37− editor::{Action, CompleteAction, Motion},
36+ editor::{Action, CompleteAction},
3837 info::Info,
3938 input::KeyEvent,
4039 keyboard::KeyCode,
@@ -44,7 +43,6 @@ use helix_view::{
4443};
4544
4645use anyhow::{anyhow, bail, ensure, Context as _};
47−use fuzzy_matcher::FuzzyMatcher;
4846use insert::*;
4947use movement::Movement;
5048
@@ -55,15 +53,20 @@ use crate::{
5553 job::Callback,
5654 keymap::ReverseKeymap,
5755 ui::{
58− self, editor::InsertEvent, lsp::SignatureHelp, overlay::overlaid, CompletionItem,
59− FilePicker, Picker, Popup, Prompt, PromptEvent,
56+ self, editor::InsertEvent, lsp::SignatureHelp, overlay::overlaid, CompletionItem, Picker,
57+ Popup, Prompt, PromptEvent,
6058 },
6159};
6260
6361use crate::job::{self, Jobs};
64−use futures_util::{stream::FuturesUnordered, StreamExt, TryStreamExt};
65−use std::{collections::HashMap, fmt, future::Future};
66−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+};
6770
6871use std::{
6972 borrow::Cow,
@@ -72,11 +75,11 @@ use std::{
7275
7376use once_cell::sync::Lazy;
7477use serde::de::{self, Deserialize, Deserializer};
78+use url::Url;
7579
7680use grep_regex::RegexMatcherBuilder;
7781use grep_searcher::{sinks, BinaryDetection, SearcherBuilder};
7882use ignore::{DirEntry, WalkBuilder, WalkState};
79−use tokio_stream::wrappers::UnboundedReceiverStream;
8083
8184pub type OnKeyCallback = Box<dyn FnOnce(&mut Context, KeyEvent)>;
8285
@@ -248,6 +251,8 @@ impl MappableCommand {
248251 move_prev_long_word_start, "Move to start of previous long word",
249252 move_next_long_word_end, "Move to end of next long word",
250253 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",
251256 extend_next_word_start, "Extend to start of next word",
252257 extend_prev_word_start, "Extend to start of previous word",
253258 extend_next_word_end, "Extend to end of next word",
@@ -256,6 +261,8 @@ impl MappableCommand {
256261 extend_prev_long_word_start, "Extend to start of previous long word",
257262 extend_next_long_word_end, "Extend to end of next long word",
258263 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",
259266 find_till_char, "Move till next occurrence of char",
260267 find_next_char, "Move to next occurrence of char",
261268 extend_till_char, "Extend till next occurrence of char",
@@ -330,7 +337,7 @@ impl MappableCommand {
330337 goto_implementation, "Goto implementation",
331338 goto_file_start, "Goto line number <n> else file start",
332339 goto_file_end, "Goto file end",
333− goto_file, "Goto files in selection",
340+ goto_file, "Goto files/URLs in selection",
334341 goto_file_hsplit, "Goto files in selection (hsplit)",
335342 goto_file_vsplit, "Goto files in selection (vsplit)",
336343 goto_reference, "Goto references",
@@ -362,6 +369,7 @@ impl MappableCommand {
362369 extend_to_line_end, "Extend to line end",
363370 extend_to_line_end_newline, "Extend to line end",
364371 signature_help, "Show signature help",
372+ smart_tab, "Insert tab if all cursors have all whitespace to their left; otherwise, run a separate command.",
365373 insert_tab, "Insert tab char",
366374 insert_newline, "Insert newline char",
367375 delete_char_backward, "Delete previous char",
@@ -376,6 +384,9 @@ impl MappableCommand {
376384 later, "Move forward in history",
377385 commit_undo_checkpoint, "Commit changes to new checkpoint",
378386 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",
379390 yank_joined_to_clipboard, "Join and yank selections to clipboard",
380391 yank_main_selection_to_clipboard, "Yank main selection to clipboard",
381392 yank_joined_to_primary_clipboard, "Join and yank selections to primary clipboard",
@@ -406,6 +417,7 @@ impl MappableCommand {
406417 rotate_selections_backward, "Rotate selections backward",
407418 rotate_selection_contents_forward, "Rotate selection contents forward",
408419 rotate_selection_contents_backward, "Rotate selections contents backward",
420+ reverse_selection_contents, "Reverse selections contents",
409421 expand_selection, "Expand selection to parent syntax node",
410422 shrink_selection, "Shrink selection to previously expanded syntax node",
411423 select_next_sibling, "Select next sibling in syntax tree",
@@ -978,6 +990,7 @@ fn align_selections(cx: &mut Context) {
978990
979991 let transaction = Transaction::change(doc.text(), changes.into_iter());
980992 doc.apply(&transaction, view.id);
993+ exit_select_mode(cx);
981994}
982995
983996fn goto_window(cx: &mut Context, align: Align) {
@@ -1097,8 +1110,7 @@ where
10971110 .transform(|range| move_fn(text, range, count, behavior));
10981111 doc.set_selection(view.id, selection);
10991112 };
1100− motion(cx.editor);
1101− cx.editor.last_motion = Some(Motion(Box::new(motion)));
1113+ cx.editor.apply_motion(motion)
11021114}
11031115
11041116fn goto_prev_paragraph(cx: &mut Context) {
@@ -1153,6 +1165,10 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
11531165 let (view, doc) = current_ref!(cx.editor);
11541166 let text = doc.text();
11551167 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();
11561172 let mut paths: Vec<_> = selections
11571173 .iter()
11581174 .map(|r| text.slice(r.from()..r.to()).to_string())
@@ -1180,16 +1196,80 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
11801196 .to_string(),
11811197 );
11821198 }
1199+
11831200 for sel in paths {
11841201 let p = sel.trim();
1185− if !p.is_empty() {
1186− 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) {
11871250 cx.editor.set_error(format!("Open file failed: {:?}", e));
11881251 }
11891252 }
11901253 }
11911254}
11921255
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+
11931273fn extend_word_impl<F>(cx: &mut Context, extend_fn: F)
11941274where
11951275 F: Fn(RopeSlice, Range, usize) -> Range,
@@ -1238,10 +1318,66 @@ fn extend_next_long_word_end(cx: &mut Context) {
12381318 extend_word_impl(cx, movement::move_next_long_word_end)
12391319}
12401320
1241−fn will_find_char<F>(cx: &mut Context, search_fn: F, inclusive: bool, extend: bool)
1242−where
1243− F: Fn(RopeSlice, char, usize, usize, bool) -> Option<usize> + 'static,
1244−{
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) {
12451381 // TODO: count is reset to 1 before next key so we move it into the closure here.
12461382 // Would be nice to carry over.
12471383 let count = cx.count();
@@ -1254,13 +1390,9 @@ where
12541390 KeyEvent {
12551391 code: KeyCode::Enter,
12561392 ..
1257− } =>
1258− // TODO: this isn't quite correct when CRLF is involved.
1259− // This hack will work in most cases, since documents don't
1260− // usually mix line endings. But we should fix it eventually
1261− // anyway.
1262− {
1263− doc!(cx.editor).line_ending.as_str().chars().next().unwrap()
1393+ } => {
1394+ find_char_line_ending(cx, count, direction, inclusive, extend);
1395+ return;
12641396 }
12651397
12661398 KeyEvent {
@@ -1273,11 +1405,18 @@ where
12731405 } => ch,
12741406 _ => return,
12751407 };
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+ };
12761418
1277− find_char_impl(cx.editor, &search_fn, inclusive, extend, ch, count);
1278− cx.editor.last_motion = Some(Motion(Box::new(move |editor: &mut Editor| {
1279− find_char_impl(editor, &search_fn, inclusive, extend, ch, 1);
1280− })));
1419+ cx.editor.apply_motion(motion);
12811420 })
12821421}
12831422
@@ -1356,46 +1495,39 @@ fn find_prev_char_impl(
13561495}
13571496
13581497fn find_till_char(cx: &mut Context) {
1359− will_find_char(cx, find_next_char_impl, false, false)
1498+ find_char(cx, Direction::Forward, false, false);
13601499}
13611500
13621501fn find_next_char(cx: &mut Context) {
1363− will_find_char(cx, find_next_char_impl, true, false)
1502+ find_char(cx, Direction::Forward, true, false)
13641503}
13651504
13661505fn extend_till_char(cx: &mut Context) {
1367− will_find_char(cx, find_next_char_impl, false, true)
1506+ find_char(cx, Direction::Forward, false, true)
13681507}
13691508
13701509fn extend_next_char(cx: &mut Context) {
1371− will_find_char(cx, find_next_char_impl, true, true)
1510+ find_char(cx, Direction::Forward, true, true)
13721511}
13731512
13741513fn till_prev_char(cx: &mut Context) {
1375− will_find_char(cx, find_prev_char_impl, false, false)
1514+ find_char(cx, Direction::Backward, false, false)
13761515}
13771516
13781517fn find_prev_char(cx: &mut Context) {
1379− will_find_char(cx, find_prev_char_impl, true, false)
1518+ find_char(cx, Direction::Backward, true, false)
13801519}
13811520
13821521fn extend_till_prev_char(cx: &mut Context) {
1383− will_find_char(cx, find_prev_char_impl, false, true)
1522+ find_char(cx, Direction::Backward, false, true)
13841523}
13851524
13861525fn extend_prev_char(cx: &mut Context) {
1387− will_find_char(cx, find_prev_char_impl, true, true)
1526+ find_char(cx, Direction::Backward, true, true)
13881527}
13891528
13901529fn repeat_last_motion(cx: &mut Context) {
1391− let count = cx.count();
1392− let last_motion = cx.editor.last_motion.take();
1393− if let Some(m) = &last_motion {
1394− for _ in 0..count {
1395− m.run(cx.editor);
1396− }
1397− cx.editor.last_motion = last_motion;
1398− }
1530+ cx.editor.repeat_last_motion(cx.count())
13991531}
14001532
14011533fn replace(cx: &mut Context) {
@@ -1462,6 +1594,7 @@ where
14621594 });
14631595
14641596 doc.apply(&transaction, view.id);
1597+ exit_select_mode(cx);
14651598}
14661599
14671600fn switch_case(cx: &mut Context) {
@@ -1703,8 +1836,8 @@ fn select_regex(cx: &mut Context) {
17031836 "select:".into(),
17041837 Some(reg),
17051838 ui::completers::none,
1706− move |editor, regex, event| {
1707− let (view, doc) = current!(editor);
1839+ move |cx, regex, event| {
1840+ let (view, doc) = current!(cx.editor);
17081841 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
17091842 return;
17101843 }
@@ -1725,8 +1858,8 @@ fn split_selection(cx: &mut Context) {
17251858 "split:".into(),
17261859 Some(reg),
17271860 ui::completers::none,
1728− move |editor, regex, event| {
1729− let (view, doc) = current!(editor);
1861+ move |cx, regex, event| {
1862+ let (view, doc) = current!(cx.editor);
17301863 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
17311864 return;
17321865 }
@@ -1849,11 +1982,11 @@ fn search_impl(
18491982
18501983fn search_completions(cx: &mut Context, reg: Option<char>) -> Vec<String> {
18511984 let mut items = reg
1852− .and_then(|reg| cx.editor.registers.get(reg))
1853− .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());
18541987 items.sort_unstable();
18551988 items.dedup();
1856− items.into_iter().cloned().collect()
1989+ items.into_iter().map(|value| value.to_string()).collect()
18571990}
18581991
18591992fn search(cx: &mut Context) {
@@ -1890,12 +2023,14 @@ fn searcher(cx: &mut Context, direction: Direction) {
18902023 .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone())))
18912024 .collect()
18922025 },
1893− move |editor, regex, event| {
1894− 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 {
18952030 return;
18962031 }
18972032 search_impl(
1898− editor,
2033+ cx.editor,
18992034 &contents,
19002035 ®ex,
19012036 Movement::Move,
@@ -1910,11 +2045,13 @@ fn searcher(cx: &mut Context, direction: Direction) {
19102045
19112046fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Direction) {
19122047 let count = cx.count();
2048+ let register = cx
2049+ .register
2050+ .unwrap_or(cx.editor.registers.last_search_register);
19132051 let config = cx.editor.config();
19142052 let scrolloff = config.scrolloff;
1915− let (_, doc) = current!(cx.editor);
1916− let registers = &cx.editor.registers;
1917− 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);
19182055 let contents = doc.text().slice(..).to_string();
19192056 let search_config = &config.search;
19202057 let case_insensitive = if search_config.smart_case {
@@ -1923,7 +2060,7 @@ fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Dir
19232060 false
19242061 };
19252062 let wrap_around = search_config.wrap_around;
1926− if let Ok(regex) = RegexBuilder::new(query)
2063+ if let Ok(regex) = RegexBuilder::new(&query)
19272064 .case_insensitive(case_insensitive)
19282065 .multi_line(true)
19292066 .build()
@@ -1963,6 +2100,7 @@ fn extend_search_prev(cx: &mut Context) {
19632100}
19642101
19652102fn search_selection(cx: &mut Context) {
2103+ let register = cx.register.unwrap_or('/');
19662104 let (view, doc) = current!(cx.editor);
19672105 let contents = doc.text().slice(..);
19682106
@@ -1975,13 +2113,24 @@ fn search_selection(cx: &mut Context) {
19752113 .collect::<Vec<_>>()
19762114 .join("|");
19772115
1978− let msg = format!("register '{}' set to '{}'", '/', ®ex);
1979− cx.editor.registers.push('/', regex);
1980− 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+ }
19812124}
19822125
19832126fn make_search_word_bounded(cx: &mut Context) {
1984− 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) {
19852134 Some(regex) => regex,
19862135 None => return,
19872136 };
@@ -1999,14 +2148,19 @@ fn make_search_word_bounded(cx: &mut Context) {
19992148 if !start_anchored {
20002149 new_regex.push_str("\\b");
20012150 }
2002− new_regex.push_str(regex);
2151+ new_regex.push_str(®ex);
20032152 if !end_anchored {
20042153 new_regex.push_str("\\b");
20052154 }
20062155
2007− let msg = format!("register '{}' set to '{}'", '/', &new_regex);
2008− cx.editor.registers.push('/', new_regex);
2009− 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+ }
20102164}
20112165
20122166fn global_search(cx: &mut Context) {
@@ -2045,13 +2199,11 @@ fn global_search(cx: &mut Context) {
20452199 }
20462200 }
20472201
2048− let (all_matches_sx, all_matches_rx) = tokio::sync::mpsc::unbounded_channel::<FileResult>();
20492202 let config = cx.editor.config();
20502203 let smart_case = config.search.smart_case;
20512204 let file_picker_config = config.file_picker.clone();
20522205
20532206 let reg = cx.register.unwrap_or('/');
2054−
20552207 let completions = search_completions(cx, Some(reg));
20562208 ui::regex_prompt(
20572209 cx,
@@ -2064,43 +2216,67 @@ fn global_search(cx: &mut Context) {
20642216 .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone())))
20652217 .collect()
20662218 },
2067− move |_editor, regex, event| {
2219+ move |cx, regex, event| {
20682220 if event != PromptEvent::Validate {
20692221 return;
20702222 }
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();
20712231
20722232 if let Ok(matcher) = RegexMatcherBuilder::new()
20732233 .case_smart(smart_case)
20742234 .build(regex.as_str())
20752235 {
2076− let searcher = SearcherBuilder::new()
2077− .binary_detection(BinaryDetection::quit(b'\x00'))
2078− .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);
20792244
2080− let search_root = std::env::current_dir()
2081− .expect("Global search error: Failed to get current dir");
20822245 let dedup_symlinks = file_picker_config.deduplicate_links;
20832246 let absolute_root = search_root
20842247 .canonicalize()
20852248 .unwrap_or_else(|_| search_root.clone());
2086−
2087− WalkBuilder::new(search_root)
2088− .hidden(file_picker_config.hidden)
2089− .parents(file_picker_config.parents)
2090− .ignore(file_picker_config.ignore)
2091− .follow_links(file_picker_config.follow_symlinks)
2092− .git_ignore(file_picker_config.git_ignore)
2093− .git_global(file_picker_config.git_global)
2094− .git_exclude(file_picker_config.git_exclude)
2095− .max_depth(file_picker_config.max_depth)
2096− .filter_entry(move |entry| {
2097− filter_picker_entry(entry, &absolute_root, dedup_symlinks)
2098− })
2099− .build_parallel()
2100− .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(|| {
21012276 let mut searcher = searcher.clone();
21022277 let matcher = matcher.clone();
2103− let all_matches_sx = all_matches_sx.clone();
2278+ let injector = injector_.clone();
2279+ let documents = &documents;
21042280 Box::new(move |entry: Result<DirEntry, ignore::Error>| -> WalkState {
21052281 let entry = match entry {
21062282 Ok(entry) => entry,
@@ -2113,17 +2289,39 @@ fn global_search(cx: &mut Context) {
21132289 _ => return WalkState::Continue,
21142290 };
21152291
2116− let result = searcher.search_path(
2117− &matcher,
2118− entry.path(),
2119− sinks::UTF8(|line_num, _| {
2120− all_matches_sx
2121− .send(FileResult::new(entry.path(), line_num as usize - 1))
2122− .unwrap();
2123−
2124− Ok(true)
2125− }),
2126− );
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+ };
21272325
21282326 if let Err(err) = result {
21292327 log::error!(
@@ -2132,67 +2330,66 @@ fn global_search(cx: &mut Context) {
21322330 err
21332331 );
21342332 }
2135− WalkState::Continue
2333+ if stop {
2334+ WalkState::Quit
2335+ } else {
2336+ WalkState::Continue
2337+ }
21362338 })
21372339 });
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+ })
21382387 } else {
21392388 // Otherwise do nothing
21402389 // log::warn!("Global Search Invalid Pattern")
21412390 }
21422391 },
21432392 );
2144−
2145− let current_path = doc_mut!(cx.editor).path().cloned();
2146−
2147− let show_picker = async move {
2148− let all_matches: Vec<FileResult> =
2149− UnboundedReceiverStream::new(all_matches_rx).collect().await;
2150− let call: job::Callback = Callback::EditorCompositor(Box::new(
2151− move |editor: &mut Editor, compositor: &mut Compositor| {
2152− if all_matches.is_empty() {
2153− editor.set_status("No matches found");
2154− return;
2155− }
2156−
2157− let picker = FilePicker::new(
2158− all_matches,
2159− current_path,
2160− move |cx, FileResult { path, line_num }, action| {
2161− match cx.editor.open(path, action) {
2162− Ok(_) => {}
2163− Err(e) => {
2164− cx.editor.set_error(format!(
2165− "Failed to open file '{}': {}",
2166− path.display(),
2167− e
2168− ));
2169− return;
2170− }
2171− }
2172−
2173− let line_num = *line_num;
2174− let (view, doc) = current!(cx.editor);
2175− let text = doc.text();
2176− if line_num >= text.len_lines() {
2177− cx.editor.set_error("The line you jumped to does not exist anymore because the file has changed.");
2178− return;
2179− }
2180− let start = text.line_to_char(line_num);
2181− let end = text.line_to_char((line_num + 1).min(text.len_lines()));
2182−
2183− doc.set_selection(view.id, Selection::single(start, end));
2184− align_view(doc, view, Align::Center);
2185− },
2186− |_editor, FileResult { path, line_num }| {
2187− Some((path.clone().into(), Some((*line_num, *line_num))))
2188− },
2189− );
2190− compositor.push(Box::new(overlaid(picker)));
2191− },
2192− ));
2193− Ok(call)
2194− };
2195− cx.jobs.callback(show_picker);
21962393}
21972394
21982395enum Extend {
@@ -2315,17 +2512,35 @@ enum Operation {
23152512 Change,
23162513}
23172514
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+
23182529fn delete_selection_impl(cx: &mut Context, op: Operation) {
23192530 let (view, doc) = current!(cx.editor);
23202531
23212532 let selection = doc.selection(view.id);
2533+ let only_whole_lines = selection_is_linewise(selection, doc.text());
23222534
23232535 if cx.register != Some('_') {
23242536 // first yank the selection
23252537 let text = doc.text().slice(..);
23262538 let values: Vec<String> = selection.fragments(text).map(Cow::into_owned).collect();
23272539 let reg_name = cx.register.unwrap_or('"');
2328− 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+ }
23292544 };
23302545
23312546 // then delete
@@ -2339,7 +2554,11 @@ fn delete_selection_impl(cx: &mut Context, op: Operation) {
23392554 exit_select_mode(cx);
23402555 }
23412556 Operation::Change => {
2342− enter_insert_mode(cx);
2557+ if only_whole_lines {
2558+ open_above(cx);
2559+ } else {
2560+ enter_insert_mode(cx);
2561+ }
23432562 }
23442563 }
23452564}
@@ -2461,6 +2680,10 @@ fn insert_mode(cx: &mut Context) {
24612680 .transform(|range| Range::new(range.to(), range.from()));
24622681
24632682 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();
24642687}
24652688
24662689// inserts at the end of each selection
@@ -2497,6 +2720,10 @@ fn append_mode(cx: &mut Context) {
24972720
24982721fn file_picker(cx: &mut Context) {
24992722 let root = find_workspace().0;
2723+ if !root.exists() {
2724+ cx.editor.set_error("Workspace directory does not exist");
2725+ return;
2726+ }
25002727 let picker = ui::file_picker(root, &cx.editor.config());
25012728 cx.push_layer(Box::new(overlaid(picker)));
25022729}
@@ -2517,8 +2744,14 @@ fn file_picker_in_current_buffer_directory(cx: &mut Context) {
25172744 let picker = ui::file_picker(path, &cx.editor.config());
25182745 cx.push_layer(Box::new(overlaid(picker)));
25192746}
2747+
25202748fn file_picker_in_current_directory(cx: &mut Context) {
2521− 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+ }
25222755 let picker = ui::file_picker(cwd, &cx.editor.config());
25232756 cx.push_layer(Box::new(overlaid(picker)));
25242757}
@@ -2577,22 +2810,18 @@ fn buffer_picker(cx: &mut Context) {
25772810 // mru
25782811 items.sort_unstable_by_key(|item| std::cmp::Reverse(item.focused_at));
25792812
2580− let picker = FilePicker::new(
2581− items,
2582− (),
2583− |cx, meta, action| {
2584− cx.editor.switch(meta.id, action);
2585− },
2586− |editor, meta| {
2587− let doc = &editor.documents.get(&meta.id)?;
2588− let &view_id = doc.selections().keys().next()?;
2589− let line = doc
2590− .selection(view_id)
2591− .primary()
2592− .cursor_line(doc.text().slice(..));
2593− Some((meta.id.into(), Some((line, line))))
2594− },
2595− );
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+ });
25962825 cx.push_layer(Box::new(overlaid(picker)));
25972826}
25982827
@@ -2658,7 +2887,7 @@ fn jumplist_picker(cx: &mut Context) {
26582887 }
26592888 };
26602889
2661− let picker = FilePicker::new(
2890+ let picker = Picker::new(
26622891 cx.editor
26632892 .tree
26642893 .views()
@@ -2672,16 +2901,18 @@ fn jumplist_picker(cx: &mut Context) {
26722901 |cx, meta, action| {
26732902 cx.editor.switch(meta.id, action);
26742903 let config = cx.editor.config();
2675− let (view, doc) = current!(cx.editor);
2904+ let (view, doc) = (view_mut!(cx.editor), doc_mut!(cx.editor, &meta.id));
26762905 doc.set_selection(view.id, meta.selection.clone());
2677− view.ensure_cursor_in_view_center(doc, config.scrolloff);
2678− },
2679− |editor, meta| {
2680− let doc = &editor.documents.get(&meta.id)?;
2681− let line = meta.selection.primary().cursor_line(doc.text().slice(..));
2682− 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+ }
26832909 },
2684− );
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+ });
26852916 cx.push_layer(Box::new(overlaid(picker)));
26862917}
26872918
@@ -2775,24 +3006,88 @@ fn last_picker(cx: &mut Context) {
27753006 }));
27763007}
27773008
2778−// 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.
27793017fn insert_at_line_start(cx: &mut Context) {
2780− goto_first_nonwhitespace(cx);
2781− enter_insert_mode(cx);
3018+ insert_with_indent(cx, IndentFallbackPos::LineStart);
27823019}
27833020
2784−// 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.
27853023fn 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) {
27863030 enter_insert_mode(cx);
3031+
27873032 let (view, doc) = current!(cx.editor);
27883033
2789− let selection = doc.selection(view.id).clone().transform(|range| {
2790− let text = doc.text().slice(..);
2791− let line = range.cursor_line(text);
2792− let pos = line_end_char_index(&text, line);
2793− 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+ }
27943087 });
2795− doc.set_selection(view.id, selection);
3088+
3089+ transaction = transaction.with_selection(Selection::new(ranges, selection.primary_index()));
3090+ doc.apply(&transaction, view.id);
27963091}
27973092
27983093// Creates an LspCallback that waits for formatting changes to be computed. When they're done,
@@ -2863,6 +3158,7 @@ fn open(cx: &mut Context, open: Open) {
28633158 Open::Below => graphemes::prev_grapheme_boundary(text, range.to()),
28643159 Open::Above => range.from(),
28653160 });
3161+
28663162 let new_line = match open {
28673163 // adjust position to the end of the line (next line - 1)
28683164 Open::Below => cursor_line + 1,
@@ -2870,13 +3166,15 @@ fn open(cx: &mut Context, open: Open) {
28703166 Open::Above => cursor_line,
28713167 };
28723168
3169+ let line_num = new_line.saturating_sub(1);
3170+
28733171 // Index to insert newlines after, as well as the char width
28743172 // to use to compensate for those inserted newlines.
28753173 let (line_end_index, line_end_offset_width) = if new_line == 0 {
28763174 (0, 0)
28773175 } else {
28783176 (
2879− line_end_char_index(&doc.text().slice(..), new_line.saturating_sub(1)),
3177+ line_end_char_index(&text, line_num),
28803178 doc.line_ending.len_chars(),
28813179 )
28823180 };
@@ -2884,13 +3182,15 @@ fn open(cx: &mut Context, open: Open) {
28843182 let indent = indent::indent_for_newline(
28853183 doc.language_config(),
28863184 doc.syntax(),
3185+ &doc.config.load().indent_heuristic,
28873186 &doc.indent_style,
28883187 doc.tab_width(),
28893188 text,
2890− new_line.saturating_sub(1),
3189+ line_num,
28913190 line_end_index,
28923191 cursor_line,
28933192 );
3193+
28943194 let indent_len = indent.len();
28953195 let mut text = String::with_capacity(1 + indent_len);
28963196 text.push_str(doc.line_ending.as_str());
@@ -3189,8 +3489,7 @@ fn goto_next_change_impl(cx: &mut Context, direction: Direction) {
31893489
31903490 doc.set_selection(view.id, selection)
31913491 };
3192− motion(cx.editor);
3193− cx.editor.last_motion = Some(Motion(Box::new(motion)));
3492+ cx.editor.apply_motion(motion);
31943493}
31953494
31963495/// Returns the [Range] for a [Hunk] in the given text.
@@ -3317,6 +3616,7 @@ pub mod insert {
33173616 }
33183617
33193618 use helix_core::auto_pairs;
3619+ use helix_view::editor::SmartTabConfig;
33203620
33213621 pub fn insert_char(cx: &mut Context, c: char) {
33223622 let (view, doc) = current_ref!(cx.editor);
@@ -3342,6 +3642,31 @@ pub mod insert {
33423642 }
33433643 }
33443644
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+
33453670 pub fn insert_tab(cx: &mut Context) {
33463671 let (view, doc) = current!(cx.editor);
33473672 // TODO: round out to nearest indentation level (for example a line with 3 spaces should
@@ -3397,6 +3722,7 @@ pub mod insert {
33973722 let indent = indent::indent_for_newline(
33983723 doc.language_config(),
33993724 doc.syntax(),
3725+ &doc.config.load().indent_heuristic,
34003726 &doc.indent_style,
34013727 doc.tab_width(),
34023728 text,
@@ -3637,34 +3963,21 @@ fn commit_undo_checkpoint(cx: &mut Context) {
36373963// Yank / Paste
36383964
36393965fn yank(cx: &mut Context) {
3640− let (view, doc) = current!(cx.editor);
3641− let text = doc.text().slice(..);
3642−
3643− let values: Vec<String> = doc
3644− .selection(view.id)
3645− .fragments(text)
3646− .map(Cow::into_owned)
3647− .collect();
3648−
3649− let msg = format!(
3650− "yanked {} selection(s) to register {}",
3651− values.len(),
3652− cx.register.unwrap_or('"')
3653− );
3966+ yank_impl(cx.editor, cx.register.unwrap_or('"'));
3967+ exit_select_mode(cx);
3968+}
36543969
3655− cx.editor
3656− .registers
3657− .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+}
36583974
3659− cx.editor.set_status(msg);
3975+fn yank_to_primary_clipboard(cx: &mut Context) {
3976+ yank_impl(cx.editor, '*');
36603977 exit_select_mode(cx);
36613978}
36623979
3663−fn yank_joined_to_clipboard_impl(
3664− editor: &mut Editor,
3665− separator: &str,
3666− clipboard_type: ClipboardType,
3667−) -> anyhow::Result<()> {
3980+fn yank_impl(editor: &mut Editor, register: char) {
36683981 let (view, doc) = current!(editor);
36693982 let text = doc.text().slice(..);
36703983
@@ -3673,74 +3986,79 @@ fn yank_joined_to_clipboard_impl(
36733986 .fragments(text)
36743987 .map(Cow::into_owned)
36753988 .collect();
3989+ let selections = values.len();
36763990
3677− let clipboard_text = match clipboard_type {
3678− ClipboardType::Clipboard => "system clipboard",
3679− ClipboardType::Selection => "primary clipboard",
3680− };
3681−
3682− let msg = format!(
3683− "joined and yanked {} selection(s) to {}",
3684− values.len(),
3685− clipboard_text,
3686− );
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+}
36873999
3688− 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(..);
36894003
3690− editor
3691− .clipboard_provider
3692− .set_contents(joined, clipboard_type)
3693− .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+ });
36944015
3695− 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+}
36964024
3697− 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);
36984029}
36994030
37004031fn yank_joined_to_clipboard(cx: &mut Context) {
37014032 let line_ending = doc!(cx.editor).line_ending;
3702− let _ =
3703− yank_joined_to_clipboard_impl(cx.editor, line_ending.as_str(), ClipboardType::Clipboard);
4033+ yank_joined_impl(cx.editor, line_ending.as_str(), '+');
37044034 exit_select_mode(cx);
37054035}
37064036
3707−fn yank_main_selection_to_clipboard_impl(
3708− editor: &mut Editor,
3709− clipboard_type: ClipboardType,
3710−) -> 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) {
37114044 let (view, doc) = current!(editor);
37124045 let text = doc.text().slice(..);
37134046
3714− let message_text = match clipboard_type {
3715− ClipboardType::Clipboard => "yanked main selection to system clipboard",
3716− ClipboardType::Selection => "yanked main selection to primary clipboard",
3717− };
3718−
3719− let value = doc.selection(view.id).primary().fragment(text);
4047+ let selection = doc.selection(view.id).primary().fragment(text).to_string();
37204048
3721− if let Err(e) = editor
3722− .clipboard_provider
3723− .set_contents(value.into_owned(), clipboard_type)
3724− {
3725− 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()),
37264052 }
3727−
3728− editor.set_status(message_text);
3729− Ok(())
37304053}
37314054
37324055fn yank_main_selection_to_clipboard(cx: &mut Context) {
3733− let _ = yank_main_selection_to_clipboard_impl(cx.editor, ClipboardType::Clipboard);
3734−}
3735−
3736−fn yank_joined_to_primary_clipboard(cx: &mut Context) {
3737− let line_ending = doc!(cx.editor).line_ending;
3738− let _ =
3739− 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);
37404058}
37414059
37424060fn yank_main_selection_to_primary_clipboard(cx: &mut Context) {
3743− let _ = yank_main_selection_to_clipboard_impl(cx.editor, ClipboardType::Selection);
4061+ yank_primary_selection_impl(cx.editor, '*');
37444062 exit_select_mode(cx);
37454063}
37464064
@@ -3838,146 +4156,99 @@ pub(crate) fn paste_bracketed_value(cx: &mut Context, contents: String) {
38384156 };
38394157 let (view, doc) = current!(cx.editor);
38404158 paste_impl(&[contents], doc, view, paste, count, cx.editor.mode);
3841−}
3842−
3843−fn paste_clipboard_impl(
3844− editor: &mut Editor,
3845− action: Paste,
3846− clipboard_type: ClipboardType,
3847− count: usize,
3848−) -> anyhow::Result<()> {
3849− let (view, doc) = current!(editor);
3850− match editor.clipboard_provider.get_contents(clipboard_type) {
3851− Ok(contents) => {
3852− paste_impl(&[contents], doc, view, action, count, editor.mode);
3853− Ok(())
3854− }
3855− Err(e) => Err(e.context("Couldn't get system clipboard contents")),
3856− }
4159+ exit_select_mode(cx);
38574160}
38584161
38594162fn paste_clipboard_after(cx: &mut Context) {
3860− let _ = paste_clipboard_impl(
3861− cx.editor,
3862− Paste::After,
3863− ClipboardType::Clipboard,
3864− cx.count(),
3865− );
4163+ paste(cx.editor, '+', Paste::After, cx.count());
4164+ exit_select_mode(cx);
38664165}
38674166
38684167fn paste_clipboard_before(cx: &mut Context) {
3869− let _ = paste_clipboard_impl(
3870− cx.editor,
3871− Paste::Before,
3872− ClipboardType::Clipboard,
3873− cx.count(),
3874− );
4168+ paste(cx.editor, '+', Paste::Before, cx.count());
4169+ exit_select_mode(cx);
38754170}
38764171
38774172fn paste_primary_clipboard_after(cx: &mut Context) {
3878− let _ = paste_clipboard_impl(
3879− cx.editor,
3880− Paste::After,
3881− ClipboardType::Selection,
3882− cx.count(),
3883− );
4173+ paste(cx.editor, '*', Paste::After, cx.count());
4174+ exit_select_mode(cx);
38844175}
38854176
38864177fn paste_primary_clipboard_before(cx: &mut Context) {
3887− let _ = paste_clipboard_impl(
3888− cx.editor,
3889− Paste::Before,
3890− ClipboardType::Selection,
3891− cx.count(),
3892− );
4178+ paste(cx.editor, '*', Paste::Before, cx.count());
4179+ exit_select_mode(cx);
38934180}
38944181
38954182fn replace_with_yanked(cx: &mut Context) {
3896− let count = cx.count();
3897− let reg_name = cx.register.unwrap_or('"');
3898− let (view, doc) = current!(cx.editor);
3899− let registers = &mut cx.editor.registers;
3900−
3901− if let Some(values) = registers.read(reg_name) {
3902− if !values.is_empty() {
3903− let repeat = std::iter::repeat(
3904− values
3905− .last()
3906− .map(|value| Tendril::from(&value.repeat(count)))
3907− .unwrap(),
3908− );
3909− let mut values = values
3910− .iter()
3911− .map(|value| Tendril::from(&value.repeat(count)))
3912− .chain(repeat);
3913− let selection = doc.selection(view.id);
3914− let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
3915− if !range.is_empty() {
3916− (range.from(), range.to(), Some(values.next().unwrap()))
3917− } else {
3918− (range.from(), range.to(), None)
3919− }
3920− });
3921−
3922− doc.apply(&transaction, view.id);
3923− exit_select_mode(cx);
3924− }
3925− }
4183+ replace_with_yanked_impl(cx.editor, cx.register.unwrap_or('"'), cx.count());
4184+ exit_select_mode(cx);
39264185}
39274186
3928−fn replace_selections_with_clipboard_impl(
3929− cx: &mut Context,
3930− clipboard_type: ClipboardType,
3931−) -> anyhow::Result<()> {
3932− let count = cx.count();
3933− let (view, doc) = current!(cx.editor);
3934−
3935− match cx.editor.clipboard_provider.get_contents(clipboard_type) {
3936− Ok(contents) => {
3937− let selection = doc.selection(view.id);
3938− let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
3939− (
3940− range.from(),
3941− range.to(),
3942− Some(contents.repeat(count).as_str().into()),
3943− )
3944− });
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();
39454192
3946− doc.apply(&transaction, view.id);
3947− 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)
39484210 }
3949− Err(e) => return Err(e.context("Couldn't get system clipboard contents")),
3950− }
4211+ });
39514212
3952− exit_select_mode(cx);
3953− Ok(())
4213+ doc.apply(&transaction, view.id);
39544214}
39554215
39564216fn replace_selections_with_clipboard(cx: &mut Context) {
3957− let _ = replace_selections_with_clipboard_impl(cx, ClipboardType::Clipboard);
4217+ replace_with_yanked_impl(cx.editor, '+', cx.count());
4218+ exit_select_mode(cx);
39584219}
39594220
39604221fn replace_selections_with_primary_clipboard(cx: &mut Context) {
3961− let _ = replace_selections_with_clipboard_impl(cx, ClipboardType::Selection);
4222+ replace_with_yanked_impl(cx.editor, '*', cx.count());
4223+ exit_select_mode(cx);
39624224}
39634225
3964−fn paste(cx: &mut Context, pos: Paste) {
3965− let count = cx.count();
3966− let reg_name = cx.register.unwrap_or('"');
3967− let (view, doc) = current!(cx.editor);
3968− 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();
39694229
3970− if let Some(values) = registers.read(reg_name) {
3971− paste_impl(values, doc, view, pos, count, cx.editor.mode);
3972− }
4230+ let (view, doc) = current!(editor);
4231+ paste_impl(&values, doc, view, pos, count, editor.mode);
39734232}
39744233
39754234fn paste_after(cx: &mut Context) {
3976− 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);
39774242}
39784243
39794244fn paste_before(cx: &mut Context) {
3980− 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);
39814252}
39824253
39834254fn get_lines(doc: &Document, view_id: ViewId) -> Vec<usize> {
@@ -4016,6 +4287,7 @@ fn indent(cx: &mut Context) {
40164287 }),
40174288 );
40184289 doc.apply(&transaction, view.id);
4290+ exit_select_mode(cx);
40194291}
40204292
40214293fn unindent(cx: &mut Context) {
@@ -4055,6 +4327,7 @@ fn unindent(cx: &mut Context) {
40554327 let transaction = Transaction::change(doc.text(), changes.into_iter());
40564328
40574329 doc.apply(&transaction, view.id);
4330+ exit_select_mode(cx);
40584331}
40594332
40604333fn format_selections(cx: &mut Context) {
@@ -4084,7 +4357,7 @@ fn format_selections(cx: &mut Context) {
40844357 })
40854358 else {
40864359 cx.editor
4087− .set_error("No configured language server does not support range formatting");
4360+ .set_error("No configured language server supports range formatting");
40884361 return;
40894362 };
40904363
@@ -4121,10 +4394,9 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
41214394 use movement::skip_while;
41224395 let (view, doc) = current!(cx.editor);
41234396 let text = doc.text();
4124− let slice = doc.text().slice(..);
4397+ let slice = text.slice(..);
41254398
41264399 let mut changes = Vec::new();
4127− let fragment = Tendril::from(" ");
41284400
41294401 for selection in doc.selection(view.id) {
41304402 let (start, mut end) = selection.line_range(slice);
@@ -4140,9 +4412,13 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
41404412 let mut end = text.line_to_char(line + 1);
41414413 end = skip_while(slice, end, |ch| matches!(ch, ' ' | '\t')).unwrap_or(end);
41424414
4143− // need to skip from start, not end
4144− let change = (start, end, Some(fragment.clone()));
4145− 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));
41464422 }
41474423 }
41484424
@@ -4154,9 +4430,6 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
41544430 changes.sort_unstable_by_key(|(from, _to, _text)| *from);
41554431 changes.dedup();
41564432
4157− // TODO: joining multiple empty lines should be replaced by a single space.
4158− // need to merge change ranges that touch
4159−
41604433 // select inserted spaces
41614434 let transaction = if select_space {
41624435 let ranges: SmallVec<_> = changes
@@ -4168,9 +4441,9 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
41684441 })
41694442 .collect();
41704443 let selection = Selection::new(ranges, 0);
4171− Transaction::change(doc.text(), changes.into_iter()).with_selection(selection)
4444+ Transaction::change(text, changes.into_iter()).with_selection(selection)
41724445 } else {
4173− Transaction::change(doc.text(), changes.into_iter())
4446+ Transaction::change(text, changes.into_iter())
41744447 };
41754448
41764449 doc.apply(&transaction, view.id);
@@ -4184,8 +4457,8 @@ fn keep_or_remove_selections_impl(cx: &mut Context, remove: bool) {
41844457 if remove { "remove:" } else { "keep:" }.into(),
41854458 Some(reg),
41864459 ui::completers::none,
4187− move |editor, regex, event| {
4188− let (view, doc) = current!(editor);
4460+ move |cx, regex, event| {
4461+ let (view, doc) = current!(cx.editor);
41894462 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
41904463 return;
41914464 }
@@ -4419,7 +4692,13 @@ fn rotate_selections_backward(cx: &mut Context) {
44194692 rotate_selections(cx, Direction::Backward)
44204693}
44214694
4422−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) {
44234702 let count = cx.count;
44244703 let (view, doc) = current!(cx.editor);
44254704 let text = doc.text().slice(..);
@@ -4437,9 +4716,10 @@ fn rotate_selection_contents(cx: &mut Context, direction: Direction) {
44374716
44384717 for chunk in fragments.chunks_mut(group) {
44394718 // TODO: also modify main index
4440− match direction {
4441− Direction::Forward => chunk.rotate_right(1),
4442− 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(),
44434723 };
44444724 }
44454725
@@ -4456,10 +4736,13 @@ fn rotate_selection_contents(cx: &mut Context, direction: Direction) {
44564736}
44574737
44584738fn rotate_selection_contents_forward(cx: &mut Context) {
4459− rotate_selection_contents(cx, Direction::Forward)
4739+ reorder_selection_contents(cx, ReorderStrategy::RotateForward)
44604740}
44614741fn rotate_selection_contents_backward(cx: &mut Context) {
4462− 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)
44634746}
44644747
44654748// tree sitter node selection
@@ -4483,8 +4766,7 @@ fn expand_selection(cx: &mut Context) {
44834766 }
44844767 }
44854768 };
4486− motion(cx.editor);
4487− cx.editor.last_motion = Some(Motion(Box::new(motion)));
4769+ cx.editor.apply_motion(motion);
44884770}
44894771
44904772fn shrink_selection(cx: &mut Context) {
@@ -4508,8 +4790,7 @@ fn shrink_selection(cx: &mut Context) {
45084790 doc.set_selection(view.id, selection);
45094791 }
45104792 };
4511− motion(cx.editor);
4512− cx.editor.last_motion = Some(Motion(Box::new(motion)));
4793+ cx.editor.apply_motion(motion);
45134794}
45144795
45154796fn select_sibling_impl<F>(cx: &mut Context, sibling_fn: &'static F)
@@ -4527,8 +4808,7 @@ where
45274808 doc.set_selection(view.id, selection);
45284809 }
45294810 };
4530− motion(cx.editor);
4531− cx.editor.last_motion = Some(Motion(Box::new(motion)));
4811+ cx.editor.apply_motion(motion);
45324812}
45334813
45344814fn select_next_sibling(cx: &mut Context) {
@@ -4539,6 +4819,49 @@ fn select_prev_sibling(cx: &mut Context) {
45394819 select_sibling_impl(cx, &|node| Node::prev_sibling(&node))
45404820}
45414821
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+
45424865fn match_brackets(cx: &mut Context) {
45434866 let (view, doc) = current!(cx.editor);
45444867 let is_select = cx.editor.mode == Mode::Select;
@@ -4548,8 +4871,8 @@ fn match_brackets(cx: &mut Context) {
45484871 let selection = doc.selection(view.id).clone().transform(|range| {
45494872 let pos = range.cursor(text_slice);
45504873 if let Some(matched_pos) = doc.syntax().map_or_else(
4551− || match_brackets::find_matching_bracket_current_line_plaintext(text, pos),
4552− |syntax| match_brackets::find_matching_bracket_fuzzy(syntax, text, pos),
4874+ || match_brackets::find_matching_bracket_plaintext(text.slice(..), pos),
4875+ |syntax| match_brackets::find_matching_bracket_fuzzy(syntax, text.slice(..), pos),
45534876 ) {
45544877 range.put_cursor(text_slice, matched_pos, is_select)
45554878 } else {
@@ -4652,17 +4975,19 @@ fn transpose_view(cx: &mut Context) {
46524975 cx.editor.transpose_view()
46534976}
46544977
4655−// split helper, clear it later
4656−fn split(cx: &mut Context, action: Action) {
4657− 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);
46584983 let id = doc.id();
46594984 let selection = doc.selection(view.id).clone();
46604985 let offset = view.offset;
46614986
4662− cx.editor.switch(id, action);
4987+ editor.switch(id, action);
46634988
46644989 // match the selection in the previous view
4665− let (view, doc) = current!(cx.editor);
4990+ let (view, doc) = current!(editor);
46664991 doc.set_selection(view.id, selection);
46674992 // match the view scroll offset (switch doesn't handle this fully
46684993 // since the selection is only matched after the split)
@@ -4670,7 +4995,7 @@ fn split(cx: &mut Context, action: Action) {
46704995}
46714996
46724997fn hsplit(cx: &mut Context) {
4673− split(cx, Action::HorizontalSplit);
4998+ split(cx.editor, Action::HorizontalSplit);
46744999}
46755000
46765001fn hsplit_new(cx: &mut Context) {
@@ -4678,7 +5003,7 @@ fn hsplit_new(cx: &mut Context) {
46785003}
46795004
46805005fn vsplit(cx: &mut Context) {
4681− split(cx, Action::VerticalSplit);
5006+ split(cx.editor, Action::VerticalSplit);
46825007}
46835008
46845009fn vsplit_new(cx: &mut Context) {
@@ -4727,7 +5052,12 @@ fn insert_register(cx: &mut Context) {
47275052 if let Some(ch) = event.char() {
47285053 cx.editor.autoinfo = None;
47295054 cx.register = Some(ch);
4730− paste(cx, Paste::Cursor);
5055+ paste(
5056+ cx.editor,
5057+ cx.register.unwrap_or('"'),
5058+ Paste::Cursor,
5059+ cx.count(),
5060+ );
47315061 }
47325062 })
47335063}
@@ -4811,8 +5141,7 @@ fn goto_ts_object_impl(cx: &mut Context, object: &'static str, direction: Direct
48115141 editor.set_status("Syntax-tree is not available in current buffer");
48125142 }
48135143 };
4814− motion(cx.editor);
4815− cx.editor.last_motion = Some(Motion(Box::new(motion)));
5144+ cx.editor.apply_motion(motion);
48165145}
48175146
48185147fn goto_next_function(cx: &mut Context) {
@@ -4933,8 +5262,7 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
49335262 });
49345263 doc.set_selection(view.id, selection);
49355264 };
4936− textobject(cx.editor);
4937− cx.editor.last_motion = Some(Motion(Box::new(textobject)));
5265+ cx.editor.apply_motion(textobject);
49385266 }
49395267 });
49405268
@@ -5024,11 +5352,18 @@ fn surround_replace(cx: &mut Context) {
50245352 }
50255353 };
50265354
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+
50275362 cx.on_next_key(move |cx, event| {
50285363 let (view, doc) = current!(cx.editor);
50295364 let to = match event.char() {
50305365 Some(to) => to,
5031− None => return,
5366+ None => return doc.set_selection(view.id, selection),
50325367 };
50335368 let (open, close) = surround::get_pair(to);
50345369 let transaction = Transaction::change(
@@ -5039,6 +5374,7 @@ fn surround_replace(cx: &mut Context) {
50395374 (pos, pos + 1, Some(t))
50405375 }),
50415376 );
5377+ doc.set_selection(view.id, selection);
50425378 doc.apply(&transaction, view.id);
50435379 exit_select_mode(cx);
50445380 });
@@ -5273,12 +5609,18 @@ fn shell(cx: &mut compositor::Context, cmd: &str, behavior: &ShellBehavior) {
52735609 };
52745610
52755611 // These `usize`s cannot underflow because selection ranges cannot overlap.
5276− // Once the MSRV is 1.66.0 (mixed_integer_ops is stabilized), we can use checked
5277− // arithmetic to assert this.
5278− 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");
52795617 let new_range = Range::new(anchor, anchor + output_len).with_direction(range.direction());
52805618 ranges.push(new_range);
5281− 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");
52825624
52835625 changes.push((from, to, Some(output)));
52845626 }
@@ -5300,7 +5642,7 @@ fn shell_prompt(cx: &mut Context, prompt: Cow<'static, str>, behavior: ShellBeha
53005642 cx,
53015643 prompt,
53025644 Some('|'),
5303− ui::completers::none,
5645+ ui::completers::filename,
53045646 move |cx, input: &str, event: PromptEvent| {
53055647 if event != PromptEvent::Validate {
53065648 return;
@@ -5417,6 +5759,7 @@ fn increment_impl(cx: &mut Context, increment_direction: IncrementDirection) {
54175759 let transaction = Transaction::change(doc.text(), changes.into_iter());
54185760 let transaction = transaction.with_selection(new_selection);
54195761 doc.apply(&transaction, view.id);
5762+ exit_select_mode(cx);
54205763 }
54215764}
54225765
@@ -5435,9 +5778,12 @@ fn record_macro(cx: &mut Context) {
54355778 }
54365779 })
54375780 .collect::<String>();
5438− cx.editor.registers.write(reg, vec![s]);
5439− cx.editor
5440− .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+ }
54415787 } else {
54425788 let reg = cx.register.take().unwrap_or('@');
54435789 cx.editor.macro_recording = Some((reg, Vec::new()));
@@ -5457,8 +5803,14 @@ fn replay_macro(cx: &mut Context) {
54575803 return;
54585804 }
54595805
5460− let keys: Vec<KeyEvent> = if let Some([keys_str]) = cx.editor.registers.read(reg) {
5461− 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) {
54625814 Ok(keys) => keys,
54635815 Err(err) => {
54645816 cx.editor.set_error(format!("Invalid macro: {}", err));