Fix getShortcut method 1. Fix invalid enum in gr-messages-list 2. getShortcut should pass individual binding key to describeBinding Change-Id: I0d29e7b2aea8117c62b8f1dbd69994765bd3621c

diff --git a/polygerrit-ui/app/elements/change/gr-messages-list/gr-messages-list.js b/polygerrit-ui/app/elements/change/gr-messages-list/gr-messages-list.js
index 635336f..342d5bb 100644
--- a/polygerrit-ui/app/elements/change/gr-messages-list/gr-messages-list.js
+++ b/polygerrit-ui/app/elements/change/gr-messages-list/gr-messages-list.js

@@ -334,7 +334,7 @@
   }
 
   _computeExpandAllTitle(_expandAllState) {
-    if (_expandAllState === ExpandAllState.COLLAPSED_ALL) {
+    if (_expandAllState === ExpandAllState.COLLAPSE_ALL) {
       return this.createTitle(
           Shortcut.COLLAPSE_ALL_MESSAGES, ShortcutSection.ACTIONS);
     }

diff --git a/polygerrit-ui/app/mixins/keyboard-shortcut-mixin/keyboard-shortcut-mixin.js b/polygerrit-ui/app/mixins/keyboard-shortcut-mixin/keyboard-shortcut-mixin.js
index 75b0b00..4c813b5 100644
--- a/polygerrit-ui/app/mixins/keyboard-shortcut-mixin/keyboard-shortcut-mixin.js
+++ b/polygerrit-ui/app/mixins/keyboard-shortcut-mixin/keyboard-shortcut-mixin.js

@@ -392,8 +392,10 @@
   }
 
   getShortcut(shortcutName) {
-    const binding = this.bindings.get(shortcutName);
-    return binding ? this.describeBinding(binding) : '';
+    const bindings = this.bindings.get(shortcutName);
+    return bindings
+      ? bindings.map(binding => this.describeBinding(binding)).join(', ')
+      : '';
   }
 
   activeShortcutsBySection() {

diff --git a/polygerrit-ui/app/mixins/keyboard-shortcut-mixin/keyboard-shortcut-mixin_test.js b/polygerrit-ui/app/mixins/keyboard-shortcut-mixin/keyboard-shortcut-mixin_test.js
index 3ab7b6d..534ead4 100644
--- a/polygerrit-ui/app/mixins/keyboard-shortcut-mixin/keyboard-shortcut-mixin_test.js
+++ b/polygerrit-ui/app/mixins/keyboard-shortcut-mixin/keyboard-shortcut-mixin_test.js

@@ -28,7 +28,7 @@
 
 const withinOverlayFixture = fixtureFromTemplate(html`
 <gr-overlay>
-  <keyboard-shortcut-mixin-test-element>      
+  <keyboard-shortcut-mixin-test-element>
   </keyboard-shortcut-mixin-test-element>
 </gr-overlay>
 `);
@@ -73,6 +73,15 @@
           [']', '}', 'right']);
     });
 
+    test('getShortcut', () => {
+      const mgr = new ShortcutManager();
+      const NEXT_FILE = Shortcut.NEXT_FILE;
+
+      assert.isUndefined(mgr.getBindingsForShortcut(NEXT_FILE));
+      mgr.bindShortcut(NEXT_FILE, ']', '}', 'right');
+      assert.equal(mgr.getShortcut(NEXT_FILE), '], }, →');
+    });
+
     suite('binding descriptions', () => {
       function mapToObject(m) {
         const o = {};