dan/gpui-component
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

input: Fix delete beginning_of_line and end_of_line to handle empty line. (#767)

Browse source 
https://github.com/user-attachments/assets/58ff94df-3ff7-45ae-8657-a526b3ee75f7
This commit is contained in:
Jason Lee 2025-04-02 13:41:37 +08:00 committed by GitHub
parent e921621a8b
commit 253c93063f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
crates/ui/src/input/input.rs
View file

@ -922,13 +922,17 @@ impl TextInput {
window: &mut Window, window: &mut Window,
cx: &mut Context<Self>, cx: &mut Context<Self>,
) { ) {
let offset = self.start_of_line(window, cx); let mut offset = self.start_of_line(window, cx);
if offset == self.cursor_offset() {
offset = offset.saturating_sub(1);
}
self.replace_text_in_range( self.replace_text_in_range(
Some(self.range_to_utf16(&(offset..self.cursor_offset()))), Some(self.range_to_utf16(&(offset..self.cursor_offset()))),
"", "",
window, window,
cx, cx,
); );
self.pause_blink_cursor(cx); self.pause_blink_cursor(cx);
} }
@ -938,7 +942,10 @@ impl TextInput {
window: &mut Window, window: &mut Window,
cx: &mut Context<Self>, cx: &mut Context<Self>,
) { ) {
let offset = self.end_of_line(window, cx); let mut offset = self.end_of_line(window, cx);
if offset == self.cursor_offset() {
offset = (offset + 1).clamp(0, self.text.len());
}
self.replace_text_in_range( self.replace_text_in_range(
Some(self.range_to_utf16(&(self.cursor_offset()..offset))), Some(self.range_to_utf16(&(self.cursor_offset()..offset))),
"", "",
@ -1137,6 +1144,7 @@ impl TextInput {
/// ///
/// Ensure the offset use self.next_boundary or self.previous_boundary to get the correct offset. /// Ensure the offset use self.next_boundary or self.previous_boundary to get the correct offset.
fn move_to(&mut self, offset: usize, _: &mut Window, cx: &mut Context<Self>) { fn move_to(&mut self, offset: usize, _: &mut Window, cx: &mut Context<Self>) {
let offset = offset.clamp(0, self.text.len());
self.selected_range = offset..offset; self.selected_range = offset..offset;
self.pause_blink_cursor(cx); self.pause_blink_cursor(cx);
self.update_preferred_x_offset(cx); self.update_preferred_x_offset(cx);
@ -1255,6 +1263,7 @@ impl TextInput {
/// ///
/// Ensure the offset use self.next_boundary or self.previous_boundary to get the correct offset. /// Ensure the offset use self.next_boundary or self.previous_boundary to get the correct offset.
fn select_to(&mut self, offset: usize, _: &mut Window, cx: &mut Context<Self>) { fn select_to(&mut self, offset: usize, _: &mut Window, cx: &mut Context<Self>) {
let offset = offset.clamp(0, self.text.len());
if self.selection_reversed { if self.selection_reversed {
self.selected_range.start = offset self.selected_range.start = offset
} else { } else {