mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-04 10:12:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

tab: Fix copy wrong relative path for tab (#19206)
Some checks are pending
CI / Check formatting and spelling (push) Waiting to run
Details
CI / (macOS) Run Clippy and tests (push) Waiting to run
Details
CI / (Linux) Run Clippy and tests (push) Waiting to run
Details
CI / (Linux) Build Remote Server (push) Waiting to run
Details
CI / (Windows) Run Clippy and tests (push) Waiting to run
Details
CI / Create a macOS bundle (push) Blocked by required conditions
Details
CI / Create a Linux bundle (push) Blocked by required conditions
Details
CI / Create arm64 Linux bundle (push) Blocked by required conditions
Details
Deploy Docs / Deploy Docs (push) Waiting to run
Details
Docs / Check formatting (push) Waiting to run
Details

Browse source 
Closes #19204 

Release Notes:

- Fixed relative paths copied incorrectly from tabs
([#19204](https://github.com/zed-industries/zed/issues/19204))
This commit is contained in:
CharlesChen0823 2024-10-15 14:27:34 +08:00 committed by GitHub
parent 41ba4178fc
commit 62de03f286
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
crates/workspace/src/pane.rs
View file

@ -1747,17 +1747,6 @@ impl Pane {
} }
} }
fn copy_relative_path(&mut self, _: &CopyRelativePath, cx: &mut ViewContext<Self>) {
if let Some(clipboard_text) = self
.active_item()
.as_ref()
.and_then(|entry| entry.project_path(cx))
.map(|p| p.path.to_string_lossy().to_string())
{
cx.write_to_clipboard(ClipboardItem::new_string(clipboard_text));
}
}
pub fn icon_color(selected: bool) -> Color { pub fn icon_color(selected: bool) -> Color {
if selected { if selected {
Color::Default Color::Default
@ -2102,6 +2091,11 @@ impl Pane {
let parent_abs_path = entry_abs_path let parent_abs_path = entry_abs_path
.as_deref() .as_deref()
.and_then(|abs_path| Some(abs_path.parent()?.to_path_buf())); .and_then(|abs_path| Some(abs_path.parent()?.to_path_buf()));
let relative_path = pane
.read(cx)
.item_for_entry(entry, cx)
.and_then(|item| item.project_path(cx))
.map(|project_path| project_path.path);
let entry_id = entry.to_proto(); let entry_id = entry.to_proto();
menu = menu menu = menu
@ -2117,13 +2111,17 @@ impl Pane {
}), }),
) )
}) })
.entry( .when_some(relative_path, |menu, relative_path| {
"Copy Relative Path", menu.entry(
Some(Box::new(CopyRelativePath)), "Copy Relative Path",
cx.handler_for(&pane, move |pane, cx| { Some(Box::new(CopyRelativePath)),
pane.copy_relative_path(&CopyRelativePath, cx); cx.handler_for(&pane, move |_, cx| {
}), cx.write_to_clipboard(ClipboardItem::new_string(
) relative_path.to_string_lossy().to_string(),
));
}),
)
})
.map(pin_tab_entries) .map(pin_tab_entries)
.separator() .separator()
.entry( .entry(