Fix broken dock command

Mikayla Maki created 2 years ago

Change summary

assets/keymaps/default.json               | 2 +-
crates/gpui/src/keymap_matcher.rs         | 3 ---
crates/terminal_view/src/terminal_view.rs | 4 +---
3 files changed, 2 insertions(+), 7 deletions(-)

Detailed changes

assets/keymaps/default.json

@@ -456,7 +456,7 @@
         }
     },
     {
-        "context": "Dock > Pane",
+        "context": "Pane && docked",
         "bindings": {
             "shift-escape": "dock::HideDock",
             "cmd-escape": "dock::RemoveTabFromDock"

crates/gpui/src/keymap_matcher.rs

@@ -89,7 +89,6 @@ impl KeymapMatcher {
         self.contexts
             .extend(dispatch_path.iter_mut().map(|e| std::mem::take(&mut e.1)));
 
-        dbg!(&self.contexts);
         // Find the bindings which map the pending keystrokes and current context
         for (i, (view_id, _)) in dispatch_path.iter().enumerate() {
             // Don't require pending view entry if there are no pending keystrokes
@@ -121,8 +120,6 @@ impl KeymapMatcher {
             }
         }
 
-        dbg!(&matched_bindings);
-
         if !any_pending {
             self.clear_pending();
         }

crates/terminal_view/src/terminal_view.rs

@@ -483,9 +483,7 @@ impl View for TerminalView {
         }
         if mode.contains(TermMode::APP_KEYPAD) {
             context.add_identifier("DECPAM");
-        }
-        //Note the ! here
-        if !mode.contains(TermMode::APP_KEYPAD) {
+        } else {
             context.add_identifier("DECPNM");
         }
         if mode.contains(TermMode::SHOW_CURSOR) {