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

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
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 message
.files_to_include .files_to_include
.split(',') .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)) .map(|glob_str| glob::Pattern::new(glob_str))
.collect::<Result<_, _>>()?, .collect::<Result<_, _>>()?,
message message
.files_to_exclude .files_to_exclude
.split(',') .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)) .map(|glob_str| glob::Pattern::new(glob_str))
.collect::<Result<_, _>>()?, .collect::<Result<_, _>>()?,
) )
@ -116,13 +118,15 @@ impl SearchQuery {
message message
.files_to_include .files_to_include
.split(',') .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)) .map(|glob_str| glob::Pattern::new(glob_str))
.collect::<Result<_, _>>()?, .collect::<Result<_, _>>()?,
message message
.files_to_exclude .files_to_exclude
.split(',') .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)) .map(|glob_str| glob::Pattern::new(glob_str))
.collect::<Result<_, _>>()?, .collect::<Result<_, _>>()?,
)) ))

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

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