Llewellyn/fzf
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/fzf.git synced 2025-01-23 23:28:31 +00:00
Code Issues Projects Releases Wiki Activity

Fix alt-, for --expect

Browse Source
This commit is contained in:
Junegunn Choi 2020-12-31 03:37:25 +09:00
parent 408c04f25f
commit 7136cfc68b
No known key found for this signature in database
GPG Key ID: 254BC280FEF9C627
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/options.go
View File

@ -449,6 +449,7 @@ func parseKeyChords(str string, message string) map[tui.Event]string {
errorExit(message) errorExit(message)
} }
str = regexp.MustCompile("(?i)(alt-),").ReplaceAllString(str, "$1"+string(escapedComma))
tokens := strings.Split(str, ",") tokens := strings.Split(str, ",")
if str == "," || strings.HasPrefix(str, ",,") || strings.HasSuffix(str, ",,") || strings.Contains(str, ",,,") { if str == "," || strings.HasPrefix(str, ",,") || strings.HasSuffix(str, ",,") || strings.Contains(str, ",,,") {
tokens = append(tokens, ",") tokens = append(tokens, ",")
@ -459,6 +460,7 @@ func parseKeyChords(str string, message string) map[tui.Event]string {
if len(key) == 0 { if len(key) == 0 {
continue // ignore continue // ignore
} }
key = strings.ReplaceAll(key, string(escapedComma), ",")
lkey := strings.ToLower(key) lkey := strings.ToLower(key)
add := func(e tui.EventType) { add := func(e tui.EventType) {
chords[e.AsEvent()] = key chords[e.AsEvent()] = key

4
src/options_test.go
View File

@ -225,6 +225,10 @@ func TestParseKeysWithComma(t *testing.T) {
pairs = parseKeyChords(",,,", "") pairs = parseKeyChords(",,,", "")
checkN(len(pairs), 1) checkN(len(pairs), 1)
check(pairs, tui.Key(','), ",") check(pairs, tui.Key(','), ",")
pairs = parseKeyChords(",ALT-,,", "")
checkN(len(pairs), 1)
check(pairs, tui.AltKey(','), "ALT-,")
} }
func TestBind(t *testing.T) { func TestBind(t *testing.T) {