chore: normalize file paths in code search query

crates/tabby-common/src/api/code.rs

@@ -1,8 +1,12 @@
+use std::path::PathBuf;
+
 use async_trait::async_trait;
 use derive_builder::Builder;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
+use crate::path::normalize_path;
+
 pub struct CodeSearchResponse {
     pub hits: Vec<CodeSearchHit>,
 }
@@ -64,7 +68,7 @@ impl CodeSearchQuery {
         source_id: String,
     ) -> Self {
         Self {
-            filepath,
+            filepath: normalize_path(filepath).unwrap_or(None),
             language,
             content,
             source_id,

crates/tabby-common/src/index/code/mod.rs

@@ -7,7 +7,7 @@ use tantivy::{
 pub use tokenizer::tokenize_code;
 
 use super::{corpus, IndexSchema};
-use crate::api::code::CodeSearchQuery;
+use crate::{api::code::CodeSearchQuery, path::normalize_path};
 
 pub mod fields {
     pub const CHUNK_GIT_URL: &str = "chunk_git_url";
@@ -52,7 +52,14 @@ fn filepath_query(filepath: &str) -> Box<TermQuery> {
     let schema = IndexSchema::instance();
     let mut term =
         Term::from_field_json_path(schema.field_chunk_attributes, fields::CHUNK_FILEPATH, false);
-    term.append_type_and_str(filepath);
+
+    // normalize the path base on the platform.
+    let filepath = normalize_path(Some(filepath.to_string()))
+        .ok()
+        .flatten()
+        .unwrap_or_else(|| filepath.to_string());
+
+    term.append_type_and_str(&filepath);
     Box::new(TermQuery::new(term, IndexRecordOption::Basic))
 }
 
@@ -84,10 +91,12 @@ pub fn code_search_query(
 
     // When filepath presents, we exclude the file from the search.
     if let Some(filepath) = &query.filepath {
-        subqueries.push((
-            Occur::MustNot,
-            Box::new(ConstScoreQuery::new(filepath_query(filepath), 0.0)),
-        ))
+        if let Ok(Some(normalized_path)) = normalize_path(Some(filepath.clone())) {
+            subqueries.push((
+                Occur::MustNot,
+                Box::new(ConstScoreQuery::new(filepath_query(&normalized_path), 0.0)),
+            ));
+        }
     }
 
     BooleanQuery::new(subqueries)

crates/tabby-common/src/path.rs

@@ -1,3 +1,4 @@
+use anyhow::Result;
 use std::{cell::Cell, env, path::PathBuf, sync::Mutex};
 
 use lazy_static::lazy_static;
@@ -53,4 +54,20 @@ pub fn events_dir() -> PathBuf {
     tabby_root().join("events")
 }
 
+pub fn normalize_path(filepath: Option<String>) -> Result<Option<String>> {
+    Ok(filepath.map(|path| {
+        let path_buf = PathBuf::from(path);
+
+        #[cfg(target_os = "windows")]
+        {
+            path_buf.to_string_lossy().replace('/', "\\")
+        }
+
+        #[cfg(not(target_os = "windows"))]
+        {
+            path_buf.to_string_lossy().replace('\\', "/")
+        }
+    }))
+}
+
 mod registry {}