Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove old project search code path, bump min-supported zed version for collaboration (#18404)

Browse source 
Release Notes:

- N/A
This commit is contained in:
Max Brunsfeld 2024-09-26 12:10:39 -07:00 • committed by GitHub
parent 71da81c743
commit c1a039a5d7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 22 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

37
crates/project/src/search.rs
View file

@ -147,30 +147,6 @@ impl SearchQuery {
})
}
pub fn from_proto_v1(message: proto::SearchProject) -> Result<Self> {
if message.regex {
Self::regex(
message.query,
message.whole_word,
message.case_sensitive,
message.include_ignored,
deserialize_path_matches(&message.files_to_include)?,
deserialize_path_matches(&message.files_to_exclude)?,
None,
)
} else {
Self::text(
message.query,
message.whole_word,
message.case_sensitive,
message.include_ignored,
deserialize_path_matches(&message.files_to_include)?,
deserialize_path_matches(&message.files_to_exclude)?,
None,
)
}
}
pub fn from_proto(message: proto::SearchQuery) -> Result<Self> {
if message.regex {
Self::regex(
@ -194,6 +170,7 @@ impl SearchQuery {
)
}
}
pub fn with_replacement(mut self, new_replacement: String) -> Self {
match self {
Self::Text {
@ -209,18 +186,6 @@ impl SearchQuery {
}
}
}
pub fn to_protov1(&self, project_id: u64) -> proto::SearchProject {
proto::SearchProject {
project_id,
query: self.as_str().to_string(),
regex: self.is_regex(),
whole_word: self.whole_word(),
case_sensitive: self.case_sensitive(),
include_ignored: self.include_ignored(),
files_to_include: self.files_to_include().sources().join(","),
files_to_exclude: self.files_to_exclude().sources().join(","),
}
}
pub fn to_proto(&self) -> proto::SearchQuery {
proto::SearchQuery {