mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-11 21:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Avoid panic in OutlineView when active item isn't an editor

Browse source
This commit is contained in:
Max Brunsfeld 2022-01-14 10:51:26 -08:00
parent b7561c6cef
commit 5de5e4b6f2
1 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
crates/outline/src/outline.rs
View file

@ -162,25 +162,24 @@ impl OutlineView {
} }
fn toggle(workspace: &mut Workspace, _: &Toggle, cx: &mut ViewContext<Workspace>) { fn toggle(workspace: &mut Workspace, _: &Toggle, cx: &mut ViewContext<Workspace>) {
let editor = workspace if let Some(editor) = workspace
.active_item(cx) .active_item(cx)
.unwrap() .and_then(|item| item.to_any().downcast::<Editor>())
.to_any() {
.downcast::<Editor>() let settings = workspace.settings();
.unwrap(); let buffer = editor
let settings = workspace.settings(); .read(cx)
let buffer = editor .buffer()
.read(cx) .read(cx)
.buffer() .read(cx)
.read(cx) .outline(Some(settings.borrow().theme.editor.syntax.as_ref()));
.read(cx) if let Some(outline) = buffer {
.outline(Some(settings.borrow().theme.editor.syntax.as_ref())); workspace.toggle_modal(cx, |cx, _| {
if let Some(outline) = buffer { let view = cx.add_view(|cx| OutlineView::new(outline, editor, settings, cx));
workspace.toggle_modal(cx, |cx, _| { cx.subscribe(&view, Self::on_event).detach();
let view = cx.add_view(|cx| OutlineView::new(outline, editor, settings, cx)); view
cx.subscribe(&view, Self::on_event).detach(); })
view }
})
} }
} }