mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-05 11:57:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge db3bd74a45 into 7ebf650029

Browse source
This commit is contained in:
ivan 2025-04-03 19:00:25 +02:00 • committed by GitHub
commit cff42fdb3d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
book/src/generated/static-cmd.md
View file

@ -80,6 +80,7 @@
| `search_selection_detect_word_boundaries` | Use current selection as the search pattern, automatically wrapping with `\b` on word boundaries | normal: `` * ``, select: `` * `` | | `search_selection_detect_word_boundaries` | Use current selection as the search pattern, automatically wrapping with `\b` on word boundaries | normal: `` * ``, select: `` * `` |
| `make_search_word_bounded` | Modify current search to make it word bounded | | | `make_search_word_bounded` | Modify current search to make it word bounded | |
| `global_search` | Global search in workspace folder | normal: `` <space>/ ``, select: `` <space>/ `` | | `global_search` | Global search in workspace folder | normal: `` <space>/ ``, select: `` <space>/ `` |
| `live_grep` | Live grep in workspace folder | |
| `extend_line` | Select current line, if already selected, extend to another line based on the anchor | | | `extend_line` | Select current line, if already selected, extend to another line based on the anchor | |
| `extend_line_below` | Select current line, if already selected, extend to next line | normal: `` x ``, select: `` x `` | | `extend_line_below` | Select current line, if already selected, extend to next line | normal: `` x ``, select: `` x `` |
| `extend_line_above` | Select current line, if already selected, extend to previous line | | | `extend_line_above` | Select current line, if already selected, extend to previous line | |

11
helix-term/src/commands.rs
View file

@ -378,6 +378,7 @@ impl MappableCommand {
search_selection_detect_word_boundaries, "Use current selection as the search pattern, automatically wrapping with `\\b` on word boundaries", search_selection_detect_word_boundaries, "Use current selection as the search pattern, automatically wrapping with `\\b` on word boundaries",
make_search_word_bounded, "Modify current search to make it word bounded", make_search_word_bounded, "Modify current search to make it word bounded",
global_search, "Global search in workspace folder", global_search, "Global search in workspace folder",
live_grep, "Live grep in workspace folder",
extend_line, "Select current line, if already selected, extend to another line based on the anchor", extend_line, "Select current line, if already selected, extend to another line based on the anchor",
extend_line_below, "Select current line, if already selected, extend to next line", extend_line_below, "Select current line, if already selected, extend to next line",
extend_line_above, "Select current line, if already selected, extend to previous line", extend_line_above, "Select current line, if already selected, extend to previous line",
@ -2416,6 +2417,14 @@ fn make_search_word_bounded(cx: &mut Context) {
} }
fn global_search(cx: &mut Context) { fn global_search(cx: &mut Context) {
global_search_impl(cx, 275);
}
fn live_grep(cx: &mut Context) {
global_search_impl(cx, 30);
}
fn global_search_impl(cx: &mut Context, debounce_ms: u64) {
#[derive(Debug)] #[derive(Debug)]
struct FileResult { struct FileResult {
path: PathBuf, path: PathBuf,
@ -2640,7 +2649,7 @@ fn global_search(cx: &mut Context) {
Some((path.as_path().into(), Some((*line_num, *line_num)))) Some((path.as_path().into(), Some((*line_num, *line_num))))
}) })
.with_history_register(Some(reg)) .with_history_register(Some(reg))
.with_dynamic_query(get_files, Some(275)); .with_dynamic_query(get_files, Some(debounce_ms));
cx.push_layer(Box::new(overlaid(picker))); cx.push_layer(Box::new(overlaid(picker)));
} }