mirror of
https://git.sr.ht/~rjarry/aerc
synced 2025-02-22 14:53:57 +01:00
b24c796dc4
Currently some bindings with modifiers are displayed with obscure names.
E.g.:
<C-e> -> enq
<C-q> -> dc1
<C-z> -> em
These do not make much sense to the user. Instead display the actual
binding verbatim (including the angle brackets, if it is a special key
or if it requires modifiers to be pressed).
Update unit tests accordingly.
Fixes: cdc90afbaa ("aerc: replace tcell keys with vaxis keys")
Signed-off-by: Robin Jarry <robin@jarry.cc>
Tested-by: Bence Ferdinandy <bence@ferdinandy.com>
103 lines
2.5 KiB
Go
103 lines
2.5 KiB
Go
package config
|
|
|
|
import (
|
|
"fmt"
|
|
"testing"
|
|
|
|
"git.sr.ht/~rockorager/vaxis"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestGetBinding(t *testing.T) {
|
|
assert := assert.New(t)
|
|
|
|
bindings := NewKeyBindings()
|
|
add := func(binding, cmd string) {
|
|
b, err := ParseBinding(binding, cmd, "")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
bindings.Add(b)
|
|
}
|
|
|
|
add("abc", ":abc")
|
|
add("cba", ":cba")
|
|
add("foo", ":foo")
|
|
add("bar", ":bar")
|
|
|
|
test := func(input []KeyStroke, result int, output string) {
|
|
_output, _ := ParseKeyStrokes(output)
|
|
r, out := bindings.GetBinding(input)
|
|
assert.Equal(result, int(r), fmt.Sprintf(
|
|
"%s: Expected result %d, got %d", output, result, r))
|
|
assert.Equal(_output, out, fmt.Sprintf(
|
|
"%s: Expected output %v, got %v", output, _output, out))
|
|
}
|
|
|
|
test([]KeyStroke{
|
|
{vaxis.ModifierMask(0), 'a'},
|
|
}, BINDING_INCOMPLETE, "")
|
|
test([]KeyStroke{
|
|
{vaxis.ModifierMask(0), 'a'},
|
|
{vaxis.ModifierMask(0), 'b'},
|
|
{vaxis.ModifierMask(0), 'c'},
|
|
}, BINDING_FOUND, ":abc")
|
|
test([]KeyStroke{
|
|
{vaxis.ModifierMask(0), 'c'},
|
|
{vaxis.ModifierMask(0), 'b'},
|
|
{vaxis.ModifierMask(0), 'a'},
|
|
}, BINDING_FOUND, ":cba")
|
|
test([]KeyStroke{
|
|
{vaxis.ModifierMask(0), 'f'},
|
|
{vaxis.ModifierMask(0), 'o'},
|
|
}, BINDING_INCOMPLETE, "")
|
|
test([]KeyStroke{
|
|
{vaxis.ModifierMask(0), '4'},
|
|
{vaxis.ModifierMask(0), '0'},
|
|
{vaxis.ModifierMask(0), '4'},
|
|
}, BINDING_NOT_FOUND, "")
|
|
|
|
add("<C-a>", "c-a")
|
|
add("<C-Down>", ":next")
|
|
add("<C-PgUp>", ":prev")
|
|
add("<C-Enter>", ":open")
|
|
add("<C-->", ":open")
|
|
add("<S-up>", ":open")
|
|
test([]KeyStroke{
|
|
{vaxis.ModCtrl, 'a'},
|
|
}, BINDING_FOUND, "c-a")
|
|
test([]KeyStroke{
|
|
{vaxis.ModCtrl, vaxis.KeyDown},
|
|
}, BINDING_FOUND, ":next")
|
|
test([]KeyStroke{
|
|
{vaxis.ModCtrl, vaxis.KeyPgUp},
|
|
}, BINDING_FOUND, ":prev")
|
|
test([]KeyStroke{
|
|
{vaxis.ModCtrl, vaxis.KeyPgDown},
|
|
}, BINDING_NOT_FOUND, "")
|
|
test([]KeyStroke{
|
|
{vaxis.ModCtrl, vaxis.KeyEnter},
|
|
}, BINDING_FOUND, ":open")
|
|
test([]KeyStroke{
|
|
{vaxis.ModCtrl, '-'},
|
|
}, BINDING_FOUND, ":open")
|
|
test([]KeyStroke{
|
|
{vaxis.ModShift, vaxis.KeyUp},
|
|
}, BINDING_FOUND, ":open")
|
|
}
|
|
|
|
func TestKeyStrokeFormatting(t *testing.T) {
|
|
tests := []struct {
|
|
stroke KeyStroke
|
|
formatted string
|
|
}{
|
|
{KeyStroke{vaxis.ModifierMask(0), vaxis.KeyLeft}, "<left>"},
|
|
{KeyStroke{vaxis.ModCtrl, vaxis.KeyLeft}, "<c-left>"},
|
|
{KeyStroke{vaxis.ModCtrl, 'e'}, "<c-e>"},
|
|
{KeyStroke{vaxis.ModifierMask(0), vaxis.KeySpace}, "<space>"},
|
|
}
|
|
|
|
for _, test := range tests {
|
|
assert.Equal(t, test.formatted, FormatKeyStrokes([]KeyStroke{test.stroke}))
|
|
}
|
|
}
|