OrgGo/gomu
1
0
Fork 0
mirror of https://github.com/issadarkthing/gomu.git synced 2025-04-26 13:49:21 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #63 from voidshard/master

Browse Source 
Fix panic on Ctrl+Arrow
This commit is contained in:
Raziman Mahathir 2022-07-03 09:30:16 +08:00 committed by GitHub
commit cda14ffa11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
anko/anko.go
View File

@ -155,12 +155,18 @@ func (a *Anko) KeybindExists(panel string, eventKey *tcell.EventKey) bool {
name := eventKey.Name()
if strings.Contains(name, "Ctrl") {
key := extractCtrlRune(name)
key, ok := extractCtrlRune(name)
if !ok {
return false
}
src = fmt.Sprintf("Keybinds.%s[\"ctrl_%s\"]",
panel, strings.ToLower(string(key)))
} else if strings.Contains(name, "Alt") {
key := extractAltRune(name)
key, ok := extractAltRune(name)
if !ok {
return false
}
src = fmt.Sprintf("Keybinds.%s[\"alt_%c\"]", panel, key)
} else if strings.Contains(name, "Rune") {
@ -186,12 +192,18 @@ func (a *Anko) ExecKeybind(panel string, eventKey *tcell.EventKey) error {
name := eventKey.Name()
if strings.Contains(name, "Ctrl") {
key := extractCtrlRune(name)
key, ok := extractCtrlRune(name)
if !ok {
return nil
}
src = fmt.Sprintf("Keybinds.%s[\"ctrl_%s\"]()",
panel, strings.ToLower(string(key)))
} else if strings.Contains(name, "Alt") {
key := extractAltRune(name)
key, ok := extractAltRune(name)
if !ok {
return nil
}
src = fmt.Sprintf("Keybinds.%s[\"alt_%c\"]()", panel, key)
} else if strings.Contains(name, "Rune") {
@ -210,14 +222,20 @@ func (a *Anko) ExecKeybind(panel string, eventKey *tcell.EventKey) error {
return nil
}
func extractCtrlRune(str string) rune {
func extractCtrlRune(str string) (rune, bool) {
re := regexp.MustCompile(`\+(.)$`)
x := re.FindStringSubmatch(str)
return rune(x[0][1])
if len(x) == 0 {
return rune(' '), false
}
return rune(x[0][1]), true
}
func extractAltRune(str string) rune {
func extractAltRune(str string) (rune, bool) {
re := regexp.MustCompile(`\[(.)\]`)
x := re.FindStringSubmatch(str)
return rune(x[0][1])
if len(x) == 0 {
return rune(' '), false
}
return rune(x[0][1]), true
}

34
anko/anko_test.go
View File

@ -145,18 +145,22 @@ func TestExtractCtrlRune(t *testing.T) {
tests := []struct {
in string
out rune
ok bool
}{
{in: "Ctrl+x", out: 'x'},
{in: "Ctrl+]", out: ']'},
{in: "Ctrl+%", out: '%'},
{in: "Ctrl+^", out: '^'},
{in: "Ctrl+7", out: '7'},
{in: "Ctrl+B", out: 'B'},
{in: "Ctrl+x", out: 'x', ok: true},
{in: "Ctrl+]", out: ']', ok: true},
{in: "Ctrl+%", out: '%', ok: true},
{in: "Ctrl+^", out: '^', ok: true},
{in: "Ctrl+7", out: '7', ok: true},
{in: "Ctrl+B", out: 'B', ok: true},
{in: "Ctrl+Down", out: ' ', ok: false},
{in: "Ctrl+Left", out: ' ', ok: false},
}
for _, test := range tests {
got := extractCtrlRune(test.in)
got, ok := extractCtrlRune(test.in)
assert.Equal(t, test.out, got)
assert.Equal(t, test.ok, ok)
}
}
@ -164,18 +168,20 @@ func TestExtractAltRune(t *testing.T) {
tests := []struct {
in string
out rune
ok bool
}{
{in: "Alt+Rune[x]", out: 'x'},
{in: "Alt+Rune[]]", out: ']'},
{in: "Alt+Rune[%]", out: '%'},
{in: "Alt+Rune[^]", out: '^'},
{in: "Alt+Rune[7]", out: '7'},
{in: "Alt+Rune[B]", out: 'B'},
{in: "Alt+Rune[x]", out: 'x', ok: true},
{in: "Alt+Rune[]]", out: ']', ok: true},
{in: "Alt+Rune[%]", out: '%', ok: true},
{in: "Alt+Rune[^]", out: '^', ok: true},
{in: "Alt+Rune[7]", out: '7', ok: true},
{in: "Alt+Rune[B]", out: 'B', ok: true},
}
for _, test := range tests {
got := extractAltRune(test.in)
got, ok := extractAltRune(test.in)
assert.Equal(t, test.out, got)
assert.Equal(t, test.ok, ok)
}
}