Split the actions StartOfLine and StartOfText

The default keybindings now use StartOfText which moves the cursor
to the start of the text on the current line instead of the actual
start of the line (if the line begins with whitespace).

Fixes #1468

internal/action/actions.go

@@ -284,15 +284,18 @@ func (h *BufPane) SelectWordLeft() bool {
 	return true
 }
 
+// StartOfLine moves the cursor to the start of the text of the line
+func (h *BufPane) StartOfText() bool {
+	h.Cursor.Deselect(true)
+	h.Cursor.StartOfText()
+	h.Relocate()
+	return true
+}
+
 // StartOfLine moves the cursor to the start of the line
 func (h *BufPane) StartOfLine() bool {
 	h.Cursor.Deselect(true)
-	h.Cursor.StartOfText()
-	// if h.Cursor.X != 0 {
-	// 	h.Cursor.Start()
-	// } else {
-	// 	h.Cursor.StartOfText()
-	// }
+	h.Cursor.Start()
 	h.Relocate()
 	return true
 }
@@ -312,6 +315,17 @@ func (h *BufPane) SelectLine() bool {
 	return true
 }
 
+// SelectToStartOfText selects to the start of the text on the current line
+func (h *BufPane) SelectToStartOfText() bool {
+	if !h.Cursor.HasSelection() {
+		h.Cursor.OrigSelection[0] = h.Cursor.Loc
+	}
+	h.Cursor.StartOfText()
+	h.Cursor.SelectTo(h.Cursor.Loc)
+	h.Relocate()
+	return true
+}
+
 // SelectToStartOfLine selects to the start of the current line
 func (h *BufPane) SelectToStartOfLine() bool {
 	if !h.Cursor.HasSelection() {

internal/action/bufpane.go

@@ -497,6 +497,7 @@ var BufKeyActions = map[string]BufKeyAction{
 	"DeleteWordLeft":         (*BufPane).DeleteWordLeft,
 	"SelectLine":             (*BufPane).SelectLine,
 	"SelectToStartOfLine":    (*BufPane).SelectToStartOfLine,
+	"SelectToStartOfText":    (*BufPane).SelectToStartOfText,
 	"SelectToEndOfLine":      (*BufPane).SelectToEndOfLine,
 	"ParagraphPrevious":      (*BufPane).ParagraphPrevious,
 	"ParagraphNext":          (*BufPane).ParagraphNext,
@@ -537,6 +538,7 @@ var BufKeyActions = map[string]BufKeyAction{
 	"SelectPageDown":         (*BufPane).SelectPageDown,
 	"HalfPageUp":             (*BufPane).HalfPageUp,
 	"HalfPageDown":           (*BufPane).HalfPageDown,
+	"StartOfText":            (*BufPane).StartOfText,
 	"StartOfLine":            (*BufPane).StartOfLine,
 	"EndOfLine":              (*BufPane).EndOfLine,
 	"ToggleHelp":             (*BufPane).ToggleHelp,

internal/action/defaults_darwin.go

@@ -17,10 +17,10 @@ func DefaultBindings() map[string]string {
 		"AltDown":        "MoveLinesDown",
 		"AltShiftRight":  "SelectWordRight",
 		"AltShiftLeft":   "SelectWordLeft",
-		"CtrlLeft":       "StartOfLine",
+		"CtrlLeft":       "StartOfText",
 		"CtrlRight":      "EndOfLine",
-		"CtrlShiftLeft":  "SelectToStartOfLine",
-		"ShiftHome":      "SelectToStartOfLine",
+		"CtrlShiftLeft":  "SelectToStartOfText",
+		"ShiftHome":      "SelectToStartOfText",
 		"CtrlShiftRight": "SelectToEndOfLine",
 		"ShiftEnd":       "SelectToEndOfLine",
 		"CtrlUp":         "CursorStart",
@@ -52,7 +52,7 @@ func DefaultBindings() map[string]string {
 		"CtrlT":          "AddTab",
 		"Alt,":           "PreviousTab",
 		"Alt.":           "NextTab",
-		"Home":           "StartOfLine",
+		"Home":           "StartOfText",
 		"End":            "EndOfLine",
 		"CtrlHome":       "CursorStart",
 		"CtrlEnd":        "CursorEnd",
@@ -76,7 +76,7 @@ func DefaultBindings() map[string]string {
 		// Emacs-style keybindings
 		"Alt-f": "WordRight",
 		"Alt-b": "WordLeft",
-		"Alt-a": "StartOfLine",
+		"Alt-a": "StartOfText",
 		"Alt-e": "EndOfLine",
 		// "Alt-p": "CursorUp",
 		// "Alt-n": "CursorDown",

internal/action/defaults_other.go

@@ -19,10 +19,10 @@ func DefaultBindings() map[string]string {
 		"AltDown":        "MoveLinesDown",
 		"CtrlShiftRight": "SelectWordRight",
 		"CtrlShiftLeft":  "SelectWordLeft",
-		"AltLeft":        "StartOfLine",
+		"AltLeft":        "StartOfText",
 		"AltRight":       "EndOfLine",
-		"AltShiftLeft":   "SelectToStartOfLine",
-		"ShiftHome":      "SelectToStartOfLine",
+		"AltShiftLeft":   "SelectToStartOfText",
+		"ShiftHome":      "SelectToStartOfText",
 		"AltShiftRight":  "SelectToEndOfLine",
 		"ShiftEnd":       "SelectToEndOfLine",
 		"CtrlUp":         "CursorStart",
@@ -54,7 +54,7 @@ func DefaultBindings() map[string]string {
 		"CtrlT":          "AddTab",
 		"Alt,":           "PreviousTab",
 		"Alt.":           "NextTab",
-		"Home":           "StartOfLine",
+		"Home":           "StartOfText",
 		"End":            "EndOfLine",
 		"CtrlHome":       "CursorStart",
 		"CtrlEnd":        "CursorEnd",
@@ -78,7 +78,7 @@ func DefaultBindings() map[string]string {
 		// Emacs-style keybindings
 		"Alt-f": "WordRight",
 		"Alt-b": "WordLeft",
-		"Alt-a": "StartOfLine",
+		"Alt-a": "StartOfText",
 		"Alt-e": "EndOfLine",
 		// "Alt-p": "CursorUp",
 		// "Alt-n": "CursorDown",