Skip to content

vim: Respect search settings in buffer search#48127

Merged
SomeoneToIgnore merged 4 commits intozed-industries:mainfrom
cppcoffee:vim_search
Feb 1, 2026
Merged

vim: Respect search settings in buffer search#48127
SomeoneToIgnore merged 4 commits intozed-industries:mainfrom
cppcoffee:vim_search

Conversation

@cppcoffee
Copy link
Contributor

@cppcoffee cppcoffee commented Feb 1, 2026 •
edited by SomeoneToIgnore
Loading

Closes #48007

Release Notes:

  • Fixed Vim search not respecting "search" default settings

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Feb 1, 2026
@cppcoffee
vim: Respect search settings in buffer search
04369b9 
Signed-off-by: Xiaobo Liu <cppcoffee@gmail.com>
SomeoneToIgnore
SomeoneToIgnore requested changes Feb 1, 2026
View reviewed changes
Copy link
Contributor

@SomeoneToIgnore SomeoneToIgnore left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As usual: the test is very much needed.

@SomeoneToIgnore SomeoneToIgnore self-assigned this Feb 1, 2026
@cppcoffee
add test
91f94c4 
Signed-off-by: Xiaobo Liu <cppcoffee@gmail.com>
@cppcoffee
style
c8836ee 
Signed-off-by: Xiaobo Liu <cppcoffee@gmail.com>
@cppcoffee
tweak
b2062e8 
Signed-off-by: Xiaobo Liu <cppcoffee@gmail.com>
@cppcoffee
Copy link
Contributor Author

cppcoffee commented Feb 1, 2026

As usual: the test is very much needed.

The unit test added.

SomeoneToIgnore
SomeoneToIgnore approved these changes Feb 1, 2026
View reviewed changes
Copy link
Contributor

@SomeoneToIgnore SomeoneToIgnore left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good, that's quite an improvement over #40963 as this time the test actually works right and does fail on main.

I would appreciate if next time you think a bit more and actually write tests when you're changing the logic.

Ideally, you can also clear slop like

Image

but one clever thing at a time, I guess...

@SomeoneToIgnore SomeoneToIgnore merged commit aafecf0 into zed-industries:main Feb 1, 2026
29 checks passed
@cppcoffee cppcoffee deleted the vim_search branch February 2, 2026 00:56
@cppcoffee
Copy link
Contributor Author

cppcoffee commented Feb 2, 2026

Refactor unit test #48165

ConradIrwin added a commit that referenced this pull request Feb 3, 2026
@ConradIrwin
Revert "vim: Respect search settings in buffer search (#48127)"
9944e08 
This reverts commit aafecf0.
@ConradIrwin
Copy link
Member

ConradIrwin commented Feb 3, 2026

I'm reverting this for now (in #48234).

The / operator should default to regex search when vim_mode: true without any further configuration.

It would be nice to allow a users' configuration to override the defaults, but the challenge is that the default for vim mode differs from the default for non-vim mode.

One possible option would be to default the regex search setting to null in default.json; and when reading it herE:

zed/crates/editor/src/editor_settings.rs

Line 271 in 9944e08

regex: search.regex.unwrap(),
default it to content.vim_mode instead of calling unwrap). We'd need to update the docs for that setting to match

ConradIrwin added a commit that referenced this pull request Feb 3, 2026
@ConradIrwin
vim: Revert changes to search (#48127) (#48234)
2539ac0 
Release Notes:

- (nightly only) Fixed vim search to be regex by default
adb-sh pushed a commit to adb-sh/zed that referenced this pull request Feb 5, 2026
@ConradIrwin @adb-sh
vim: Revert changes to search (zed-industries#48127) (zed-industries#…
604487e 
…48234)

Release Notes:

- (nightly only) Fixed vim search to be regex by default
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SomeoneToIgnore SomeoneToIgnore SomeoneToIgnore approved these changes

Assignees

@SomeoneToIgnore SomeoneToIgnore

Labels

cla-signed The user has signed the Contributor License Agreement

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

search setting doesn't work for buffer search

3 participants

@cppcoffee @ConradIrwin @SomeoneToIgnore