From 71149bc7ccdebaa38d5cae8e4e66a21d8ab88075 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Mon, 8 Jan 2024 13:56:52 -0700
Subject: [PATCH] Fix relative path opening from project symbols

Co-Authored-By: Max <max@zed.dev>
---
 crates/collab/src/tests/integration_tests.rs |  6 +++---
 crates/file_finder/src/file_finder.rs        |  2 +-
 crates/project/src/project.rs                | 17 ++++++++++++++++-
 crates/project/src/project_tests.rs          | 10 ++--------
 crates/semantic_index/src/semantic_index.rs  | 12 +++++-------
 5 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/crates/collab/src/tests/integration_tests.rs b/crates/collab/src/tests/integration_tests.rs
index 457f085f8f..a21235b6f3 100644
--- a/crates/collab/src/tests/integration_tests.rs
+++ b/crates/collab/src/tests/integration_tests.rs
@@ -4936,10 +4936,10 @@ async fn test_project_symbols(
         .await
         .unwrap();
 
-    buffer_b_2.read_with(cx_b, |buffer, _| {
+    buffer_b_2.read_with(cx_b, |buffer, cx| {
         assert_eq!(
-            buffer.file().unwrap().path().as_ref(),
-            Path::new("../crate-2/two.rs")
+            buffer.file().unwrap().full_path(cx),
+            Path::new("/code/crate-2/two.rs")
         );
     });
 
diff --git a/crates/file_finder/src/file_finder.rs b/crates/file_finder/src/file_finder.rs
index ce68819646..d49eb9ee60 100644
--- a/crates/file_finder/src/file_finder.rs
+++ b/crates/file_finder/src/file_finder.rs
@@ -1297,7 +1297,7 @@ mod tests {
         // so that one should be sorted earlier
         let b_path = ProjectPath {
             worktree_id,
-            path: Arc::from(Path::new("/root/dir2/b.txt")),
+            path: Arc::from(Path::new("dir2/b.txt")),
         };
         workspace
             .update(cx, |workspace, cx| {
diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs
index 584638a47a..044b750ad9 100644
--- a/crates/project/src/project.rs
+++ b/crates/project/src/project.rs
@@ -4732,7 +4732,8 @@ impl Project {
             } else {
                 return Task::ready(Err(anyhow!("worktree not found for symbol")));
             };
-            let symbol_abs_path = worktree_abs_path.join(&symbol.path.path);
+
+            let symbol_abs_path = resolve_path(worktree_abs_path, &symbol.path.path);
             let symbol_uri = if let Ok(uri) = lsp::Url::from_file_path(symbol_abs_path) {
                 uri
             } else {
@@ -8725,6 +8726,20 @@ fn relativize_path(base: &Path, path: &Path) -> PathBuf {
     components.iter().map(|c| c.as_os_str()).collect()
 }
 
+fn resolve_path(base: &Path, path: &Path) -> PathBuf {
+    let mut result = base.to_path_buf();
+    for component in path.components() {
+        match component {
+            Component::ParentDir => {
+                result.pop();
+            }
+            Component::CurDir => (),
+            _ => result.push(component),
+        }
+    }
+    result
+}
+
 impl Item for Buffer {
     fn entry_id(&self, cx: &AppContext) -> Option<ProjectEntryId> {
         File::from_dyn(self.file()).and_then(|file| file.project_entry_id(cx))
diff --git a/crates/project/src/project_tests.rs b/crates/project/src/project_tests.rs
index 5c3c21fd08..e90d323712 100644
--- a/crates/project/src/project_tests.rs
+++ b/crates/project/src/project_tests.rs
@@ -4337,20 +4337,14 @@ async fn test_create_entry(cx: &mut gpui::TestAppContext) {
         ]
     );
 
-    // ************************************
-    // Note: unsure if this is the best fix for the integration failure, but assuming we want
-    // to keep that behavior, then this test should cover it
-    // ************************************
-
-    // But we can open buffers with '..'
+    // And we cannot open buffers with '..'
     let result = project
         .update(cx, |project, cx| {
             let id = project.worktrees().next().unwrap().read(cx).id();
             project.open_buffer((id, "../c.rs"), cx)
         })
         .await;
-
-    assert!(dbg!(result).is_ok())
+    assert!(result.is_err())
 }
 
 async fn search(
diff --git a/crates/semantic_index/src/semantic_index.rs b/crates/semantic_index/src/semantic_index.rs
index dbcdeee5ed..81c4fbbc3d 100644
--- a/crates/semantic_index/src/semantic_index.rs
+++ b/crates/semantic_index/src/semantic_index.rs
@@ -559,7 +559,7 @@ impl SemanticIndex {
                         .spawn(async move {
                             let mut changed_paths = BTreeMap::new();
                             for file in worktree.files(false, 0) {
-                                let absolute_path = worktree.absolutize(&file.path);
+                                let absolute_path = worktree.absolutize(&file.path)?;
 
                                 if file.is_external || file.is_ignored || file.is_symlink {
                                     continue;
@@ -1068,11 +1068,10 @@ impl SemanticIndex {
                                 return true;
                             };
 
-                        worktree_state.changed_paths.retain(|path, info| {
+                        for (path, info) in &worktree_state.changed_paths {
                             if info.is_deleted {
                                 files_to_delete.push((worktree_state.db_id, path.clone()));
-                            } else {
-                                let absolute_path = worktree.read(cx).absolutize(path);
+                            } else if let Ok(absolute_path) = worktree.read(cx).absolutize(path) {
                                 let job_handle = JobHandle::new(pending_file_count_tx);
                                 pending_files.push(PendingFile {
                                     absolute_path,
@@ -1083,9 +1082,8 @@ impl SemanticIndex {
                                     worktree_db_id: worktree_state.db_id,
                                 });
                             }
-
-                            false
-                        });
+                        }
+                        worktree_state.changed_paths.clear();
                         true
                     });