mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-14 14:11:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Change interpretation of marked_text and edit when handling input

Browse source 
Co-authored-by: Antonio Scandurra <antonio@zed.dev
This commit is contained in:
Max Brunsfeld 2022-07-20 09:53:49 -07:00
parent 42ac4bf9fc
commit 1b0e93b153
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/gpui/src/platform.rs
View file

@ -92,7 +92,7 @@ pub trait Dispatcher: Send + Sync {
pub trait InputHandler { pub trait InputHandler {
fn select(&mut self, range: Range<usize>); fn select(&mut self, range: Range<usize>);
fn selected_range(&self) -> Option<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( fn compose(
&mut self, &mut self,
marked_text: &str, marked_text: &str,

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

@ -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 pending_event = window_state.borrow_mut().pending_key_event.take().unwrap();
let mut inserted_text = false; 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 let Some(text) = pending_event.insert_text.as_ref() {
if !text.is_empty() && (had_marked_text || has_marked_text || text.chars().count() > 1) 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; handled = true;
} else { } else {
if let Some(text) = pending_event.insert_text { if let Some(text) = pending_event.insert_text {
// TODO: we may not need this anymore.
event.input = Some(text); event.input = Some(text);
if event.input.as_ref().unwrap().chars().count() == 1 { if event.input.as_ref().unwrap().chars().count() == 1 {
event.keystroke.key = event.input.clone().unwrap(); 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 !handled {
if let Some(input) = event.input { if let Some(input) = event.input {
with_input_handler(this, |input_handler| { with_input_handler(this, |input_handler| {
handled = input_handler.edit(None, &input); input_handler.edit(None, &input);
}); });
handled = true;
} }
} }
} }