mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-03 08:54:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #1527 from zed-industries/ime-fix

Browse source 
Fix panic on main
This commit is contained in:
Mikayla Maki 2022-08-16 22:47:02 -07:00 committed by GitHub
commit c612dc8a31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
crates/gpui/src/platform/mac/window.rs
View file

@ -1169,23 +1169,18 @@ extern "C" fn insert_text(this: &Object, _: Sel, text: id, replacement_range: NS
.flatten() .flatten()
.is_some(); .is_some();
match pending_key_down { if is_composing || text.chars().count() > 1 || pending_key_down.is_none() {
None | Some(_) if is_composing || text.chars().count() > 1 => {
with_input_handler(this, |input_handler| { with_input_handler(this, |input_handler| {
input_handler.replace_text_in_range(replacement_range, text) input_handler.replace_text_in_range(replacement_range, text)
}); });
} } else {
let mut pending_key_down = pending_key_down.unwrap();
Some(mut pending_key_down) => {
pending_key_down.1 = Some(InsertText { pending_key_down.1 = Some(InsertText {
replacement_range, replacement_range,
text: text.to_string(), text: text.to_string(),
}); });
window_state.borrow_mut().pending_key_down = Some(pending_key_down); window_state.borrow_mut().pending_key_down = Some(pending_key_down);
} }
_ => unreachable!(),
}
} }
} }

1
styles/package-lock.json generated
View file

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