Merge pull request #1410 from zed-industries/ctrl-c-regression

Mikayla Maki created 3 years ago

Fixed keybinding regression

Change summary

crates/terminal/src/connected_view.rs | 2 +-
crates/terminal/src/terminal.rs       | 4 ++--
styles/package-lock.json              | 1 -
3 files changed, 3 insertions(+), 4 deletions(-)

Detailed changes

crates/terminal/src/connected_view.rs

@@ -146,7 +146,7 @@ impl ConnectedView {
 
 impl View for ConnectedView {
     fn ui_name() -> &'static str {
-        "Connected Terminal View"
+        "Terminal"
     }
 
     fn render(&mut self, cx: &mut gpui::RenderContext<'_, Self>) -> ElementBox {

crates/terminal/src/terminal.rs

@@ -140,7 +140,7 @@ impl TerminalView {
 
 impl View for TerminalView {
     fn ui_name() -> &'static str {
-        "Terminal"
+        "Terminal View"
     }
 
     fn render(&mut self, cx: &mut gpui::RenderContext<'_, Self>) -> ElementBox {
@@ -176,7 +176,7 @@ impl View for TerminalView {
 
 impl View for ErrorView {
     fn ui_name() -> &'static str {
-        "Terminal Error"
+        "DisconnectedTerminal"
     }
 
     fn render(&mut self, cx: &mut gpui::RenderContext<'_, Self>) -> ElementBox {

styles/package-lock.json

@@ -5,7 +5,6 @@
   "requires": true,
   "packages": {
     "": {
-      "name": "styles",
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {