Merge branch 'main' into follow

2022-03-22 11:20:55 +01:00
parent e5a99cf8cd 05ddd26d75
commit 016fb01ef8
9 changed files with 2 additions and 3 deletions
@@ -1097,9 +1097,8 @@ impl Workspace {
    {
        use project::Item as _;

-        if let Some(item) = project_item
-            .read(cx)
-            .entry_id(cx)
+        let entry_id = project_item.read(cx).entry_id(cx);
+        if let Some(item) = entry_id
            .and_then(|entry_id| self.active_pane().read(cx).item_for_entry(entry_id, cx))
            .and_then(|item| item.downcast())
        {