Skip to content

Commit

Permalink
Show proper shortcut for every action on edit inlay (#1913)
Browse files Browse the repository at this point in the history
Closes CODY-2388

## Test plan

1. Run any edit action
2. Verify all actions have descriptions


![image](https://github.com/user-attachments/assets/862d826b-6798-48a0-a098-e7246cb909e9)
  • Loading branch information
pkukielka authored Jul 17, 2024
1 parent 94c0271 commit 943383f
Showing 1 changed file with 9 additions and 11 deletions.
20 changes: 9 additions & 11 deletions src/main/kotlin/com/sourcegraph/cody/edit/EditCommandPrompt.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
}
Expand Down

0 comments on commit 943383f

Please sign in to comment.