From a4ceae3cf286ece23ab2fd31a5006088c1db5bf8 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Thu, 21 Jul 2022 13:48:56 +0200 Subject: [PATCH] Remove unused `{cancel,finish}_composition` methods --- crates/gpui/src/app.rs | 12 ------------ crates/gpui/src/platform.rs | 2 -- crates/gpui/src/platform/mac/window.rs | 2 +- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/crates/gpui/src/app.rs b/crates/gpui/src/app.rs index a049f5753fba9140145ce662c2b6966f74f3861b..15f5bad570b4ae8d6bc5312b2e8ff9c9a7077d4e 100644 --- a/crates/gpui/src/app.rs +++ b/crates/gpui/src/app.rs @@ -445,18 +445,6 @@ impl InputHandler for WindowInputHandler { ); }); } - - // TODO - do these need to be handled separately? - - fn cancel_composition(&mut self) { - println!("cancel_composition()"); - self.unmark_text(); - } - - fn finish_composition(&mut self) { - println!("finish_composition()"); - self.unmark_text(); - } } #[cfg(any(test, feature = "test-support"))] diff --git a/crates/gpui/src/platform.rs b/crates/gpui/src/platform.rs index 22eaa00540166f8a0217e2212b123087cf776d4b..be121ff5b7a307f07c6165a60fb742c51370a6f2 100644 --- a/crates/gpui/src/platform.rs +++ b/crates/gpui/src/platform.rs @@ -102,8 +102,6 @@ pub trait InputHandler { ); fn marked_text_range(&self) -> Option>; fn unmark_text(&mut self); - fn cancel_composition(&mut self); - fn finish_composition(&mut self); } pub trait Window: WindowContext { diff --git a/crates/gpui/src/platform/mac/window.rs b/crates/gpui/src/platform/mac/window.rs index 897bcc25ee44935ae56d272a7320f6ec2c253e5d..f7fdc700d26c883472e8e1dd724b11f93a809932 100644 --- a/crates/gpui/src/platform/mac/window.rs +++ b/crates/gpui/src/platform/mac/window.rs @@ -1097,7 +1097,7 @@ extern "C" fn set_marked_text( } extern "C" fn unmark_text(this: &Object, _: Sel) { - with_input_handler(this, |input_handler| input_handler.finish_composition()); + with_input_handler(this, |input_handler| input_handler.unmark_text()); } extern "C" fn attributed_substring_for_proposed_range(