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

Fix scroll to top on multibuffer save (#24885)

Browse source 
Co-Authored-By: Cole <cole@zed.dev>

Closes #ISSUE

Release Notes:

- N/A

---------

Co-authored-by: Cole <cole@zed.dev>
This commit is contained in:
Conrad Irwin 2025-02-14 11:18:07 -07:00 • committed by GitHub
parent 7ee492746d
commit 20460239a0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 19 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/multi_buffer/src/multi_buffer.rs
View file

@ -149,11 +149,14 @@ impl MultiBufferDiffHunk {
}
#[derive(PartialEq, Eq, Ord, PartialOrd, Clone, Hash, Debug)]
pub struct PathKey(String);
pub struct PathKey {
namespace: &'static str,
path: Arc<Path>,
}
impl PathKey {
pub fn namespaced(namespace: &str, path: &Path) -> Self {
Self(format!("{}/{}", namespace, path.to_string_lossy()))
pub fn namespaced(namespace: &'static str, path: Arc<Path>) -> Self {
Self { namespace, path }
}
}

6
crates/multi_buffer/src/multi_buffer_tests.rs
View file

@ -1599,7 +1599,7 @@ fn test_set_excerpts_for_buffer_ordering(cx: &mut TestAppContext) {
cx,
)
});
let path1: PathKey = PathKey::namespaced("0", Path::new("/"));
let path1: PathKey = PathKey::namespaced("0", Path::new("/").into());
let multibuffer = cx.new(|_| MultiBuffer::new(Capability::ReadWrite));
multibuffer.update(cx, |multibuffer, cx| {
@ -1695,7 +1695,7 @@ fn test_set_excerpts_for_buffer(cx: &mut TestAppContext) {
cx,
)
});
let path1: PathKey = PathKey::namespaced("0", Path::new("/"));
let path1: PathKey = PathKey::namespaced("0", Path::new("/").into());
let buf2 = cx.new(|cx| {
Buffer::local(
indoc! {
@ -1714,7 +1714,7 @@ fn test_set_excerpts_for_buffer(cx: &mut TestAppContext) {
cx,
)
});
let path2 = PathKey::namespaced("x", Path::new("/"));
let path2 = PathKey::namespaced("x", Path::new("/").into());
let multibuffer = cx.new(|_| MultiBuffer::new(Capability::ReadWrite));
multibuffer.update(cx, |multibuffer, cx| {