oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Trim glob input

Browse Source
This commit is contained in:
Kirill Bulatov
2023-05-10 11:11:31 +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
crates/project/src/search.rs
+8 -4
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<_, _>>()?,
))
crates/search/src/project_search.rs
+4 -2
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;