Merge pull request #1584 from zed-industries/restore-modal-terminal

restore modal terminal

assets/keymaps/default.json

@@ -309,7 +309,8 @@
             "cmd-shift-p": "command_palette::Toggle",
             "cmd-shift-m": "diagnostics::Deploy",
             "cmd-shift-e": "project_panel::ToggleFocus",
-            "cmd-alt-s": "workspace::SaveAll"
+            "cmd-alt-s": "workspace::SaveAll",
+            "shift-escape": "terminal::DeployModal"
         }
     },
     // Bindings from Sublime Text
@@ -425,5 +426,12 @@
             "cmd-v": "terminal::Paste",
             "cmd-k": "terminal::Clear"
         }
+    },
+    {
+        "context": "ModalTerminal",
+        "bindings": {
+            "ctrl-cmd-space": "terminal::ShowCharacterPalette",
+            "shift-escape": "terminal::DeployModal"
+        }
     }
 ]

assets/keymaps/experiments/modal_terminal.json

@@ -1,15 +0,0 @@
-[
-    {
-        "context": "Workspace",
-        "bindings": {
-            "shift-escape": "terminal::DeployModal"
-        }
-    },
-    {
-        "context": "ModalTerminal",
-        "bindings": {
-            "ctrl-cmd-space": "terminal::ShowCharacterPalette",
-            "shift-escape": "terminal::DeployModal"
-        }
-    }
-]

crates/settings/src/settings.rs

@@ -40,21 +40,11 @@ pub struct Settings {
 }
 
 #[derive(Copy, Clone, Debug, Default, Deserialize, JsonSchema)]
-pub struct FeatureFlags {
-    modal_terminal: Option<bool>,
-}
+pub struct FeatureFlags {}
 
 impl FeatureFlags {
     pub fn keymap_files(&self) -> Vec<&'static str> {
-        let mut res = vec![];
-        if self.modal_terminal() {
-            res.push("keymaps/experiments/modal_terminal.json")
-        }
-        res
-    }
-
-    pub fn modal_terminal(&self) -> bool {
-        self.modal_terminal.unwrap_or_default()
+        vec![]
     }
 }
 

crates/terminal/src/terminal.rs

@@ -53,10 +53,7 @@ use crate::mappings::{
 
 ///Initialize and register all of our action handlers
 pub fn init(cx: &mut MutableAppContext) {
-    let settings = cx.global::<Settings>();
-    if settings.experiments.modal_terminal() {
-        cx.add_action(deploy_modal);
-    }
+    cx.add_action(deploy_modal);
 
     terminal_view::init(cx);
     terminal_container_view::init(cx);