zesterer/zte
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More ergonomic backspace

Browse source
This commit is contained in:
Joshua Barretto 2025-11-04 13:06:36 +00:00
parent f6e37dbc3a
commit 79c6cf7c0e
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -23,4 +23,6 @@
- [ ] Replace
- [ ] Terminal windows
## Issues to fix
## Issues to fix
- New file creation should work with non-existent directories

8
src/state.rs
View file

@ -647,10 +647,10 @@ impl Buffer {
let Some(cursor) = self.cursors.get(cursor_id) else {
return;
};
let line_start = self.text.to_pos([0, self.text.to_coord(cursor.pos)[1]]);
let coord = self.text.to_coord(cursor.pos);
let line_start = self.text.to_pos([0, coord[1]]);
// At start of line, remove entire line
let line_text_start = self.text.start_of_line_text(coord[1]).unwrap_or_else(|s| s);
let line_text_start = self.text.start_of_line_text(coord[1]);
if let Some(selection) = cursor.selection() {
self.remove(selection);
@ -661,12 +661,12 @@ impl Buffer {
self.remove(line_start..cursor.pos);
self.backspace(cursor_id); // Remove the newline too
} else*/
if cursor.pos == line_text_start {
if cursor.pos != line_start && line_text_start == Ok(cursor.pos) {
self.remove(line_start.saturating_sub(1)..cursor.pos);
} else if let Some(pos) = cursor.pos.checked_sub(1) {
// If a backspace is performed on a space, a deindent takes place instead
// Ensure there's only whitespace to our left
if cursor.pos == line_text_start {
if cursor.pos != line_start && cursor.pos == line_text_start.unwrap_or_else(|s| s) {
self.indent_at(cursor.pos, false);
} else {
self.remove(pos..pos + 1);