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

Trim glob input

Browse Source
This commit is contained in:
Kirill Bulatov 2023-05-09 15:20:19 +03:00 committed by Kirill Bulatov
parent 13296d502c
commit 6fb8679184
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/project/src/search.rs
View File

@ -98,13 +98,15 @@ impl SearchQuery {
message
.files_to_include
.split(',')
.filter(|glob_str| !glob_str.trim().is_empty())
.map(str::trim)
.filter(|glob_str| !glob_str.is_empty())
.map(|glob_str| glob::Pattern::new(glob_str))
.collect::<Result<_, _>>()?,
message
.files_to_exclude
.split(',')
.filter(|glob_str| !glob_str.trim().is_empty())
.map(str::trim)
.filter(|glob_str| !glob_str.is_empty())
.map(|glob_str| glob::Pattern::new(glob_str))
.collect::<Result<_, _>>()?,
)
@ -116,13 +118,15 @@ impl SearchQuery {
message
.files_to_include
.split(',')
.filter(|glob_str| !glob_str.trim().is_empty())
.map(str::trim)
.filter(|glob_str| !glob_str.is_empty())
.map(|glob_str| glob::Pattern::new(glob_str))
.collect::<Result<_, _>>()?,
message
.files_to_exclude
.split(',')
.filter(|glob_str| !glob_str.trim().is_empty())
.map(str::trim)
.filter(|glob_str| !glob_str.is_empty())
.map(|glob_str| glob::Pattern::new(glob_str))
.collect::<Result<_, _>>()?,
))

6
crates/search/src/project_search.rs
View File

@ -562,7 +562,8 @@ impl ProjectSearchView {
.read(cx)
.text(cx)
.split(',')
.filter(|glob_str| !glob_str.trim().is_empty())
.map(str::trim)
.filter(|glob_str| !glob_str.is_empty())
.map(|glob_str| glob::Pattern::new(glob_str))
.collect::<Result<_, _>>() else {
self.query_contains_error = true;
@ -574,7 +575,8 @@ impl ProjectSearchView {
.read(cx)
.text(cx)
.split(',')
.filter(|glob_str| !glob_str.trim().is_empty())
.map(str::trim)
.filter(|glob_str| !glob_str.is_empty())
.map(|glob_str| glob::Pattern::new(glob_str))
.collect::<Result<_, _>>() else {
self.query_contains_error = true;