Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
gpui: Anchor IME candidate window to the start of the visual line (#55876)
Wanten737f55a1a14d
diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rsindex 2cc32107f18..fad863d9ff3 100644--- a/crates/gpui/src/platform.rs+++ b/crates/gpui/src/platform.rs@@ -1250,17 +1250,55 @@ impl PlatformInputHandler {self.handler.replace_text_in_range(None, input, window, cx);}+ pub fn compute_ime_candidate_bounds(+ marked_range: Option<Range<usize>>,+ selection: &UTF16Selection,+ mut bounds_for_range: impl FnMut(Range<usize>) -> Option<Bounds<Pixels>>,+ ) -> Option<Bounds<Pixels>> {+ if let Some(marked_range) = marked_range {+ // Default to the start of the marked (composing) range.+ let mut line_start = marked_range.start;++ // Walk backward from the caret looking for a line break. A change in+ // the Y coordinate means we crossed into the previous visual line, so+ // the line start is one position after the break point.+ let caret = selection.range.end;+ if let Some(caret_bounds) = bounds_for_range(caret..caret) {+ for i in (marked_range.start..caret).rev() {+ if let Some(b) = bounds_for_range(i..i) {+ if (b.origin.y - caret_bounds.origin.y).abs() > px(0.1) {+ line_start = i + 1;+ break;+ }+ }+ }+ }+ bounds_for_range(line_start..line_start)+ } else {+ // No active composition — use the selection endpoint.+ let offset = if selection.reversed {+ selection.range.start+ } else {+ selection.range.end+ };+ bounds_for_range(offset..offset)+ }+ }+pub fn selected_bounds(&mut self, window: &mut Window, cx: &mut App) -> Option<Bounds<Pixels>> {+ let marked_range = self.handler.marked_text_range(window, cx);let selection = self.handler.selected_text_range(true, window, cx)?;- self.handler.bounds_for_range(- if selection.reversed {- selection.range.start..selection.range.start- } else {- selection.range.end..selection.range.end- },- window,- cx,- )+ Self::compute_ime_candidate_bounds(marked_range, &selection, |range| {+ self.handler.bounds_for_range(range, window, cx)+ })+ }++ pub fn ime_candidate_bounds(&mut self) -> Option<Bounds<Pixels>> {+ let marked_range = self.marked_text_range();+ let selection = self.selected_text_range(true)?;+ Self::compute_ime_candidate_bounds(marked_range, &selection, |range| {+ self.bounds_for_range(range)+ })}#[allow(unused)]diff --git a/crates/gpui_linux/src/linux/wayland/window.rs b/crates/gpui_linux/src/linux/wayland/window.rsindex d8cf35686eb..9d5c85b2058 100644--- a/crates/gpui_linux/src/linux/wayland/window.rs+++ b/crates/gpui_linux/src/linux/wayland/window.rs@@ -945,9 +945,7 @@ impl WaylandWindowStatePtr {let mut bounds: Option<Bounds<Pixels>> = None;if let Some(mut input_handler) = state.input_handler.take() {drop(state);- if let Some(selection) = input_handler.marked_text_range() {- bounds = input_handler.bounds_for_range(selection.start..selection.start);- }+ bounds = input_handler.ime_candidate_bounds();self.state.borrow_mut().input_handler = Some(input_handler);}bounds