Merge remote-tracking branch 'origin/main' into assistant-2

# Conflicts: # crates/ui2/src/components/icon.rs
2023-12-06 18:18:58 +01:00
parent 80f315106d 7c9e2f6b7d
commit 14def2a1a3
41 changed files with 1667 additions and 1270 deletions
@@ -92,6 +92,7 @@ use std::{
    ops::{ControlFlow, Deref, DerefMut, Range, RangeInclusive},
    path::Path,
    sync::Arc,
+    sync::Weak,
    time::{Duration, Instant},
 };
 pub use sum_tree::Bias;
@@ -420,6 +421,25 @@ pub fn init(cx: &mut AppContext) {
        },
    )
    .detach();
+
+    cx.on_action(move |_: &workspace::NewFile, cx| {
+        let app_state = cx.global::<Weak<workspace::AppState>>();
+        if let Some(app_state) = app_state.upgrade() {
+            workspace::open_new(&app_state, cx, |workspace, cx| {
+                Editor::new_file(workspace, &Default::default(), cx)
+            })
+            .detach();
+        }
+    });
+    cx.on_action(move |_: &workspace::NewWindow, cx| {
+        let app_state = cx.global::<Weak<workspace::AppState>>();
+        if let Some(app_state) = app_state.upgrade() {
+            workspace::open_new(&app_state, cx, |workspace, cx| {
+                Editor::new_file(workspace, &Default::default(), cx)
+            })
+            .detach();
+        }
+    });
 }

 trait InvalidationRegion {