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

Do not open directories in the InvalidBufferView

Browse source
This commit is contained in:
Kirill Bulatov 2025-08-25 23:25:58 +03:00
parent e783a52d53
commit 54bf4a0e26
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -613,7 +613,12 @@ impl ProjectItemRegistry {
self.build_project_item_for_path_fns self.build_project_item_for_path_fns
.push(|project, project_path, window, cx| { .push(|project, project_path, window, cx| {
let project_path = project_path.clone(); let project_path = project_path.clone();
let abs_path = project.read(cx).absolute_path(&project_path, cx); let file_abs_path = project
.read(cx)
.entry_for_path(&project_path, cx)
.is_some_and(|entry| entry.is_file())
.then(|| project.read(cx).absolute_path(&project_path, cx))
.flatten();
let is_local = project.read(cx).is_local(); let is_local = project.read(cx).is_local();
let project_item = let project_item =
<T::Item as project::ProjectItem>::try_open(project, &project_path, cx)?; <T::Item as project::ProjectItem>::try_open(project, &project_path, cx)?;
@ -638,7 +643,7 @@ impl ProjectItemRegistry {
) as Box<_>; ) as Box<_>;
Ok((project_entry_id, build_workspace_item)) Ok((project_entry_id, build_workspace_item))
} }
Err(e) => match abs_path { Err(e) => match file_abs_path {
Some(abs_path) => match cx.update(|window, cx| { Some(abs_path) => match cx.update(|window, cx| {
T::for_broken_project_item(abs_path, is_local, &e, window, cx) T::for_broken_project_item(abs_path, is_local, &e, window, cx)
})? { })? {