Go to the closest match when disabling raw mode

2 files changed, 53 insertions, 16 deletions

diff --git a/src/terminal.go b/src/terminal.go
index 9b3d390b..f9381aa5 100644
--- a/src/terminal.go
+++ b/src/terminal.go
@@ -300,7 +300,6 @@ type Terminal struct {
 	subWordNext        string
 	cx                 int
 	cy                 int
-	lastMatchingIndex  int32
 	offset             int
 	xoffset            int
 	yanked             []rune
@@ -996,7 +995,6 @@ func NewTerminal(opts *Options, eventBox *util.EventBox, executor *util.Executor
 		subWordNext:        subWordNext,
 		cx:                 len(input),
 		cy:                 0,
-		lastMatchingIndex:  minItem.Index(),
 		offset:             0,
 		xoffset:            0,
 		yanked:             []rune{},
@@ -3225,9 +3223,6 @@ func (t *Terminal) printList() {
 		if itemCount < count {
 			item := t.merger.Get(itemCount + t.offset)
 			current := itemCount == t.cy-t.offset
-			if current && (!t.raw || t.isItemMatch(item.item)) {
-				t.lastMatchingIndex = item.Index()
-			}
 			line = t.printItem(item, line, maxy, itemCount, current, barRange)
 		} else if !t.prevLines[line].empty {
 			t.renderEmptyLine(line, barRange)
@@ -6122,26 +6117,50 @@ func (t *Terminal) Loop() error {
 				req(reqList)
 			case actToggleRaw, actEnableRaw, actDisableRaw:
 				prevRaw := t.raw
+				newRaw := t.raw
 				switch a.t {
 				case actEnableRaw:
-					t.raw = true
+					newRaw = true
 				case actDisableRaw:
-					t.raw = false
+					newRaw = false
 				case actToggleRaw:
-					t.raw = !t.raw
+					newRaw = !t.raw
 				}
-				if prevRaw == t.raw {
+				if prevRaw == newRaw {
 					break
 				}
 				prevPos := t.cy - t.offset
 				prevIndex := t.currentIndex()
-				if t.raw {
+				if newRaw {
 					// Build matchMap if not available
 					if len(t.matchMap) == 0 {
 						t.matchMap = t.resultMerger.ToMap()
 					}
 					t.merger = t.passMerger
 				} else {
+					// Find the closest matching item
+					if !t.isCurrentItemMatch() && t.resultMerger.Length() > 1 {
+						distance := 0
+					Loop:
+						for {
+							distance++
+							checks := 0
+							for _, cy := range []int{t.cy + distance, t.cy - distance} {
+								if cy >= 0 && cy < t.merger.Length() {
+									checks++
+									item := t.merger.Get(cy).item
+									if t.isItemMatch(item) {
+										prevIndex = item.Index()
+										break Loop
+									}
+								}
+							}
+							if checks == 0 {
+								break
+							}
+						}
+					}
+
 					t.merger = t.resultMerger
 
 					// Need to remove non-matching items from the selection
@@ -6150,15 +6169,11 @@ func (t *Terminal) Loop() error {
 						req(reqInfo)
 					}
 				}
+				t.raw = newRaw
 
 				// Try to retain position
 				if prevIndex != minItem.Index() {
-					i := t.merger.FindIndex(prevIndex)
-					if i >= 0 {
-						t.cy = i
-					} else {
-						t.cy = t.merger.FindIndex(t.lastMatchingIndex)
-					}
+					t.cy = util.Max(0, t.merger.FindIndex(prevIndex))
 					t.offset = t.cy - prevPos
 				}
 
diff --git a/test/test_raw.rb b/test/test_raw.rb
index eb0df4de..63b62cc7 100644
--- a/test/test_raw.rb
+++ b/test/test_raw.rb
@@ -79,5 +79,27 @@ class TestRaw < TestInteractive
 
     tmux.send_keys :Space
     tmux.until { assert_includes it, '[[]] 11' }
+
+    tmux.send_keys 'C-u', '5'
+    tmux.until { assert_includes it, '> 5' }
+
+    tmux.send_keys 'C-x', 'C-p', 'C-p'
+    tmux.until do
+      assert_includes it, '> 25'
+      assert_includes it, '▖ 24'
+    end
+
+    tmux.send_keys 'C-x'
+    tmux.until do
+      assert_includes it, '> 25'
+      assert_includes it, '▌ 15'
+    end
+
+    # 35 is the closest match in raw mode
+    tmux.send_keys 'C-x', :Up, :Up, :Up, :Up, :Up, :Up, 'C-x'
+    tmux.until do
+      assert_includes it, '> 35'
+      assert_includes it, '▌ 25'
+    end
   end
 end