SRShortcut can parse keyCode-less key equivalents.

Refs #114
Kentzo · Apr 7, 2020 · d4fcafc · d4fcafc
1 parent 1113cc4
commit d4fcafc
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/Library/SRShortcut.m b/Library/SRShortcut.m
@@ -97,8 +97,16 @@ + (instancetype)shortcutWithKeyEquivalent:(NSString *)aKeyEquivalent
     [parser scanCharactersFromSet:PossibleFlags intoString:&modifierFlagsString];
     NSString *keyCodeString = [aKeyEquivalent substringFromIndex:parser.scanLocation];
 
-    NSNumber *modifierFlags = [SRSymbolicModifierFlagsTransformer.sharedTransformer reverseTransformedValue:modifierFlagsString];
-    NSNumber *keyCode = [SRASCIILiteralKeyCodeTransformer.sharedTransformer reverseTransformedValue:keyCodeString];
+    if (!modifierFlagsString.length && !keyCodeString.length)
+        return nil;
+
+    NSNumber *modifierFlags = @0;
+    if (modifierFlagsString.length)
+        modifierFlags = [SRSymbolicModifierFlagsTransformer.sharedTransformer reverseTransformedValue:modifierFlagsString];
+
+    NSNumber *keyCode = @(SRKeyCodeNone);
+    if (keyCodeString.length)
+        keyCode = [SRASCIILiteralKeyCodeTransformer.sharedTransformer reverseTransformedValue:keyCodeString];
 
     if (!modifierFlags || !keyCode)
         return nil;