Show proper shortcut for every action on edit inlay

sourcegraph · Jul 17, 2024 · 2b13eee · 2b13eee
1 parent 94c0271
commit 2b13eee
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/src/main/kotlin/com/sourcegraph/cody/edit/EditCommandPrompt.kt b/src/main/kotlin/com/sourcegraph/cody/edit/EditCommandPrompt.kt
@@ -614,21 +614,19 @@ class EditCommandPrompt(
     /** Returns a compact symbol representation of the action's keyboard shortcut, if any. */
     @JvmStatic
     fun getShortcutDisplayString(actionId: String): String? {
+      fun getFirstShortcut(id: String): String? {
+        return KeymapManager.getInstance().activeKeymap.getShortcuts(id).firstOrNull()?.let {
+          KeymapUtil.getShortcutText(it)
+        }
+      }
+
       return when (actionId) {
         "cody.editCodeAction",
-        "cody.inlineEditRetryAction" -> {
-          KeymapUtil.getShortcutText(
-              KeymapManager.getInstance().activeKeymap.getShortcuts("cody.editCodeAction")[0])
-        }
+        "cody.inlineEditRetryAction" -> getFirstShortcut("cody.editCodeAction")
         "cody.inlineEditCancelAction",
         "cody.inlineEditUndoAction",
-        "cody.inlineEditDismissAction" -> {
-          KeymapUtil.getShortcutText(
-              KeymapManager.getInstance()
-                  .activeKeymap
-                  .getShortcuts("cody.editCancelOrUndoAction")[0])
-        }
-        else -> null
+        "cody.inlineEditDismissAction" -> getFirstShortcut("cody.editCancelOrUndoAction")
+        else -> getFirstShortcut(actionId)
       }
     }
   }