From 1b0e93b1536a01c7871e4225d2b660780b180ce0 Mon Sep 17 00:00:00 2001
From: Max Brunsfeld <maxbrunsfeld@gmail.com>
Date: Wed, 20 Jul 2022 09:53:49 -0700
Subject: [PATCH] Change interpretation of marked_text and edit when handling
 input

Co-authored-by: Antonio Scandurra <antonio@zed.dev
---
 crates/gpui/src/platform.rs            |  2 +-
 crates/gpui/src/platform/mac/window.rs | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs
index d8c845aff6..255995cdf3 100644
--- a/crates/gpui/src/platform.rs
+++ b/crates/gpui/src/platform.rs
@@ -92,7 +92,7 @@ pub trait Dispatcher: Send + Sync {
 pub trait InputHandler {
     fn select(&mut self, range: Range<usize>);
     fn selected_range(&self) -> Option<Range<usize>>;
-    fn edit(&mut self, replacement_range: Option<Range<usize>>, text: &str) -> bool;
+    fn edit(&mut self, replacement_range: Option<Range<usize>>, text: &str);
     fn compose(
         &mut self,
         marked_text: &str,
diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs
index 98d2cc5039..9e749bc67d 100644
--- a/crates/gpui/src/platform/mac/window.rs
+++ b/crates/gpui/src/platform/mac/window.rs
@@ -746,7 +746,10 @@ extern "C" fn handle_key_equivalent(this: &Object, _: Sel, native_event: id) ->
 
         let pending_event = window_state.borrow_mut().pending_key_event.take().unwrap();
         let mut inserted_text = false;
-        let has_marked_text = pending_event.set_marked_text.is_some();
+        let has_marked_text = pending_event.set_marked_text.is_some()
+            || with_input_handler(this, |input_handler| input_handler.marked_range())
+                .flatten()
+                .is_some();
         if let Some(text) = pending_event.insert_text.as_ref() {
             if !text.is_empty() && (had_marked_text || has_marked_text || text.chars().count() > 1)
             {
@@ -781,7 +784,9 @@ extern "C" fn handle_key_equivalent(this: &Object, _: Sel, native_event: id) ->
                     handled = true;
                 } else {
                     if let Some(text) = pending_event.insert_text {
+                        // TODO: we may not need this anymore.
                         event.input = Some(text);
+
                         if event.input.as_ref().unwrap().chars().count() == 1 {
                             event.keystroke.key = event.input.clone().unwrap();
                         }
@@ -791,8 +796,9 @@ extern "C" fn handle_key_equivalent(this: &Object, _: Sel, native_event: id) ->
                     if !handled {
                         if let Some(input) = event.input {
                             with_input_handler(this, |input_handler| {
-                                handled = input_handler.edit(None, &input);
+                                input_handler.edit(None, &input);
                             });
+                            handled = true;
                         }
                     }
                 }