Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve path display/functionality for resource links

Browse source 
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
Co-authored-by: Ben Brandt <benjamin.j.brandt@gmail.com>
This commit is contained in:
Danilo Leal 2025-08-25 14:40:35 -03:00
parent e7abe34581
commit 65b1547056
2 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/agent2/src/tools/find_path_tool.rs
View file

@ -168,10 +168,9 @@ fn search_paths(glob: &str, project: Entity<Project>, cx: &mut App) -> Task<Resu
Ok(snapshots Ok(snapshots
.iter() .iter()
.flat_map(|snapshot| { .flat_map(|snapshot| {
let root_name = PathBuf::from(snapshot.root_name());
snapshot snapshot
.entries(false, 0) .entries(false, 0)
.map(move |entry| root_name.join(&entry.path)) .map(move |entry| snapshot.abs_path().join(&entry.path))
.filter(|path| path_matcher.is_match(&path)) .filter(|path| path_matcher.is_match(&path))
}) })
.collect()) .collect())

22
crates/agent_ui/src/acp/thread_view.rs
View file

@ -35,6 +35,7 @@ use prompt_store::{PromptId, PromptStore};
use rope::Point; use rope::Point;
use settings::{Settings as _, SettingsStore}; use settings::{Settings as _, SettingsStore};
use std::cell::Cell; use std::cell::Cell;
use std::path::Path;
use std::sync::Arc; use std::sync::Arc;
use std::time::Instant; use std::time::Instant;
use std::{collections::BTreeMap, rc::Rc, time::Duration}; use std::{collections::BTreeMap, rc::Rc, time::Duration};
@ -2042,8 +2043,25 @@ impl AcpThreadView {
let uri: SharedString = resource_link.uri.clone().into(); let uri: SharedString = resource_link.uri.clone().into();
let is_file = resource_link.uri.strip_prefix("file://"); let is_file = resource_link.uri.strip_prefix("file://");
let label: SharedString = if let Some(path) = is_file { let label: SharedString = if let Some(abs_path) = is_file {
path.to_string().into() if let Some(project_path) = self
.project
.read(cx)
.project_path_for_absolute_path(&Path::new(abs_path), cx)
&& let Some(worktree) = self
.project
.read(cx)
.worktree_for_id(project_path.worktree_id, cx)
{
worktree
.read(cx)
.full_path(&project_path.path)
.to_string_lossy()
.to_string()
.into()
} else {
abs_path.to_string().into()
}
} else { } else {
uri.clone() uri.clone()
}; };