Do not replace all spaces by <space>, it makes the bindings completely
unreadable. Only replace trailing and leading spaces with <space> since
these are the only one that actually matter. The others are implicit and
it improves readability level by over 9000.
Signed-off-by: Robin Jarry <robin@jarry.cc>
---
config/binds.go | 24 ++++++++++++++++++++----widgets/aerc.go | 1 -
2 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/config/binds.go b/config/binds.go
index 9188bf49ffd4..0fcfd8196a19 100644
--- a/config/binds.go+++ b/config/binds.go
@@ -405,11 +405,16 @@ func FormatKeyStrokes(keystrokes []KeyStroke) string {
if ks.Modifiers == stroke.Modifiers && ks.Key == stroke.Key && ks.Rune == stroke.Rune {
switch name {
case "cr", "c-m":
- name = "enter"+ s = "<enter>" case "c-i":
- name = "tab"+ s = "<tab>"+ case "space":+ s = " "+ case "semicolon":+ s = ";"+ default:+ s = fmt.Sprintf("<%s>", name) }
- s = fmt.Sprintf("<%s>", name) break
}
}
@@ -419,7 +424,18 @@ func FormatKeyStrokes(keystrokes []KeyStroke) string {
sb.WriteString(s)
}
- return sb.String()+ // replace leading & trailing spaces with explicit <space> keystrokes+ var prefix, suffix string+ buf, found := strings.CutSuffix(sb.String(), " ")+ for ; found; buf, found = strings.CutSuffix(buf, " ") {+ suffix += "<space>"+ }+ buf, found = strings.CutPrefix(buf, " ")+ for ; found; buf, found = strings.CutPrefix(buf, " ") {+ prefix += "<space>"+ }