From 4b98c35d680811707ed4dcada09b5422da8fbe62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=B0=8F=E7=99=BD?= <364772080@qq.com> Date: Thu, 9 May 2024 02:01:48 +0800 Subject: [PATCH] windows: Let IME early return in vim mode (#11551) This PR follows up #11387 , slightly changes the IME window behavior to match macOS implementation. Release Notes: - N/A --- crates/gpui/src/platform/windows/events.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crates/gpui/src/platform/windows/events.rs b/crates/gpui/src/platform/windows/events.rs index 22b42d79958631ee57be15d3a0d88203b5e6c7a3..89315eac071fca8fa9f622b0356cadafd60159fe 100644 --- a/crates/gpui/src/platform/windows/events.rs +++ b/crates/gpui/src/platform/windows/events.rs @@ -585,7 +585,10 @@ fn handle_ime_position(handle: HWND, state_ptr: Rc) -> Op let scale_factor = lock.scale_factor; drop(lock); - let caret_range = input_handler.selected_text_range().unwrap_or_default(); + let Some(caret_range) = input_handler.selected_text_range() else { + state_ptr.state.borrow_mut().input_handler = Some(input_handler); + return Some(0); + }; let caret_position = input_handler.bounds_for_range(caret_range).unwrap(); state_ptr.state.borrow_mut().input_handler = Some(input_handler); let config = CANDIDATEFORM {