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>
125 lines
4.2 KiB
Rust
125 lines
4.2 KiB
Rust
use crate::{AgentTool, ToolCallEventStream};
|
|
use agent_client_protocol::ToolKind;
|
|
use anyhow::{Context as _, Result, anyhow};
|
|
use gpui::{App, AppContext, Entity, SharedString, Task};
|
|
use project::Project;
|
|
use schemars::JsonSchema;
|
|
use serde::{Deserialize, Serialize};
|
|
use std::{path::Path, sync::Arc};
|
|
use util::markdown::MarkdownInlineCode;
|
|
|
|
/// Moves or rename a file or directory in the project, and returns confirmation that the move succeeded.
|
|
///
|
|
/// If the source and destination directories are the same, but the filename is different, this performs a rename. Otherwise, it performs a move.
|
|
///
|
|
/// This tool should be used when it's desirable to move or rename a file or directory without changing its contents at all.
|
|
#[derive(Debug, Serialize, Deserialize, JsonSchema)]
|
|
pub struct MovePathToolInput {
|
|
/// The source path of the file or directory to move/rename.
|
|
///
|
|
/// <example>
|
|
/// If the project has the following files:
|
|
///
|
|
/// - directory1/a/something.txt
|
|
/// - directory2/a/things.txt
|
|
/// - directory3/a/other.txt
|
|
///
|
|
/// You can move the first file by providing a source_path of "directory1/a/something.txt"
|
|
/// </example>
|
|
pub source_path: String,
|
|
|
|
/// The destination path where the file or directory should be moved/renamed to.
|
|
/// If the paths are the same except for the filename, then this will be a rename.
|
|
///
|
|
/// <example>
|
|
/// To move "directory1/a/something.txt" to "directory2/b/renamed.txt",
|
|
/// provide a destination_path of "directory2/b/renamed.txt"
|
|
/// </example>
|
|
pub destination_path: String,
|
|
}
|
|
|
|
pub struct MovePathTool {
|
|
project: Entity<Project>,
|
|
}
|
|
|
|
impl MovePathTool {
|
|
pub fn new(project: Entity<Project>) -> Self {
|
|
Self { project }
|
|
}
|
|
}
|
|
|
|
impl AgentTool for MovePathTool {
|
|
type Input = MovePathToolInput;
|
|
type Output = String;
|
|
|
|
fn name() -> &'static str {
|
|
"move_path"
|
|
}
|
|
|
|
fn kind() -> ToolKind {
|
|
ToolKind::Move
|
|
}
|
|
|
|
fn initial_title(
|
|
&self,
|
|
input: Result<Self::Input, serde_json::Value>,
|
|
_cx: &mut App,
|
|
) -> SharedString {
|
|
if let Ok(input) = input {
|
|
let src = MarkdownInlineCode(&input.source_path);
|
|
let dest = MarkdownInlineCode(&input.destination_path);
|
|
let src_path = Path::new(&input.source_path);
|
|
let dest_path = Path::new(&input.destination_path);
|
|
|
|
match dest_path
|
|
.file_name()
|
|
.and_then(|os_str| os_str.to_os_string().into_string().ok())
|
|
{
|
|
Some(filename) if src_path.parent() == dest_path.parent() => {
|
|
let filename = MarkdownInlineCode(&filename);
|
|
format!("Rename {src} to {filename}").into()
|
|
}
|
|
_ => format!("Move {src} to {dest}").into(),
|
|
}
|
|
} else {
|
|
"Move path".into()
|
|
}
|
|
}
|
|
|
|
fn run(
|
|
self: Arc<Self>,
|
|
input: Self::Input,
|
|
_event_stream: ToolCallEventStream,
|
|
cx: &mut App,
|
|
) -> Task<Result<Self::Output>> {
|
|
let rename_task = self.project.update(cx, |project, cx| {
|
|
match project
|
|
.find_project_path(&input.source_path, cx)
|
|
.and_then(|project_path| project.entry_for_path(&project_path, cx))
|
|
{
|
|
Some(entity) => match project.find_project_path(&input.destination_path, cx) {
|
|
Some(project_path) => project.rename_entry(entity.id, project_path, cx),
|
|
None => Task::ready(Err(anyhow!(
|
|
"Destination path {} was outside the project.",
|
|
input.destination_path
|
|
))),
|
|
},
|
|
None => Task::ready(Err(anyhow!(
|
|
"Source path {} was not found in the project.",
|
|
input.source_path
|
|
))),
|
|
}
|
|
});
|
|
|
|
cx.background_spawn(async move {
|
|
let _ = rename_task.await.with_context(|| {
|
|
format!("Moving {} to {}", input.source_path, input.destination_path)
|
|
})?;
|
|
Ok(format!(
|
|
"Moved {} to {}",
|
|
input.source_path, input.destination_path
|
|
))
|
|
})
|
|
}
|
|
}
|