From 5a0f106005603c9b52c5c18ccfb74f77cede0c39 Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Wed, 31 Aug 2022 13:06:15 -0700
Subject: [PATCH] restore modal terminal

---
 assets/keymaps/default.json                    | 10 +++++++++-
 assets/keymaps/experiments/modal_terminal.json | 15 ---------------
 crates/settings/src/settings.rs                | 14 ++------------
 crates/terminal/src/terminal.rs                |  5 +----
 4 files changed, 12 insertions(+), 32 deletions(-)
 delete mode 100644 assets/keymaps/experiments/modal_terminal.json

diff --git a/assets/keymaps/default.json b/assets/keymaps/default.json
index 7b059652fa2ff5105f5054d7285bc801256bf58f..1d95c33cbf1edc3fc4ee4a8bd1c4a7f8a3118418 100644
--- a/assets/keymaps/default.json
+++ b/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"
+        }
     }
 ]
\ No newline at end of file
diff --git a/assets/keymaps/experiments/modal_terminal.json b/assets/keymaps/experiments/modal_terminal.json
deleted file mode 100644
index 4d33fc8ffe02baf30a907e978775b8cd42609ce4..0000000000000000000000000000000000000000
--- a/assets/keymaps/experiments/modal_terminal.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-    {
-        "context": "Workspace",
-        "bindings": {
-            "shift-escape": "terminal::DeployModal"
-        }
-    },
-    {
-        "context": "ModalTerminal",
-        "bindings": {
-            "ctrl-cmd-space": "terminal::ShowCharacterPalette",
-            "shift-escape": "terminal::DeployModal"
-        }
-    }
-]
\ No newline at end of file
diff --git a/crates/settings/src/settings.rs b/crates/settings/src/settings.rs
index 1ac1bf0cc3cb321b5db50f5563c2070a81434403..895a0bc36341d31204a8dbb0eb0ea56bd8daf7b9 100644
--- a/crates/settings/src/settings.rs
+++ b/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![]
     }
 }
 
diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs
index 89fec264470e2ce0dae04c335a6679622b3c57c3..52af9cc5e808264a4802d5c25fabe187d28c3ca6 100644
--- a/crates/terminal/src/terminal.rs
+++ b/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);