fix non-ascii spaces like are not available for keys

Author: rhysd

doc/binding_syntax.md

@@ -30,7 +30,7 @@ This is the grammar of key binding representation in [W3C EBNF notation][ebnf].
 ```ebnf
 key-binding     ::= key-sequence
 key-sequence    ::= key-combination ((space)+ key-combination)*
-space           ::= ' ' | '\t'
+space           ::= ' ' | #09 | #0A | #0C | #0D
 key-combination ::= (modifier '+')* key
 modifier        ::= 'Control' | 'Ctrl' | 'Command' | 'Cmd' | 'Mod' | 'Alt' | 'Super' | 'Option' | 'Shift' |
                     'control' | 'ctrl' | 'command' | 'cmd' | 'mod' | 'alt' | 'super' | 'option' | 'shift' |
@@ -70,7 +70,7 @@ The following modifier keys are available:
 - `Super`: <kbd>Windows</kbd> key on platforms other than macOS, Command key on macOS
 - `Alt`: <kbd>Alt</kbd> key
 - `Option`: An alias to <kbd>Alt</kbd> key
-- `Shift`: <kbd>Shift</kbd> key
+- `Shift`: <kbd>Shift</kbd> key (can only modify named keys)
 
 > [!Caution]
 >

src/key.rs

@@ -70,7 +70,7 @@ impl FromStr for Key {
     type Err = Error;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let s = s.trim();
+        let s = s.trim_ascii();
         {
             let mut c = s.chars();
             if let (Some(c), None) = (c.next(), c.next()) {
@@ -159,7 +159,7 @@ impl FromStr for Mods {
     type Err = Error;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s.trim() {
+        match s.trim_ascii() {
             "Control" | "control" | "CONTROL" | "Ctrl" | "ctrl" | "CTRL" => Ok(Self::CTRL),
             "Command" | "command" | "COMMAND" | "Cmd" | "cmd" | "CMD" => Ok(Self::CMD),
             "Mod" | "mod" | "MOD" => Ok(Self::MOD),
@@ -200,7 +200,7 @@ impl FromStr for KeyInput {
     type Err = Error;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let mut s = s.trim().split('+');
+        let mut s = s.trim_ascii().split('+');
         let mut cur = s.next().unwrap(); // Iterator by `.split()` is never empty
         let mut mods = Mods::NONE;
         loop {
@@ -282,7 +282,7 @@ impl FromStr for KeySeq {
     type Err = Error;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        let mut keys = s.split_whitespace();
+        let mut keys = s.split_ascii_whitespace();
         if let Some(key) = keys.next() {
             let mut seq = Self::Single(key.parse()?);
             for key in keys {
@@ -348,6 +348,8 @@ mod tests {
             ),
             ("Shift+Plus", KeyInput::new('+', Mods::SHIFT)),
             ("Shift+Space", KeyInput::new(' ', Mods::SHIFT)),
+            ("　", KeyInput::new('　', Mods::NONE)),
+            ("Ctrl+　", KeyInput::new('　', Mods::CTRL)),
         ];
 
         for (input, expected) in tests {
@@ -397,6 +399,13 @@ mod tests {
                     KeyInput::new('c', Mods::MOD),
                 ]),
             ),
+            (
+                "　 Ctrl+　",
+                KeySeq::from(vec![
+                    KeyInput::new('　', Mods::NONE),
+                    KeyInput::new('　', Mods::CTRL),
+                ]),
+            ),
         ];
 
         for (seq, expected) in tests {

src/keybind.rs

@@ -370,4 +370,20 @@ mod tests {
         assert_eq!(dispatcher.dispatch('a'), Some(&A::Action1));
         assert_eq!(dispatcher.dispatch('b'), None);
     }
+
+    #[test]
+    fn non_ascii_space() {
+        let binds = vec![Keybind::new('　', A::Action1)];
+        let mut dispatcher = KeybindDispatcher::new(binds);
+        assert_eq!(dispatcher.dispatch('　'), Some(&A::Action1));
+
+        let mut dispatcher = KeybindDispatcher::default();
+        dispatcher.bind("　", A::Action1).unwrap();
+        dispatcher.bind("Ctrl+　", A::Action2).unwrap();
+        assert_eq!(dispatcher.dispatch('　'), Some(&A::Action1));
+        assert_eq!(
+            dispatcher.dispatch(KeyInput::new('　', Mods::CTRL)),
+            Some(&A::Action2),
+        );
+    }
 }