@@ -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
@@ -61,9 +59,14 @@ use crate::{
6159};
6260
6361use crate::job::{self, Jobs};
64−use futures_util::{stream::FuturesUnordered, StreamExt, TryStreamExt};
65−use std::{collections::HashMap, fmt, future::Future};
66−use std::{collections::HashSet, num::NonZeroUsize};
62+use futures_util::{stream::FuturesUnordered, TryStreamExt};
63+use std::{
64+ collections::{HashMap, HashSet},
65+ fmt,
66+ future::Future,
67+ io::Read,
68+ num::NonZeroUsize,
69+};
6770
6871use std::{
6972 borrow::Cow,
@@ -72,11 +75,11 @@ use std::{
7275
7376use once_cell::sync::Lazy;
7477use serde::de::{self, Deserialize, Deserializer};
78+use url::Url;
7579
7680use grep_regex::RegexMatcherBuilder;
7781use grep_searcher::{sinks, BinaryDetection, SearcherBuilder};
7882use ignore::{DirEntry, WalkBuilder, WalkState};
79−use tokio_stream::wrappers::UnboundedReceiverStream;
8083
8184pub type OnKeyCallback = Box<dyn FnOnce(&mut Context, KeyEvent)>;
8285
@@ -248,6 +251,8 @@ impl MappableCommand {
248251 move_prev_long_word_start, "Move to start of previous long word",
249252 move_next_long_word_end, "Move to end of next long word",
250253 move_prev_long_word_end, "Move to end of previous long word",
254+ move_parent_node_end, "Move to end of the parent node",
255+ move_parent_node_start, "Move to beginning of the parent node",
251256 extend_next_word_start, "Extend to start of next word",
252257 extend_prev_word_start, "Extend to start of previous word",
253258 extend_next_word_end, "Extend to end of next word",
@@ -256,6 +261,8 @@ impl MappableCommand {
256261 extend_prev_long_word_start, "Extend to start of previous long word",
257262 extend_next_long_word_end, "Extend to end of next long word",
258263 extend_prev_long_word_end, "Extend to end of prev long word",
264+ extend_parent_node_end, "Extend to end of the parent node",
265+ extend_parent_node_start, "Extend to beginning of the parent node",
259266 find_till_char, "Move till next occurrence of char",
260267 find_next_char, "Move to next occurrence of char",
261268 extend_till_char, "Extend till next occurrence of char",
@@ -330,7 +337,7 @@ impl MappableCommand {
330337 goto_implementation, "Goto implementation",
331338 goto_file_start, "Goto line number <n> else file start",
332339 goto_file_end, "Goto file end",
333− goto_file, "Goto files in selection",
340+ goto_file, "Goto files/URLs in selection",
334341 goto_file_hsplit, "Goto files in selection (hsplit)",
335342 goto_file_vsplit, "Goto files in selection (vsplit)",
336343 goto_reference, "Goto references",
@@ -362,6 +369,7 @@ impl MappableCommand {
362369 extend_to_line_end, "Extend to line end",
363370 extend_to_line_end_newline, "Extend to line end",
364371 signature_help, "Show signature help",
372+ smart_tab, "Insert tab if all cursors have all whitespace to their left; otherwise, run a separate command.",
365373 insert_tab, "Insert tab char",
366374 insert_newline, "Insert newline char",
367375 delete_char_backward, "Delete previous char",
@@ -376,6 +384,8 @@ impl MappableCommand {
376384 later, "Move forward in history",
377385 commit_undo_checkpoint, "Commit changes to new checkpoint",
378386 yank, "Yank selection",
387+ yank_to_clipboard, "Yank selections to clipboard",
388+ yank_to_primary_clipboard, "Yank selections to primary clipboard",
379389 yank_joined, "Join and yank selections",
380390 yank_joined_to_clipboard, "Join and yank selections to clipboard",
381391 yank_main_selection_to_clipboard, "Yank main selection to clipboard",
@@ -980,6 +990,7 @@ fn align_selections(cx: &mut Context) {
980990
981991 let transaction = Transaction::change(doc.text(), changes.into_iter());
982992 doc.apply(&transaction, view.id);
993+ exit_select_mode(cx);
983994}
984995
985996fn goto_window(cx: &mut Context, align: Align) {
@@ -1099,8 +1110,7 @@ where
10991110 .transform(|range| move_fn(text, range, count, behavior));
11001111 doc.set_selection(view.id, selection);
11011112 };
1102− motion(cx.editor);
1103− cx.editor.last_motion = Some(Motion(Box::new(motion)));
1113+ cx.editor.apply_motion(motion)
11041114}
11051115
11061116fn goto_prev_paragraph(cx: &mut Context) {
@@ -1155,6 +1165,10 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
11551165 let (view, doc) = current_ref!(cx.editor);
11561166 let text = doc.text();
11571167 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();
11581172 let mut paths: Vec<_> = selections
11591173 .iter()
11601174 .map(|r| text.slice(r.from()..r.to()).to_string())
@@ -1182,16 +1196,80 @@ fn goto_file_impl(cx: &mut Context, action: Action) {
11821196 .to_string(),
11831197 );
11841198 }
1199+
11851200 for sel in paths {
11861201 let p = sel.trim();
1187− if !p.is_empty() {
1188− 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) {
11891250 cx.editor.set_error(format!("Open file failed: {:?}", e));
11901251 }
11911252 }
11921253 }
11931254}
11941255
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+
11951273fn extend_word_impl<F>(cx: &mut Context, extend_fn: F)
11961274where
11971275 F: Fn(RopeSlice, Range, usize) -> Range,
@@ -1240,10 +1318,66 @@ fn extend_next_long_word_end(cx: &mut Context) {
12401318 extend_word_impl(cx, movement::move_next_long_word_end)
12411319}
12421320
1243−fn will_find_char<F>(cx: &mut Context, search_fn: F, inclusive: bool, extend: bool)
1244−where
1245− F: Fn(RopeSlice, char, usize, usize, bool) -> Option<usize> + 'static,
1246−{
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) {
12471381 // TODO: count is reset to 1 before next key so we move it into the closure here.
12481382 // Would be nice to carry over.
12491383 let count = cx.count();
@@ -1256,13 +1390,9 @@ where
12561390 KeyEvent {
12571391 code: KeyCode::Enter,
12581392 ..
1259− } =>
1260− // TODO: this isn't quite correct when CRLF is involved.
1261− // This hack will work in most cases, since documents don't
1262− // usually mix line endings. But we should fix it eventually
1263− // anyway.
1264− {
1265− doc!(cx.editor).line_ending.as_str().chars().next().unwrap()
1393+ } => {
1394+ find_char_line_ending(cx, count, direction, inclusive, extend);
1395+ return;
12661396 }
12671397
12681398 KeyEvent {
@@ -1275,11 +1405,18 @@ where
12751405 } => ch,
12761406 _ => return,
12771407 };
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+ };
12781418
1279− find_char_impl(cx.editor, &search_fn, inclusive, extend, ch, count);
1280− cx.editor.last_motion = Some(Motion(Box::new(move |editor: &mut Editor| {
1281− find_char_impl(editor, &search_fn, inclusive, extend, ch, 1);
1282− })));
1419+ cx.editor.apply_motion(motion);
12831420 })
12841421}
12851422
@@ -1358,46 +1495,39 @@ fn find_prev_char_impl(
13581495}
13591496
13601497fn find_till_char(cx: &mut Context) {
1361− will_find_char(cx, find_next_char_impl, false, false)
1498+ find_char(cx, Direction::Forward, false, false);
13621499}
13631500
13641501fn find_next_char(cx: &mut Context) {
1365− will_find_char(cx, find_next_char_impl, true, false)
1502+ find_char(cx, Direction::Forward, true, false)
13661503}
13671504
13681505fn extend_till_char(cx: &mut Context) {
1369− will_find_char(cx, find_next_char_impl, false, true)
1506+ find_char(cx, Direction::Forward, false, true)
13701507}
13711508
13721509fn extend_next_char(cx: &mut Context) {
1373− will_find_char(cx, find_next_char_impl, true, true)
1510+ find_char(cx, Direction::Forward, true, true)
13741511}
13751512
13761513fn till_prev_char(cx: &mut Context) {
1377− will_find_char(cx, find_prev_char_impl, false, false)
1514+ find_char(cx, Direction::Backward, false, false)
13781515}
13791516
13801517fn find_prev_char(cx: &mut Context) {
1381− will_find_char(cx, find_prev_char_impl, true, false)
1518+ find_char(cx, Direction::Backward, true, false)
13821519}
13831520
13841521fn extend_till_prev_char(cx: &mut Context) {
1385− will_find_char(cx, find_prev_char_impl, false, true)
1522+ find_char(cx, Direction::Backward, false, true)
13861523}
13871524
13881525fn extend_prev_char(cx: &mut Context) {
1389− will_find_char(cx, find_prev_char_impl, true, true)
1526+ find_char(cx, Direction::Backward, true, true)
13901527}
13911528
13921529fn repeat_last_motion(cx: &mut Context) {
1393− let count = cx.count();
1394− let last_motion = cx.editor.last_motion.take();
1395− if let Some(m) = &last_motion {
1396− for _ in 0..count {
1397− m.run(cx.editor);
1398− }
1399− cx.editor.last_motion = last_motion;
1400− }
1530+ cx.editor.repeat_last_motion(cx.count())
14011531}
14021532
14031533fn replace(cx: &mut Context) {
@@ -1464,6 +1594,7 @@ where
14641594 });
14651595
14661596 doc.apply(&transaction, view.id);
1597+ exit_select_mode(cx);
14671598}
14681599
14691600fn switch_case(cx: &mut Context) {
@@ -1705,8 +1836,8 @@ fn select_regex(cx: &mut Context) {
17051836 "select:".into(),
17061837 Some(reg),
17071838 ui::completers::none,
1708− move |editor, regex, event| {
1709− let (view, doc) = current!(editor);
1839+ move |cx, regex, event| {
1840+ let (view, doc) = current!(cx.editor);
17101841 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
17111842 return;
17121843 }
@@ -1727,8 +1858,8 @@ fn split_selection(cx: &mut Context) {
17271858 "split:".into(),
17281859 Some(reg),
17291860 ui::completers::none,
1730− move |editor, regex, event| {
1731− let (view, doc) = current!(editor);
1861+ move |cx, regex, event| {
1862+ let (view, doc) = current!(cx.editor);
17321863 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
17331864 return;
17341865 }
@@ -1851,11 +1982,11 @@ fn search_impl(
18511982
18521983fn search_completions(cx: &mut Context, reg: Option<char>) -> Vec<String> {
18531984 let mut items = reg
1854− .and_then(|reg| cx.editor.registers.get(reg))
1855− .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());
18561987 items.sort_unstable();
18571988 items.dedup();
1858− items.into_iter().cloned().collect()
1989+ items.into_iter().map(|value| value.to_string()).collect()
18591990}
18601991
18611992fn search(cx: &mut Context) {
@@ -1892,12 +2023,14 @@ fn searcher(cx: &mut Context, direction: Direction) {
18922023 .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone())))
18932024 .collect()
18942025 },
1895− move |editor, regex, event| {
1896− 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 {
18972030 return;
18982031 }
18992032 search_impl(
1900− editor,
2033+ cx.editor,
19012034 &contents,
19022035 ®ex,
19032036 Movement::Move,
@@ -1912,11 +2045,13 @@ fn searcher(cx: &mut Context, direction: Direction) {
19122045
19132046fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Direction) {
19142047 let count = cx.count();
2048+ let register = cx
2049+ .register
2050+ .unwrap_or(cx.editor.registers.last_search_register);
19152051 let config = cx.editor.config();
19162052 let scrolloff = config.scrolloff;
1917− let (_, doc) = current!(cx.editor);
1918− let registers = &cx.editor.registers;
1919− 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);
19202055 let contents = doc.text().slice(..).to_string();
19212056 let search_config = &config.search;
19222057 let case_insensitive = if search_config.smart_case {
@@ -1925,7 +2060,7 @@ fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Dir
19252060 false
19262061 };
19272062 let wrap_around = search_config.wrap_around;
1928− if let Ok(regex) = RegexBuilder::new(query)
2063+ if let Ok(regex) = RegexBuilder::new(&query)
19292064 .case_insensitive(case_insensitive)
19302065 .multi_line(true)
19312066 .build()
@@ -1965,6 +2100,7 @@ fn extend_search_prev(cx: &mut Context) {
19652100}
19662101
19672102fn search_selection(cx: &mut Context) {
2103+ let register = cx.register.unwrap_or('/');
19682104 let (view, doc) = current!(cx.editor);
19692105 let contents = doc.text().slice(..);
19702106
@@ -1977,13 +2113,24 @@ fn search_selection(cx: &mut Context) {
19772113 .collect::<Vec<_>>()
19782114 .join("|");
19792115
1980− let msg = format!("register '{}' set to '{}'", '/', ®ex);
1981− cx.editor.registers.push('/', regex);
1982− 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+ }
19832124}
19842125
19852126fn make_search_word_bounded(cx: &mut Context) {
1986− 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) {
19872134 Some(regex) => regex,
19882135 None => return,
19892136 };
@@ -2001,14 +2148,19 @@ fn make_search_word_bounded(cx: &mut Context) {
20012148 if !start_anchored {
20022149 new_regex.push_str("\\b");
20032150 }
2004− new_regex.push_str(regex);
2151+ new_regex.push_str(®ex);
20052152 if !end_anchored {
20062153 new_regex.push_str("\\b");
20072154 }
20082155
2009− let msg = format!("register '{}' set to '{}'", '/', &new_regex);
2010− cx.editor.registers.push('/', new_regex);
2011− 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+ }
20122164}
20132165
20142166fn global_search(cx: &mut Context) {
@@ -2047,13 +2199,11 @@ fn global_search(cx: &mut Context) {
20472199 }
20482200 }
20492201
2050− let (all_matches_sx, all_matches_rx) = tokio::sync::mpsc::unbounded_channel::<FileResult>();
20512202 let config = cx.editor.config();
20522203 let smart_case = config.search.smart_case;
20532204 let file_picker_config = config.file_picker.clone();
20542205
20552206 let reg = cx.register.unwrap_or('/');
2056−
20572207 let completions = search_completions(cx, Some(reg));
20582208 ui::regex_prompt(
20592209 cx,
@@ -2066,43 +2216,67 @@ fn global_search(cx: &mut Context) {
20662216 .map(|comp| (0.., std::borrow::Cow::Owned(comp.clone())))
20672217 .collect()
20682218 },
2069− move |_editor, regex, event| {
2219+ move |cx, regex, event| {
20702220 if event != PromptEvent::Validate {
20712221 return;
20722222 }
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();
20732231
20742232 if let Ok(matcher) = RegexMatcherBuilder::new()
20752233 .case_smart(smart_case)
20762234 .build(regex.as_str())
20772235 {
2078− let searcher = SearcherBuilder::new()
2079− .binary_detection(BinaryDetection::quit(b'\x00'))
2080− .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);
20812244
2082− let search_root = std::env::current_dir()
2083− .expect("Global search error: Failed to get current dir");
20842245 let dedup_symlinks = file_picker_config.deduplicate_links;
20852246 let absolute_root = search_root
20862247 .canonicalize()
20872248 .unwrap_or_else(|_| search_root.clone());
2088−
2089− WalkBuilder::new(search_root)
2090− .hidden(file_picker_config.hidden)
2091− .parents(file_picker_config.parents)
2092− .ignore(file_picker_config.ignore)
2093− .follow_links(file_picker_config.follow_symlinks)
2094− .git_ignore(file_picker_config.git_ignore)
2095− .git_global(file_picker_config.git_global)
2096− .git_exclude(file_picker_config.git_exclude)
2097− .max_depth(file_picker_config.max_depth)
2098− .filter_entry(move |entry| {
2099− filter_picker_entry(entry, &absolute_root, dedup_symlinks)
2100− })
2101− .build_parallel()
2102− .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(|| {
21032276 let mut searcher = searcher.clone();
21042277 let matcher = matcher.clone();
2105− let all_matches_sx = all_matches_sx.clone();
2278+ let injector = injector_.clone();
2279+ let documents = &documents;
21062280 Box::new(move |entry: Result<DirEntry, ignore::Error>| -> WalkState {
21072281 let entry = match entry {
21082282 Ok(entry) => entry,
@@ -2115,17 +2289,39 @@ fn global_search(cx: &mut Context) {
21152289 _ => return WalkState::Continue,
21162290 };
21172291
2118− let result = searcher.search_path(
2119− &matcher,
2120− entry.path(),
2121− sinks::UTF8(|line_num, _| {
2122− all_matches_sx
2123− .send(FileResult::new(entry.path(), line_num as usize - 1))
2124− .unwrap();
2125−
2126− Ok(true)
2127− }),
2128− );
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+ };
21292325
21302326 if let Err(err) = result {
21312327 log::error!(
@@ -2134,65 +2330,66 @@ fn global_search(cx: &mut Context) {
21342330 err
21352331 );
21362332 }
2137− WalkState::Continue
2333+ if stop {
2334+ WalkState::Quit
2335+ } else {
2336+ WalkState::Continue
2337+ }
21382338 })
21392339 });
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+ })
21402387 } else {
21412388 // Otherwise do nothing
21422389 // log::warn!("Global Search Invalid Pattern")
21432390 }
21442391 },
21452392 );
2146−
2147− let current_path = doc_mut!(cx.editor).path().cloned();
2148−
2149− let show_picker = async move {
2150− let all_matches: Vec<FileResult> =
2151− UnboundedReceiverStream::new(all_matches_rx).collect().await;
2152− let call: job::Callback = Callback::EditorCompositor(Box::new(
2153− move |editor: &mut Editor, compositor: &mut Compositor| {
2154− if all_matches.is_empty() {
2155− editor.set_status("No matches found");
2156− return;
2157− }
2158−
2159− let picker = Picker::new(
2160− all_matches,
2161− current_path,
2162− move |cx, FileResult { path, line_num }, action| {
2163− match cx.editor.open(path, action) {
2164− Ok(_) => {}
2165− Err(e) => {
2166− cx.editor.set_error(format!(
2167− "Failed to open file '{}': {}",
2168− path.display(),
2169− e
2170− ));
2171− return;
2172− }
2173− }
2174−
2175− let line_num = *line_num;
2176− let (view, doc) = current!(cx.editor);
2177− let text = doc.text();
2178− if line_num >= text.len_lines() {
2179− cx.editor.set_error("The line you jumped to does not exist anymore because the file has changed.");
2180− return;
2181− }
2182− let start = text.line_to_char(line_num);
2183− let end = text.line_to_char((line_num + 1).min(text.len_lines()));
2184−
2185− doc.set_selection(view.id, Selection::single(start, end));
2186− align_view(doc, view, Align::Center);
2187− }).with_preview(|_editor, FileResult { path, line_num }| {
2188− Some((path.clone().into(), Some((*line_num, *line_num))))
2189− });
2190− compositor.push(Box::new(overlaid(picker)));
2191− },
2192− ));
2193− Ok(call)
2194− };
2195− cx.jobs.callback(show_picker);
21962393}
21972394
21982395enum Extend {
@@ -2315,17 +2512,35 @@ enum Operation {
23152512 Change,
23162513}
23172514
2515+fn selection_is_linewise(selection: &Selection, text: &Rope) -> bool {
2516+ selection.ranges().iter().all(|range| {
2517+ let text = text.slice(..);
2518+ if range.slice(text).len_lines() < 2 {
2519+ return false;
2520+ }
2521+ // If the start of the selection is at the start of a line and the end at the end of a line.
2522+ let (start_line, end_line) = range.line_range(text);
2523+ let start = text.line_to_char(start_line);
2524+ let end = text.line_to_char((end_line + 1).min(text.len_lines()));
2525+ start == range.from() && end == range.to()
2526+ })
2527+}
2528+
23182529fn delete_selection_impl(cx: &mut Context, op: Operation) {
23192530 let (view, doc) = current!(cx.editor);
23202531
23212532 let selection = doc.selection(view.id);
2533+ let only_whole_lines = selection_is_linewise(selection, doc.text());
23222534
23232535 if cx.register != Some('_') {
23242536 // first yank the selection
23252537 let text = doc.text().slice(..);
23262538 let values: Vec<String> = selection.fragments(text).map(Cow::into_owned).collect();
23272539 let reg_name = cx.register.unwrap_or('"');
2328− cx.editor.registers.write(reg_name, values);
2540+ if let Err(err) = cx.editor.registers.write(reg_name, values) {
2541+ cx.editor.set_error(err.to_string());
2542+ return;
2543+ }
23292544 };
23302545
23312546 // then delete
@@ -2339,7 +2554,11 @@ fn delete_selection_impl(cx: &mut Context, op: Operation) {
23392554 exit_select_mode(cx);
23402555 }
23412556 Operation::Change => {
2342− enter_insert_mode(cx);
2557+ if only_whole_lines {
2558+ open_above(cx);
2559+ } else {
2560+ enter_insert_mode(cx);
2561+ }
23432562 }
23442563 }
23452564}
@@ -2461,6 +2680,10 @@ fn insert_mode(cx: &mut Context) {
24612680 .transform(|range| Range::new(range.to(), range.from()));
24622681
24632682 doc.set_selection(view.id, selection);
2683+
2684+ // [TODO] temporary workaround until we're not using the idle timer to
2685+ // trigger auto completions any more
2686+ cx.editor.clear_idle_timer();
24642687}
24652688
24662689// inserts at the end of each selection
@@ -2497,6 +2720,10 @@ fn append_mode(cx: &mut Context) {
24972720
24982721fn file_picker(cx: &mut Context) {
24992722 let root = find_workspace().0;
2723+ if !root.exists() {
2724+ cx.editor.set_error("Workspace directory does not exist");
2725+ return;
2726+ }
25002727 let picker = ui::file_picker(root, &cx.editor.config());
25012728 cx.push_layer(Box::new(overlaid(picker)));
25022729}
@@ -2517,8 +2744,14 @@ fn file_picker_in_current_buffer_directory(cx: &mut Context) {
25172744 let picker = ui::file_picker(path, &cx.editor.config());
25182745 cx.push_layer(Box::new(overlaid(picker)));
25192746}
2747+
25202748fn file_picker_in_current_directory(cx: &mut Context) {
2521− let cwd = std::env::current_dir().unwrap_or_else(|_| PathBuf::from("./"));
2749+ let cwd = helix_loader::current_working_dir();
2750+ if !cwd.exists() {
2751+ cx.editor
2752+ .set_error("Current working directory does not exist");
2753+ return;
2754+ }
25222755 let picker = ui::file_picker(cwd, &cx.editor.config());
25232756 cx.push_layer(Box::new(overlaid(picker)));
25242757}
@@ -2668,9 +2901,11 @@ fn jumplist_picker(cx: &mut Context) {
26682901 |cx, meta, action| {
26692902 cx.editor.switch(meta.id, action);
26702903 let config = cx.editor.config();
2671− let (view, doc) = current!(cx.editor);
2904+ let (view, doc) = (view_mut!(cx.editor), doc_mut!(cx.editor, &meta.id));
26722905 doc.set_selection(view.id, meta.selection.clone());
2673− view.ensure_cursor_in_view_center(doc, config.scrolloff);
2906+ if action.align_view(view, doc.id()) {
2907+ view.ensure_cursor_in_view_center(doc, config.scrolloff);
2908+ }
26742909 },
26752910 )
26762911 .with_preview(|editor, meta| {
@@ -2818,6 +3053,7 @@ fn insert_with_indent(cx: &mut Context, cursor_fallback: IndentFallbackPos) {
28183053 let indent = indent::indent_for_newline(
28193054 language_config,
28203055 syntax,
3056+ &doc.config.load().indent_heuristic,
28213057 &doc.indent_style,
28223058 tab_width,
28233059 text,
@@ -2922,6 +3158,7 @@ fn open(cx: &mut Context, open: Open) {
29223158 Open::Below => graphemes::prev_grapheme_boundary(text, range.to()),
29233159 Open::Above => range.from(),
29243160 });
3161+
29253162 let new_line = match open {
29263163 // adjust position to the end of the line (next line - 1)
29273164 Open::Below => cursor_line + 1,
@@ -2929,13 +3166,15 @@ fn open(cx: &mut Context, open: Open) {
29293166 Open::Above => cursor_line,
29303167 };
29313168
3169+ let line_num = new_line.saturating_sub(1);
3170+
29323171 // Index to insert newlines after, as well as the char width
29333172 // to use to compensate for those inserted newlines.
29343173 let (line_end_index, line_end_offset_width) = if new_line == 0 {
29353174 (0, 0)
29363175 } else {
29373176 (
2938− line_end_char_index(&doc.text().slice(..), new_line.saturating_sub(1)),
3177+ line_end_char_index(&text, line_num),
29393178 doc.line_ending.len_chars(),
29403179 )
29413180 };
@@ -2943,13 +3182,15 @@ fn open(cx: &mut Context, open: Open) {
29433182 let indent = indent::indent_for_newline(
29443183 doc.language_config(),
29453184 doc.syntax(),
3185+ &doc.config.load().indent_heuristic,
29463186 &doc.indent_style,
29473187 doc.tab_width(),
29483188 text,
2949− new_line.saturating_sub(1),
3189+ line_num,
29503190 line_end_index,
29513191 cursor_line,
29523192 );
3193+
29533194 let indent_len = indent.len();
29543195 let mut text = String::with_capacity(1 + indent_len);
29553196 text.push_str(doc.line_ending.as_str());
@@ -3248,8 +3489,7 @@ fn goto_next_change_impl(cx: &mut Context, direction: Direction) {
32483489
32493490 doc.set_selection(view.id, selection)
32503491 };
3251− motion(cx.editor);
3252− cx.editor.last_motion = Some(Motion(Box::new(motion)));
3492+ cx.editor.apply_motion(motion);
32533493}
32543494
32553495/// Returns the [Range] for a [Hunk] in the given text.
@@ -3376,6 +3616,7 @@ pub mod insert {
33763616 }
33773617
33783618 use helix_core::auto_pairs;
3619+ use helix_view::editor::SmartTabConfig;
33793620
33803621 pub fn insert_char(cx: &mut Context, c: char) {
33813622 let (view, doc) = current_ref!(cx.editor);
@@ -3401,6 +3642,31 @@ pub mod insert {
34013642 }
34023643 }
34033644
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+
34043670 pub fn insert_tab(cx: &mut Context) {
34053671 let (view, doc) = current!(cx.editor);
34063672 // TODO: round out to nearest indentation level (for example a line with 3 spaces should
@@ -3456,6 +3722,7 @@ pub mod insert {
34563722 let indent = indent::indent_for_newline(
34573723 doc.language_config(),
34583724 doc.syntax(),
3725+ &doc.config.load().indent_heuristic,
34593726 &doc.indent_style,
34603727 doc.tab_width(),
34613728 text,
@@ -3696,7 +3963,22 @@ fn commit_undo_checkpoint(cx: &mut Context) {
36963963// Yank / Paste
36973964
36983965fn yank(cx: &mut Context) {
3699− let (view, doc) = current!(cx.editor);
3966+ yank_impl(cx.editor, cx.register.unwrap_or('"'));
3967+ exit_select_mode(cx);
3968+}
3969+
3970+fn yank_to_clipboard(cx: &mut Context) {
3971+ yank_impl(cx.editor, '+');
3972+ exit_select_mode(cx);
3973+}
3974+
3975+fn yank_to_primary_clipboard(cx: &mut Context) {
3976+ yank_impl(cx.editor, '*');
3977+ exit_select_mode(cx);
3978+}
3979+
3980+fn yank_impl(editor: &mut Editor, register: char) {
3981+ let (view, doc) = current!(editor);
37003982 let text = doc.text().slice(..);
37013983
37023984 let values: Vec<String> = doc
@@ -3704,19 +3986,15 @@ fn yank(cx: &mut Context) {
37043986 .fragments(text)
37053987 .map(Cow::into_owned)
37063988 .collect();
3989+ let selections = values.len();
37073990
3708− let msg = format!(
3709− "yanked {} selection(s) to register {}",
3710− values.len(),
3711− cx.register.unwrap_or('"')
3712− );
3713−
3714− cx.editor
3715− .registers
3716− .write(cx.register.unwrap_or('"'), values);
3717−
3718− cx.editor.set_status(msg);
3719− exit_select_mode(cx);
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+ }
37203998}
37213999
37224000fn yank_joined_impl(editor: &mut Editor, separator: &str, register: char) {
@@ -3724,6 +4002,7 @@ fn yank_joined_impl(editor: &mut Editor, separator: &str, register: char) {
37244002 let text = doc.text().slice(..);
37254003
37264004 let selection = doc.selection(view.id);
4005+ let selections = selection.len();
37274006 let joined = selection
37284007 .fragments(text)
37294008 .fold(String::new(), |mut acc, fragment| {
@@ -3734,104 +4013,52 @@ fn yank_joined_impl(editor: &mut Editor, separator: &str, register: char) {
37344013 acc
37354014 });
37364015
3737− let msg = format!(
3738− "joined and yanked {} selection(s) to register {}",
3739− selection.len(),
3740− register,
3741− );
3742−
3743− editor.registers.write(register, vec![joined]);
3744− 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+ }
37454023}
37464024
37474025fn yank_joined(cx: &mut Context) {
3748− let line_ending = doc!(cx.editor).line_ending;
3749− let register = cx.register.unwrap_or('"');
3750− yank_joined_impl(cx.editor, line_ending.as_str(), register);
4026+ let separator = doc!(cx.editor).line_ending.as_str();
4027+ yank_joined_impl(cx.editor, separator, cx.register.unwrap_or('"'));
37514028 exit_select_mode(cx);
37524029}
37534030
3754−fn yank_joined_to_clipboard_impl(
3755− editor: &mut Editor,
3756− separator: &str,
3757− clipboard_type: ClipboardType,
3758−) -> anyhow::Result<()> {
3759− let (view, doc) = current!(editor);
3760− let text = doc.text().slice(..);
3761−
3762− let values: Vec<String> = doc
3763− .selection(view.id)
3764− .fragments(text)
3765− .map(Cow::into_owned)
3766− .collect();
3767−
3768− let clipboard_text = match clipboard_type {
3769− ClipboardType::Clipboard => "system clipboard",
3770− ClipboardType::Selection => "primary clipboard",
3771− };
3772−
3773− let msg = format!(
3774− "joined and yanked {} selection(s) to {}",
3775− values.len(),
3776− clipboard_text,
3777− );
3778−
3779− let joined = values.join(separator);
3780−
3781− editor
3782− .clipboard_provider
3783− .set_contents(joined, clipboard_type)
3784− .context("Couldn't set system clipboard content")?;
3785−
3786− editor.set_status(msg);
3787−
3788− Ok(())
4031+fn yank_joined_to_clipboard(cx: &mut Context) {
4032+ let line_ending = doc!(cx.editor).line_ending;
4033+ yank_joined_impl(cx.editor, line_ending.as_str(), '+');
4034+ exit_select_mode(cx);
37894035}
37904036
3791−fn yank_joined_to_clipboard(cx: &mut Context) {
4037+fn yank_joined_to_primary_clipboard(cx: &mut Context) {
37924038 let line_ending = doc!(cx.editor).line_ending;
3793− let _ =
3794− yank_joined_to_clipboard_impl(cx.editor, line_ending.as_str(), ClipboardType::Clipboard);
4039+ yank_joined_impl(cx.editor, line_ending.as_str(), '*');
37954040 exit_select_mode(cx);
37964041}
37974042
3798−fn yank_main_selection_to_clipboard_impl(
3799− editor: &mut Editor,
3800− clipboard_type: ClipboardType,
3801−) -> anyhow::Result<()> {
4043+fn yank_primary_selection_impl(editor: &mut Editor, register: char) {
38024044 let (view, doc) = current!(editor);
38034045 let text = doc.text().slice(..);
38044046
3805− let message_text = match clipboard_type {
3806− ClipboardType::Clipboard => "yanked main selection to system clipboard",
3807− ClipboardType::Selection => "yanked main selection to primary clipboard",
3808− };
3809−
3810− let value = doc.selection(view.id).primary().fragment(text);
4047+ let selection = doc.selection(view.id).primary().fragment(text).to_string();
38114048
3812− if let Err(e) = editor
3813− .clipboard_provider
3814− .set_contents(value.into_owned(), clipboard_type)
3815− {
3816− 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()),
38174052 }
3818−
3819− editor.set_status(message_text);
3820− Ok(())
38214053}
38224054
38234055fn yank_main_selection_to_clipboard(cx: &mut Context) {
3824− let _ = yank_main_selection_to_clipboard_impl(cx.editor, ClipboardType::Clipboard);
3825−}
3826−
3827−fn yank_joined_to_primary_clipboard(cx: &mut Context) {
3828− let line_ending = doc!(cx.editor).line_ending;
3829− let _ =
3830− 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);
38314058}
38324059
38334060fn yank_main_selection_to_primary_clipboard(cx: &mut Context) {
3834− let _ = yank_main_selection_to_clipboard_impl(cx.editor, ClipboardType::Selection);
4061+ yank_primary_selection_impl(cx.editor, '*');
38354062 exit_select_mode(cx);
38364063}
38374064
@@ -3929,146 +4156,99 @@ pub(crate) fn paste_bracketed_value(cx: &mut Context, contents: String) {
39294156 };
39304157 let (view, doc) = current!(cx.editor);
39314158 paste_impl(&[contents], doc, view, paste, count, cx.editor.mode);
3932−}
3933−
3934−fn paste_clipboard_impl(
3935− editor: &mut Editor,
3936− action: Paste,
3937− clipboard_type: ClipboardType,
3938− count: usize,
3939−) -> anyhow::Result<()> {
3940− let (view, doc) = current!(editor);
3941− match editor.clipboard_provider.get_contents(clipboard_type) {
3942− Ok(contents) => {
3943− paste_impl(&[contents], doc, view, action, count, editor.mode);
3944− Ok(())
3945− }
3946− Err(e) => Err(e.context("Couldn't get system clipboard contents")),
3947− }
4159+ exit_select_mode(cx);
39484160}
39494161
39504162fn paste_clipboard_after(cx: &mut Context) {
3951− let _ = paste_clipboard_impl(
3952− cx.editor,
3953− Paste::After,
3954− ClipboardType::Clipboard,
3955− cx.count(),
3956− );
4163+ paste(cx.editor, '+', Paste::After, cx.count());
4164+ exit_select_mode(cx);
39574165}
39584166
39594167fn paste_clipboard_before(cx: &mut Context) {
3960− let _ = paste_clipboard_impl(
3961− cx.editor,
3962− Paste::Before,
3963− ClipboardType::Clipboard,
3964− cx.count(),
3965− );
4168+ paste(cx.editor, '+', Paste::Before, cx.count());
4169+ exit_select_mode(cx);
39664170}
39674171
39684172fn paste_primary_clipboard_after(cx: &mut Context) {
3969− let _ = paste_clipboard_impl(
3970− cx.editor,
3971− Paste::After,
3972− ClipboardType::Selection,
3973− cx.count(),
3974− );
4173+ paste(cx.editor, '*', Paste::After, cx.count());
4174+ exit_select_mode(cx);
39754175}
39764176
39774177fn paste_primary_clipboard_before(cx: &mut Context) {
3978− let _ = paste_clipboard_impl(
3979− cx.editor,
3980− Paste::Before,
3981− ClipboardType::Selection,
3982− cx.count(),
3983− );
4178+ paste(cx.editor, '*', Paste::Before, cx.count());
4179+ exit_select_mode(cx);
39844180}
39854181
39864182fn replace_with_yanked(cx: &mut Context) {
3987− let count = cx.count();
3988− let reg_name = cx.register.unwrap_or('"');
3989− let (view, doc) = current!(cx.editor);
3990− let registers = &mut cx.editor.registers;
3991−
3992− if let Some(values) = registers.read(reg_name) {
3993− if !values.is_empty() {
3994− let repeat = std::iter::repeat(
3995− values
3996− .last()
3997− .map(|value| Tendril::from(&value.repeat(count)))
3998− .unwrap(),
3999− );
4000− let mut values = values
4001− .iter()
4002− .map(|value| Tendril::from(&value.repeat(count)))
4003− .chain(repeat);
4004− let selection = doc.selection(view.id);
4005− let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
4006− if !range.is_empty() {
4007− (range.from(), range.to(), Some(values.next().unwrap()))
4008− } else {
4009− (range.from(), range.to(), None)
4010− }
4011− });
4012−
4013− doc.apply(&transaction, view.id);
4014− exit_select_mode(cx);
4015− }
4016− }
4183+ replace_with_yanked_impl(cx.editor, cx.register.unwrap_or('"'), cx.count());
4184+ exit_select_mode(cx);
40174185}
40184186
4019−fn replace_selections_with_clipboard_impl(
4020− cx: &mut Context,
4021− clipboard_type: ClipboardType,
4022−) -> anyhow::Result<()> {
4023− let count = cx.count();
4024− let (view, doc) = current!(cx.editor);
4025−
4026− match cx.editor.clipboard_provider.get_contents(clipboard_type) {
4027− Ok(contents) => {
4028− let selection = doc.selection(view.id);
4029− let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
4030− (
4031− range.from(),
4032− range.to(),
4033− Some(contents.repeat(count).as_str().into()),
4034− )
4035− });
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();
40364192
4037− doc.apply(&transaction, view.id);
4038− 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)
40394210 }
4040− Err(e) => return Err(e.context("Couldn't get system clipboard contents")),
4041− }
4211+ });
40424212
4043− exit_select_mode(cx);
4044− Ok(())
4213+ doc.apply(&transaction, view.id);
40454214}
40464215
40474216fn replace_selections_with_clipboard(cx: &mut Context) {
4048− let _ = replace_selections_with_clipboard_impl(cx, ClipboardType::Clipboard);
4217+ replace_with_yanked_impl(cx.editor, '+', cx.count());
4218+ exit_select_mode(cx);
40494219}
40504220
40514221fn replace_selections_with_primary_clipboard(cx: &mut Context) {
4052− let _ = replace_selections_with_clipboard_impl(cx, ClipboardType::Selection);
4222+ replace_with_yanked_impl(cx.editor, '*', cx.count());
4223+ exit_select_mode(cx);
40534224}
40544225
4055−fn paste(cx: &mut Context, pos: Paste) {
4056− let count = cx.count();
4057− let reg_name = cx.register.unwrap_or('"');
4058− let (view, doc) = current!(cx.editor);
4059− 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();
40604229
4061− if let Some(values) = registers.read(reg_name) {
4062− paste_impl(values, doc, view, pos, count, cx.editor.mode);
4063− }
4230+ let (view, doc) = current!(editor);
4231+ paste_impl(&values, doc, view, pos, count, editor.mode);
40644232}
40654233
40664234fn paste_after(cx: &mut Context) {
4067− 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);
40684242}
40694243
40704244fn paste_before(cx: &mut Context) {
4071− 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);
40724252}
40734253
40744254fn get_lines(doc: &Document, view_id: ViewId) -> Vec<usize> {
@@ -4107,6 +4287,7 @@ fn indent(cx: &mut Context) {
41074287 }),
41084288 );
41094289 doc.apply(&transaction, view.id);
4290+ exit_select_mode(cx);
41104291}
41114292
41124293fn unindent(cx: &mut Context) {
@@ -4146,6 +4327,7 @@ fn unindent(cx: &mut Context) {
41464327 let transaction = Transaction::change(doc.text(), changes.into_iter());
41474328
41484329 doc.apply(&transaction, view.id);
4330+ exit_select_mode(cx);
41494331}
41504332
41514333fn format_selections(cx: &mut Context) {
@@ -4175,7 +4357,7 @@ fn format_selections(cx: &mut Context) {
41754357 })
41764358 else {
41774359 cx.editor
4178− .set_error("No configured language server does not support range formatting");
4360+ .set_error("No configured language server supports range formatting");
41794361 return;
41804362 };
41814363
@@ -4212,10 +4394,9 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
42124394 use movement::skip_while;
42134395 let (view, doc) = current!(cx.editor);
42144396 let text = doc.text();
4215− let slice = doc.text().slice(..);
4397+ let slice = text.slice(..);
42164398
42174399 let mut changes = Vec::new();
4218− let fragment = Tendril::from(" ");
42194400
42204401 for selection in doc.selection(view.id) {
42214402 let (start, mut end) = selection.line_range(slice);
@@ -4231,9 +4412,13 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
42314412 let mut end = text.line_to_char(line + 1);
42324413 end = skip_while(slice, end, |ch| matches!(ch, ' ' | '\t')).unwrap_or(end);
42334414
4234− // need to skip from start, not end
4235− let change = (start, end, Some(fragment.clone()));
4236− 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));
42374422 }
42384423 }
42394424
@@ -4245,9 +4430,6 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
42454430 changes.sort_unstable_by_key(|(from, _to, _text)| *from);
42464431 changes.dedup();
42474432
4248− // TODO: joining multiple empty lines should be replaced by a single space.
4249− // need to merge change ranges that touch
4250−
42514433 // select inserted spaces
42524434 let transaction = if select_space {
42534435 let ranges: SmallVec<_> = changes
@@ -4259,9 +4441,9 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
42594441 })
42604442 .collect();
42614443 let selection = Selection::new(ranges, 0);
4262− Transaction::change(doc.text(), changes.into_iter()).with_selection(selection)
4444+ Transaction::change(text, changes.into_iter()).with_selection(selection)
42634445 } else {
4264− Transaction::change(doc.text(), changes.into_iter())
4446+ Transaction::change(text, changes.into_iter())
42654447 };
42664448
42674449 doc.apply(&transaction, view.id);
@@ -4275,8 +4457,8 @@ fn keep_or_remove_selections_impl(cx: &mut Context, remove: bool) {
42754457 if remove { "remove:" } else { "keep:" }.into(),
42764458 Some(reg),
42774459 ui::completers::none,
4278− move |editor, regex, event| {
4279− let (view, doc) = current!(editor);
4460+ move |cx, regex, event| {
4461+ let (view, doc) = current!(cx.editor);
42804462 if !matches!(event, PromptEvent::Update | PromptEvent::Validate) {
42814463 return;
42824464 }
@@ -4584,8 +4766,7 @@ fn expand_selection(cx: &mut Context) {
45844766 }
45854767 }
45864768 };
4587− motion(cx.editor);
4588− cx.editor.last_motion = Some(Motion(Box::new(motion)));
4769+ cx.editor.apply_motion(motion);
45894770}
45904771
45914772fn shrink_selection(cx: &mut Context) {
@@ -4609,8 +4790,7 @@ fn shrink_selection(cx: &mut Context) {
46094790 doc.set_selection(view.id, selection);
46104791 }
46114792 };
4612− motion(cx.editor);
4613− cx.editor.last_motion = Some(Motion(Box::new(motion)));
4793+ cx.editor.apply_motion(motion);
46144794}
46154795
46164796fn select_sibling_impl<F>(cx: &mut Context, sibling_fn: &'static F)
@@ -4628,8 +4808,7 @@ where
46284808 doc.set_selection(view.id, selection);
46294809 }
46304810 };
4631− motion(cx.editor);
4632− cx.editor.last_motion = Some(Motion(Box::new(motion)));
4811+ cx.editor.apply_motion(motion);
46334812}
46344813
46354814fn select_next_sibling(cx: &mut Context) {
@@ -4640,6 +4819,49 @@ fn select_prev_sibling(cx: &mut Context) {
46404819 select_sibling_impl(cx, &|node| Node::prev_sibling(&node))
46414820}
46424821
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+
46434865fn match_brackets(cx: &mut Context) {
46444866 let (view, doc) = current!(cx.editor);
46454867 let is_select = cx.editor.mode == Mode::Select;
@@ -4753,17 +4975,19 @@ fn transpose_view(cx: &mut Context) {
47534975 cx.editor.transpose_view()
47544976}
47554977
4756−// split helper, clear it later
4757−fn split(cx: &mut Context, action: Action) {
4758− 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);
47594983 let id = doc.id();
47604984 let selection = doc.selection(view.id).clone();
47614985 let offset = view.offset;
47624986
4763− cx.editor.switch(id, action);
4987+ editor.switch(id, action);
47644988
47654989 // match the selection in the previous view
4766− let (view, doc) = current!(cx.editor);
4990+ let (view, doc) = current!(editor);
47674991 doc.set_selection(view.id, selection);
47684992 // match the view scroll offset (switch doesn't handle this fully
47694993 // since the selection is only matched after the split)
@@ -4771,7 +4995,7 @@ fn split(cx: &mut Context, action: Action) {
47714995}
47724996
47734997fn hsplit(cx: &mut Context) {
4774− split(cx, Action::HorizontalSplit);
4998+ split(cx.editor, Action::HorizontalSplit);
47754999}
47765000
47775001fn hsplit_new(cx: &mut Context) {
@@ -4779,7 +5003,7 @@ fn hsplit_new(cx: &mut Context) {
47795003}
47805004
47815005fn vsplit(cx: &mut Context) {
4782− split(cx, Action::VerticalSplit);
5006+ split(cx.editor, Action::VerticalSplit);
47835007}
47845008
47855009fn vsplit_new(cx: &mut Context) {
@@ -4828,7 +5052,12 @@ fn insert_register(cx: &mut Context) {
48285052 if let Some(ch) = event.char() {
48295053 cx.editor.autoinfo = None;
48305054 cx.register = Some(ch);
4831− paste(cx, Paste::Cursor);
5055+ paste(
5056+ cx.editor,
5057+ cx.register.unwrap_or('"'),
5058+ Paste::Cursor,
5059+ cx.count(),
5060+ );
48325061 }
48335062 })
48345063}
@@ -4912,8 +5141,7 @@ fn goto_ts_object_impl(cx: &mut Context, object: &'static str, direction: Direct
49125141 editor.set_status("Syntax-tree is not available in current buffer");
49135142 }
49145143 };
4915− motion(cx.editor);
4916− cx.editor.last_motion = Some(Motion(Box::new(motion)));
5144+ cx.editor.apply_motion(motion);
49175145}
49185146
49195147fn goto_next_function(cx: &mut Context) {
@@ -5034,8 +5262,7 @@ fn select_textobject(cx: &mut Context, objtype: textobject::TextObject) {
50345262 });
50355263 doc.set_selection(view.id, selection);
50365264 };
5037− textobject(cx.editor);
5038− cx.editor.last_motion = Some(Motion(Box::new(textobject)));
5265+ cx.editor.apply_motion(textobject);
50395266 }
50405267 });
50415268
@@ -5125,11 +5352,18 @@ fn surround_replace(cx: &mut Context) {
51255352 }
51265353 };
51275354
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+
51285362 cx.on_next_key(move |cx, event| {
51295363 let (view, doc) = current!(cx.editor);
51305364 let to = match event.char() {
51315365 Some(to) => to,
5132− None => return,
5366+ None => return doc.set_selection(view.id, selection),
51335367 };
51345368 let (open, close) = surround::get_pair(to);
51355369 let transaction = Transaction::change(
@@ -5140,6 +5374,7 @@ fn surround_replace(cx: &mut Context) {
51405374 (pos, pos + 1, Some(t))
51415375 }),
51425376 );
5377+ doc.set_selection(view.id, selection);
51435378 doc.apply(&transaction, view.id);
51445379 exit_select_mode(cx);
51455380 });
@@ -5374,12 +5609,18 @@ fn shell(cx: &mut compositor::Context, cmd: &str, behavior: &ShellBehavior) {
53745609 };
53755610
53765611 // These `usize`s cannot underflow because selection ranges cannot overlap.
5377− // Once the MSRV is 1.66.0 (mixed_integer_ops is stabilized), we can use checked
5378− // arithmetic to assert this.
5379− 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");
53805617 let new_range = Range::new(anchor, anchor + output_len).with_direction(range.direction());
53815618 ranges.push(new_range);
5382− 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");
53835624
53845625 changes.push((from, to, Some(output)));
53855626 }
@@ -5518,6 +5759,7 @@ fn increment_impl(cx: &mut Context, increment_direction: IncrementDirection) {
55185759 let transaction = Transaction::change(doc.text(), changes.into_iter());
55195760 let transaction = transaction.with_selection(new_selection);
55205761 doc.apply(&transaction, view.id);
5762+ exit_select_mode(cx);
55215763 }
55225764}
55235765
@@ -5536,9 +5778,12 @@ fn record_macro(cx: &mut Context) {
55365778 }
55375779 })
55385780 .collect::<String>();
5539− cx.editor.registers.write(reg, vec![s]);
5540− cx.editor
5541− .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+ }
55425787 } else {
55435788 let reg = cx.register.take().unwrap_or('@');
55445789 cx.editor.macro_recording = Some((reg, Vec::new()));
@@ -5558,8 +5803,14 @@ fn replay_macro(cx: &mut Context) {
55585803 return;
55595804 }
55605805
5561− let keys: Vec<KeyEvent> = if let Some([keys_str]) = cx.editor.registers.read(reg) {
5562− 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) {
55635814 Ok(keys) => keys,
55645815 Err(err) => {
55655816 cx.editor.set_error(format!("Invalid macro: {}", err));