From 6fb8679184ed5e70d27b7c87c998215e52bbd818 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Tue, 9 May 2023 15:20:19 +0300
Subject: [PATCH] Trim glob input

---
 crates/project/src/search.rs        | 12 ++++++++----
 crates/search/src/project_search.rs |  6 ++++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/crates/project/src/search.rs b/crates/project/src/search.rs
index 48146d13d8..ed139c97d3 100644
--- a/crates/project/src/search.rs
+++ b/crates/project/src/search.rs
@@ -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<_, _>>()?,
             ))
diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs
index e3559038ae..9de9ecc5e5 100644
--- a/crates/search/src/project_search.rs
+++ b/crates/search/src/project_search.rs
@@ -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;