Fix the arrow key movement when holding down an arrow key

Author: xyproto

Diff for: v2/keyhist.go

@@ -152,12 +152,19 @@ func (kh *KeyHistory) OnlyInAndAllDiffer(keyPresses ...string) bool {
 func (kh *KeyHistory) AllWithin(dur time.Duration) bool {
 	khMut.RLock()
 	defer khMut.RUnlock()
-
 	firstTime := kh.t[0]
 	lastTime := kh.t[2]
 	return lastTime.Sub(firstTime) < dur
 }
 
+// LastChanged checks if a key was added to the key history for longer since than the given duration, or not
+func (kh *KeyHistory) LastChanged(dur time.Duration) bool {
+	khMut.RLock()
+	defer khMut.RUnlock()
+	lastTime := kh.t[2]
+	return time.Since(lastTime) < dur
+}
+
 // PrevWithin checks if the previous keypress happened within the given duration (to check for rapid successions)
 func (kh *KeyHistory) PrevWithin(dur time.Duration) bool {
 	khMut.RLock()

Diff for: v2/keyloop.go

@@ -678,8 +678,10 @@ func Loop(tty *vt100.TTY, fnord FilenameOrData, lineNumber LineNumber, colNumber
 
 			e.CursorBackward(c, status)
 
-			// Check if it has been pressed 2 times the last 200ms, if so, give it an extra boost
-			if kh.TwoLastAre(leftArrow) && kh.AllWithin(200*time.Millisecond) {
+			// Move extra if the key is held down
+			if kh.TwoLastAre(leftArrow) && kh.AllWithin(200*time.Millisecond) && kh.LastChanged(200*time.Millisecond) {
+				e.CursorBackward(c, status)
+				e.CursorBackward(c, status)
 				e.CursorBackward(c, status)
 			}
 
@@ -704,12 +706,9 @@ func Loop(tty *vt100.TTY, fnord FilenameOrData, lineNumber LineNumber, colNumber
 
 			e.CursorForward(c, status)
 
-			if kh.TwoLastAre(leftArrow) && kh.AllWithin(200*time.Millisecond) {
+			// Move extra if the key is held down
+			if kh.TwoLastAre(rightArrow) && kh.AllWithin(200*time.Millisecond) && kh.LastChanged(200*time.Millisecond) {
 				e.CursorForward(c, status)
-			}
-
-			// Check if it has been pressed 2 times the last 200 ms, if so, give it an extra boost
-			if kh.TwoLastAre(rightArrow) && kh.AllWithin(200*time.Millisecond) {
 				e.CursorForward(c, status)
 				e.CursorForward(c, status)
 			}
@@ -731,8 +730,8 @@ func Loop(tty *vt100.TTY, fnord FilenameOrData, lineNumber LineNumber, colNumber
 
 			e.CursorUpward(c, status)
 
-			// Check if it has been pressed 2 times the last 200 ms, if so, give it an extra boost
-			if kh.TwoLastAre(upArrow) && kh.AllWithin(200*time.Millisecond) {
+			// Move extra if the key is held down
+			if kh.TwoLastAre(upArrow) && kh.AllWithin(200*time.Millisecond) && kh.LastChanged(200*time.Millisecond) {
 				e.CursorUpward(c, status)
 			}
 
@@ -754,8 +753,8 @@ func Loop(tty *vt100.TTY, fnord FilenameOrData, lineNumber LineNumber, colNumber
 
 			e.CursorDownward(c, status)
 
-			// Check if it has been pressed 2 times the last 200 ms, if so, give it an extra boost
-			if kh.TwoLastAre(downArrow) && kh.AllWithin(200*time.Millisecond) {
+			// Move extra if the key is held down
+			if kh.TwoLastAre(downArrow) && kh.AllWithin(200*time.Millisecond) && kh.LastChanged(200*time.Millisecond) {
 				e.CursorDownward(c, status)
 			}