@@ -13,7 +13,6 @@ use helix_core::{
1313 numbers::NumberIncrementor,
1414 object, pos_at_coords,
1515 regex::{self, Regex, RegexBuilder},
16− register::Register,
1716 search, selection, surround, textobject,
1817 unicode::width::UnicodeWidthChar,
1918 LineEnding, Position, Range, Rope, RopeGraphemes, RopeSlice, Selection, SmallVec, Tendril,
@@ -236,7 +235,9 @@ impl Command {
236235 extend_line, "Select current line, if already selected, extend to next line",
237236 extend_to_line_bounds, "Extend selection to line bounds (line-wise selection)",
238237 delete_selection, "Delete selection",
238+ delete_selection_noyank, "Delete selection, without yanking",
239239 change_selection, "Change selection (delete and enter insert mode)",
240+ change_selection_noyank, "Change selection (delete and enter insert mode, without yanking)",
240241 collapse_selection, "Collapse selection onto a single cursor",
241242 flip_selections, "Flip selection cursor and anchor",
242243 insert_mode, "Insert before selection",
@@ -262,6 +263,9 @@ impl Command {
262263 goto_implementation, "Goto implementation",
263264 goto_file_start, "Goto file start/line",
264265 goto_file_end, "Goto file end",
266+ goto_file, "Goto files in the selection",
267+ goto_file_hsplit, "Goto files in the selection in horizontal splits",
268+ goto_file_vsplit, "Goto files in the selection in vertical splits",
265269 goto_reference, "Goto references",
266270 goto_window_top, "Goto window top",
267271 goto_window_middle, "Goto window middle",
@@ -318,6 +322,7 @@ impl Command {
318322 join_selections, "Join lines inside selection",
319323 keep_selections, "Keep selections matching regex",
320324 remove_selections, "Remove selections matching regex",
325+ align_selections, "Align selections in column",
321326 keep_primary_selection, "Keep primary selection",
322327 remove_primary_selection, "Remove primary selection",
323328 completion, "Invoke completion popup",
@@ -676,11 +681,83 @@ fn trim_selections(cx: &mut Context) {
676681 };
677682}
678683
684+// align text in selection
685+fn align_selections(cx: &mut Context) {
686+ let align_style = cx.count();
687+ if align_style > 3 {
688+ cx.editor.set_error(
689+ "align only accept 1,2,3 as count to set left/center/right align".to_string(),
690+ );
691+ return;
692+ }
693+
694+ let (view, doc) = current!(cx.editor);
695+ let text = doc.text().slice(..);
696+ let selection = doc.selection(view.id);
697+ let mut column_widths = vec![];
698+ let mut last_line = text.len_lines();
699+ let mut column = 0;
700+ // first of all, we need compute all column's width, let use max width of the selections in a column
701+ for sel in selection {
702+ let (l1, l2) = sel.line_range(text);
703+ if l1 != l2 {
704+ cx.editor
705+ .set_error("align cannot work with multi line selections".to_string());
706+ return;
707+ }
708+ // if the selection is not in the same line with last selection, we set the column to 0
709+ column = if l1 != last_line { 0 } else { column + 1 };
710+ last_line = l1;
711+
712+ if column < column_widths.len() {
713+ if sel.to() - sel.from() > column_widths[column] {
714+ column_widths[column] = sel.to() - sel.from();
715+ }
716+ } else {
717+ // a new column, current selection width is the temp width of the column
718+ column_widths.push(sel.to() - sel.from());
719+ }
720+ }
721+ last_line = text.len_lines();
722+ // once we get the with of each column, we transform each selection with to it's column width based on the align style
723+ let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
724+ let l = range.cursor_line(text);
725+ column = if l != last_line { 0 } else { column + 1 };
726+ last_line = l;
727+
728+ (
729+ range.from(),
730+ range.to(),
731+ Some(
732+ align_fragment_to_width(&range.fragment(text), column_widths[column], align_style)
733+ .into(),
734+ ),
735+ )
736+ });
737+
738+ doc.apply(&transaction, view.id);
739+ doc.append_changes_to_history(view.id);
740+}
741+
742+fn align_fragment_to_width(fragment: &str, width: usize, align_style: usize) -> String {
743+ let trimed = fragment.trim_matches(|c| c == ' ');
744+ let mut s = " ".repeat(width - trimed.chars().count());
745+ match align_style {
746+ 1 => s.insert_str(0, trimed), // left align
747+ 2 => s.insert_str(s.len() / 2, trimed), // center align
748+ 3 => s.push_str(trimed), // right align
749+ n => unimplemented!("{}", n),
750+ }
751+ s
752+}
753+
679754fn goto_window(cx: &mut Context, align: Align) {
755+ let count = cx.count() - 1;
680756 let (view, doc) = current!(cx.editor);
681757
682758 let height = view.inner_area().height as usize;
683759
760+ // respect user given count if any
684761 // - 1 so we have at least one gap in the middle.
685762 // a height of 6 with padding of 3 on each side will keep shifting the view back and forth
686763 // as we type
@@ -689,11 +766,12 @@ fn goto_window(cx: &mut Context, align: Align) {
689766 let last_line = view.last_line(doc);
690767
691768 let line = match align {
692− Align::Top => (view.offset.row + scrolloff),
693− Align::Center => (view.offset.row + (height / 2)),
694− Align::Bottom => last_line.saturating_sub(scrolloff),
769+ Align::Top => (view.offset.row + scrolloff + count),
770+ Align::Center => (view.offset.row + ((last_line - view.offset.row) / 2)),
771+ Align::Bottom => last_line.saturating_sub(scrolloff + count),
695772 }
696− .min(last_line.saturating_sub(scrolloff));
773+ .min(last_line.saturating_sub(scrolloff))
774+ .max(view.offset.row + scrolloff);
697775
698776 let pos = doc.text().line_to_char(line);
699777
@@ -782,6 +860,49 @@ fn goto_file_end(cx: &mut Context) {
782860 doc.set_selection(view.id, selection);
783861}
784862
863+fn goto_file(cx: &mut Context) {
864+ goto_file_impl(cx, Action::Replace);
865+}
866+
867+fn goto_file_hsplit(cx: &mut Context) {
868+ goto_file_impl(cx, Action::HorizontalSplit);
869+}
870+
871+fn goto_file_vsplit(cx: &mut Context) {
872+ goto_file_impl(cx, Action::VerticalSplit);
873+}
874+
875+fn goto_file_impl(cx: &mut Context, action: Action) {
876+ let (view, doc) = current_ref!(cx.editor);
877+ let text = doc.text();
878+ let selections = doc.selection(view.id);
879+ let mut paths: Vec<_> = selections
880+ .iter()
881+ .map(|r| text.slice(r.from()..r.to()).to_string())
882+ .collect();
883+ let primary = selections.primary();
884+ if selections.len() == 1 && primary.to() - primary.from() == 1 {
885+ let current_word = movement::move_next_long_word_start(
886+ text.slice(..),
887+ movement::move_prev_long_word_start(text.slice(..), primary, 1),
888+ 1,
889+ );
890+ paths.clear();
891+ paths.push(
892+ text.slice(current_word.from()..current_word.to())
893+ .to_string(),
894+ );
895+ }
896+ for sel in paths {
897+ let p = sel.trim();
898+ if !p.is_empty() {
899+ if let Err(e) = cx.editor.open(PathBuf::from(p), action) {
900+ cx.editor.set_error(format!("Open file failed: {:?}", e));
901+ }
902+ }
903+ }
904+}
905+
785906fn extend_word_impl<F>(cx: &mut Context, extend_fn: F)
786907where
787908 F: Fn(RopeSlice, Range, usize) -> Range,
@@ -1459,6 +1580,7 @@ fn global_search(cx: &mut Context) {
14591580 let (all_matches_sx, all_matches_rx) =
14601581 tokio::sync::mpsc::unbounded_channel::<(usize, PathBuf)>();
14611582 let smart_case = cx.editor.config.smart_case;
1583+ let file_picker_config = cx.editor.config.file_picker.clone();
14621584
14631585 let completions = search_completions(cx, None);
14641586 let prompt = ui::regex_prompt(
@@ -1487,41 +1609,55 @@ fn global_search(cx: &mut Context) {
14871609
14881610 let search_root = std::env::current_dir()
14891611 .expect("Global search error: Failed to get current dir");
1490− WalkBuilder::new(search_root).build_parallel().run(|| {
1491− let mut searcher_cl = searcher.clone();
1492− let matcher_cl = matcher.clone();
1493− let all_matches_sx_cl = all_matches_sx.clone();
1494− Box::new(move |dent: Result<DirEntry, ignore::Error>| -> WalkState {
1495− let dent = match dent {
1496− Ok(dent) => dent,
1497− Err(_) => return WalkState::Continue,
1498− };
1499−
1500− match dent.file_type() {
1501− Some(fi) => {
1502− if !fi.is_file() {
1503− return WalkState::Continue;
1612+ WalkBuilder::new(search_root)
1613+ .hidden(file_picker_config.hidden)
1614+ .parents(file_picker_config.parents)
1615+ .ignore(file_picker_config.ignore)
1616+ .git_ignore(file_picker_config.git_ignore)
1617+ .git_global(file_picker_config.git_global)
1618+ .git_exclude(file_picker_config.git_exclude)
1619+ .max_depth(file_picker_config.max_depth)
1620+ .build_parallel()
1621+ .run(|| {
1622+ let mut searcher_cl = searcher.clone();
1623+ let matcher_cl = matcher.clone();
1624+ let all_matches_sx_cl = all_matches_sx.clone();
1625+ Box::new(move |dent: Result<DirEntry, ignore::Error>| -> WalkState {
1626+ let dent = match dent {
1627+ Ok(dent) => dent,
1628+ Err(_) => return WalkState::Continue,
1629+ };
1630+
1631+ match dent.file_type() {
1632+ Some(fi) => {
1633+ if !fi.is_file() {
1634+ return WalkState::Continue;
1635+ }
15041636 }
1637+ None => return WalkState::Continue,
15051638 }
1506− None => return WalkState::Continue,
1507− }
15081639
1509− let result_sink = sinks::UTF8(|line_num, _| {
1510− match all_matches_sx_cl
1511− .send((line_num as usize - 1, dent.path().to_path_buf()))
1512− {
1513− Ok(_) => Ok(true),
1514− Err(_) => Ok(false),
1640+ let result_sink = sinks::UTF8(|line_num, _| {
1641+ match all_matches_sx_cl
1642+ .send((line_num as usize - 1, dent.path().to_path_buf()))
1643+ {
1644+ Ok(_) => Ok(true),
1645+ Err(_) => Ok(false),
1646+ }
1647+ });
1648+ let result =
1649+ searcher_cl.search_path(&matcher_cl, dent.path(), result_sink);
1650+
1651+ if let Err(err) = result {
1652+ log::error!(
1653+ "Global search error: {}, {}",
1654+ dent.path().display(),
1655+ err
1656+ );
15151657 }
1516− });
1517− let result = searcher_cl.search_path(&matcher_cl, dent.path(), result_sink);
1518−
1519− if let Err(err) = result {
1520− log::error!("Global search error: {}, {}", dent.path().display(), err);
1521− }
1522− WalkState::Continue
1523− })
1524− });
1658+ WalkState::Continue
1659+ })
1660+ });
15251661 } else {
15261662 // Otherwise do nothing
15271663 // log::warn!("Global Search Invalid Pattern")
@@ -1626,19 +1762,42 @@ fn extend_to_line_bounds(cx: &mut Context) {
16261762 );
16271763}
16281764
1629−fn delete_selection_impl(reg: &mut Register, doc: &mut Document, view_id: ViewId) {
1765+enum Operation {
1766+ Delete,
1767+ Change,
1768+}
1769+
1770+fn delete_selection_impl(cx: &mut Context, op: Operation) {
1771+ let (view, doc) = current!(cx.editor);
1772+
16301773 let text = doc.text().slice(..);
1631− let selection = doc.selection(view_id);
1774+ let selection = doc.selection(view.id);
16321775
1633− // first yank the selection
1634− let values: Vec<String> = selection.fragments(text).map(Cow::into_owned).collect();
1635− reg.write(values);
1776+ if cx.register != Some('_') {
1777+ // first yank the selection
1778+ let values: Vec<String> = selection.fragments(text).map(Cow::into_owned).collect();
1779+ let reg_name = cx.register.unwrap_or('"');
1780+ let registers = &mut cx.editor.registers;
1781+ let reg = registers.get_mut(reg_name);
1782+ reg.write(values);
1783+ };
16361784
16371785 // then delete
16381786 let transaction = Transaction::change_by_selection(doc.text(), selection, |range| {
16391787 (range.from(), range.to(), None)
16401788 });
1641− doc.apply(&transaction, view_id);
1789+ doc.apply(&transaction, view.id);
1790+
1791+ match op {
1792+ Operation::Delete => {
1793+ doc.append_changes_to_history(view.id);
1794+ // exit select mode, if currently in select mode
1795+ exit_select_mode(cx);
1796+ }
1797+ Operation::Change => {
1798+ enter_insert_mode(doc);
1799+ }
1800+ }
16421801}
16431802
16441803#[inline]
@@ -1653,25 +1812,21 @@ fn delete_selection_insert_mode(doc: &mut Document, view: &View, selection: &Sel
16531812}
16541813
16551814fn delete_selection(cx: &mut Context) {
1656− let reg_name = cx.register.unwrap_or('"');
1657− let (view, doc) = current!(cx.editor);
1658− let registers = &mut cx.editor.registers;
1659− let reg = registers.get_mut(reg_name);
1660− delete_selection_impl(reg, doc, view.id);
1661−
1662− doc.append_changes_to_history(view.id);
1815+ delete_selection_impl(cx, Operation::Delete);
1816+}
16631817
1664− // exit select mode, if currently in select mode
1665− exit_select_mode(cx);
1818+fn delete_selection_noyank(cx: &mut Context) {
1819+ cx.register = Some('_');
1820+ delete_selection_impl(cx, Operation::Delete);
16661821}
16671822
16681823fn change_selection(cx: &mut Context) {
1669− let reg_name = cx.register.unwrap_or('"');
1670− let (view, doc) = current!(cx.editor);
1671− let registers = &mut cx.editor.registers;
1672− let reg = registers.get_mut(reg_name);
1673− delete_selection_impl(reg, doc, view.id);
1674− enter_insert_mode(doc);
1824+ delete_selection_impl(cx, Operation::Change);
1825+}
1826+
1827+fn change_selection_noyank(cx: &mut Context) {
1828+ cx.register = Some('_');
1829+ delete_selection_impl(cx, Operation::Change);
16751830}
16761831
16771832fn collapse_selection(cx: &mut Context) {
@@ -1820,7 +1975,7 @@ mod cmd {
18201975 let jobs = &mut cx.jobs;
18211976 let (_, doc) = current!(cx.editor);
18221977
1823− if let Some(path) = path {
1978+ if let Some(ref path) = path {
18241979 doc.set_path(Some(path.as_ref()))
18251980 .context("invalid filepath")?;
18261981 }
@@ -1840,6 +1995,11 @@ mod cmd {
18401995 });
18411996 let future = doc.format_and_save(fmt);
18421997 cx.jobs.add(Job::new(future).wait_before_exiting());
1998+
1999+ if path.is_some() {
2000+ let id = doc.id();
2001+ let _ = cx.editor.refresh_language_server(id);
2002+ }
18432003 Ok(())
18442004 }
18452005
@@ -2466,6 +2626,26 @@ mod cmd {
24662626 Ok(())
24672627 }
24682628
2629+ pub(super) fn goto_line_number(
2630+ cx: &mut compositor::Context,
2631+ args: &[&str],
2632+ _event: PromptEvent,
2633+ ) -> anyhow::Result<()> {
2634+ if args.is_empty() {
2635+ bail!("Line number required");
2636+ }
2637+
2638+ let line = args[0].parse::<usize>()?;
2639+
2640+ goto_line_impl(&mut cx.editor, NonZeroUsize::new(line));
2641+
2642+ let (view, doc) = current!(cx.editor);
2643+
2644+ view.ensure_cursor_in_view(doc, line);
2645+
2646+ Ok(())
2647+ }
2648+
24692649 pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
24702650 TypableCommand {
24712651 name: "quit",
@@ -2768,6 +2948,13 @@ mod cmd {
27682948 fun: tutor,
27692949 completer: None,
27702950 },
2951+ TypableCommand {
2952+ name: "goto",
2953+ aliases: &["g"],
2954+ doc: "Go to line number.",
2955+ fun: goto_line_number,
2956+ completer: None,
2957+ }
27712958 ];
27722959
27732960 pub static COMMANDS: Lazy<HashMap<&'static str, &'static TypableCommand>> = Lazy::new(|| {
@@ -2830,6 +3017,15 @@ fn command_mode(cx: &mut Context) {
28303017 return;
28313018 }
28323019
3020+ // If command is numeric, interpret as line number and go there.
3021+ if parts.len() == 1 && parts[0].parse::<usize>().ok().is_some() {
3022+ if let Err(e) = cmd::goto_line_number(cx, &parts[0..], event) {
3023+ cx.editor.set_error(format!("{}", e));
3024+ }
3025+ return;
3026+ }
3027+
3028+ // Handle typable commands
28333029 if let Some(cmd) = cmd::COMMANDS.get(parts[0]) {
28343030 if let Err(e) = (cmd.fun)(cx, &parts[1..], event) {
28353031 cx.editor.set_error(format!("{}", e));
@@ -2855,7 +3051,7 @@ fn command_mode(cx: &mut Context) {
28553051
28563052fn file_picker(cx: &mut Context) {
28573053 let root = find_root(None).unwrap_or_else(|| PathBuf::from("./"));
2858− let picker = ui::file_picker(root);
3054+ let picker = ui::file_picker(root, &cx.editor.config);
28593055 cx.push_layer(Box::new(picker));
28603056}
28613057
@@ -3463,10 +3659,14 @@ fn push_jump(editor: &mut Editor) {
34633659}
34643660
34653661fn goto_line(cx: &mut Context) {
3466− if let Some(count) = cx.count {
3467− push_jump(cx.editor);
3662+ goto_line_impl(&mut cx.editor, cx.count)
3663+}
34683664
3469− let (view, doc) = current!(cx.editor);
3665+fn goto_line_impl(editor: &mut Editor, count: Option<NonZeroUsize>) {
3666+ if let Some(count) = count {
3667+ push_jump(editor);
3668+
3669+ let (view, doc) = current!(editor);
34703670 let max_line = if doc.text().line(doc.text().len_lines() - 1).len_chars() == 0 {
34713671 // If the last line is blank, don't jump to it.
34723672 doc.text().len_lines().saturating_sub(2)
@@ -5065,7 +5265,9 @@ fn match_brackets(cx: &mut Context) {
50655265 if let Some(syntax) = doc.syntax() {
50665266 let text = doc.text().slice(..);
50675267 let selection = doc.selection(view.id).clone().transform(|range| {
5068− if let Some(pos) = match_brackets::find(syntax, doc.text(), range.anchor) {
5268+ if let Some(pos) =
5269+ match_brackets::find_matching_bracket_fuzzy(syntax, doc.text(), range.anchor)
5270+ {
50695271 range.put_cursor(text, pos, doc.mode == Mode::Select)
50705272 } else {
50715273 range