Merge branch 'main' into follow

Antonio Scandurra created

Change summary

crates/workspace/src/workspace.rs                                | 5 -
crates/zed/assets/fonts/zed-mono/zed-mono-extended.ttf           | 0 
crates/zed/assets/fonts/zed-mono/zed-mono-extendedbold.ttf       | 0 
crates/zed/assets/fonts/zed-mono/zed-mono-extendedbolditalic.ttf | 0 
crates/zed/assets/fonts/zed-mono/zed-mono-extendeditalic.ttf     | 0 
crates/zed/assets/fonts/zed-sans/zed-sans-extended.ttf           | 0 
crates/zed/assets/fonts/zed-sans/zed-sans-extendedbold.ttf       | 0 
crates/zed/assets/fonts/zed-sans/zed-sans-extendedbolditalic.ttf | 0 
crates/zed/assets/fonts/zed-sans/zed-sans-extendeditalic.ttf     | 0 
9 files changed, 2 insertions(+), 3 deletions(-)

Detailed changes

crates/workspace/src/workspace.rs 🔗 

@@ -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())
         {