Closes https://github.com/zed-industries/zed/issues/38690 Closes #37353 ### Background On Windows, paths are normally separated by `\`, unlike mac and linux where they are separated by `/`. When editing code in a project that uses a different path style than your local system (e.g. remoting from Windows to Linux, using WSL, and collaboration between windows and unix users), the correct separator for a path may differ from the "native" separator. Previously, to work around this, Zed converted paths' separators in numerous places. This was applied to both absolute and relative paths, leading to incorrect conversions in some cases. ### Solution Many code paths in Zed use paths that are *relative* to either a worktree root or a git repository. This PR introduces a dedicated type for these paths called `RelPath`, which stores the path in the same way regardless of host platform, and offers `Path`-like manipulation APIs. RelPath supports *displaying* the path using either separator, so that we can display paths in a style that is determined at runtime based on the current project. The representation of absolute paths is left untouched, for now. Absolute paths are different from relative paths because (except in contexts where we know that the path refers to the local filesystem) they should generally be treated as opaque strings. Currently we use a mix of types for these paths (std::path::Path, String, SanitizedPath). Release Notes: - N/A --------- Co-authored-by: Cole Miller <cole@zed.dev> Co-authored-by: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Co-authored-by: Peter Tripp <petertripp@gmail.com> Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com> Co-authored-by: Lukas Wirth <me@lukaswirth.dev>
119 lines
3.9 KiB
Rust
119 lines
3.9 KiB
Rust
use agent_settings::AgentProfileId;
|
|
use anyhow::Result;
|
|
use async_trait::async_trait;
|
|
use util::rel_path::RelPath;
|
|
|
|
use crate::example::{Example, ExampleContext, ExampleMetadata, JudgeAssertion, LanguageServer};
|
|
|
|
pub struct AddArgToTraitMethod;
|
|
|
|
#[async_trait(?Send)]
|
|
impl Example for AddArgToTraitMethod {
|
|
fn meta(&self) -> ExampleMetadata {
|
|
ExampleMetadata {
|
|
name: "add_arg_to_trait_method".to_string(),
|
|
url: "https://github.com/zed-industries/zed.git".to_string(),
|
|
revision: "f69aeb6311dde3c0b8979c293d019d66498d54f2".to_string(),
|
|
language_server: Some(LanguageServer {
|
|
file_extension: "rs".to_string(),
|
|
allow_preexisting_diagnostics: false,
|
|
}),
|
|
max_assertions: None,
|
|
profile_id: AgentProfileId::default(),
|
|
existing_thread_json: None,
|
|
max_turns: None,
|
|
}
|
|
}
|
|
|
|
async fn conversation(&self, cx: &mut ExampleContext) -> Result<()> {
|
|
const FILENAME: &str = "assistant_tool.rs";
|
|
cx.push_user_message(format!(
|
|
r#"
|
|
Add a `window: Option<gpui::AnyWindowHandle>` argument to the `Tool::run` trait method in {FILENAME},
|
|
and update all the implementations of the trait and call sites accordingly.
|
|
"#
|
|
));
|
|
|
|
let _ = cx.run_to_end().await?;
|
|
|
|
// Adds ignored argument to all but `batch_tool`
|
|
|
|
let add_ignored_window_paths = &[
|
|
"code_action_tool",
|
|
"code_symbols_tool",
|
|
"contents_tool",
|
|
"copy_path_tool",
|
|
"create_directory_tool",
|
|
"create_file_tool",
|
|
"delete_path_tool",
|
|
"diagnostics_tool",
|
|
"edit_file_tool",
|
|
"fetch_tool",
|
|
"grep_tool",
|
|
"list_directory_tool",
|
|
"move_path_tool",
|
|
"now_tool",
|
|
"open_tool",
|
|
"path_search_tool",
|
|
"read_file_tool",
|
|
"rename_tool",
|
|
"symbol_info_tool",
|
|
"terminal_tool",
|
|
"thinking_tool",
|
|
"web_search_tool",
|
|
];
|
|
|
|
let edits = cx.edits();
|
|
|
|
for tool_name in add_ignored_window_paths {
|
|
let path_str = format!("crates/assistant_tools/src/{}.rs", tool_name);
|
|
let edits = edits.get(RelPath::new(&path_str).unwrap());
|
|
|
|
let ignored = edits.is_some_and(|edits| {
|
|
edits.has_added_line(" _window: Option<gpui::AnyWindowHandle>,\n")
|
|
});
|
|
let uningored = edits.is_some_and(|edits| {
|
|
edits.has_added_line(" window: Option<gpui::AnyWindowHandle>,\n")
|
|
});
|
|
|
|
cx.assert(ignored || uningored, format!("Argument: {}", tool_name))
|
|
.ok();
|
|
|
|
cx.assert(ignored, format!("`_` prefix: {}", tool_name))
|
|
.ok();
|
|
}
|
|
|
|
// Adds unignored argument to `batch_tool`
|
|
|
|
let batch_tool_edits =
|
|
edits.get(RelPath::new("crates/assistant_tools/src/batch_tool.rs").unwrap());
|
|
|
|
cx.assert(
|
|
batch_tool_edits.is_some_and(|edits| {
|
|
edits.has_added_line(" window: Option<gpui::AnyWindowHandle>,\n")
|
|
}),
|
|
"Argument: batch_tool",
|
|
)
|
|
.ok();
|
|
|
|
Ok(())
|
|
}
|
|
|
|
fn diff_assertions(&self) -> Vec<JudgeAssertion> {
|
|
vec![
|
|
JudgeAssertion {
|
|
id: "batch tool passes window to each".to_string(),
|
|
description:
|
|
"batch_tool is modified to pass a clone of the window to each tool it calls."
|
|
.to_string(),
|
|
},
|
|
JudgeAssertion {
|
|
id: "tool tests updated".to_string(),
|
|
description:
|
|
"tool tests are updated to pass the new `window` argument (`None` is ok)."
|
|
.to_string(),
|
|
},
|
|
]
|
|
}
|
|
}
|