Rooba
/
lapce
mirror of https://github.com/lapce/lapce.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't restore non-insert cursor mode if not in modal editing mode

This commit is contained in:
Dániel Buga 2022-09-15 22:31:16 +02:00
parent 75289540ab
commit 2a07fb040d
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lapce-core/src/editor.rs
View File

@ -820,11 +820,15 @@ pub fn do_edit<T: Clipboard>(
Undo => {
if let Some((delta, inval_lines, cursor_mode)) = buffer.do_undo() {
if let Some(cursor_mode) = cursor_mode {
if modal {
cursor.mode = CursorMode::Normal(cursor_mode.offset());
cursor.mode = if modal {
CursorMode::Normal(cursor_mode.offset())
} else if cursor.is_insert() {
cursor_mode
} else {
cursor.mode = cursor_mode;
}
CursorMode::Insert(Selection::caret(
cursor_mode.offset(),
))
};
} else if let Some(new_cursor) =
get_first_selection_after(cursor, buffer, &delta)
{
@ -840,11 +844,15 @@ pub fn do_edit<T: Clipboard>(
Redo => {
if let Some((delta, inval_lines, cursor_mode)) = buffer.do_redo() {
if let Some(cursor_mode) = cursor_mode {
if modal {
cursor.mode = CursorMode::Normal(cursor_mode.offset());
cursor.mode = if modal {
CursorMode::Normal(cursor_mode.offset())
} else if cursor.is_insert() {
cursor_mode
} else {
cursor.mode = cursor_mode;
}
CursorMode::Insert(Selection::caret(
cursor_mode.offset(),
))
};
} else if let Some(new_cursor) =
get_first_selection_after(cursor, buffer, &delta)
{