From aa75fbe56c04f1b6f54089b326046d0fce6b7068 Mon Sep 17 00:00:00 2001 From: Mikayla Maki Date: Tue, 16 Aug 2022 22:36:24 -0700 Subject: [PATCH] Fix panic on main --- crates/gpui/src/platform/mac/window.rs | 27 +++++++++++--------------- styles/package-lock.json | 1 - 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs index b597dfb778..83dd9d6e20 100644 --- a/crates/gpui/src/platform/mac/window.rs +++ b/crates/gpui/src/platform/mac/window.rs @@ -1169,22 +1169,17 @@ extern "C" fn insert_text(this: &Object, _: Sel, text: id, replacement_range: NS .flatten() .is_some(); - match pending_key_down { - None | Some(_) if is_composing || text.chars().count() > 1 => { - with_input_handler(this, |input_handler| { - input_handler.replace_text_in_range(replacement_range, text) - }); - } - - Some(mut pending_key_down) => { - pending_key_down.1 = Some(InsertText { - replacement_range, - text: text.to_string(), - }); - window_state.borrow_mut().pending_key_down = Some(pending_key_down); - } - - _ => unreachable!(), + if is_composing || text.chars().count() > 1 || pending_key_down.is_none() { + with_input_handler(this, |input_handler| { + input_handler.replace_text_in_range(replacement_range, text) + }); + } else { + let mut pending_key_down = pending_key_down.unwrap(); + pending_key_down.1 = Some(InsertText { + replacement_range, + text: text.to_string(), + }); + window_state.borrow_mut().pending_key_down = Some(pending_key_down); } } } diff --git a/styles/package-lock.json b/styles/package-lock.json index 582f1c8496..5499f1852c 100644 --- a/styles/package-lock.json +++ b/styles/package-lock.json @@ -5,7 +5,6 @@ "requires": true, "packages": { "": { - "name": "styles", "version": "1.0.0", "license": "ISC", "dependencies": {