Merge pull request #36 from tjmtmmnk/backspace-ignore-cursor

Backspace ignored cursor position
ktr0731 · Dec 25, 2020 · 0555829 · 0555829
2 parents 0d9e17e + 776f827
commit 0555829
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/fuzzyfinder.go b/fuzzyfinder.go
@@ -402,10 +402,10 @@ func (f *finder) readKey() error {
 			if f.state.x == 0 {
 				return nil
 			}
-			// Remove the latest input rune.
-			f.state.cursorX -= runewidth.RuneWidth(f.state.input[len(f.state.input)-1])
+			x := f.state.x
+			f.state.cursorX -= runewidth.RuneWidth(f.state.input[x-1])
 			f.state.x--
-			f.state.input = f.state.input[0 : len(f.state.input)-1]
+			f.state.input = append(f.state.input[:x-1], f.state.input[x:]...)
 		case tcell.KeyDelete:
 			if f.state.x == len(f.state.input) {
 				return nil

diff --git a/fuzzyfinder_test.go b/fuzzyfinder_test.go
@@ -143,6 +143,10 @@ func TestFind(t *testing.T) {
 			{tcell.KeyBackspace2, rune(tcell.KeyBackspace2), tcell.ModNone},
 			{tcell.KeyBackspace2, rune(tcell.KeyBackspace2), tcell.ModNone},
 		}...)...)},
+		"arrow left backspace": {append(runes("オレンジ"), keys([]input{
+			{tcell.KeyLeft, rune(tcell.KeyLeft), tcell.ModNone},
+			{tcell.KeyBackspace, rune(tcell.KeyBackspace), tcell.ModNone},
+		}...)...)},
 		"delete": {append(runes("オレンジ"), keys([]input{
 			{tcell.KeyCtrlA, 'A', tcell.ModCtrl},
 			{tcell.KeyDelete, rune(tcell.KeyDelete), tcell.ModNone},

diff --git a/testdata/fixtures/testfind-arrow_left_backspace.golden b/testdata/fixtures/testfind-arrow_left_backspace.golden
@@ -0,0 +1,11 @@
+                              [m[38;5;0m┌────────────────────────────┐
+                              [m[38;5;0m│[m[39m not found                  [m[38;5;0m│
+                              [m[38;5;0m│[m[39m                            [m[38;5;0m│
+                              [m[38;5;0m│[m[39m                            [m[38;5;0m│
+                              [m[38;5;0m│[m[39m                            [m[38;5;0m│
+                              [m[38;5;0m│[m[39m                            [m[38;5;0m│
+                              [m[38;5;0m│[m[39m                            [m[38;5;0m│
+                              [m[38;5;0m│[m[39m                            [m[38;5;0m│
+  [m[38;5;3m0/9[m[39m                         [m[38;5;0m│[m[39m                            [m[38;5;0m│
+[m[38;5;4m> [m[1;39mオレ[m[48;5;7mジ[m[49m                      [m[38;5;0m└────────────────────────────┘
+[m