Andrew Lygin
935e0d547e
This PR changes ways the Find/Replace functionality in the Buffer/Project Search is accessible via shortcuts. It makes those panels work the same way as in VS Code and Sublime Text. The details are described in the issue: [Make Find/Replace easier to use](https://github.com/zed-industries/zed/issues/9142) There's a difficulty with the Linux keybindings: VS Code uses on MacOS (this PR replicates it): | Action | Buffer Search | Project Search | | --- | --- | --- | | Find | `cmd-f` | `cmd-shift-f` | | Replace | `cmd-alt-f` | `cmd-shift-h` | VS Code uses on Linux (this PR replicates all but one): | Action | Buffer Search | Project Search | | --- | --- | --- | | Find | `ctrl-f` | `ctrl-shift-f` | | Replace | `ctrl-h` ❗ | `ctrl-shift-h` | The problem is that `ctrl-h` is already taken by the `editor::Backspace` action in Zed on Linux. There's two options here: 1. Change keybinding for `editor::Backspace` on Linux to something else, and use `ctrl-h` for the "replace in buffer" action. 2. Use some other keybinding on Linux in Zed. This PR introduces `ctrl-r` for this purpose, though I'm not sure it's the best choice. What do you think? fixes #9142 Release Notes: - Improved access to "Find/Replace in Buffer" and "Find/Replace in Files" via shortcuts (#9142). Optionally, include screenshots / media showcasing your addition that can be included in the release notes. - N/A
108 lines
3.2 KiB
Rust
108 lines
3.2 KiB
Rust
use bitflags::bitflags;
|
|
pub use buffer_search::BufferSearchBar;
|
|
use gpui::{actions, Action, AppContext, IntoElement};
|
|
pub use mode::SearchMode;
|
|
use project::search::SearchQuery;
|
|
pub use project_search::ProjectSearchView;
|
|
use ui::{prelude::*, Tooltip};
|
|
use ui::{ButtonStyle, IconButton};
|
|
|
|
pub mod buffer_search;
|
|
mod mode;
|
|
pub mod project_search;
|
|
pub(crate) mod search_bar;
|
|
|
|
pub fn init(cx: &mut AppContext) {
|
|
menu::init();
|
|
buffer_search::init(cx);
|
|
project_search::init(cx);
|
|
}
|
|
|
|
actions!(
|
|
search,
|
|
[
|
|
CycleMode,
|
|
FocusSearch,
|
|
ToggleWholeWord,
|
|
ToggleCaseSensitive,
|
|
ToggleIncludeIgnored,
|
|
ToggleReplace,
|
|
SelectNextMatch,
|
|
SelectPrevMatch,
|
|
SelectAllMatches,
|
|
NextHistoryQuery,
|
|
PreviousHistoryQuery,
|
|
ActivateTextMode,
|
|
ActivateRegexMode,
|
|
ReplaceAll,
|
|
ReplaceNext,
|
|
]
|
|
);
|
|
|
|
bitflags! {
|
|
#[derive(Debug, PartialEq, Eq, Clone, Copy, Default)]
|
|
pub struct SearchOptions: u8 {
|
|
const NONE = 0b000;
|
|
const WHOLE_WORD = 0b001;
|
|
const CASE_SENSITIVE = 0b010;
|
|
const INCLUDE_IGNORED = 0b100;
|
|
}
|
|
}
|
|
|
|
impl SearchOptions {
|
|
pub fn label(&self) -> &'static str {
|
|
match *self {
|
|
SearchOptions::WHOLE_WORD => "Match Whole Word",
|
|
SearchOptions::CASE_SENSITIVE => "Match Case",
|
|
SearchOptions::INCLUDE_IGNORED => "Include ignored",
|
|
_ => panic!("{:?} is not a named SearchOption", self),
|
|
}
|
|
}
|
|
|
|
pub fn icon(&self) -> ui::IconName {
|
|
match *self {
|
|
SearchOptions::WHOLE_WORD => ui::IconName::WholeWord,
|
|
SearchOptions::CASE_SENSITIVE => ui::IconName::CaseSensitive,
|
|
SearchOptions::INCLUDE_IGNORED => ui::IconName::FileGit,
|
|
_ => panic!("{:?} is not a named SearchOption", self),
|
|
}
|
|
}
|
|
|
|
pub fn to_toggle_action(&self) -> Box<dyn Action + Sync + Send + 'static> {
|
|
match *self {
|
|
SearchOptions::WHOLE_WORD => Box::new(ToggleWholeWord),
|
|
SearchOptions::CASE_SENSITIVE => Box::new(ToggleCaseSensitive),
|
|
SearchOptions::INCLUDE_IGNORED => Box::new(ToggleIncludeIgnored),
|
|
_ => panic!("{:?} is not a named SearchOption", self),
|
|
}
|
|
}
|
|
|
|
pub fn none() -> SearchOptions {
|
|
SearchOptions::NONE
|
|
}
|
|
|
|
pub fn from_query(query: &SearchQuery) -> SearchOptions {
|
|
let mut options = SearchOptions::NONE;
|
|
options.set(SearchOptions::WHOLE_WORD, query.whole_word());
|
|
options.set(SearchOptions::CASE_SENSITIVE, query.case_sensitive());
|
|
options.set(SearchOptions::INCLUDE_IGNORED, query.include_ignored());
|
|
options
|
|
}
|
|
|
|
pub fn as_button(
|
|
&self,
|
|
active: bool,
|
|
action: impl Fn(&gpui::ClickEvent, &mut WindowContext) + 'static,
|
|
) -> impl IntoElement {
|
|
IconButton::new(self.label(), self.icon())
|
|
.on_click(action)
|
|
.style(ButtonStyle::Subtle)
|
|
.selected(active)
|
|
.tooltip({
|
|
let action = self.to_toggle_action();
|
|
let label: SharedString = format!("Toggle {}", self.label()).into();
|
|
move |cx| Tooltip::for_action(label.clone(), &*action, cx)
|
|
})
|
|
}
|
|
}
|