@@ -23,17 +23,17 @@ use helix_core::{
2323 regex::{self, Regex, RegexBuilder},
2424 search::{self, CharMatcher},
2525 selection, shellwords, surround,
26+ syntax::LanguageServerFeature,
2627 text_annotations::TextAnnotations,
2728 textobject,
2829 tree_sitter::Node,
2930 unicode::width::UnicodeWidthChar,
3031 visual_offset_from_block, Deletion, LineEnding, Position, Range, Rope, RopeGraphemes,
31− RopeSlice, Selection, SmallVec, Tendril, Transaction,
32+ RopeReader, RopeSlice, Selection, SmallVec, Tendril, Transaction,
3233};
3334use helix_view::{
34− clipboard::ClipboardType,
3535 document::{FormatterError, Mode, SCRATCH_BUFFER_NAME},
36− editor::{Action, CompleteAction, Motion},
36+ editor::{Action, CompleteAction},
3737 info::Info,
3838 input::KeyEvent,
3939 keyboard::KeyCode,
@@ -43,7 +43,6 @@ use helix_view::{
4343};
4444
4545use anyhow::{anyhow, bail, ensure, Context as _};
46−use fuzzy_matcher::FuzzyMatcher;
4746use insert::*;
4847use movement::Movement;
4948
@@ -54,15 +53,20 @@ use crate::{
5453 job::Callback,
5554 keymap::ReverseKeymap,
5655 ui::{
57− self, editor::InsertEvent, lsp::SignatureHelp, overlay::overlaid, FilePicker, Picker,
56+ self, editor::InsertEvent, lsp::SignatureHelp, overlay::overlaid, CompletionItem, Picker,
5857 Popup, Prompt, PromptEvent,
5958 },
6059};
6160
6261use crate::job::{self, Jobs};
63−use futures_util::StreamExt;
64−use std::{collections::HashMap, fmt, future::Future};
65−use std::{collections::HashSet, num::NonZeroUsize};
62+use futures_util::{stream::FuturesUnordered, TryStreamExt};
63+use std::{
64+ collections::{HashMap, HashSet},
65+ fmt,
66+ future::Future,
67+ io::Read,
68+ num::NonZeroUsize,
69+};
6670
6771use std::{
6872 borrow::Cow,
@@ -71,11 +75,11 @@ use std::{
7175
7276use once_cell::sync::Lazy;
7377use serde::de::{self, Deserialize, Deserializer};
78+use url::Url;
7479
7580use grep_regex::RegexMatcherBuilder;
7681use grep_searcher::{sinks, BinaryDetection, SearcherBuilder};
7782use ignore::{DirEntry, WalkBuilder, WalkState};
78−use tokio_stream::wrappers::UnboundedReceiverStream;
7983
8084pub type OnKeyCallback = Box<dyn FnOnce(&mut Context, KeyEvent)>;
8185
@@ -246,6 +250,9 @@ impl MappableCommand {
246250 move_next_long_word_start, "Move to start of next long word",
247251 move_prev_long_word_start, "Move to start of previous long word",
248252 move_next_long_word_end, "Move to end of next long word",
253+ move_prev_long_word_end, "Move to end of previous long word",
254+ move_parent_node_end, "Move to end of the parent node",
255+ move_parent_node_start, "Move to beginning of the parent node",
249256 extend_next_word_start, "Extend to start of next word",
250257 extend_prev_word_start, "Extend to start of previous word",
251258 extend_next_word_end, "Extend to end of next word",
@@ -253,6 +260,9 @@ impl MappableCommand {
253260 extend_next_long_word_start, "Extend to start of next long word",
254261 extend_prev_long_word_start, "Extend to start of previous long word",
255262 extend_next_long_word_end, "Extend to end of next long word",
263+ extend_prev_long_word_end, "Extend to end of prev long word",
264+ extend_parent_node_end, "Extend to end of the parent node",
265+ extend_parent_node_start, "Extend to beginning of the parent node",
256266 find_till_char, "Move till next occurrence of char",
257267 find_next_char, "Move to next occurrence of char",
258268 extend_till_char, "Extend till next occurrence of char",
@@ -274,6 +284,7 @@ impl MappableCommand {
274284 select_regex, "Select all regex matches inside selections",
275285 split_selection, "Split selections on regex matches",
276286 split_selection_on_newline, "Split selection on newlines",
287+ merge_selections, "Merge selections",
277288 merge_consecutive_selections, "Merge consecutive selections",
278289 search, "Search for regex pattern",
279290 rsearch, "Reverse search for regex pattern",
@@ -326,7 +337,7 @@ impl MappableCommand {
326337 goto_implementation, "Goto implementation",
327338 goto_file_start, "Goto line number <n> else file start",
328339 goto_file_end, "Goto file end",
329− goto_file, "Goto files in selection",
340+ goto_file, "Goto files/URLs in selection",
330341 goto_file_hsplit, "Goto files in selection (hsplit)",
331342 goto_file_vsplit, "Goto files in selection (vsplit)",
332343 goto_reference, "Goto references",
@@ -358,6 +369,7 @@ impl MappableCommand {
358369 extend_to_line_end, "Extend to line end",
359370 extend_to_line_end_newline, "Extend to line end",
360371 signature_help, "Show signature help",
372+ smart_tab, "Insert tab if all cursors have all whitespace to their left; otherwise, run a separate command.",
361373 insert_tab, "Insert tab char",
362374 insert_newline, "Insert newline char",
363375 delete_char_backward, "Delete previous char",
@@ -372,6 +384,9 @@ impl MappableCommand {
372384 later, "Move forward in history",
373385 commit_undo_checkpoint, "Commit changes to new checkpoint",
374386 yank, "Yank selection",
387+ yank_to_clipboard, "Yank selections to clipboard",
388+ yank_to_primary_clipboard, "Yank selections to primary clipboard",
389+ yank_joined, "Join and yank selections",
375390 yank_joined_to_clipboard, "Join and yank selections to clipboard",
376391 yank_main_selection_to_clipboard, "Yank main selection to clipboard",
377392 yank_joined_to_primary_clipboard, "Join and yank selections to primary clipboard",
@@ -402,6 +417,7 @@ impl MappableCommand {
402417 rotate_selections_backward, "Rotate selections backward",
403418 rotate_selection_contents_forward, "Rotate selection contents forward",
404419 rotate_selection_contents_backward, "Rotate selections contents backward",
420+ reverse_selection_contents, "Reverse selections contents",
405421 expand_selection, "Expand selection to parent syntax node",
406422 shrink_selection, "Shrink selection to previously expanded syntax node",
407423 select_next_sibling, "Select next sibling in syntax tree",
@@ -974,6 +990,7 @@ fn align_selections(cx: &mut Context) {
974990
975991 let transaction = Transaction::change(doc.text(), changes.into_iter());
976992 doc.apply(&transaction, view.id);
993+ exit_select_mode(cx);
977994}
978995
979996fn goto_window(cx: &mut Context, align: Align) {
@@ -1065,6 +1082,10 @@ fn move_prev_long_word_start(cx: &mut Context) {
10651082 move_word_impl(cx, movement::move_prev_long_word_start)
10661083}
10671084
1085+fn move_prev_long_word_end(cx: &mut Context) {
1086+ move_word_impl(cx, movement::move_prev_long_word_end)
1087+}
1088+
10681089fn move_next_long_word_end(cx: &mut Context) {
10691090 move_word_impl(cx, movement::move_next_long_word_end)
10701091}
@@ -1089,8 +1110,7 @@ where
10891110 .transform(|range| move_fn(text, range, count, behavior));
10901111 doc.set_selection(view.id, selection);
10911112 };
1092− motion(cx.editor);
1093− cx.editor.last_motion = Some(Motion(Box::new(motion)));
1113+ cx.editor.apply_motion(motion)
10941114}
10951115
10961116fn goto_prev_paragraph(cx: &mut Context) {
@@ -1145,6 +1165,10 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
11451165 let (view, doc) = current_ref!(cx.editor);
11461166 let text = doc.text();
11471167 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();
11481172 let mut paths: Vec<_> = selections
11491173 .iter()
11501174 .map(|r| text.slice(r.from()..r.to()).to_string())
@@ -1172,16 +1196,80 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
11721196 .to_string(),
11731197 );
11741198 }
1199+
11751200 for sel in paths {
11761201 let p = sel.trim();
1177− if !p.is_empty() {
1178− 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) {
11791250 cx.editor.set_error(format!("Open file failed: {:?}", e));
11801251 }
11811252 }
11821253 }
11831254}
11841255
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+
11851273fn extend_word_impl<F>(cx: &mut Context, extend_fn: F)
11861274where
11871275 F: Fn(RopeSlice, Range, usize) -> Range,
@@ -1222,14 +1310,74 @@ fn extend_prev_long_word_start(cx: &mut Context) {
12221310 extend_word_impl(cx, movement::move_prev_long_word_start)
12231311}
12241312
1313+fn extend_prev_long_word_end(cx: &mut Context) {
1314+ extend_word_impl(cx, movement::move_prev_long_word_end)
1315+}
1316+
12251317fn extend_next_long_word_end(cx: &mut Context) {
12261318 extend_word_impl(cx, movement::move_next_long_word_end)
12271319}
12281320
1229−fn will_find_char<F>(cx: &mut Context, search_fn: F, inclusive: bool, extend: bool)
1230−where
1231− F: Fn(RopeSlice, char, usize, usize, bool) -> Option<usize> + 'static,
1232−{
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) {
12331381 // TODO: count is reset to 1 before next key so we move it into the closure here.
12341382 // Would be nice to carry over.
12351383 let count = cx.count();
@@ -1242,13 +1390,9 @@ where
12421390 KeyEvent {
12431391 code: KeyCode::Enter,
12441392 ..
1245− } =>
1246− // TODO: this isn't quite correct when CRLF is involved.
1247− // This hack will work in most cases, since documents don't
1248− // usually mix line endings. But we should fix it eventually
1249− // anyway.
1250− {
1251− doc!(cx.editor).line_ending.as_str().chars().next().unwrap()
1393+ } => {
1394+ find_char_line_ending(cx, count, direction, inclusive, extend);
1395+ return;
12521396 }
12531397
12541398 KeyEvent {
@@ -1261,11 +1405,18 @@ where
12611405 } => ch,
12621406 _ => return,
12631407 };
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+ };
12641418
1265− find_char_impl(cx.editor, &search_fn, inclusive, extend, ch, count);
1266− cx.editor.last_motion = Some(Motion(Box::new(move |editor: &mut Editor| {
1267− find_char_impl(editor, &search_fn, inclusive, true, ch, 1);
1268− })));
1419+ cx.editor.apply_motion(motion);
12691420 })
12701421}
12711422
@@ -1344,46 +1495,39 @@ fn find_prev_char_impl(
13441495}
13451496
13461497fn find_till_char(cx: &mut Context) {
1347− will_find_char(cx, find_next_char_impl, false, false)
1498+ find_char(cx, Direction::Forward, false, false);
13481499}
13491500
13501501fn find_next_char(cx: &mut Context) {
1351− will_find_char(cx, find_next_char_impl, true, false)
1502+ find_char(cx, Direction::Forward, true, false)
13521503}
13531504
13541505fn extend_till_char(cx: &mut Context) {
1355− will_find_char(cx, find_next_char_impl, false, true)
1506+ find_char(cx, Direction::Forward, false, true)
13561507}
13571508
13581509fn extend_next_char(cx: &mut Context) {
1359− will_find_char(cx, find_next_char_impl, true, true)
1510+ find_char(cx, Direction::Forward, true, true)
13601511}
13611512
13621513fn till_prev_char(cx: &mut Context) {
1363− will_find_char(cx, find_prev_char_impl, false, false)
1514+ find_char(cx, Direction::Backward, false, false)
13641515}
13651516
13661517fn find_prev_char(cx: &mut Context) {
1367− will_find_char(cx, find_prev_char_impl, true, false)
1518+ find_char(cx, Direction::Backward, true, false)
13681519}
13691520
13701521fn extend_till_prev_char(cx: &mut Context) {
1371− will_find_char(cx, find_prev_char_impl, false, true)
1522+ find_char(cx, Direction::Backward, false, true)
13721523}
13731524
13741525fn extend_prev_char(cx: &mut Context) {
1375− will_find_char(cx, find_prev_char_impl, true, true)
1526+ find_char(cx, Direction::Backward, true, true)
13761527}
13771528
13781529fn repeat_last_motion(cx: &mut Context) {
1379− let count = cx.count();
1380− let last_motion = cx.editor.last_motion.take();
1381− if let Some(m) = &last_motion {
1382− for _ in 0..count {
1383− m.run(cx.editor);
1384− }
1385− cx.editor.last_motion = last_motion;
1386− }
1530+ cx.editor.repeat_last_motion(cx.count())
13871531}
13881532
13891533fn replace(cx: &mut Context) {
@@ -1450,6 +1594,7 @@ where
14501594 });
14511595
14521596 doc.apply(&transaction, view.id);
1597+ exit_select_mode(cx);
14531598}
14541599
14551600fn switch_case(cx: &mut Context) {
@@ -1691,8 +1836,8 @@ fn select_regex(cx: &mut Context) {
16911836 "select:".into(),
16921837 Some(reg),
16931838 ui::completers::none,
1694− move |editor, regex, event| {
1695− let (view, doc) = current!(editor);
1839+ move |cx, regex, event| {
1840+ let (view, doc) = current!(cx.editor);
16961841 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
16971842 return;
16981843 }
@@ -1713,8 +1858,8 @@ fn split_selection(cx: &mut Context) {
17131858 "split:".into(),
17141859 Some(reg),
17151860 ui::completers::none,
1716− move |editor, regex, event| {
1717− let (view, doc) = current!(editor);
1861+ move |cx, regex, event| {
1862+ let (view, doc) = current!(cx.editor);
17181863 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
17191864 return;
17201865 }
@@ -1736,6 +1881,12 @@ fn split_selection_on_newline(cx: &mut Context) {
17361881 doc.set_selection(view.id, selection);
17371882}
17381883
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+
17391890fn merge_consecutive_selections(cx: &mut Context) {
17401891 let (view, doc) = current!(cx.editor);
17411892 let selection = doc.selection(view.id).clone().merge_consecutive_ranges();
@@ -1831,11 +1982,11 @@ fn search_impl(
18311982
18321983fn search_completions(cx: &mut Context, reg: Option<char>) -> Vec<String> {
18331984 let mut items = reg
1834− .and_then(|reg| cx.editor.registers.get(reg))
1835− .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());
18361987 items.sort_unstable();
18371988 items.dedup();
1838− items.into_iter().cloned().collect()
1989+ items.into_iter().map(|value| value.to_string()).collect()
18391990}
18401991
18411992fn search(cx: &mut Context) {
@@ -1872,12 +2023,14 @@ fn searcher(cx: &mut Context, direction: Direction) {
18722023 .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone())))
18732024 .collect()
18742025 },
1875− move |editor, regex, event| {
1876− 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 {
18772030 return;
18782031 }
18792032 search_impl(
1880− editor,
2033+ cx.editor,
18812034 &contents,
18822035 ®ex,
18832036 Movement::Move,
@@ -1892,11 +2045,13 @@ fn searcher(cx: &mut Context, direction: Direction) {
18922045
18932046fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Direction) {
18942047 let count = cx.count();
2048+ let register = cx
2049+ .register
2050+ .unwrap_or(cx.editor.registers.last_search_register);
18952051 let config = cx.editor.config();
18962052 let scrolloff = config.scrolloff;
1897− let (_, doc) = current!(cx.editor);
1898− let registers = &cx.editor.registers;
1899− 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);
19002055 let contents = doc.text().slice(..).to_string();
19012056 let search_config = &config.search;
19022057 let case_insensitive = if search_config.smart_case {
@@ -1905,7 +2060,7 @@ fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Dir
19052060 false
19062061 };
19072062 let wrap_around = search_config.wrap_around;
1908− if let Ok(regex) = RegexBuilder::new(query)
2063+ if let Ok(regex) = RegexBuilder::new(&query)
19092064 .case_insensitive(case_insensitive)
19102065 .multi_line(true)
19112066 .build()
@@ -1945,6 +2100,7 @@ fn extend_search_prev(cx: &mut Context) {
19452100}
19462101
19472102fn search_selection(cx: &mut Context) {
2103+ let register = cx.register.unwrap_or('/');
19482104 let (view, doc) = current!(cx.editor);
19492105 let contents = doc.text().slice(..);
19502106
@@ -1957,13 +2113,24 @@ fn search_selection(cx: &mut Context) {
19572113 .collect::<Vec<_>>()
19582114 .join("|");
19592115
1960− let msg = format!("register '{}' set to '{}'", '/', ®ex);
1961− cx.editor.registers.push('/', regex);
1962− 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+ }
19632124}
19642125
19652126fn make_search_word_bounded(cx: &mut Context) {
1966− 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) {
19672134 Some(regex) => regex,
19682135 None => return,
19692136 };
@@ -1981,14 +2148,19 @@ fn make_search_word_bounded(cx: &mut Context) {
19812148 if !start_anchored {
19822149 new_regex.push_str("\\b");
19832150 }
1984− new_regex.push_str(regex);
2151+ new_regex.push_str(®ex);
19852152 if !end_anchored {
19862153 new_regex.push_str("\\b");
19872154 }
19882155
1989− let msg = format!("register '{}' set to '{}'", '/', &new_regex);
1990− cx.editor.registers.push('/', new_regex);
1991− 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+ }
19922164}
19932165
19942166fn global_search(cx: &mut Context) {
@@ -2027,13 +2199,11 @@ fn global_search(cx: &mut Context) {
20272199 }
20282200 }
20292201
2030− let (all_matches_sx, all_matches_rx) = tokio::sync::mpsc::unbounded_channel::<FileResult>();
20312202 let config = cx.editor.config();
20322203 let smart_case = config.search.smart_case;
20332204 let file_picker_config = config.file_picker.clone();
20342205
20352206 let reg = cx.register.unwrap_or('/');
2036−
20372207 let completions = search_completions(cx, Some(reg));
20382208 ui::regex_prompt(
20392209 cx,
@@ -2046,43 +2216,67 @@ fn global_search(cx: &mut Context) {
20462216 .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone())))
20472217 .collect()
20482218 },
2049− move |_editor, regex, event| {
2219+ move |cx, regex, event| {
20502220 if event != PromptEvent::Validate {
20512221 return;
20522222 }
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();
20532231
20542232 if let Ok(matcher) = RegexMatcherBuilder::new()
20552233 .case_smart(smart_case)
20562234 .build(regex.as_str())
20572235 {
2058− let searcher = SearcherBuilder::new()
2059− .binary_detection(BinaryDetection::quit(b'\x00'))
2060− .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);
20612244
2062− let search_root = std::env::current_dir()
2063− .expect("Global search error: Failed to get current dir");
20642245 let dedup_symlinks = file_picker_config.deduplicate_links;
20652246 let absolute_root = search_root
20662247 .canonicalize()
20672248 .unwrap_or_else(|_| search_root.clone());
2068−
2069− WalkBuilder::new(search_root)
2070− .hidden(file_picker_config.hidden)
2071− .parents(file_picker_config.parents)
2072− .ignore(file_picker_config.ignore)
2073− .follow_links(file_picker_config.follow_symlinks)
2074− .git_ignore(file_picker_config.git_ignore)
2075− .git_global(file_picker_config.git_global)
2076− .git_exclude(file_picker_config.git_exclude)
2077− .max_depth(file_picker_config.max_depth)
2078− .filter_entry(move |entry| {
2079− filter_picker_entry(entry, &absolute_root, dedup_symlinks)
2080− })
2081− .build_parallel()
2082− .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(|| {
20832276 let mut searcher = searcher.clone();
20842277 let matcher = matcher.clone();
2085− let all_matches_sx = all_matches_sx.clone();
2278+ let injector = injector_.clone();
2279+ let documents = &documents;
20862280 Box::new(move |entry: Result<DirEntry, ignore::Error>| -> WalkState {
20872281 let entry = match entry {
20882282 Ok(entry) => entry,
@@ -2095,17 +2289,39 @@ fn global_search(cx: &mut Context) {
20952289 _ => return WalkState::Continue,
20962290 };
20972291
2098− let result = searcher.search_path(
2099− &matcher,
2100− entry.path(),
2101− sinks::UTF8(|line_num, _| {
2102− all_matches_sx
2103− .send(FileResult::new(entry.path(), line_num as usize - 1))
2104− .unwrap();
2105−
2106− Ok(true)
2107− }),
2108− );
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+ };
21092325
21102326 if let Err(err) = result {
21112327 log::error!(
@@ -2114,67 +2330,66 @@ fn global_search(cx: &mut Context) {
21142330 err
21152331 );
21162332 }
2117− WalkState::Continue
2333+ if stop {
2334+ WalkState::Quit
2335+ } else {
2336+ WalkState::Continue
2337+ }
21182338 })
21192339 });
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+ })
21202387 } else {
21212388 // Otherwise do nothing
21222389 // log::warn!("Global Search Invalid Pattern")
21232390 }
21242391 },
21252392 );
2126−
2127− let current_path = doc_mut!(cx.editor).path().cloned();
2128−
2129− let show_picker = async move {
2130− let all_matches: Vec<FileResult> =
2131− UnboundedReceiverStream::new(all_matches_rx).collect().await;
2132− let call: job::Callback = Callback::EditorCompositor(Box::new(
2133− move |editor: &mut Editor, compositor: &mut Compositor| {
2134− if all_matches.is_empty() {
2135− editor.set_status("No matches found");
2136− return;
2137− }
2138−
2139− let picker = FilePicker::new(
2140− all_matches,
2141− current_path,
2142− move |cx, FileResult { path, line_num }, action| {
2143− match cx.editor.open(path, action) {
2144− Ok(_) => {}
2145− Err(e) => {
2146− cx.editor.set_error(format!(
2147− "Failed to open file '{}': {}",
2148− path.display(),
2149− e
2150− ));
2151− return;
2152− }
2153− }
2154−
2155− let line_num = *line_num;
2156− let (view, doc) = current!(cx.editor);
2157− let text = doc.text();
2158− if line_num >= text.len_lines() {
2159− cx.editor.set_error("The line you jumped to does not exist anymore because the file has changed.");
2160− return;
2161− }
2162− let start = text.line_to_char(line_num);
2163− let end = text.line_to_char((line_num + 1).min(text.len_lines()));
2164−
2165− doc.set_selection(view.id, Selection::single(start, end));
2166− align_view(doc, view, Align::Center);
2167− },
2168− |_editor, FileResult { path, line_num }| {
2169− Some((path.clone().into(), Some((*line_num, *line_num))))
2170− },
2171− );
2172− compositor.push(Box::new(overlaid(picker)));
2173− },
2174− ));
2175− Ok(call)
2176− };
2177− cx.jobs.callback(show_picker);
21782393}
21792394
21802395enum Extend {
@@ -2297,17 +2512,35 @@ enum Operation {
22972512 Change,
22982513}
22992514
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+
23002529fn delete_selection_impl(cx: &mut Context, op: Operation) {
23012530 let (view, doc) = current!(cx.editor);
23022531
23032532 let selection = doc.selection(view.id);
2533+ let only_whole_lines = selection_is_linewise(selection, doc.text());
23042534
23052535 if cx.register != Some('_') {
23062536 // first yank the selection
23072537 let text = doc.text().slice(..);
23082538 let values: Vec<String> = selection.fragments(text).map(Cow::into_owned).collect();
23092539 let reg_name = cx.register.unwrap_or('"');
2310− 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+ }
23112544 };
23122545
23132546 // then delete
@@ -2321,7 +2554,11 @@ fn delete_selection_impl(cx: &mut Context, op: Operation) {
23212554 exit_select_mode(cx);
23222555 }
23232556 Operation::Change => {
2324− enter_insert_mode(cx);
2557+ if only_whole_lines {
2558+ open_above(cx);
2559+ } else {
2560+ enter_insert_mode(cx);
2561+ }
23252562 }
23262563 }
23272564}
@@ -2443,6 +2680,10 @@ fn insert_mode(cx: &mut Context) {
24432680 .transform(|range| Range::new(range.to(), range.from()));
24442681
24452682 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();
24462687}
24472688
24482689// inserts at the end of each selection
@@ -2479,6 +2720,10 @@ fn append_mode(cx: &mut Context) {
24792720
24802721fn file_picker(cx: &mut Context) {
24812722 let root = find_workspace().0;
2723+ if !root.exists() {
2724+ cx.editor.set_error("Workspace directory does not exist");
2725+ return;
2726+ }
24822727 let picker = ui::file_picker(root, &cx.editor.config());
24832728 cx.push_layer(Box::new(overlaid(picker)));
24842729}
@@ -2499,8 +2744,14 @@ fn file_picker_in_current_buffer_directory(cx: &mut Context) {
24992744 let picker = ui::file_picker(path, &cx.editor.config());
25002745 cx.push_layer(Box::new(overlaid(picker)));
25012746}
2747+
25022748fn file_picker_in_current_directory(cx: &mut Context) {
2503− 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+ }
25042755 let picker = ui::file_picker(cwd, &cx.editor.config());
25052756 cx.push_layer(Box::new(overlaid(picker)));
25062757}
@@ -2559,22 +2810,18 @@ fn buffer_picker(cx: &mut Context) {
25592810 // mru
25602811 items.sort_unstable_by_key(|item| std::cmp::Reverse(item.focused_at));
25612812
2562− let picker = FilePicker::new(
2563− items,
2564− (),
2565− |cx, meta, action| {
2566− cx.editor.switch(meta.id, action);
2567− },
2568− |editor, meta| {
2569− let doc = &editor.documents.get(&meta.id)?;
2570− let &view_id = doc.selections().keys().next()?;
2571− let line = doc
2572− .selection(view_id)
2573− .primary()
2574− .cursor_line(doc.text().slice(..));
2575− Some((meta.id.into(), Some((line, line))))
2576− },
2577− );
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+ });
25782825 cx.push_layer(Box::new(overlaid(picker)));
25792826}
25802827
@@ -2640,7 +2887,7 @@ fn jumplist_picker(cx: &mut Context) {
26402887 }
26412888 };
26422889
2643− let picker = FilePicker::new(
2890+ let picker = Picker::new(
26442891 cx.editor
26452892 .tree
26462893 .views()
@@ -2654,16 +2901,18 @@ fn jumplist_picker(cx: &mut Context) {
26542901 |cx, meta, action| {
26552902 cx.editor.switch(meta.id, action);
26562903 let config = cx.editor.config();
2657− let (view, doc) = current!(cx.editor);
2904+ let (view, doc) = (view_mut!(cx.editor), doc_mut!(cx.editor, &meta.id));
26582905 doc.set_selection(view.id, meta.selection.clone());
2659− view.ensure_cursor_in_view_center(doc, config.scrolloff);
2660− },
2661− |editor, meta| {
2662− let doc = &editor.documents.get(&meta.id)?;
2663− let line = meta.selection.primary().cursor_line(doc.text().slice(..));
2664− 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+ }
26652909 },
2666− );
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+ });
26672916 cx.push_layer(Box::new(overlaid(picker)));
26682917}
26692918
@@ -2697,6 +2946,9 @@ impl ui::menu::Item for MappableCommand {
26972946}
26982947
26992948pub fn command_palette(cx: &mut Context) {
2949+ let register = cx.register;
2950+ let count = cx.count;
2951+
27002952 cx.callback = Some(Box::new(
27012953 move |compositor: &mut Compositor, cx: &mut compositor::Context| {
27022954 let keymap = compositor.find::<ui::EditorView>().unwrap().keymaps.map()
@@ -2714,8 +2966,8 @@ pub fn command_palette(cx: &mut Context) {
27142966
27152967 let picker = Picker::new(commands, keymap, move |cx, command, _action| {
27162968 let mut ctx = Context {
2717− register: None,
2718− count: std::num::NonZeroUsize::new(1),
2969+ register,
2970+ count,
27192971 editor: cx.editor,
27202972 callback: None,
27212973 on_next_key_callback: None,
@@ -2754,24 +3006,88 @@ fn last_picker(cx: &mut Context) {
27543006 }));
27553007}
27563008
2757−// 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.
27583017fn insert_at_line_start(cx: &mut Context) {
2759− goto_first_nonwhitespace(cx);
2760− enter_insert_mode(cx);
3018+ insert_with_indent(cx, IndentFallbackPos::LineStart);
27613019}
27623020
2763−// 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.
27643023fn 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) {
27653030 enter_insert_mode(cx);
3031+
27663032 let (view, doc) = current!(cx.editor);
27673033
2768− let selection = doc.selection(view.id).clone().transform(|range| {
2769− let text = doc.text().slice(..);
2770− let line = range.cursor_line(text);
2771− let pos = line_end_char_index(&text, line);
2772− 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+ }
27733087 });
2774− doc.set_selection(view.id, selection);
3088+
3089+ transaction = transaction.with_selection(Selection::new(ranges, selection.primary_index()));
3090+ doc.apply(&transaction, view.id);
27753091}
27763092
27773093// Creates an LspCallback that waits for formatting changes to be computed. When they're done,
@@ -2842,6 +3158,7 @@ fn open(cx: &mut Context, open: Open) {
28423158 Open::Below => graphemes::prev_grapheme_boundary(text, range.to()),
28433159 Open::Above => range.from(),
28443160 });
3161+
28453162 let new_line = match open {
28463163 // adjust position to the end of the line (next line - 1)
28473164 Open::Below => cursor_line + 1,
@@ -2849,13 +3166,15 @@ fn open(cx: &mut Context, open: Open) {
28493166 Open::Above => cursor_line,
28503167 };
28513168
3169+ let line_num = new_line.saturating_sub(1);
3170+
28523171 // Index to insert newlines after, as well as the char width
28533172 // to use to compensate for those inserted newlines.
28543173 let (line_end_index, line_end_offset_width) = if new_line == 0 {
28553174 (0, 0)
28563175 } else {
28573176 (
2858− line_end_char_index(&doc.text().slice(..), new_line.saturating_sub(1)),
3177+ line_end_char_index(&text, line_num),
28593178 doc.line_ending.len_chars(),
28603179 )
28613180 };
@@ -2863,13 +3182,15 @@ fn open(cx: &mut Context, open: Open) {
28633182 let indent = indent::indent_for_newline(
28643183 doc.language_config(),
28653184 doc.syntax(),
3185+ &doc.config.load().indent_heuristic,
28663186 &doc.indent_style,
28673187 doc.tab_width(),
28683188 text,
2869− new_line.saturating_sub(1),
3189+ line_num,
28703190 line_end_index,
28713191 cursor_line,
28723192 );
3193+
28733194 let indent_len = indent.len();
28743195 let mut text = String::with_capacity(1 + indent_len);
28753196 text.push_str(doc.line_ending.as_str());
@@ -3029,7 +3350,7 @@ fn exit_select_mode(cx: &mut Context) {
30293350
30303351fn goto_first_diag(cx: &mut Context) {
30313352 let (view, doc) = current!(cx.editor);
3032− let selection = match doc.diagnostics().first() {
3353+ let selection = match doc.shown_diagnostics().next() {
30333354 Some(diag) => Selection::single(diag.range.start, diag.range.end),
30343355 None => return,
30353356 };
@@ -3038,7 +3359,7 @@ fn goto_first_diag(cx: &mut Context) {
30383359
30393360fn goto_last_diag(cx: &mut Context) {
30403361 let (view, doc) = current!(cx.editor);
3041− let selection = match doc.diagnostics().last() {
3362+ let selection = match doc.shown_diagnostics().last() {
30423363 Some(diag) => Selection::single(diag.range.start, diag.range.end),
30433364 None => return,
30443365 };
@@ -3054,10 +3375,9 @@ fn goto_next_diag(cx: &mut Context) {
30543375 .cursor(doc.text().slice(..));
30553376
30563377 let diag = doc
3057− .diagnostics()
3058− .iter()
3378+ .shown_diagnostics()
30593379 .find(|diag| diag.range.start > cursor_pos)
3060− .or_else(|| doc.diagnostics().first());
3380+ .or_else(|| doc.shown_diagnostics().next());
30613381
30623382 let selection = match diag {
30633383 Some(diag) => Selection::single(diag.range.start, diag.range.end),
@@ -3075,11 +3395,10 @@ fn goto_prev_diag(cx: &mut Context) {
30753395 .cursor(doc.text().slice(..));
30763396
30773397 let diag = doc
3078− .diagnostics()
3079− .iter()
3398+ .shown_diagnostics()
30803399 .rev()
30813400 .find(|diag| diag.range.start < cursor_pos)
3082− .or_else(|| doc.diagnostics().last());
3401+ .or_else(|| doc.shown_diagnostics().last());
30833402
30843403 let selection = match diag {
30853404 // NOTE: the selection is reversed because we're jumping to the
@@ -3170,8 +3489,7 @@ fn goto_next_change_impl(cx: &mut Context, direction: Direction) {
31703489
31713490 doc.set_selection(view.id, selection)
31723491 };
3173− motion(cx.editor);
3174− cx.editor.last_motion = Some(Motion(Box::new(motion)));
3492+ cx.editor.apply_motion(motion);
31753493}
31763494
31773495/// Returns the [Range] for a [Hunk] in the given text.
@@ -3234,23 +3552,19 @@ pub mod insert {
32343552 use helix_lsp::lsp;
32353553 // if ch matches completion char, trigger completion
32363554 let doc = doc_mut!(cx.editor);
3237− let language_server = match doc.language_server() {
3238− Some(language_server) => language_server,
3239− None => return,
3240− };
3241−
3242− let capabilities = language_server.capabilities();
3555+ let trigger_completion = doc
3556+ .language_servers_with_feature(LanguageServerFeature::Completion)
3557+ .any(|ls| {
3558+ // TODO: what if trigger is multiple chars long
3559+ matches!(&ls.capabilities().completion_provider, Some(lsp::CompletionOptions {
3560+ trigger_characters: Some(triggers),
3561+ ..
3562+ }) if triggers.iter().any(|trigger| trigger.contains(ch)))
3563+ });
32433564
3244− if let Some(lsp::CompletionOptions {
3245− trigger_characters: Some(triggers),
3246− ..
3247− }) = &capabilities.completion_provider
3248− {
3249− // TODO: what if trigger is multiple chars long
3250− if triggers.iter().any(|trigger| trigger.contains(ch)) {
3251− cx.editor.clear_idle_timer();
3252− super::completion(cx);
3253− }
3565+ if trigger_completion {
3566+ cx.editor.clear_idle_timer();
3567+ super::completion(cx);
32543568 }
32553569 }
32563570
@@ -3258,12 +3572,12 @@ pub mod insert {
32583572 use helix_lsp::lsp;
32593573 // if ch matches signature_help char, trigger
32603574 let doc = doc_mut!(cx.editor);
3261− // The language_server!() macro is not used here since it will
3262− // print an "LSP not active for current buffer" message on
3263− // every keypress.
3264− let language_server = match doc.language_server() {
3265− Some(language_server) => language_server,
3266− None => return,
3575+ // TODO support multiple language servers (not just the first that is found), likely by merging UI somehow
3576+ let Some(language_server) = doc
3577+ .language_servers_with_feature(LanguageServerFeature::SignatureHelp)
3578+ .next()
3579+ else {
3580+ return;
32673581 };
32683582
32693583 let capabilities = language_server.capabilities();
@@ -3302,6 +3616,7 @@ pub mod insert {
33023616 }
33033617
33043618 use helix_core::auto_pairs;
3619+ use helix_view::editor::SmartTabConfig;
33053620
33063621 pub fn insert_char(cx: &mut Context, c: char) {
33073622 let (view, doc) = current_ref!(cx.editor);
@@ -3327,6 +3642,31 @@ pub mod insert {
33273642 }
33283643 }
33293644
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+
33303670 pub fn insert_tab(cx: &mut Context) {
33313671 let (view, doc) = current!(cx.editor);
33323672 // TODO: round out to nearest indentation level (for example a line with 3 spaces should
@@ -3382,6 +3722,7 @@ pub mod insert {
33823722 let indent = indent::indent_for_newline(
33833723 doc.language_config(),
33843724 doc.syntax(),
3725+ &doc.config.load().indent_heuristic,
33853726 &doc.indent_style,
33863727 doc.tab_width(),
33873728 text,
@@ -3622,34 +3963,21 @@ fn commit_undo_checkpoint(cx: &mut Context) {
36223963// Yank / Paste
36233964
36243965fn yank(cx: &mut Context) {
3625− let (view, doc) = current!(cx.editor);
3626− let text = doc.text().slice(..);
3627−
3628− let values: Vec<String> = doc
3629− .selection(view.id)
3630− .fragments(text)
3631− .map(Cow::into_owned)
3632− .collect();
3633−
3634− let msg = format!(
3635− "yanked {} selection(s) to register {}",
3636− values.len(),
3637− cx.register.unwrap_or('"')
3638− );
3966+ yank_impl(cx.editor, cx.register.unwrap_or('"'));
3967+ exit_select_mode(cx);
3968+}
36393969
3640− cx.editor
3641− .registers
3642− .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+}
36433974
3644− cx.editor.set_status(msg);
3975+fn yank_to_primary_clipboard(cx: &mut Context) {
3976+ yank_impl(cx.editor, '*');
36453977 exit_select_mode(cx);
36463978}
36473979
3648−fn yank_joined_to_clipboard_impl(
3649− editor: &mut Editor,
3650− separator: &str,
3651− clipboard_type: ClipboardType,
3652−) -> anyhow::Result<()> {
3980+fn yank_impl(editor: &mut Editor, register: char) {
36533981 let (view, doc) = current!(editor);
36543982 let text = doc.text().slice(..);
36553983
@@ -3658,74 +3986,79 @@ fn yank_joined_to_clipboard_impl(
36583986 .fragments(text)
36593987 .map(Cow::into_owned)
36603988 .collect();
3989+ let selections = values.len();
36613990
3662− let clipboard_text = match clipboard_type {
3663− ClipboardType::Clipboard => "system clipboard",
3664− ClipboardType::Selection => "primary clipboard",
3665− };
3666−
3667− let msg = format!(
3668− "joined and yanked {} selection(s) to {}",
3669− values.len(),
3670− clipboard_text,
3671− );
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+}
36723999
3673− 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(..);
36744003
3675− editor
3676− .clipboard_provider
3677− .set_contents(joined, clipboard_type)
3678− .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+ });
36794015
3680− 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+}
36814024
3682− 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);
36834029}
36844030
36854031fn yank_joined_to_clipboard(cx: &mut Context) {
36864032 let line_ending = doc!(cx.editor).line_ending;
3687− let _ =
3688− yank_joined_to_clipboard_impl(cx.editor, line_ending.as_str(), ClipboardType::Clipboard);
4033+ yank_joined_impl(cx.editor, line_ending.as_str(), '+');
36894034 exit_select_mode(cx);
36904035}
36914036
3692−fn yank_main_selection_to_clipboard_impl(
3693− editor: &mut Editor,
3694− clipboard_type: ClipboardType,
3695−) -> 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) {
36964044 let (view, doc) = current!(editor);
36974045 let text = doc.text().slice(..);
36984046
3699− let message_text = match clipboard_type {
3700− ClipboardType::Clipboard => "yanked main selection to system clipboard",
3701− ClipboardType::Selection => "yanked main selection to primary clipboard",
3702− };
4047+ let selection = doc.selection(view.id).primary().fragment(text).to_string();
37034048
3704− let value = doc.selection(view.id).primary().fragment(text);
3705−
3706− if let Err(e) = editor
3707− .clipboard_provider
3708− .set_contents(value.into_owned(), clipboard_type)
3709− {
3710− 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()),
37114052 }
3712−
3713− editor.set_status(message_text);
3714− Ok(())
37154053}
37164054
37174055fn yank_main_selection_to_clipboard(cx: &mut Context) {
3718− let _ = yank_main_selection_to_clipboard_impl(cx.editor, ClipboardType::Clipboard);
3719−}
3720−
3721−fn yank_joined_to_primary_clipboard(cx: &mut Context) {
3722− let line_ending = doc!(cx.editor).line_ending;
3723− let _ =
3724− 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);
37254058}
37264059
37274060fn yank_main_selection_to_primary_clipboard(cx: &mut Context) {
3728− let _ = yank_main_selection_to_clipboard_impl(cx.editor, ClipboardType::Selection);
4061+ yank_primary_selection_impl(cx.editor, '*');
37294062 exit_select_mode(cx);
37304063}
37314064
@@ -3823,146 +4156,99 @@ pub(crate) fn paste_bracketed_value(cx: &mut Context, contents: String) {
38234156 };
38244157 let (view, doc) = current!(cx.editor);
38254158 paste_impl(&[contents], doc, view, paste, count, cx.editor.mode);
3826−}
3827−
3828−fn paste_clipboard_impl(
3829− editor: &mut Editor,
3830− action: Paste,
3831− clipboard_type: ClipboardType,
3832− count: usize,
3833−) -> anyhow::Result<()> {
3834− let (view, doc) = current!(editor);
3835− match editor.clipboard_provider.get_contents(clipboard_type) {
3836− Ok(contents) => {
3837− paste_impl(&[contents], doc, view, action, count, editor.mode);
3838− Ok(())
3839− }
3840− Err(e) => Err(e.context("Couldn't get system clipboard contents")),
3841− }
4159+ exit_select_mode(cx);
38424160}
38434161
38444162fn paste_clipboard_after(cx: &mut Context) {
3845− let _ = paste_clipboard_impl(
3846− cx.editor,
3847− Paste::After,
3848− ClipboardType::Clipboard,
3849− cx.count(),
3850− );
4163+ paste(cx.editor, '+', Paste::After, cx.count());
4164+ exit_select_mode(cx);
38514165}
38524166
38534167fn paste_clipboard_before(cx: &mut Context) {
3854− let _ = paste_clipboard_impl(
3855− cx.editor,
3856− Paste::Before,
3857− ClipboardType::Clipboard,
3858− cx.count(),
3859− );
4168+ paste(cx.editor, '+', Paste::Before, cx.count());
4169+ exit_select_mode(cx);
38604170}
38614171
38624172fn paste_primary_clipboard_after(cx: &mut Context) {
3863− let _ = paste_clipboard_impl(
3864− cx.editor,
3865− Paste::After,
3866− ClipboardType::Selection,
3867− cx.count(),
3868− );
4173+ paste(cx.editor, '*', Paste::After, cx.count());
4174+ exit_select_mode(cx);
38694175}
38704176
38714177fn paste_primary_clipboard_before(cx: &mut Context) {
3872− let _ = paste_clipboard_impl(
3873− cx.editor,
3874− Paste::Before,
3875− ClipboardType::Selection,
3876− cx.count(),
3877− );
4178+ paste(cx.editor, '*', Paste::Before, cx.count());
4179+ exit_select_mode(cx);
38784180}
38794181
38804182fn replace_with_yanked(cx: &mut Context) {
3881− let count = cx.count();
3882− let reg_name = cx.register.unwrap_or('"');
3883− let (view, doc) = current!(cx.editor);
3884− let registers = &mut cx.editor.registers;
3885−
3886− if let Some(values) = registers.read(reg_name) {
3887− if !values.is_empty() {
3888− let repeat = std::iter::repeat(
3889− values
3890− .last()
3891− .map(|value| Tendril::from(&value.repeat(count)))
3892− .unwrap(),
3893− );
3894− let mut values = values
3895− .iter()
3896− .map(|value| Tendril::from(&value.repeat(count)))
3897− .chain(repeat);
3898− let selection = doc.selection(view.id);
3899− let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
3900− if !range.is_empty() {
3901− (range.from(), range.to(), Some(values.next().unwrap()))
3902− } else {
3903− (range.from(), range.to(), None)
3904− }
3905− });
3906−
3907− doc.apply(&transaction, view.id);
3908− exit_select_mode(cx);
3909− }
3910− }
4183+ replace_with_yanked_impl(cx.editor, cx.register.unwrap_or('"'), cx.count());
4184+ exit_select_mode(cx);
39114185}
39124186
3913−fn replace_selections_with_clipboard_impl(
3914− cx: &mut Context,
3915− clipboard_type: ClipboardType,
3916−) -> anyhow::Result<()> {
3917− let count = cx.count();
3918− let (view, doc) = current!(cx.editor);
3919−
3920− match cx.editor.clipboard_provider.get_contents(clipboard_type) {
3921− Ok(contents) => {
3922− let selection = doc.selection(view.id);
3923− let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
3924− (
3925− range.from(),
3926− range.to(),
3927− Some(contents.repeat(count).as_str().into()),
3928− )
3929− });
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();
39304192
3931− doc.apply(&transaction, view.id);
3932− 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)
39334210 }
3934− Err(e) => return Err(e.context("Couldn't get system clipboard contents")),
3935− }
4211+ });
39364212
3937− exit_select_mode(cx);
3938− Ok(())
4213+ doc.apply(&transaction, view.id);
39394214}
39404215
39414216fn replace_selections_with_clipboard(cx: &mut Context) {
3942− let _ = replace_selections_with_clipboard_impl(cx, ClipboardType::Clipboard);
4217+ replace_with_yanked_impl(cx.editor, '+', cx.count());
4218+ exit_select_mode(cx);
39434219}
39444220
39454221fn replace_selections_with_primary_clipboard(cx: &mut Context) {
3946− let _ = replace_selections_with_clipboard_impl(cx, ClipboardType::Selection);
4222+ replace_with_yanked_impl(cx.editor, '*', cx.count());
4223+ exit_select_mode(cx);
39474224}
39484225
3949−fn paste(cx: &mut Context, pos: Paste) {
3950− let count = cx.count();
3951− let reg_name = cx.register.unwrap_or('"');
3952− let (view, doc) = current!(cx.editor);
3953− 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();
39544229
3955− if let Some(values) = registers.read(reg_name) {
3956− paste_impl(values, doc, view, pos, count, cx.editor.mode);
3957− }
4230+ let (view, doc) = current!(editor);
4231+ paste_impl(&values, doc, view, pos, count, editor.mode);
39584232}
39594233
39604234fn paste_after(cx: &mut Context) {
3961− 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);
39624242}
39634243
39644244fn paste_before(cx: &mut Context) {
3965− 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);
39664252}
39674253
39684254fn get_lines(doc: &Document, view_id: ViewId) -> Vec<usize> {
@@ -4001,6 +4287,7 @@ fn indent(cx: &mut Context) {
40014287 }),
40024288 );
40034289 doc.apply(&transaction, view.id);
4290+ exit_select_mode(cx);
40044291}
40054292
40064293fn unindent(cx: &mut Context) {
@@ -4040,71 +4327,76 @@ fn unindent(cx: &mut Context) {
40404327 let transaction = Transaction::change(doc.text(), changes.into_iter());
40414328
40424329 doc.apply(&transaction, view.id);
4330+ exit_select_mode(cx);
40434331}
40444332
40454333fn format_selections(cx: &mut Context) {
40464334 use helix_lsp::{lsp, util::range_to_lsp_range};
40474335
40484336 let (view, doc) = current!(cx.editor);
4337+ let view_id = view.id;
40494338
40504339 // via lsp if available
40514340 // TODO: else via tree-sitter indentation calculations
40524341
4053− let language_server = match doc.language_server() {
4054− Some(language_server) => language_server,
4055− None => return,
4342+ if doc.selection(view_id).len() != 1 {
4343+ cx.editor
4344+ .set_error("format_selections only supports a single selection for now");
4345+ return;
4346+ }
4347+
4348+ // TODO extra LanguageServerFeature::FormatSelections?
4349+ // maybe such that LanguageServerFeature::Format contains it as well
4350+ let Some(language_server) = doc
4351+ .language_servers_with_feature(LanguageServerFeature::Format)
4352+ .find(|ls| {
4353+ matches!(
4354+ ls.capabilities().document_range_formatting_provider,
4355+ Some(lsp::OneOf::Left(true) | lsp::OneOf::Right(_))
4356+ )
4357+ })
4358+ else {
4359+ cx.editor
4360+ .set_error("No configured language server supports range formatting");
4361+ return;
40564362 };
40574363
4364+ let offset_encoding = language_server.offset_encoding();
40584365 let ranges: Vec<lsp::Range> = doc
4059− .selection(view.id)
4366+ .selection(view_id)
40604367 .iter()
4061− .map(|range| range_to_lsp_range(doc.text(), *range, language_server.offset_encoding()))
4368+ .map(|range| range_to_lsp_range(doc.text(), *range, offset_encoding))
40624369 .collect();
40634370
4064− if ranges.len() != 1 {
4065− cx.editor
4066− .set_error("format_selections only supports a single selection for now");
4067− return;
4068− }
4069−
40704371 // TODO: handle fails
40714372 // TODO: concurrent map over all ranges
40724373
40734374 let range = ranges[0];
40744375
4075− let request = match language_server.text_document_range_formatting(
4076− doc.identifier(),
4077− range,
4078− lsp::FormattingOptions::default(),
4079− None,
4080− ) {
4081− Some(future) => future,
4082− None => {
4083− cx.editor
4084− .set_error("Language server does not support range formatting");
4085− return;
4086− }
4087− };
4376+ let future = language_server
4377+ .text_document_range_formatting(
4378+ doc.identifier(),
4379+ range,
4380+ lsp::FormattingOptions::default(),
4381+ None,
4382+ )
4383+ .unwrap();
40884384
4089− let edits = tokio::task::block_in_place(|| helix_lsp::block_on(request)).unwrap_or_default();
4385+ let edits = tokio::task::block_in_place(|| helix_lsp::block_on(future)).unwrap_or_default();
40904386
4091− let transaction = helix_lsp::util::generate_transaction_from_edits(
4092− doc.text(),
4093− edits,
4094− language_server.offset_encoding(),
4095− );
4387+ let transaction =
4388+ helix_lsp::util::generate_transaction_from_edits(doc.text(), edits, offset_encoding);
40964389
4097− doc.apply(&transaction, view.id);
4390+ doc.apply(&transaction, view_id);
40984391}
40994392
41004393fn join_selections_impl(cx: &mut Context, select_space: bool) {
41014394 use movement::skip_while;
41024395 let (view, doc) = current!(cx.editor);
41034396 let text = doc.text();
4104− let slice = doc.text().slice(..);
4397+ let slice = text.slice(..);
41054398
41064399 let mut changes = Vec::new();
4107− let fragment = Tendril::from(" ");
41084400
41094401 for selection in doc.selection(view.id) {
41104402 let (start, mut end) = selection.line_range(slice);
@@ -4120,9 +4412,13 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
41204412 let mut end = text.line_to_char(line + 1);
41214413 end = skip_while(slice, end, |ch| matches!(ch, ' ' | '\t')).unwrap_or(end);
41224414
4123− // need to skip from start, not end
4124− let change = (start, end, Some(fragment.clone()));
4125− 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));
41264422 }
41274423 }
41284424
@@ -4134,9 +4430,6 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
41344430 changes.sort_unstable_by_key(|(from, _to, _text)| *from);
41354431 changes.dedup();
41364432
4137− // TODO: joining multiple empty lines should be replaced by a single space.
4138− // need to merge change ranges that touch
4139−
41404433 // select inserted spaces
41414434 let transaction = if select_space {
41424435 let ranges: SmallVec<_> = changes
@@ -4148,9 +4441,9 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
41484441 })
41494442 .collect();
41504443 let selection = Selection::new(ranges, 0);
4151− Transaction::change(doc.text(), changes.into_iter()).with_selection(selection)
4444+ Transaction::change(text, changes.into_iter()).with_selection(selection)
41524445 } else {
4153− Transaction::change(doc.text(), changes.into_iter())
4446+ Transaction::change(text, changes.into_iter())
41544447 };
41554448
41564449 doc.apply(&transaction, view.id);
@@ -4164,8 +4457,8 @@ fn keep_or_remove_selections_impl(cx: &mut Context, remove: bool) {
41644457 if remove { "remove:" } else { "keep:" }.into(),
41654458 Some(reg),
41664459 ui::completers::none,
4167− move |editor, regex, event| {
4168− let (view, doc) = current!(editor);
4460+ move |cx, regex, event| {
4461+ let (view, doc) = current!(cx.editor);
41694462 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
41704463 return;
41714464 }
@@ -4231,21 +4524,46 @@ pub fn completion(cx: &mut Context) {
42314524 doc.savepoint(view)
42324525 };
42334526
4234− let language_server = match doc.language_server() {
4235− Some(language_server) => language_server,
4236− None => return,
4237− };
4238−
4239− let offset_encoding = language_server.offset_encoding();
42404527 let text = savepoint.text.clone();
42414528 let cursor = savepoint.cursor();
42424529
4243− let pos = pos_to_lsp_pos(&text, cursor, offset_encoding);
4530+ let mut seen_language_servers = HashSet::new();
4531+
4532+ let mut futures: FuturesUnordered<_> = doc
4533+ .language_servers_with_feature(LanguageServerFeature::Completion)
4534+ .filter(|ls| seen_language_servers.insert(ls.id()))
4535+ .map(|language_server| {
4536+ let language_server_id = language_server.id();
4537+ let offset_encoding = language_server.offset_encoding();
4538+ let pos = pos_to_lsp_pos(&text, cursor, offset_encoding);
4539+ let doc_id = doc.identifier();
4540+ let completion_request = language_server.completion(doc_id, pos, None).unwrap();
4541+
4542+ async move {
4543+ let json = completion_request.await?;
4544+ let response: Option<lsp::CompletionResponse> = serde_json::from_value(json)?;
4545+
4546+ let items = match response {
4547+ Some(lsp::CompletionResponse::Array(items)) => items,
4548+ // TODO: do something with is_incomplete
4549+ Some(lsp::CompletionResponse::List(lsp::CompletionList {
4550+ is_incomplete: _is_incomplete,
4551+ items,
4552+ })) => items,
4553+ None => Vec::new(),
4554+ }
4555+ .into_iter()
4556+ .map(|item| CompletionItem {
4557+ item,
4558+ language_server_id,
4559+ resolved: false,
4560+ })
4561+ .collect();
42444562
4245− let future = match language_server.completion(doc.identifier(), pos, None) {
4246− Some(future) => future,
4247− None => return,
4248− };
4563+ anyhow::Ok(items)
4564+ }
4565+ })
4566+ .collect();
42494567
42504568 // setup a channel that allows the request to be canceled
42514569 let (tx, rx) = oneshot::channel();
@@ -4254,12 +4572,20 @@ pub fn completion(cx: &mut Context) {
42544572 // and the associated request is automatically dropped
42554573 cx.editor.completion_request_handle = Some(tx);
42564574 let future = async move {
4575+ let items_future = async move {
4576+ let mut items = Vec::new();
4577+ // TODO if one completion request errors, all other completion requests are discarded (even if they're valid)
4578+ while let Some(mut lsp_items) = futures.try_next().await? {
4579+ items.append(&mut lsp_items);
4580+ }
4581+ anyhow::Ok(items)
4582+ };
42574583 tokio::select! {
42584584 biased;
42594585 _ = rx => {
4260− Ok(serde_json::Value::Null)
4586+ Ok(Vec::new())
42614587 }
4262− res = future => {
4588+ res = items_future => {
42634589 res
42644590 }
42654591 }
@@ -4293,9 +4619,9 @@ pub fn completion(cx: &mut Context) {
42934619 },
42944620 ));
42954621
4296− cx.callback(
4297− future,
4298− move |editor, compositor, response: Option<lsp::CompletionResponse>| {
4622+ cx.jobs.callback(async move {
4623+ let items = future.await?;
4624+ let call = move |editor: &mut Editor, compositor: &mut Compositor| {
42994625 let (view, doc) = current_ref!(editor);
43004626 // check if the completion request is stale.
43014627 //
@@ -4306,16 +4632,6 @@ pub fn completion(cx: &mut Context) {
43064632 return;
43074633 }
43084634
4309− let items = match response {
4310− Some(lsp::CompletionResponse::Array(items)) => items,
4311− // TODO: do something with is_incomplete
4312− Some(lsp::CompletionResponse::List(lsp::CompletionList {
4313− is_incomplete: _is_incomplete,
4314− items,
4315− })) => items,
4316− None => Vec::new(),
4317− };
4318−
43194635 if items.is_empty() {
43204636 // editor.set_error("No completion available");
43214637 return;
@@ -4326,7 +4642,6 @@ pub fn completion(cx: &mut Context) {
43264642 editor,
43274643 savepoint,
43284644 items,
4329− offset_encoding,
43304645 start_offset,
43314646 trigger_offset,
43324647 size,
@@ -4340,8 +4655,9 @@ pub fn completion(cx: &mut Context) {
43404655 {
43414656 compositor.remove(SignatureHelp::ID);
43424657 }
4343− },
4344− );
4658+ };
4659+ Ok(Callback::EditorCompositor(Box::new(call)))
4660+ });
43454661}
43464662
43474663// comments
@@ -4376,7 +4692,13 @@ fn rotate_selections_backward(cx: &mut Context) {
43764692 rotate_selections(cx, Direction::Backward)
43774693}
43784694
4379−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) {
43804702 let count = cx.count;
43814703 let (view, doc) = current!(cx.editor);
43824704 let text = doc.text().slice(..);
@@ -4394,9 +4716,10 @@ fn rotate_selection_contents(cx: &mut Context, direction: Direction) {
43944716
43954717 for chunk in fragments.chunks_mut(group) {
43964718 // TODO: also modify main index
4397− match direction {
4398− Direction::Forward => chunk.rotate_right(1),
4399− 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(),
44004723 };
44014724 }
44024725
@@ -4413,10 +4736,13 @@ fn rotate_selection_contents(cx: &mut Context, direction: Direction) {
44134736}
44144737
44154738fn rotate_selection_contents_forward(cx: &mut Context) {
4416− rotate_selection_contents(cx, Direction::Forward)
4739+ reorder_selection_contents(cx, ReorderStrategy::RotateForward)
44174740}
44184741fn rotate_selection_contents_backward(cx: &mut Context) {
4419− 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)
44204746}
44214747
44224748// tree sitter node selection
@@ -4440,8 +4766,7 @@ fn expand_selection(cx: &mut Context) {
44404766 }
44414767 }
44424768 };
4443− motion(cx.editor);
4444− cx.editor.last_motion = Some(Motion(Box::new(motion)));
4769+ cx.editor.apply_motion(motion);
44454770}
44464771
44474772fn shrink_selection(cx: &mut Context) {
@@ -4465,8 +4790,7 @@ fn shrink_selection(cx: &mut Context) {
44654790 doc.set_selection(view.id, selection);
44664791 }
44674792 };
4468− motion(cx.editor);
4469− cx.editor.last_motion = Some(Motion(Box::new(motion)));
4793+ cx.editor.apply_motion(motion);
44704794}
44714795
44724796fn select_sibling_impl<F>(cx: &mut Context, sibling_fn: &'static F)
@@ -4484,8 +4808,7 @@ where
44844808 doc.set_selection(view.id, selection);
44854809 }
44864810 };
4487− motion(cx.editor);
4488− cx.editor.last_motion = Some(Motion(Box::new(motion)));
4811+ cx.editor.apply_motion(motion);
44894812}
44904813
44914814fn select_next_sibling(cx: &mut Context) {
@@ -4496,22 +4819,68 @@ fn select_prev_sibling(cx: &mut Context) {
44964819 select_sibling_impl(cx, &|node| Node::prev_sibling(&node))
44974820}
44984821
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+
44994865fn match_brackets(cx: &mut Context) {
45004866 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(..);
45014870
4502− if let Some(syntax) = doc.syntax() {
4503− let text = doc.text().slice(..);
4504− let selection = doc.selection(view.id).clone().transform(|range| {
4505− if let Some(pos) =
4506− match_brackets::find_matching_bracket_fuzzy(syntax, doc.text(), range.cursor(text))
4507− {
4508− range.put_cursor(text, pos, cx.editor.mode == Mode::Select)
4509− } else {
4510− range
4511− }
4512− });
4513− doc.set_selection(view.id, selection);
4514− }
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);
45154884}
45164885
45174886//
@@ -4606,17 +4975,19 @@ fn transpose_view(cx: &mut Context) {
46064975 cx.editor.transpose_view()
46074976}
46084977
4609−// split helper, clear it later
4610−fn split(cx: &mut Context, action: Action) {
4611− 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);
46124983 let id = doc.id();
46134984 let selection = doc.selection(view.id).clone();
46144985 let offset = view.offset;
46154986
4616− cx.editor.switch(id, action);
4987+ editor.switch(id, action);
46174988
46184989 // match the selection in the previous view
4619− let (view, doc) = current!(cx.editor);
4990+ let (view, doc) = current!(editor);
46204991 doc.set_selection(view.id, selection);
46214992 // match the view scroll offset (switch doesn't handle this fully
46224993 // since the selection is only matched after the split)
@@ -4624,7 +4995,7 @@ fn split(cx: &mut Context, action: Action) {
46244995}
46254996
46264997fn hsplit(cx: &mut Context) {
4627− split(cx, Action::HorizontalSplit);
4998+ split(cx.editor, Action::HorizontalSplit);
46284999}
46295000
46305001fn hsplit_new(cx: &mut Context) {
@@ -4632,7 +5003,7 @@ fn hsplit_new(cx: &mut Context) {
46325003}
46335004
46345005fn vsplit(cx: &mut Context) {
4635− split(cx, Action::VerticalSplit);
5006+ split(cx.editor, Action::VerticalSplit);
46365007}
46375008
46385009fn vsplit_new(cx: &mut Context) {
@@ -4681,7 +5052,12 @@ fn insert_register(cx: &mut Context) {
46815052 if let Some(ch) = event.char() {
46825053 cx.editor.autoinfo = None;
46835054 cx.register = Some(ch);
4684− paste(cx, Paste::Cursor);
5055+ paste(
5056+ cx.editor,
5057+ cx.register.unwrap_or('"'),
5058+ Paste::Cursor,
5059+ cx.count(),
5060+ );
46855061 }
46865062 })
46875063}
@@ -4765,8 +5141,7 @@ fn goto_ts_object_impl(cx: &mut Context, object: &'static str, direction: Direct
47655141 editor.set_status("Syntax-tree is not available in current buffer");
47665142 }
47675143 };
4768− motion(cx.editor);
4769− cx.editor.last_motion = Some(Motion(Box::new(motion)));
5144+ cx.editor.apply_motion(motion);
47705145}
47715146
47725147fn goto_next_function(cx: &mut Context) {
@@ -4887,8 +5262,7 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
48875262 });
48885263 doc.set_selection(view.id, selection);
48895264 };
4890− textobject(cx.editor);
4891− cx.editor.last_motion = Some(Motion(Box::new(textobject)));
5265+ cx.editor.apply_motion(textobject);
48925266 }
48935267 });
48945268
@@ -4978,11 +5352,18 @@ fn surround_replace(cx: &mut Context) {
49785352 }
49795353 };
49805354
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+
49815362 cx.on_next_key(move |cx, event| {
49825363 let (view, doc) = current!(cx.editor);
49835364 let to = match event.char() {
49845365 Some(to) => to,
4985− None => return,
5366+ None => return doc.set_selection(view.id, selection),
49865367 };
49875368 let (open, close) = surround::get_pair(to);
49885369 let transaction = Transaction::change(
@@ -4993,6 +5374,7 @@ fn surround_replace(cx: &mut Context) {
49935374 (pos, pos + 1, Some(t))
49945375 }),
49955376 );
5377+ doc.set_selection(view.id, selection);
49965378 doc.apply(&transaction, view.id);
49975379 exit_select_mode(cx);
49985380 });
@@ -5141,7 +5523,7 @@ async fn shell_impl_async(
51415523 helix_view::document::to_writer(&mut stdin, (encoding::UTF_8, false), &input)
51425524 .await?;
51435525 }
5144− Ok::<_, anyhow::Error>(())
5526+ anyhow::Ok(())
51455527 });
51465528 let (output, _) = tokio::join! {
51475529 process.wait_with_output(),
@@ -5227,12 +5609,18 @@ fn shell(cx: &mut compositor::Context, cmd: &str, behavior: &ShellBehavior) {
52275609 };
52285610
52295611 // These `usize`s cannot underflow because selection ranges cannot overlap.
5230− // Once the MSRV is 1.66.0 (mixed_integer_ops is stabilized), we can use checked
5231− // arithmetic to assert this.
5232− 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");
52335617 let new_range = Range::new(anchor, anchor + output_len).with_direction(range.direction());
52345618 ranges.push(new_range);
5235− 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");
52365624
52375625 changes.push((from, to, Some(output)));
52385626 }
@@ -5254,7 +5642,7 @@ fn shell_prompt(cx: &mut Context, prompt: Cow<'static, str>, behavior: ShellBeha
52545642 cx,
52555643 prompt,
52565644 Some('|'),
5257− ui::completers::none,
5645+ ui::completers::filename,
52585646 move |cx, input: &str, event: PromptEvent| {
52595647 if event != PromptEvent::Validate {
52605648 return;
@@ -5371,6 +5759,7 @@ fn increment_impl(cx: &mut Context, increment_direction: IncrementDirection) {
53715759 let transaction = Transaction::change(doc.text(), changes.into_iter());
53725760 let transaction = transaction.with_selection(new_selection);
53735761 doc.apply(&transaction, view.id);
5762+ exit_select_mode(cx);
53745763 }
53755764}
53765765
@@ -5389,9 +5778,12 @@ fn record_macro(cx: &mut Context) {
53895778 }
53905779 })
53915780 .collect::<String>();
5392− cx.editor.registers.write(reg, vec![s]);
5393− cx.editor
5394− .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+ }
53955787 } else {
53965788 let reg = cx.register.take().unwrap_or('@');
53975789 cx.editor.macro_recording = Some((reg, Vec::new()));
@@ -5411,8 +5803,14 @@ fn replay_macro(cx: &mut Context) {
54115803 return;
54125804 }
54135805
5414− let keys: Vec<KeyEvent> = if let Some([keys_str]) = cx.editor.registers.read(reg) {
5415− 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) {
54165814 Ok(keys) => keys,
54175815 Err(err) => {
54185816 cx.editor.set_error(format!("Invalid macro: {}", err));