Skip to content

Fix Delete(Sub)Word commands to respect active selection #3987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
masmu wants to merge 2 commits into
base: master
Choose a base branch
from
+54 −12
Open

Fix Delete(Sub)Word commands to respect active selection #3987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e6bc3a
Fix Delete(Sub)Word commands to respect active selection
masmu Feb 2, 2026
bb9fd3e
Action: Add DeleteSelections action and update default keybindings
masmu Feb 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 44 additions & 4 deletions internal/action/actions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,43 +751,63 @@ func (h *BufPane) Backspace() bool {

// DeleteWordRight deletes the word to the right of the cursor
func (h *BufPane) DeleteWordRight() bool {
h.SelectWordRight()
if h.Cursor.HasSelection() {
h.Cursor.DeleteSelection()
h.Cursor.ResetSelection()
} else {
h.SelectWordRight()
if h.Cursor.HasSelection() {
h.Cursor.DeleteSelection()
h.Cursor.ResetSelection()
}

@dmaluka dmaluka Jul 16, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not:

	if !h.Cursor.HasSelection() {
		h.SelectWordRight()
	}
	h.Cursor.DeleteSelection()
	h.Cursor.ResetSelection()

?

@masmu masmu Jul 19, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's more simple. I am gonna change that for DeleteWordRight, DeleteWordLeft, DeleteSubWordRight, DeleteSubWordLeft.

}
h.Relocate()
return true
}

// DeleteWordLeft deletes the word to the left of the cursor
func (h *BufPane) DeleteWordLeft() bool {
h.SelectWordLeft()
if h.Cursor.HasSelection() {
h.Cursor.DeleteSelection()
h.Cursor.ResetSelection()
} else {
h.SelectWordLeft()
if h.Cursor.HasSelection() {
h.Cursor.DeleteSelection()
h.Cursor.ResetSelection()
}
}
h.Relocate()
return true
}

// DeleteSubWordRight deletes the sub-word to the right of the cursor
func (h *BufPane) DeleteSubWordRight() bool {
h.SelectSubWordRight()
if h.Cursor.HasSelection() {
h.Cursor.DeleteSelection()
h.Cursor.ResetSelection()
} else {
h.SelectSubWordRight()
if h.Cursor.HasSelection() {
h.Cursor.DeleteSelection()
h.Cursor.ResetSelection()
}
}
h.Relocate()
return true
}

// DeleteSubWordLeft deletes the sub-word to the left of the cursor
func (h *BufPane) DeleteSubWordLeft() bool {
h.SelectSubWordLeft()
if h.Cursor.HasSelection() {
h.Cursor.DeleteSelection()
h.Cursor.ResetSelection()
} else {
h.SelectSubWordLeft()
if h.Cursor.HasSelection() {
h.Cursor.DeleteSelection()
h.Cursor.ResetSelection()
}
}
h.Relocate()
return true
Expand All @@ -808,6 +828,26 @@ func (h *BufPane) Delete() bool {
return true
}

// DeleteSelections checks for any active cursors selections and
// if there are it deletes them and returns true. It returns false when
// there are no selections.
func (h *BufPane) DeleteSelections() bool {
hasSelection := false
for _, c := range h.Buf.GetCursors() {
if c.HasSelection() {
c.DeleteSelection()
c.ResetSelection()
hasSelection = true
}
}

if hasSelection {
h.Relocate()
return true
}
return false
}

// IndentSelection indents the current selection
func (h *BufPane) IndentSelection() bool {
if h.Cursor.HasSelection() {
Expand Down
1 change: 1 addition & 0 deletions internal/action/bufpane.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,6 +762,7 @@ var BufKeyActions = map[string]BufKeyAction{
"InsertNewline": (*BufPane).InsertNewline,
"Backspace": (*BufPane).Backspace,
"Delete": (*BufPane).Delete,
"DeleteSelections": (*BufPane).DeleteSelections,
"InsertTab": (*BufPane).InsertTab,
"Save": (*BufPane).Save,
"SaveAll": (*BufPane).SaveAll,
Expand Down
4 changes: 2 additions & 2 deletions internal/action/defaults_darwin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ var bufdefaults = map[string]string{
"CtrlH": "Backspace",
"Backspace": "Backspace",
"OldBackspace": "Backspace",
"Alt-CtrlH": "DeleteWordLeft",
"Alt-Backspace": "DeleteWordLeft",
"Alt-CtrlH": "DeleteSelections|DeleteWordLeft",
"Alt-Backspace": "DeleteSelections|DeleteWordLeft",
Comment thread
JoeKar marked this conversation as resolved.

@dmaluka dmaluka Jul 16, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes the default behavior of these keys inconsistent with the default behavior of Backspace and Delete (which still don't "prevent accidental deletion of adjacent text when selections are present")?

I think we shouldn't change these default keybindings, we should just add this DeleteSelections action, and let the user rebind them to DeleteSelections|DeleteWordLeft (or rebind Delete to DeleteSelections|Delete, or Backspace to DeleteSelections|Backspace, or whatever) if the user wants to.

...Also, could you fix huge lines in the commit messages?

@masmu masmu Jul 19, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes the default behavior of these keys inconsistent with the default behavior of Backspace and Delete (which still don't "prevent accidental deletion of adjacent text when selections are present")?

We could add DeleteSelections to Delete and Backspace as well to provide sane default bindings.

I think we shouldn't change these default keybindings, we should just add this DeleteSelections action, and let the user rebind them to DeleteSelections|DeleteWordLeft (or rebind Delete to DeleteSelections|Delete, or Backspace to DeleteSelections|Backspace, or whatever) if the user wants to.

I am fine with that as well.

...Also, could you fix huge lines in the commit messages?

Sure. What line limits do you suggest? 50/72?

@dmaluka dmaluka Jul 20, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What line limits do you suggest? 50/72?

Both are fine to me. I personally use 72.

"Tab": "Autocomplete|IndentSelection|InsertTab",
"Backtab": "CycleAutocompleteBack|OutdentSelection|OutdentLine",
"Ctrl-o": "OpenFile",
Expand Down
4 changes: 2 additions & 2 deletions internal/action/defaults_other.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ var bufdefaults = map[string]string{
"CtrlH": "Backspace",
"Backspace": "Backspace",
"OldBackspace": "Backspace",
"Alt-CtrlH": "DeleteWordLeft",
"Alt-Backspace": "DeleteWordLeft",
"Alt-CtrlH": "DeleteSelections|DeleteWordLeft",
"Alt-Backspace": "DeleteSelections|DeleteWordLeft",
Comment thread
JoeKar marked this conversation as resolved.
"Tab": "Autocomplete|IndentSelection|InsertTab",
"Backtab": "CycleAutocompleteBack|OutdentSelection|OutdentLine",
"Ctrl-o": "OpenFile",
Expand Down
9 changes: 5 additions & 4 deletions runtime/help/keybindings.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ SelectToParagraphNext
InsertNewline
Backspace
Delete
DeleteSelections
InsertTab
Save
SaveAll
Expand Down Expand Up @@ -559,8 +560,8 @@ conventions for text editing defaults.
"Enter": "InsertNewline",
"Ctrl-h": "Backspace",
"Backspace": "Backspace",
"Alt-CtrlH": "DeleteWordLeft",
"Alt-Backspace": "DeleteWordLeft",
"Alt-CtrlH": "DeleteSelections|DeleteWordLeft",
"Alt-Backspace": "DeleteSelections|DeleteWordLeft",
"Tab": "Autocomplete|IndentSelection|InsertTab",
"Backtab": "OutdentSelection|OutdentLine",
"Ctrl-o": "OpenFile",
Expand Down Expand Up @@ -693,8 +694,8 @@ are given below:
"CtrlH": "Backspace",
"Backspace": "Backspace",
"OldBackspace": "Backspace",
"Alt-CtrlH": "DeleteWordLeft",
"Alt-Backspace": "DeleteWordLeft",
"Alt-CtrlH": "DeleteSelections|DeleteWordLeft",
"Alt-Backspace": "DeleteSelections|DeleteWordLeft",
"Tab": "CommandComplete",
"Backtab": "CycleAutocompleteBack",
"Ctrl-z": "Undo",
Expand Down