Llewellyn/fzf
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/fzf.git synced 2025-04-05 08:41:51 +00:00
Code Issues Projects Releases Wiki Activity

Use more explicit int-to-string conversion.

Browse Source 
This fixes the following errors with Go 1.15:
```
src/options.go:452:69: conversion from untyped int to string yields a string of one rune, not a string of digits (did you mean fmt.Sprint(x)?)
src/options.go:463:33: conversion from untyped int to string yields a string of one rune, not a string of digits (did you mean fmt.Sprint(x)?)
```
This commit is contained in:
Elliott Sales de Andrade 2021-01-02 23:25:43 -05:00 committed by Junegunn Choi
parent 8c533e34ea
commit 82791f7efc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/options.go
View File

@ -449,7 +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)) str = regexp.MustCompile("(?i)(alt-),").ReplaceAllString(str, "$1"+string([]rune{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, ",")
@ -460,7 +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), ",") key = strings.ReplaceAll(key, string([]rune{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