Merge pull request #217 from atom/b3-fix-caps-lock-issues

Deal with caps lock issues on Windows

spec/keymap-manager-spec.coffee

@@ -649,6 +649,8 @@ describe "KeymapManager", ->
         assert.equal(keymapManager.keystrokeForKeyboardEvent(buildKeydownEvent({key: 'a', shiftKey: true})), 'shift-A')
         assert.equal(keymapManager.keystrokeForKeyboardEvent(buildKeydownEvent({key: 'a', shiftKey: true, altKey: true})), 'alt-shift-A')
         assert.equal(keymapManager.keystrokeForKeyboardEvent(buildKeydownEvent({key: 'a', shiftKey: true, ctrlKey: true})), 'ctrl-shift-A')
+      it "doesn't drop the ctrl-alt modifiers when there is no AltGraph variant", ->
+        assert.equal(keymapManager.keystrokeForKeyboardEvent(buildKeydownEvent({key: 'p', shiftKey: true, altKey: true, ctrlKey: true})), 'ctrl-alt-shift-P')
 
     describe "when the KeyboardEvent.key is 'Delete' but KeyboardEvent.code is 'Backspace' due to pressing ctrl-delete with numlock enabled on Windows", ->
       it "translates as ctrl-backspace instead of ctrl-delete", ->

src/helpers.coffee

@@ -156,6 +156,13 @@ exports.keystrokeForKeyboardEvent = (event, customKeystrokeResolvers) ->
   if isNonCharacterKey
     key = NON_CHARACTER_KEY_NAMES_BY_KEYBOARD_EVENT_KEY[key] ? key.toLowerCase()
   else
+    # Deal with caps-lock issues. Key bindings should always adjust the
+    # capitalization of the key based on the shiftKey state and never the state
+    # of the caps-lock key
+    if shiftKey
+      key = key.toUpperCase()
+    else
+      key = key.toLowerCase()
     if event.getModifierState('AltGraph') or (process.platform is 'darwin' and altKey)
       # All macOS layouts have an alt-modified character variant for every
       # single key. Therefore, if we always favored the alt variant, it would
@@ -192,14 +199,6 @@ exports.keystrokeForKeyboardEvent = (event, customKeystrokeResolvers) ->
           key = nonAltModifiedKey
           altKey = event.getModifierState('AltGraph')
 
-    # Deal with caps-lock issues. Key bindings should always adjust the
-    # capitalization of the key based on the shiftKey state and never the state
-    # of the caps-lock key
-    if shiftKey
-      key = key.toUpperCase()
-    else
-      key = key.toLowerCase()
-
   # Use US equivalent character for non-latin characters in keystrokes with modifiers
   # or when using the dvorak-qwertycmd layout and holding down the command key.
   if (key.length is 1 and not isLatinKeymap(KeyboardLayout.getCurrentKeymap())) or