zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-09 00:50:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

vim: Reset search options whenever / is used (#19058)

Browse Source 
This is a bit of a personal thing, but it's been bugging me for a while
now that the search options are sticky whenever I use `/` in Vim mode.

This change makes it so that the options are reset with each new `/`.

That means you can, for example, use `v` to create a visual selection,
then hit `*` to search for that (which activates a bunch of search
options), but then continue with `/` to get a normal search.

Release Notes:

- Changed `/` in Vim mode to always reset the search options in the
search bar back to regex-only. That means using `*` (in normal or visual
mode) still works with its options, but the next `/` will reset the
search options. That makes it much closer to how `/` behaves in Vim.
This commit is contained in:
Thorsten Ball 2024-10-11 10:06:33 +02:00 committed by GitHub
parent e962839d13
commit 36b9e40085
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crates/vim/src/normal/search.rs
View File

@ -129,14 +129,13 @@ impl Vim {
search_bar.select_query(cx); search_bar.select_query(cx);
cx.focus_self(); cx.focus_self();
if query.is_empty() {
search_bar.set_replacement(None, cx); search_bar.set_replacement(None, cx);
search_bar.set_search_options(SearchOptions::REGEX, cx); search_bar.set_search_options(SearchOptions::NONE | SearchOptions::REGEX, cx);
}
self.search = SearchState { self.search = SearchState {
direction, direction,
count, count,
initial_query: query.clone(), initial_query: query,
prior_selections, prior_selections,
prior_operator: self.operator_stack.last().cloned(), prior_operator: self.operator_stack.last().cloned(),
prior_mode: self.mode, prior_mode: self.mode,