@@ -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
@@ -247,6 +250,9 @@ impl MappableCommand {
247250 move_next_long_word_start, "Move to start of next long word",
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",
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",
250256 extend_next_word_start, "Extend to start of next word",
251257 extend_prev_word_start, "Extend to start of previous word",
252258 extend_next_word_end, "Extend to end of next word",
@@ -254,6 +260,9 @@ impl MappableCommand {
254260 extend_next_long_word_start, "Extend to start of next long word",
255261 extend_prev_long_word_start, "Extend to start of previous long word",
256262 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",
257266 find_till_char, "Move till next occurrence of char",
258267 find_next_char, "Move to next occurrence of char",
259268 extend_till_char, "Extend till next occurrence of char",
@@ -275,6 +284,7 @@ impl MappableCommand {
275284 select_regex, "Select all regex matches inside selections",
276285 split_selection, "Split selections on regex matches",
277286 split_selection_on_newline, "Split selection on newlines",
287+ merge_selections, "Merge selections",
278288 merge_consecutive_selections, "Merge consecutive selections",
279289 search, "Search for regex pattern",
280290 rsearch, "Reverse search for regex pattern",
@@ -327,7 +337,7 @@ impl MappableCommand {
327337 goto_implementation, "Goto implementation",
328338 goto_file_start, "Goto line number <n> else file start",
329339 goto_file_end, "Goto file end",
330− goto_file, "Goto files in selection",
340+ goto_file, "Goto files/URLs in selection",
331341 goto_file_hsplit, "Goto files in selection (hsplit)",
332342 goto_file_vsplit, "Goto files in selection (vsplit)",
333343 goto_reference, "Goto references",
@@ -359,6 +369,7 @@ impl MappableCommand {
359369 extend_to_line_end, "Extend to line end",
360370 extend_to_line_end_newline, "Extend to line end",
361371 signature_help, "Show signature help",
372+ smart_tab, "Insert tab if all cursors have all whitespace to their left; otherwise, run a separate command.",
362373 insert_tab, "Insert tab char",
363374 insert_newline, "Insert newline char",
364375 delete_char_backward, "Delete previous char",
@@ -373,6 +384,9 @@ impl MappableCommand {
373384 later, "Move forward in history",
374385 commit_undo_checkpoint, "Commit changes to new checkpoint",
375386 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",
376390 yank_joined_to_clipboard, "Join and yank selections to clipboard",
377391 yank_main_selection_to_clipboard, "Yank main selection to clipboard",
378392 yank_joined_to_primary_clipboard, "Join and yank selections to primary clipboard",
@@ -403,6 +417,7 @@ impl MappableCommand {
403417 rotate_selections_backward, "Rotate selections backward",
404418 rotate_selection_contents_forward, "Rotate selection contents forward",
405419 rotate_selection_contents_backward, "Rotate selections contents backward",
420+ reverse_selection_contents, "Reverse selections contents",
406421 expand_selection, "Expand selection to parent syntax node",
407422 shrink_selection, "Shrink selection to previously expanded syntax node",
408423 select_next_sibling, "Select next sibling in syntax tree",
@@ -975,6 +990,7 @@ fn align_selections(cx: &mut Context) {
975990
976991 let transaction = Transaction::change(doc.text(), changes.into_iter());
977992 doc.apply(&transaction, view.id);
993+ exit_select_mode(cx);
978994}
979995
980996fn goto_window(cx: &mut Context, align: Align) {
@@ -1066,6 +1082,10 @@ fn move_prev_long_word_start(cx: &mut Context) {
10661082 move_word_impl(cx, movement::move_prev_long_word_start)
10671083}
10681084
1085+fn move_prev_long_word_end(cx: &mut Context) {
1086+ move_word_impl(cx, movement::move_prev_long_word_end)
1087+}
1088+
10691089fn move_next_long_word_end(cx: &mut Context) {
10701090 move_word_impl(cx, movement::move_next_long_word_end)
10711091}
@@ -1090,8 +1110,7 @@ where
10901110 .transform(|range| move_fn(text, range, count, behavior));
10911111 doc.set_selection(view.id, selection);
10921112 };
1093− motion(cx.editor);
1094− cx.editor.last_motion = Some(Motion(Box::new(motion)));
1113+ cx.editor.apply_motion(motion)
10951114}
10961115
10971116fn goto_prev_paragraph(cx: &mut Context) {
@@ -1146,6 +1165,10 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
11461165 let (view, doc) = current_ref!(cx.editor);
11471166 let text = doc.text();
11481167 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();
11491172 let mut paths: Vec<_> = selections
11501173 .iter()
11511174 .map(|r| text.slice(r.from()..r.to()).to_string())
@@ -1173,16 +1196,80 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
11731196 .to_string(),
11741197 );
11751198 }
1199+
11761200 for sel in paths {
11771201 let p = sel.trim();
1178− if !p.is_empty() {
1179− 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) {
11801250 cx.editor.set_error(format!("Open file failed: {:?}", e));
11811251 }
11821252 }
11831253 }
11841254}
11851255
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+
11861273fn extend_word_impl<F>(cx: &mut Context, extend_fn: F)
11871274where
11881275 F: Fn(RopeSlice, Range, usize) -> Range,
@@ -1223,14 +1310,74 @@ fn extend_prev_long_word_start(cx: &mut Context) {
12231310 extend_word_impl(cx, movement::move_prev_long_word_start)
12241311}
12251312
1313+fn extend_prev_long_word_end(cx: &mut Context) {
1314+ extend_word_impl(cx, movement::move_prev_long_word_end)
1315+}
1316+
12261317fn extend_next_long_word_end(cx: &mut Context) {
12271318 extend_word_impl(cx, movement::move_next_long_word_end)
12281319}
12291320
1230−fn will_find_char<F>(cx: &mut Context, search_fn: F, inclusive: bool, extend: bool)
1231−where
1232− F: Fn(RopeSlice, char, usize, usize, bool) -> Option<usize> + 'static,
1233−{
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) {
12341381 // TODO: count is reset to 1 before next key so we move it into the closure here.
12351382 // Would be nice to carry over.
12361383 let count = cx.count();
@@ -1243,13 +1390,9 @@ where
12431390 KeyEvent {
12441391 code: KeyCode::Enter,
12451392 ..
1246− } =>
1247− // TODO: this isn't quite correct when CRLF is involved.
1248− // This hack will work in most cases, since documents don't
1249− // usually mix line endings. But we should fix it eventually
1250− // anyway.
1251− {
1252− doc!(cx.editor).line_ending.as_str().chars().next().unwrap()
1393+ } => {
1394+ find_char_line_ending(cx, count, direction, inclusive, extend);
1395+ return;
12531396 }
12541397
12551398 KeyEvent {
@@ -1262,11 +1405,18 @@ where
12621405 } => ch,
12631406 _ => return,
12641407 };
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+ };
12651418
1266− find_char_impl(cx.editor, &search_fn, inclusive, extend, ch, count);
1267− cx.editor.last_motion = Some(Motion(Box::new(move |editor: &mut Editor| {
1268− find_char_impl(editor, &search_fn, inclusive, true, ch, 1);
1269− })));
1419+ cx.editor.apply_motion(motion);
12701420 })
12711421}
12721422
@@ -1345,46 +1495,39 @@ fn find_prev_char_impl(
13451495}
13461496
13471497fn find_till_char(cx: &mut Context) {
1348− will_find_char(cx, find_next_char_impl, false, false)
1498+ find_char(cx, Direction::Forward, false, false);
13491499}
13501500
13511501fn find_next_char(cx: &mut Context) {
1352− will_find_char(cx, find_next_char_impl, true, false)
1502+ find_char(cx, Direction::Forward, true, false)
13531503}
13541504
13551505fn extend_till_char(cx: &mut Context) {
1356− will_find_char(cx, find_next_char_impl, false, true)
1506+ find_char(cx, Direction::Forward, false, true)
13571507}
13581508
13591509fn extend_next_char(cx: &mut Context) {
1360− will_find_char(cx, find_next_char_impl, true, true)
1510+ find_char(cx, Direction::Forward, true, true)
13611511}
13621512
13631513fn till_prev_char(cx: &mut Context) {
1364− will_find_char(cx, find_prev_char_impl, false, false)
1514+ find_char(cx, Direction::Backward, false, false)
13651515}
13661516
13671517fn find_prev_char(cx: &mut Context) {
1368− will_find_char(cx, find_prev_char_impl, true, false)
1518+ find_char(cx, Direction::Backward, true, false)
13691519}
13701520
13711521fn extend_till_prev_char(cx: &mut Context) {
1372− will_find_char(cx, find_prev_char_impl, false, true)
1522+ find_char(cx, Direction::Backward, false, true)
13731523}
13741524
13751525fn extend_prev_char(cx: &mut Context) {
1376− will_find_char(cx, find_prev_char_impl, true, true)
1526+ find_char(cx, Direction::Backward, true, true)
13771527}
13781528
13791529fn repeat_last_motion(cx: &mut Context) {
1380− let count = cx.count();
1381− let last_motion = cx.editor.last_motion.take();
1382− if let Some(m) = &last_motion {
1383− for _ in 0..count {
1384− m.run(cx.editor);
1385− }
1386− cx.editor.last_motion = last_motion;
1387− }
1530+ cx.editor.repeat_last_motion(cx.count())
13881531}
13891532
13901533fn replace(cx: &mut Context) {
@@ -1451,6 +1594,7 @@ where
14511594 });
14521595
14531596 doc.apply(&transaction, view.id);
1597+ exit_select_mode(cx);
14541598}
14551599
14561600fn switch_case(cx: &mut Context) {
@@ -1692,8 +1836,8 @@ fn select_regex(cx: &mut Context) {
16921836 "select:".into(),
16931837 Some(reg),
16941838 ui::completers::none,
1695− move |editor, regex, event| {
1696− let (view, doc) = current!(editor);
1839+ move |cx, regex, event| {
1840+ let (view, doc) = current!(cx.editor);
16971841 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
16981842 return;
16991843 }
@@ -1714,8 +1858,8 @@ fn split_selection(cx: &mut Context) {
17141858 "split:".into(),
17151859 Some(reg),
17161860 ui::completers::none,
1717− move |editor, regex, event| {
1718− let (view, doc) = current!(editor);
1861+ move |cx, regex, event| {
1862+ let (view, doc) = current!(cx.editor);
17191863 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
17201864 return;
17211865 }
@@ -1737,6 +1881,12 @@ fn split_selection_on_newline(cx: &mut Context) {
17371881 doc.set_selection(view.id, selection);
17381882}
17391883
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+
17401890fn merge_consecutive_selections(cx: &mut Context) {
17411891 let (view, doc) = current!(cx.editor);
17421892 let selection = doc.selection(view.id).clone().merge_consecutive_ranges();
@@ -1832,11 +1982,11 @@ fn search_impl(
18321982
18331983fn search_completions(cx: &mut Context, reg: Option<char>) -> Vec<String> {
18341984 let mut items = reg
1835− .and_then(|reg| cx.editor.registers.get(reg))
1836− .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());
18371987 items.sort_unstable();
18381988 items.dedup();
1839− items.into_iter().cloned().collect()
1989+ items.into_iter().map(|value| value.to_string()).collect()
18401990}
18411991
18421992fn search(cx: &mut Context) {
@@ -1873,12 +2023,14 @@ fn searcher(cx: &mut Context, direction: Direction) {
18732023 .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone())))
18742024 .collect()
18752025 },
1876− move |editor, regex, event| {
1877− 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 {
18782030 return;
18792031 }
18802032 search_impl(
1881− editor,
2033+ cx.editor,
18822034 &contents,
18832035 ®ex,
18842036 Movement::Move,
@@ -1893,11 +2045,13 @@ fn searcher(cx: &mut Context, direction: Direction) {
18932045
18942046fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Direction) {
18952047 let count = cx.count();
2048+ let register = cx
2049+ .register
2050+ .unwrap_or(cx.editor.registers.last_search_register);
18962051 let config = cx.editor.config();
18972052 let scrolloff = config.scrolloff;
1898− let (_, doc) = current!(cx.editor);
1899− let registers = &cx.editor.registers;
1900− 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);
19012055 let contents = doc.text().slice(..).to_string();
19022056 let search_config = &config.search;
19032057 let case_insensitive = if search_config.smart_case {
@@ -1906,7 +2060,7 @@ fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Dir
19062060 false
19072061 };
19082062 let wrap_around = search_config.wrap_around;
1909− if let Ok(regex) = RegexBuilder::new(query)
2063+ if let Ok(regex) = RegexBuilder::new(&query)
19102064 .case_insensitive(case_insensitive)
19112065 .multi_line(true)
19122066 .build()
@@ -1946,6 +2100,7 @@ fn extend_search_prev(cx: &mut Context) {
19462100}
19472101
19482102fn search_selection(cx: &mut Context) {
2103+ let register = cx.register.unwrap_or('/');
19492104 let (view, doc) = current!(cx.editor);
19502105 let contents = doc.text().slice(..);
19512106
@@ -1958,13 +2113,24 @@ fn search_selection(cx: &mut Context) {
19582113 .collect::<Vec<_>>()
19592114 .join("|");
19602115
1961− let msg = format!("register '{}' set to '{}'", '/', ®ex);
1962− cx.editor.registers.push('/', regex);
1963− 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+ }
19642124}
19652125
19662126fn make_search_word_bounded(cx: &mut Context) {
1967− 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) {
19682134 Some(regex) => regex,
19692135 None => return,
19702136 };
@@ -1982,14 +2148,19 @@ fn make_search_word_bounded(cx: &mut Context) {
19822148 if !start_anchored {
19832149 new_regex.push_str("\\b");
19842150 }
1985− new_regex.push_str(regex);
2151+ new_regex.push_str(®ex);
19862152 if !end_anchored {
19872153 new_regex.push_str("\\b");
19882154 }
19892155
1990− let msg = format!("register '{}' set to '{}'", '/', &new_regex);
1991− cx.editor.registers.push('/', new_regex);
1992− 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+ }
19932164}
19942165
19952166fn global_search(cx: &mut Context) {
@@ -2028,13 +2199,11 @@ fn global_search(cx: &mut Context) {
20282199 }
20292200 }
20302201
2031− let (all_matches_sx, all_matches_rx) = tokio::sync::mpsc::unbounded_channel::<FileResult>();
20322202 let config = cx.editor.config();
20332203 let smart_case = config.search.smart_case;
20342204 let file_picker_config = config.file_picker.clone();
20352205
20362206 let reg = cx.register.unwrap_or('/');
2037−
20382207 let completions = search_completions(cx, Some(reg));
20392208 ui::regex_prompt(
20402209 cx,
@@ -2047,43 +2216,67 @@ fn global_search(cx: &mut Context) {
20472216 .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone())))
20482217 .collect()
20492218 },
2050− move |_editor, regex, event| {
2219+ move |cx, regex, event| {
20512220 if event != PromptEvent::Validate {
20522221 return;
20532222 }
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();
20542231
20552232 if let Ok(matcher) = RegexMatcherBuilder::new()
20562233 .case_smart(smart_case)
20572234 .build(regex.as_str())
20582235 {
2059− let searcher = SearcherBuilder::new()
2060− .binary_detection(BinaryDetection::quit(b'\x00'))
2061− .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);
20622244
2063− let search_root = std::env::current_dir()
2064− .expect("Global search error: Failed to get current dir");
20652245 let dedup_symlinks = file_picker_config.deduplicate_links;
20662246 let absolute_root = search_root
20672247 .canonicalize()
20682248 .unwrap_or_else(|_| search_root.clone());
2069−
2070− WalkBuilder::new(search_root)
2071− .hidden(file_picker_config.hidden)
2072− .parents(file_picker_config.parents)
2073− .ignore(file_picker_config.ignore)
2074− .follow_links(file_picker_config.follow_symlinks)
2075− .git_ignore(file_picker_config.git_ignore)
2076− .git_global(file_picker_config.git_global)
2077− .git_exclude(file_picker_config.git_exclude)
2078− .max_depth(file_picker_config.max_depth)
2079− .filter_entry(move |entry| {
2080− filter_picker_entry(entry, &absolute_root, dedup_symlinks)
2081− })
2082− .build_parallel()
2083− .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(|| {
20842276 let mut searcher = searcher.clone();
20852277 let matcher = matcher.clone();
2086− let all_matches_sx = all_matches_sx.clone();
2278+ let injector = injector_.clone();
2279+ let documents = &documents;
20872280 Box::new(move |entry: Result<DirEntry, ignore::Error>| -> WalkState {
20882281 let entry = match entry {
20892282 Ok(entry) => entry,
@@ -2096,17 +2289,39 @@ fn global_search(cx: &mut Context) {
20962289 _ => return WalkState::Continue,
20972290 };
20982291
2099− let result = searcher.search_path(
2100− &matcher,
2101− entry.path(),
2102− sinks::UTF8(|line_num, _| {
2103− all_matches_sx
2104− .send(FileResult::new(entry.path(), line_num as usize - 1))
2105− .unwrap();
2106−
2107− Ok(true)
2108− }),
2109− );
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+ };
21102325
21112326 if let Err(err) = result {
21122327 log::error!(
@@ -2115,67 +2330,66 @@ fn global_search(cx: &mut Context) {
21152330 err
21162331 );
21172332 }
2118− WalkState::Continue
2333+ if stop {
2334+ WalkState::Quit
2335+ } else {
2336+ WalkState::Continue
2337+ }
21192338 })
21202339 });
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+ })
21212387 } else {
21222388 // Otherwise do nothing
21232389 // log::warn!("Global Search Invalid Pattern")
21242390 }
21252391 },
21262392 );
2127−
2128− let current_path = doc_mut!(cx.editor).path().cloned();
2129−
2130− let show_picker = async move {
2131− let all_matches: Vec<FileResult> =
2132− UnboundedReceiverStream::new(all_matches_rx).collect().await;
2133− let call: job::Callback = Callback::EditorCompositor(Box::new(
2134− move |editor: &mut Editor, compositor: &mut Compositor| {
2135− if all_matches.is_empty() {
2136− editor.set_status("No matches found");
2137− return;
2138− }
2139−
2140− let picker = FilePicker::new(
2141− all_matches,
2142− current_path,
2143− move |cx, FileResult { path, line_num }, action| {
2144− match cx.editor.open(path, action) {
2145− Ok(_) => {}
2146− Err(e) => {
2147− cx.editor.set_error(format!(
2148− "Failed to open file '{}': {}",
2149− path.display(),
2150− e
2151− ));
2152− return;
2153− }
2154− }
2155−
2156− let line_num = *line_num;
2157− let (view, doc) = current!(cx.editor);
2158− let text = doc.text();
2159− if line_num >= text.len_lines() {
2160− cx.editor.set_error("The line you jumped to does not exist anymore because the file has changed.");
2161− return;
2162− }
2163− let start = text.line_to_char(line_num);
2164− let end = text.line_to_char((line_num + 1).min(text.len_lines()));
2165−
2166− doc.set_selection(view.id, Selection::single(start, end));
2167− align_view(doc, view, Align::Center);
2168− },
2169− |_editor, FileResult { path, line_num }| {
2170− Some((path.clone().into(), Some((*line_num, *line_num))))
2171− },
2172− );
2173− compositor.push(Box::new(overlaid(picker)));
2174− },
2175− ));
2176− Ok(call)
2177− };
2178− cx.jobs.callback(show_picker);
21792393}
21802394
21812395enum Extend {
@@ -2298,17 +2512,35 @@ enum Operation {
22982512 Change,
22992513}
23002514
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+
23012529fn delete_selection_impl(cx: &mut Context, op: Operation) {
23022530 let (view, doc) = current!(cx.editor);
23032531
23042532 let selection = doc.selection(view.id);
2533+ let only_whole_lines = selection_is_linewise(selection, doc.text());
23052534
23062535 if cx.register != Some('_') {
23072536 // first yank the selection
23082537 let text = doc.text().slice(..);
23092538 let values: Vec<String> = selection.fragments(text).map(Cow::into_owned).collect();
23102539 let reg_name = cx.register.unwrap_or('"');
2311− 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+ }
23122544 };
23132545
23142546 // then delete
@@ -2322,7 +2554,11 @@ fn delete_selection_impl(cx: &mut Context, op: Operation) {
23222554 exit_select_mode(cx);
23232555 }
23242556 Operation::Change => {
2325− enter_insert_mode(cx);
2557+ if only_whole_lines {
2558+ open_above(cx);
2559+ } else {
2560+ enter_insert_mode(cx);
2561+ }
23262562 }
23272563 }
23282564}
@@ -2444,6 +2680,10 @@ fn insert_mode(cx: &mut Context) {
24442680 .transform(|range| Range::new(range.to(), range.from()));
24452681
24462682 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();
24472687}
24482688
24492689// inserts at the end of each selection
@@ -2480,6 +2720,10 @@ fn append_mode(cx: &mut Context) {
24802720
24812721fn file_picker(cx: &mut Context) {
24822722 let root = find_workspace().0;
2723+ if !root.exists() {
2724+ cx.editor.set_error("Workspace directory does not exist");
2725+ return;
2726+ }
24832727 let picker = ui::file_picker(root, &cx.editor.config());
24842728 cx.push_layer(Box::new(overlaid(picker)));
24852729}
@@ -2500,8 +2744,14 @@ fn file_picker_in_current_buffer_directory(cx: &mut Context) {
25002744 let picker = ui::file_picker(path, &cx.editor.config());
25012745 cx.push_layer(Box::new(overlaid(picker)));
25022746}
2747+
25032748fn file_picker_in_current_directory(cx: &mut Context) {
2504− 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+ }
25052755 let picker = ui::file_picker(cwd, &cx.editor.config());
25062756 cx.push_layer(Box::new(overlaid(picker)));
25072757}
@@ -2560,22 +2810,18 @@ fn buffer_picker(cx: &mut Context) {
25602810 // mru
25612811 items.sort_unstable_by_key(|item| std::cmp::Reverse(item.focused_at));
25622812
2563− let picker = FilePicker::new(
2564− items,
2565− (),
2566− |cx, meta, action| {
2567− cx.editor.switch(meta.id, action);
2568− },
2569− |editor, meta| {
2570− let doc = &editor.documents.get(&meta.id)?;
2571− let &view_id = doc.selections().keys().next()?;
2572− let line = doc
2573− .selection(view_id)
2574− .primary()
2575− .cursor_line(doc.text().slice(..));
2576− Some((meta.id.into(), Some((line, line))))
2577− },
2578− );
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+ });
25792825 cx.push_layer(Box::new(overlaid(picker)));
25802826}
25812827
@@ -2641,7 +2887,7 @@ fn jumplist_picker(cx: &mut Context) {
26412887 }
26422888 };
26432889
2644− let picker = FilePicker::new(
2890+ let picker = Picker::new(
26452891 cx.editor
26462892 .tree
26472893 .views()
@@ -2655,16 +2901,18 @@ fn jumplist_picker(cx: &mut Context) {
26552901 |cx, meta, action| {
26562902 cx.editor.switch(meta.id, action);
26572903 let config = cx.editor.config();
2658− let (view, doc) = current!(cx.editor);
2904+ let (view, doc) = (view_mut!(cx.editor), doc_mut!(cx.editor, &meta.id));
26592905 doc.set_selection(view.id, meta.selection.clone());
2660− view.ensure_cursor_in_view_center(doc, config.scrolloff);
2661− },
2662− |editor, meta| {
2663− let doc = &editor.documents.get(&meta.id)?;
2664− let line = meta.selection.primary().cursor_line(doc.text().slice(..));
2665− 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+ }
26662909 },
2667− );
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+ });
26682916 cx.push_layer(Box::new(overlaid(picker)));
26692917}
26702918
@@ -2698,6 +2946,9 @@ impl ui::menu::Item for MappableCommand {
26982946}
26992947
27002948pub fn command_palette(cx: &mut Context) {
2949+ let register = cx.register;
2950+ let count = cx.count;
2951+
27012952 cx.callback = Some(Box::new(
27022953 move |compositor: &mut Compositor, cx: &mut compositor::Context| {
27032954 let keymap = compositor.find::<ui::EditorView>().unwrap().keymaps.map()
@@ -2715,8 +2966,8 @@ pub fn command_palette(cx: &mut Context) {
27152966
27162967 let picker = Picker::new(commands, keymap, move |cx, command, _action| {
27172968 let mut ctx = Context {
2718− register: None,
2719− count: std::num::NonZeroUsize::new(1),
2969+ register,
2970+ count,
27202971 editor: cx.editor,
27212972 callback: None,
27222973 on_next_key_callback: None,
@@ -2755,24 +3006,88 @@ fn last_picker(cx: &mut Context) {
27553006 }));
27563007}
27573008
2758−// 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.
27593017fn insert_at_line_start(cx: &mut Context) {
2760− goto_first_nonwhitespace(cx);
2761− enter_insert_mode(cx);
3018+ insert_with_indent(cx, IndentFallbackPos::LineStart);
27623019}
27633020
2764−// 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.
27653023fn 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) {
27663030 enter_insert_mode(cx);
3031+
27673032 let (view, doc) = current!(cx.editor);
27683033
2769− let selection = doc.selection(view.id).clone().transform(|range| {
2770− let text = doc.text().slice(..);
2771− let line = range.cursor_line(text);
2772− let pos = line_end_char_index(&text, line);
2773− 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+ }
27743087 });
2775− doc.set_selection(view.id, selection);
3088+
3089+ transaction = transaction.with_selection(Selection::new(ranges, selection.primary_index()));
3090+ doc.apply(&transaction, view.id);
27763091}
27773092
27783093// Creates an LspCallback that waits for formatting changes to be computed. When they're done,
@@ -2843,6 +3158,7 @@ fn open(cx: &mut Context, open: Open) {
28433158 Open::Below => graphemes::prev_grapheme_boundary(text, range.to()),
28443159 Open::Above => range.from(),
28453160 });
3161+
28463162 let new_line = match open {
28473163 // adjust position to the end of the line (next line - 1)
28483164 Open::Below => cursor_line + 1,
@@ -2850,13 +3166,15 @@ fn open(cx: &mut Context, open: Open) {
28503166 Open::Above => cursor_line,
28513167 };
28523168
3169+ let line_num = new_line.saturating_sub(1);
3170+
28533171 // Index to insert newlines after, as well as the char width
28543172 // to use to compensate for those inserted newlines.
28553173 let (line_end_index, line_end_offset_width) = if new_line == 0 {
28563174 (0, 0)
28573175 } else {
28583176 (
2859− line_end_char_index(&doc.text().slice(..), new_line.saturating_sub(1)),
3177+ line_end_char_index(&text, line_num),
28603178 doc.line_ending.len_chars(),
28613179 )
28623180 };
@@ -2864,13 +3182,15 @@ fn open(cx: &mut Context, open: Open) {
28643182 let indent = indent::indent_for_newline(
28653183 doc.language_config(),
28663184 doc.syntax(),
3185+ &doc.config.load().indent_heuristic,
28673186 &doc.indent_style,
28683187 doc.tab_width(),
28693188 text,
2870− new_line.saturating_sub(1),
3189+ line_num,
28713190 line_end_index,
28723191 cursor_line,
28733192 );
3193+
28743194 let indent_len = indent.len();
28753195 let mut text = String::with_capacity(1 + indent_len);
28763196 text.push_str(doc.line_ending.as_str());
@@ -3169,8 +3489,7 @@ fn goto_next_change_impl(cx: &mut Context, direction: Direction) {
31693489
31703490 doc.set_selection(view.id, selection)
31713491 };
3172− motion(cx.editor);
3173− cx.editor.last_motion = Some(Motion(Box::new(motion)));
3492+ cx.editor.apply_motion(motion);
31743493}
31753494
31763495/// Returns the [Range] for a [Hunk] in the given text.
@@ -3236,10 +3555,8 @@ pub mod insert {
32363555 let trigger_completion = doc
32373556 .language_servers_with_feature(LanguageServerFeature::Completion)
32383557 .any(|ls| {
3239− let capabilities = ls.capabilities();
3240−
32413558 // TODO: what if trigger is multiple chars long
3242− matches!(&capabilities.completion_provider, Some(lsp::CompletionOptions {
3559+ matches!(&ls.capabilities().completion_provider, Some(lsp::CompletionOptions {
32433560 trigger_characters: Some(triggers),
32443561 ..
32453562 }) if triggers.iter().any(|trigger| trigger.contains(ch)))
@@ -3252,51 +3569,39 @@ pub mod insert {
32523569 }
32533570
32543571 fn signature_help(cx: &mut Context, ch: char) {
3255− use futures_util::FutureExt;
32563572 use helix_lsp::lsp;
32573573 // if ch matches signature_help char, trigger
3258− let (view, doc) = current!(cx.editor);
3259− // lsp doesn't tell us when to close the signature help, so we request
3260− // the help information again after common close triggers which should
3261− // return None, which in turn closes the popup.
3262− let close_triggers = &[')', ';', '.'];
3263− // TODO support multiple language servers (not just the first that is found)
3264− let future = doc
3574+ let doc = doc_mut!(cx.editor);
3575+ // TODO support multiple language servers (not just the first that is found), likely by merging UI somehow
3576+ let Some(language_server) = doc
32653577 .language_servers_with_feature(LanguageServerFeature::SignatureHelp)
3266− .find_map(|ls| {
3267− let capabilities = ls.capabilities();
3268−
3269− match capabilities {
3270− lsp::ServerCapabilities {
3271− signature_help_provider:
3272− Some(lsp::SignatureHelpOptions {
3273− trigger_characters: Some(triggers),
3274− // TODO: retrigger_characters
3275− ..
3276− }),
3277− ..
3278− } if triggers.iter().any(|trigger| trigger.contains(ch))
3279− || close_triggers.contains(&ch) =>
3280− {
3281− let pos = doc.position(view.id, ls.offset_encoding());
3282− ls.text_document_signature_help(doc.identifier(), pos, None)
3283− }
3284− _ if close_triggers.contains(&ch) => ls.text_document_signature_help(
3285− doc.identifier(),
3286− doc.position(view.id, ls.offset_encoding()),
3287− None,
3288− ),
3289− // TODO: what if trigger is multiple chars long
3290− _ => None,
3291− }
3292− });
3578+ .next()
3579+ else {
3580+ return;
3581+ };
32933582
3294− if let Some(future) = future {
3295− super::signature_help_impl_with_future(
3296− cx,
3297− future.boxed(),
3298− SignatureHelpInvoked::Automatic,
3299− )
3583+ let capabilities = language_server.capabilities();
3584+
3585+ if let lsp::ServerCapabilities {
3586+ signature_help_provider:
3587+ Some(lsp::SignatureHelpOptions {
3588+ trigger_characters: Some(triggers),
3589+ // TODO: retrigger_characters
3590+ ..
3591+ }),
3592+ ..
3593+ } = capabilities
3594+ {
3595+ // TODO: what if trigger is multiple chars long
3596+ let is_trigger = triggers.iter().any(|trigger| trigger.contains(ch));
3597+ // lsp doesn't tell us when to close the signature help, so we request
3598+ // the help information again after common close triggers which should
3599+ // return None, which in turn closes the popup.
3600+ let close_triggers = &[')', ';', '.'];
3601+
3602+ if is_trigger || close_triggers.contains(&ch) {
3603+ super::signature_help_impl(cx, SignatureHelpInvoked::Automatic);
3604+ }
33003605 }
33013606 }
33023607
@@ -3310,7 +3615,8 @@ pub mod insert {
33103615 Some(transaction)
33113616 }
33123617
3313− use helix_core::{auto_pairs, syntax::LanguageServerFeature};
3618+ use helix_core::auto_pairs;
3619+ use helix_view::editor::SmartTabConfig;
33143620
33153621 pub fn insert_char(cx: &mut Context, c: char) {
33163622 let (view, doc) = current_ref!(cx.editor);
@@ -3336,6 +3642,31 @@ pub mod insert {
33363642 }
33373643 }
33383644
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+
33393670 pub fn insert_tab(cx: &mut Context) {
33403671 let (view, doc) = current!(cx.editor);
33413672 // TODO: round out to nearest indentation level (for example a line with 3 spaces should
@@ -3391,6 +3722,7 @@ pub mod insert {
33913722 let indent = indent::indent_for_newline(
33923723 doc.language_config(),
33933724 doc.syntax(),
3725+ &doc.config.load().indent_heuristic,
33943726 &doc.indent_style,
33953727 doc.tab_width(),
33963728 text,
@@ -3631,34 +3963,21 @@ fn commit_undo_checkpoint(cx: &mut Context) {
36313963// Yank / Paste
36323964
36333965fn yank(cx: &mut Context) {
3634− let (view, doc) = current!(cx.editor);
3635− let text = doc.text().slice(..);
3636−
3637− let values: Vec<String> = doc
3638− .selection(view.id)
3639− .fragments(text)
3640− .map(Cow::into_owned)
3641− .collect();
3642−
3643− let msg = format!(
3644− "yanked {} selection(s) to register {}",
3645− values.len(),
3646− cx.register.unwrap_or('"')
3647− );
3966+ yank_impl(cx.editor, cx.register.unwrap_or('"'));
3967+ exit_select_mode(cx);
3968+}
36483969
3649− cx.editor
3650− .registers
3651− .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+}
36523974
3653− cx.editor.set_status(msg);
3975+fn yank_to_primary_clipboard(cx: &mut Context) {
3976+ yank_impl(cx.editor, '*');
36543977 exit_select_mode(cx);
36553978}
36563979
3657−fn yank_joined_to_clipboard_impl(
3658− editor: &mut Editor,
3659− separator: &str,
3660− clipboard_type: ClipboardType,
3661−) -> anyhow::Result<()> {
3980+fn yank_impl(editor: &mut Editor, register: char) {
36623981 let (view, doc) = current!(editor);
36633982 let text = doc.text().slice(..);
36643983
@@ -3667,74 +3986,79 @@ fn yank_joined_to_clipboard_impl(
36673986 .fragments(text)
36683987 .map(Cow::into_owned)
36693988 .collect();
3989+ let selections = values.len();
36703990
3671− let clipboard_text = match clipboard_type {
3672− ClipboardType::Clipboard => "system clipboard",
3673− ClipboardType::Selection => "primary clipboard",
3674− };
3675−
3676− let msg = format!(
3677− "joined and yanked {} selection(s) to {}",
3678− values.len(),
3679− clipboard_text,
3680− );
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+}
36813999
3682− 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(..);
36834003
3684− editor
3685− .clipboard_provider
3686− .set_contents(joined, clipboard_type)
3687− .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+ });
36884015
3689− 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+}
36904024
3691− 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);
36924029}
36934030
36944031fn yank_joined_to_clipboard(cx: &mut Context) {
36954032 let line_ending = doc!(cx.editor).line_ending;
3696− let _ =
3697− yank_joined_to_clipboard_impl(cx.editor, line_ending.as_str(), ClipboardType::Clipboard);
4033+ yank_joined_impl(cx.editor, line_ending.as_str(), '+');
36984034 exit_select_mode(cx);
36994035}
37004036
3701−fn yank_main_selection_to_clipboard_impl(
3702− editor: &mut Editor,
3703− clipboard_type: ClipboardType,
3704−) -> 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) {
37054044 let (view, doc) = current!(editor);
37064045 let text = doc.text().slice(..);
37074046
3708− let message_text = match clipboard_type {
3709− ClipboardType::Clipboard => "yanked main selection to system clipboard",
3710− ClipboardType::Selection => "yanked main selection to primary clipboard",
3711− };
3712−
3713− let value = doc.selection(view.id).primary().fragment(text);
4047+ let selection = doc.selection(view.id).primary().fragment(text).to_string();
37144048
3715− if let Err(e) = editor
3716− .clipboard_provider
3717− .set_contents(value.into_owned(), clipboard_type)
3718− {
3719− 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()),
37204052 }
3721−
3722− editor.set_status(message_text);
3723− Ok(())
37244053}
37254054
37264055fn yank_main_selection_to_clipboard(cx: &mut Context) {
3727− let _ = yank_main_selection_to_clipboard_impl(cx.editor, ClipboardType::Clipboard);
3728−}
3729−
3730−fn yank_joined_to_primary_clipboard(cx: &mut Context) {
3731− let line_ending = doc!(cx.editor).line_ending;
3732− let _ =
3733− 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);
37344058}
37354059
37364060fn yank_main_selection_to_primary_clipboard(cx: &mut Context) {
3737− let _ = yank_main_selection_to_clipboard_impl(cx.editor, ClipboardType::Selection);
4061+ yank_primary_selection_impl(cx.editor, '*');
37384062 exit_select_mode(cx);
37394063}
37404064
@@ -3832,146 +4156,99 @@ pub(crate) fn paste_bracketed_value(cx: &mut Context, contents: String) {
38324156 };
38334157 let (view, doc) = current!(cx.editor);
38344158 paste_impl(&[contents], doc, view, paste, count, cx.editor.mode);
3835−}
3836−
3837−fn paste_clipboard_impl(
3838− editor: &mut Editor,
3839− action: Paste,
3840− clipboard_type: ClipboardType,
3841− count: usize,
3842−) -> anyhow::Result<()> {
3843− let (view, doc) = current!(editor);
3844− match editor.clipboard_provider.get_contents(clipboard_type) {
3845− Ok(contents) => {
3846− paste_impl(&[contents], doc, view, action, count, editor.mode);
3847− Ok(())
3848− }
3849− Err(e) => Err(e.context("Couldn't get system clipboard contents")),
3850− }
4159+ exit_select_mode(cx);
38514160}
38524161
38534162fn paste_clipboard_after(cx: &mut Context) {
3854− let _ = paste_clipboard_impl(
3855− cx.editor,
3856− Paste::After,
3857− ClipboardType::Clipboard,
3858− cx.count(),
3859− );
4163+ paste(cx.editor, '+', Paste::After, cx.count());
4164+ exit_select_mode(cx);
38604165}
38614166
38624167fn paste_clipboard_before(cx: &mut Context) {
3863− let _ = paste_clipboard_impl(
3864− cx.editor,
3865− Paste::Before,
3866− ClipboardType::Clipboard,
3867− cx.count(),
3868− );
4168+ paste(cx.editor, '+', Paste::Before, cx.count());
4169+ exit_select_mode(cx);
38694170}
38704171
38714172fn paste_primary_clipboard_after(cx: &mut Context) {
3872− let _ = paste_clipboard_impl(
3873− cx.editor,
3874− Paste::After,
3875− ClipboardType::Selection,
3876− cx.count(),
3877− );
4173+ paste(cx.editor, '*', Paste::After, cx.count());
4174+ exit_select_mode(cx);
38784175}
38794176
38804177fn paste_primary_clipboard_before(cx: &mut Context) {
3881− let _ = paste_clipboard_impl(
3882− cx.editor,
3883− Paste::Before,
3884− ClipboardType::Selection,
3885− cx.count(),
3886− );
4178+ paste(cx.editor, '*', Paste::Before, cx.count());
4179+ exit_select_mode(cx);
38874180}
38884181
38894182fn replace_with_yanked(cx: &mut Context) {
3890− let count = cx.count();
3891− let reg_name = cx.register.unwrap_or('"');
3892− let (view, doc) = current!(cx.editor);
3893− let registers = &mut cx.editor.registers;
3894−
3895− if let Some(values) = registers.read(reg_name) {
3896− if !values.is_empty() {
3897− let repeat = std::iter::repeat(
3898− values
3899− .last()
3900− .map(|value| Tendril::from(&value.repeat(count)))
3901− .unwrap(),
3902− );
3903− let mut values = values
3904− .iter()
3905− .map(|value| Tendril::from(&value.repeat(count)))
3906− .chain(repeat);
3907− let selection = doc.selection(view.id);
3908− let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
3909− if !range.is_empty() {
3910− (range.from(), range.to(), Some(values.next().unwrap()))
3911− } else {
3912− (range.from(), range.to(), None)
3913− }
3914− });
3915−
3916− doc.apply(&transaction, view.id);
3917− exit_select_mode(cx);
3918− }
3919− }
4183+ replace_with_yanked_impl(cx.editor, cx.register.unwrap_or('"'), cx.count());
4184+ exit_select_mode(cx);
39204185}
39214186
3922−fn replace_selections_with_clipboard_impl(
3923− cx: &mut Context,
3924− clipboard_type: ClipboardType,
3925−) -> anyhow::Result<()> {
3926− let count = cx.count();
3927− let (view, doc) = current!(cx.editor);
3928−
3929− match cx.editor.clipboard_provider.get_contents(clipboard_type) {
3930− Ok(contents) => {
3931− let selection = doc.selection(view.id);
3932− let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
3933− (
3934− range.from(),
3935− range.to(),
3936− Some(contents.repeat(count).as_str().into()),
3937− )
3938− });
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();
39394192
3940− doc.apply(&transaction, view.id);
3941− 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)
39424210 }
3943− Err(e) => return Err(e.context("Couldn't get system clipboard contents")),
3944− }
4211+ });
39454212
3946− exit_select_mode(cx);
3947− Ok(())
4213+ doc.apply(&transaction, view.id);
39484214}
39494215
39504216fn replace_selections_with_clipboard(cx: &mut Context) {
3951− let _ = replace_selections_with_clipboard_impl(cx, ClipboardType::Clipboard);
4217+ replace_with_yanked_impl(cx.editor, '+', cx.count());
4218+ exit_select_mode(cx);
39524219}
39534220
39544221fn replace_selections_with_primary_clipboard(cx: &mut Context) {
3955− let _ = replace_selections_with_clipboard_impl(cx, ClipboardType::Selection);
4222+ replace_with_yanked_impl(cx.editor, '*', cx.count());
4223+ exit_select_mode(cx);
39564224}
39574225
3958−fn paste(cx: &mut Context, pos: Paste) {
3959− let count = cx.count();
3960− let reg_name = cx.register.unwrap_or('"');
3961− let (view, doc) = current!(cx.editor);
3962− 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();
39634229
3964− if let Some(values) = registers.read(reg_name) {
3965− paste_impl(values, doc, view, pos, count, cx.editor.mode);
3966− }
4230+ let (view, doc) = current!(editor);
4231+ paste_impl(&values, doc, view, pos, count, editor.mode);
39674232}
39684233
39694234fn paste_after(cx: &mut Context) {
3970− 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);
39714242}
39724243
39734244fn paste_before(cx: &mut Context) {
3974− 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);
39754252}
39764253
39774254fn get_lines(doc: &Document, view_id: ViewId) -> Vec<usize> {
@@ -4010,6 +4287,7 @@ fn indent(cx: &mut Context) {
40104287 }),
40114288 );
40124289 doc.apply(&transaction, view.id);
4290+ exit_select_mode(cx);
40134291}
40144292
40154293fn unindent(cx: &mut Context) {
@@ -4049,6 +4327,7 @@ fn unindent(cx: &mut Context) {
40494327 let transaction = Transaction::change(doc.text(), changes.into_iter());
40504328
40514329 doc.apply(&transaction, view.id);
4330+ exit_select_mode(cx);
40524331}
40534332
40544333fn format_selections(cx: &mut Context) {
@@ -4065,38 +4344,43 @@ fn format_selections(cx: &mut Context) {
40654344 .set_error("format_selections only supports a single selection for now");
40664345 return;
40674346 }
4068− let future_offset_encoding = doc
4347+
4348+ // TODO extra LanguageServerFeature::FormatSelections?
4349+ // maybe such that LanguageServerFeature::Format contains it as well
4350+ let Some(language_server) = doc
40694351 .language_servers_with_feature(LanguageServerFeature::Format)
4070− .find_map(|language_server| {
4071− let offset_encoding = language_server.offset_encoding();
4072− let ranges: Vec<lsp::Range> = doc
4073− .selection(view_id)
4074− .iter()
4075− .map(|range| range_to_lsp_range(doc.text(), *range, offset_encoding))
4076− .collect();
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;
4362+ };
40774363
4078− // TODO: handle fails
4079− // TODO: concurrent map over all ranges
4364+ let offset_encoding = language_server.offset_encoding();
4365+ let ranges: Vec<lsp::Range> = doc
4366+ .selection(view_id)
4367+ .iter()
4368+ .map(|range| range_to_lsp_range(doc.text(), *range, offset_encoding))
4369+ .collect();
40804370
4081− let range = ranges[0];
4371+ // TODO: handle fails
4372+ // TODO: concurrent map over all ranges
40824373
4083− let future = language_server.text_document_range_formatting(
4084− doc.identifier(),
4085− range,
4086− lsp::FormattingOptions::default(),
4087− None,
4088− )?;
4089− Some((future, offset_encoding))
4090− });
4374+ let range = ranges[0];
40914375
4092− let (future, offset_encoding) = match future_offset_encoding {
4093− Some(future_offset_encoding) => future_offset_encoding,
4094− None => {
4095− cx.editor
4096− .set_error("No configured language server supports range formatting");
4097− return;
4098− }
4099− };
4376+ let future = language_server
4377+ .text_document_range_formatting(
4378+ doc.identifier(),
4379+ range,
4380+ lsp::FormattingOptions::default(),
4381+ None,
4382+ )
4383+ .unwrap();
41004384
41014385 let edits = tokio::task::block_in_place(|| helix_lsp::block_on(future)).unwrap_or_default();
41024386
@@ -4110,10 +4394,9 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
41104394 use movement::skip_while;
41114395 let (view, doc) = current!(cx.editor);
41124396 let text = doc.text();
4113− let slice = doc.text().slice(..);
4397+ let slice = text.slice(..);
41144398
41154399 let mut changes = Vec::new();
4116− let fragment = Tendril::from(" ");
41174400
41184401 for selection in doc.selection(view.id) {
41194402 let (start, mut end) = selection.line_range(slice);
@@ -4129,9 +4412,13 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
41294412 let mut end = text.line_to_char(line + 1);
41304413 end = skip_while(slice, end, |ch| matches!(ch, ' ' | '\t')).unwrap_or(end);
41314414
4132− // need to skip from start, not end
4133− let change = (start, end, Some(fragment.clone()));
4134− 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));
41354422 }
41364423 }
41374424
@@ -4143,9 +4430,6 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
41434430 changes.sort_unstable_by_key(|(from, _to, _text)| *from);
41444431 changes.dedup();
41454432
4146− // TODO: joining multiple empty lines should be replaced by a single space.
4147− // need to merge change ranges that touch
4148−
41494433 // select inserted spaces
41504434 let transaction = if select_space {
41514435 let ranges: SmallVec<_> = changes
@@ -4157,9 +4441,9 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
41574441 })
41584442 .collect();
41594443 let selection = Selection::new(ranges, 0);
4160− Transaction::change(doc.text(), changes.into_iter()).with_selection(selection)
4444+ Transaction::change(text, changes.into_iter()).with_selection(selection)
41614445 } else {
4162− Transaction::change(doc.text(), changes.into_iter())
4446+ Transaction::change(text, changes.into_iter())
41634447 };
41644448
41654449 doc.apply(&transaction, view.id);
@@ -4173,8 +4457,8 @@ fn keep_or_remove_selections_impl(cx: &mut Context, remove: bool) {
41734457 if remove { "remove:" } else { "keep:" }.into(),
41744458 Some(reg),
41754459 ui::completers::none,
4176− move |editor, regex, event| {
4177− let (view, doc) = current!(editor);
4460+ move |cx, regex, event| {
4461+ let (view, doc) = current!(cx.editor);
41784462 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
41794463 return;
41804464 }
@@ -4247,15 +4531,15 @@ pub fn completion(cx: &mut Context) {
42474531
42484532 let mut futures: FuturesUnordered<_> = doc
42494533 .language_servers_with_feature(LanguageServerFeature::Completion)
4250− // TODO this should probably already been filtered in something like "language_servers_with_feature"
42514534 .filter(|ls| seen_language_servers.insert(ls.id()))
4252− .filter_map(|language_server| {
4535+ .map(|language_server| {
42534536 let language_server_id = language_server.id();
42544537 let offset_encoding = language_server.offset_encoding();
4255− let pos = pos_to_lsp_pos(doc.text(), cursor, offset_encoding);
4256− let completion_request = language_server.completion(doc.identifier(), pos, None)?;
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();
42574541
4258− Some(async move {
4542+ async move {
42594543 let json = completion_request.await?;
42604544 let response: Option<lsp::CompletionResponse> = serde_json::from_value(json)?;
42614545
@@ -4277,7 +4561,7 @@ pub fn completion(cx: &mut Context) {
42774561 .collect();
42784562
42794563 anyhow::Ok(items)
4280− })
4564+ }
42814565 })
42824566 .collect();
42834567
@@ -4408,7 +4692,13 @@ fn rotate_selections_backward(cx: &mut Context) {
44084692 rotate_selections(cx, Direction::Backward)
44094693}
44104694
4411−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) {
44124702 let count = cx.count;
44134703 let (view, doc) = current!(cx.editor);
44144704 let text = doc.text().slice(..);
@@ -4426,9 +4716,10 @@ fn rotate_selection_contents(cx: &mut Context, direction: Direction) {
44264716
44274717 for chunk in fragments.chunks_mut(group) {
44284718 // TODO: also modify main index
4429− match direction {
4430− Direction::Forward => chunk.rotate_right(1),
4431− 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(),
44324723 };
44334724 }
44344725
@@ -4445,10 +4736,13 @@ fn rotate_selection_contents(cx: &mut Context, direction: Direction) {
44454736}
44464737
44474738fn rotate_selection_contents_forward(cx: &mut Context) {
4448− rotate_selection_contents(cx, Direction::Forward)
4739+ reorder_selection_contents(cx, ReorderStrategy::RotateForward)
44494740}
44504741fn rotate_selection_contents_backward(cx: &mut Context) {
4451− 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)
44524746}
44534747
44544748// tree sitter node selection
@@ -4472,8 +4766,7 @@ fn expand_selection(cx: &mut Context) {
44724766 }
44734767 }
44744768 };
4475− motion(cx.editor);
4476− cx.editor.last_motion = Some(Motion(Box::new(motion)));
4769+ cx.editor.apply_motion(motion);
44774770}
44784771
44794772fn shrink_selection(cx: &mut Context) {
@@ -4497,8 +4790,7 @@ fn shrink_selection(cx: &mut Context) {
44974790 doc.set_selection(view.id, selection);
44984791 }
44994792 };
4500− motion(cx.editor);
4501− cx.editor.last_motion = Some(Motion(Box::new(motion)));
4793+ cx.editor.apply_motion(motion);
45024794}
45034795
45044796fn select_sibling_impl<F>(cx: &mut Context, sibling_fn: &'static F)
@@ -4516,8 +4808,7 @@ where
45164808 doc.set_selection(view.id, selection);
45174809 }
45184810 };
4519− motion(cx.editor);
4520− cx.editor.last_motion = Some(Motion(Box::new(motion)));
4811+ cx.editor.apply_motion(motion);
45214812}
45224813
45234814fn select_next_sibling(cx: &mut Context) {
@@ -4528,22 +4819,68 @@ fn select_prev_sibling(cx: &mut Context) {
45284819 select_sibling_impl(cx, &|node| Node::prev_sibling(&node))
45294820}
45304821
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+
45314865fn match_brackets(cx: &mut Context) {
45324866 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(..);
45334870
4534− if let Some(syntax) = doc.syntax() {
4535− let text = doc.text().slice(..);
4536− let selection = doc.selection(view.id).clone().transform(|range| {
4537− if let Some(pos) =
4538− match_brackets::find_matching_bracket_fuzzy(syntax, doc.text(), range.cursor(text))
4539− {
4540− range.put_cursor(text, pos, cx.editor.mode == Mode::Select)
4541− } else {
4542− range
4543− }
4544− });
4545− doc.set_selection(view.id, selection);
4546− }
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);
45474884}
45484885
45494886//
@@ -4638,17 +4975,19 @@ fn transpose_view(cx: &mut Context) {
46384975 cx.editor.transpose_view()
46394976}
46404977
4641−// split helper, clear it later
4642−fn split(cx: &mut Context, action: Action) {
4643− 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);
46444983 let id = doc.id();
46454984 let selection = doc.selection(view.id).clone();
46464985 let offset = view.offset;
46474986
4648− cx.editor.switch(id, action);
4987+ editor.switch(id, action);
46494988
46504989 // match the selection in the previous view
4651− let (view, doc) = current!(cx.editor);
4990+ let (view, doc) = current!(editor);
46524991 doc.set_selection(view.id, selection);
46534992 // match the view scroll offset (switch doesn't handle this fully
46544993 // since the selection is only matched after the split)
@@ -4656,7 +4995,7 @@ fn split(cx: &mut Context, action: Action) {
46564995}
46574996
46584997fn hsplit(cx: &mut Context) {
4659− split(cx, Action::HorizontalSplit);
4998+ split(cx.editor, Action::HorizontalSplit);
46604999}
46615000
46625001fn hsplit_new(cx: &mut Context) {
@@ -4664,7 +5003,7 @@ fn hsplit_new(cx: &mut Context) {
46645003}
46655004
46665005fn vsplit(cx: &mut Context) {
4667− split(cx, Action::VerticalSplit);
5006+ split(cx.editor, Action::VerticalSplit);
46685007}
46695008
46705009fn vsplit_new(cx: &mut Context) {
@@ -4713,7 +5052,12 @@ fn insert_register(cx: &mut Context) {
47135052 if let Some(ch) = event.char() {
47145053 cx.editor.autoinfo = None;
47155054 cx.register = Some(ch);
4716− paste(cx, Paste::Cursor);
5055+ paste(
5056+ cx.editor,
5057+ cx.register.unwrap_or('"'),
5058+ Paste::Cursor,
5059+ cx.count(),
5060+ );
47175061 }
47185062 })
47195063}
@@ -4797,8 +5141,7 @@ fn goto_ts_object_impl(cx: &mut Context, object: &'static str, direction: Direct
47975141 editor.set_status("Syntax-tree is not available in current buffer");
47985142 }
47995143 };
4800− motion(cx.editor);
4801− cx.editor.last_motion = Some(Motion(Box::new(motion)));
5144+ cx.editor.apply_motion(motion);
48025145}
48035146
48045147fn goto_next_function(cx: &mut Context) {
@@ -4919,8 +5262,7 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
49195262 });
49205263 doc.set_selection(view.id, selection);
49215264 };
4922− textobject(cx.editor);
4923− cx.editor.last_motion = Some(Motion(Box::new(textobject)));
5265+ cx.editor.apply_motion(textobject);
49245266 }
49255267 });
49265268
@@ -5010,11 +5352,18 @@ fn surround_replace(cx: &mut Context) {
50105352 }
50115353 };
50125354
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+
50135362 cx.on_next_key(move |cx, event| {
50145363 let (view, doc) = current!(cx.editor);
50155364 let to = match event.char() {
50165365 Some(to) => to,
5017− None => return,
5366+ None => return doc.set_selection(view.id, selection),
50185367 };
50195368 let (open, close) = surround::get_pair(to);
50205369 let transaction = Transaction::change(
@@ -5025,6 +5374,7 @@ fn surround_replace(cx: &mut Context) {
50255374 (pos, pos + 1, Some(t))
50265375 }),
50275376 );
5377+ doc.set_selection(view.id, selection);
50285378 doc.apply(&transaction, view.id);
50295379 exit_select_mode(cx);
50305380 });
@@ -5259,12 +5609,18 @@ fn shell(cx: &mut compositor::Context, cmd: &str, behavior: &ShellBehavior) {
52595609 };
52605610
52615611 // These `usize`s cannot underflow because selection ranges cannot overlap.
5262− // Once the MSRV is 1.66.0 (mixed_integer_ops is stabilized), we can use checked
5263− // arithmetic to assert this.
5264− 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");
52655617 let new_range = Range::new(anchor, anchor + output_len).with_direction(range.direction());
52665618 ranges.push(new_range);
5267− 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");
52685624
52695625 changes.push((from, to, Some(output)));
52705626 }
@@ -5286,7 +5642,7 @@ fn shell_prompt(cx: &mut Context, prompt: Cow<'static, str>, behavior: ShellBeha
52865642 cx,
52875643 prompt,
52885644 Some('|'),
5289− ui::completers::none,
5645+ ui::completers::filename,
52905646 move |cx, input: &str, event: PromptEvent| {
52915647 if event != PromptEvent::Validate {
52925648 return;
@@ -5403,6 +5759,7 @@ fn increment_impl(cx: &mut Context, increment_direction: IncrementDirection) {
54035759 let transaction = Transaction::change(doc.text(), changes.into_iter());
54045760 let transaction = transaction.with_selection(new_selection);
54055761 doc.apply(&transaction, view.id);
5762+ exit_select_mode(cx);
54065763 }
54075764}
54085765
@@ -5421,9 +5778,12 @@ fn record_macro(cx: &mut Context) {
54215778 }
54225779 })
54235780 .collect::<String>();
5424− cx.editor.registers.write(reg, vec![s]);
5425− cx.editor
5426− .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+ }
54275787 } else {
54285788 let reg = cx.register.take().unwrap_or('@');
54295789 cx.editor.macro_recording = Some((reg, Vec::new()));
@@ -5443,8 +5803,14 @@ fn replay_macro(cx: &mut Context) {
54435803 return;
54445804 }
54455805
5446− let keys: Vec<KeyEvent> = if let Some([keys_str]) = cx.editor.registers.read(reg) {
5447− 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) {
54485814 Ok(keys) => keys,
54495815 Err(err) => {
54505816 cx.editor.set_error(format!("Invalid macro: {}", err));