fix(search): fix num results (#3841)

biomejs · Sep 9, 2024 · bdf8547 · bdf8547
1 parent b93a266
commit bdf8547
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/crates/biome_cli/src/execute/process_file.rs b/crates/biome_cli/src/execute/process_file.rs
@@ -28,7 +28,7 @@ pub(crate) enum FileStatus {
     /// While handling the file, something happened
     Message(Message),
     /// A match was found while searching a file
-    SearchResult(Message),
+    SearchResult(usize, Message),
     /// File ignored, it should not be count as "handled"
     Ignored,
     /// Files that belong to other tools and shouldn't be touched

diff --git a/crates/biome_cli/src/execute/process_file/search.rs b/crates/biome_cli/src/execute/process_file/search.rs
@@ -44,11 +44,7 @@ pub(crate) fn search_with_guard<'ctx>(
                 skipped_diagnostics: 0,
             };
 
-            if matches_len > 0 {
-                Ok(FileStatus::SearchResult(search_results))
-            } else {
-                Ok(FileStatus::Message(search_results))
-            }
+            Ok(FileStatus::SearchResult(matches_len, search_results))
         },
     )
 }
diff --git a/crates/biome_cli/src/execute/traverse.rs b/crates/biome_cli/src/execute/traverse.rs
@@ -574,8 +574,9 @@ impl<'ctx, 'app> TraversalOptions<'ctx, 'app> {
     pub(crate) fn increment_unchanged(&self) {
         self.unchanged.fetch_add(1, Ordering::Relaxed);
     }
-    pub(crate) fn increment_matches(&self) {
-        self.matches.fetch_add(1, Ordering::Relaxed);
+
+    pub(crate) fn increment_matches(&self, num_matches: usize) {
+        self.matches.fetch_add(num_matches, Ordering::Relaxed);
     }
 
     /// Send a message to the display thread
@@ -700,9 +701,9 @@ fn handle_file(ctx: &TraversalOptions, path: &BiomePath) {
         Ok(Ok(FileStatus::Unchanged)) => {
             ctx.increment_unchanged();
         }
-        Ok(Ok(FileStatus::SearchResult(msg))) => {
+        Ok(Ok(FileStatus::SearchResult(num_matches, msg))) => {
             ctx.increment_unchanged();
-            ctx.increment_matches();
+            ctx.increment_matches(num_matches);
             ctx.push_message(msg);
         }
         Ok(Ok(FileStatus::Message(msg))) => {

diff --git a/crates/biome_cli/src/reporter/terminal.rs b/crates/biome_cli/src/reporter/terminal.rs
@@ -236,7 +236,11 @@ impl<'a> fmt::Display for ConsoleTraversalSummary<'a> {
         }
 
         if let TraversalMode::Search { .. } = self.0 {
-            fmt.write_markup(markup!(" "<Info>"Found "{self.1.matches}" matches."</Info>))?
+            if self.1.matches == 1 {
+                fmt.write_markup(markup!(" "<Info>"Found "{self.1.matches}" match."</Info>))?
+            } else {
+                fmt.write_markup(markup!(" "<Info>"Found "{self.1.matches}" matches."</Info>))?
+            };
         };
         Ok(())
     }