Add new key mappings, add whitespace trimming for keys with multiple components

fe9lix · fe9lix · commit 0fdc97c0b841 · 2013-11-17T21:58:41.000+01:00
diff --git a/CodingKeys/HotKey.m b/CodingKeys/HotKey.m
@@ -76,7 +76,10 @@ - (NSArray *)mappedHotKeysForAppWithName:(NSString *)appName {
     NSMutableArray *mappedKeys = [NSMutableArray array];
     
     for (NSString *mappingComponent in mappingComponents) {
-        HotKey *hotKey = [[HotKey alloc] initWithKey:mappingComponent
+        NSString *trimmedComponent = [mappingComponent stringByTrimmingCharactersInSet:
+                                      [NSCharacterSet whitespaceCharacterSet]];
+        
+        HotKey *hotKey = [[HotKey alloc] initWithKey:trimmedComponent
                                              mapping:nil];
         [mappedKeys addObject:hotKey];
     }
diff --git a/CodingKeys/data/keys.json b/CodingKeys/data/keys.json
@@ -26,7 +26,7 @@
     "key": "⌘ D",
     "mapping": 
     {
-      "Xcode": "⌃ A|⇧ ↓|⌘ C|⌘ V|⌘ V",
+      "Xcode": "⌃ A | ⇧ ↓ | ⌘ C | ⌘ V | ⌘ V",
       "Sublime Text": "⇧ ⌘ D",
       "Eclipse": "⌥ ⌘ ↓",
       "Android Studio": "⌘ D"
@@ -37,10 +37,43 @@
     "key": "⌘ ⌫",
     "mapping": 
     {
-      "Xcode": "⌃ A|⌃ K|⌃ K",
+      "Xcode": "⌃ A | ⌃ K | ⌃ K",
       "Sublime Text": "⌃ ⇧ K",
       "Eclipse": "⌘ D",
       "Android Studio": "⌘ ⌫"
     }
+  },
+  {
+    "command": "Format",
+    "key": "⇧ ⌘ F",
+    "mapping": 
+    {
+      "Xcode": "⌃ I",
+      "Sublime Text": "⌃ ⇧ R",
+      "Eclipse": "⇧ ⌘ F",
+      "Android Studio": "⌥ ⌘ L"
+    }
+  },
+  {
+    "command": "Rename",
+    "key": "⌃ ⌘ R",
+    "mapping": 
+    {
+      "Xcode": "⌃ ⌥ R",
+      "Sublime Text": "⌃ ⌘ G",
+      "Eclipse": "⌥ ⌘ R",
+      "Android Studio": "⇧ F6"
+    }
+  },
+  {
+    "command": "Find/Replace",
+    "key": "⌥ ⌘ F",
+    "mapping": 
+    {
+      "Xcode": "⌥ ⌘ F",
+      "Sublime Text": "⌥ ⌘ F",
+      "Eclipse": "⌘ F",
+      "Android Studio": "⌘ R"
+    }
   }
 ]
