~rjarry/aerc-devel

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch
2 2

[PATCH aerc] binds: improve display of key sequences

Details
Message ID
<20230915221755.204778-2-robin@jarry.cc>
DKIM signature
missing
Download raw message
Patch: +20 -5
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>"
	}

	return prefix + buf + suffix
}

var keyNames = map[string]KeyStroke{
diff --git a/widgets/aerc.go b/widgets/aerc.go
index faec403e47fd..efa1319415e3 100644
--- a/widgets/aerc.go
+++ b/widgets/aerc.go
@@ -209,7 +209,6 @@ func (aerc *Aerc) HumanReadableBindings() []string {
	var result []string
	binds := aerc.getBindings()
	format := func(s string) string {
		s = strings.ReplaceAll(s, "<space>", " ")
		return strings.ReplaceAll(s, "%", "%%")
	}
	fmtStr := "%10s %s"
-- 
2.41.0

[aerc/patches] build failed

builds.sr.ht <builds@sr.ht>
Details
Message ID
<CVJUCQA3J1ZG.1K4D2GT2B8S5S@cirno2>
In-Reply-To
<20230915221755.204778-2-robin@jarry.cc> (view parent)
DKIM signature
missing
Download raw message
aerc/patches: FAILED in 4m46s

[binds: improve display of key sequences][0] from [Robin Jarry][1]

[0]: https://lists.sr.ht/~rjarry/aerc-devel/patches/44776
[1]: robin@jarry.cc

✓ #1058203 SUCCESS aerc/patches/openbsd.yml     https://builds.sr.ht/~rjarry/job/1058203
✗ #1058202 FAILED  aerc/patches/alpine-edge.yml https://builds.sr.ht/~rjarry/job/1058202
Details
Message ID
<CVJUF0EKDINM.3CIARU8C2MFKR@ringo>
In-Reply-To
<20230915221755.204778-2-robin@jarry.cc> (view parent)
DKIM signature
missing
Download raw message
Robin Jarry, Sep 16, 2023 at 00:17:
> +	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>"
> +	}

These functions are not available in go 1.18... Expect a v2.
Reply to thread Export thread (mbox)