Fix command-enter shortcut for Edit Code #1919
Conversation
mkondratek
force-pushed
the
mkondratek/fix/command-enter
branch
from
474cd0b
to
51cb0c9
Compare
| @@ -52,6 +52,9 @@ | |||
|
|
|||
| <applicationService | |||
| serviceImplementation="com.sourcegraph.cody.config.CodyPersistentAccounts"/> | |||
|
|
|||
| <actionPromoter implementation="com.sourcegraph.cody.edit.CodyActionPromoter"/> | |||
There was a problem hiding this comment.
this is the actual fix for this one - thank you JetBrains community Slack for help 😃
| <action id="cody.inlineEditEditCode" | ||
| text="Edit Code" | ||
| class="com.sourcegraph.cody.edit.InlineEditPromptEditCodeAction" > | ||
| <keyboard-shortcut replace-all="true" first-keystroke="ctrl ENTER" keymap="$default"/> |
There was a problem hiding this comment.
I see such comment from @steveyegge in this file:
<!--
N.B. You have to declare all the Mac keystrokes with ctrl or alt separately,
even if their definition is identical to $default, because otherwise it will
result in the actual keybindings switching to command/meta and/or shift.
-->
@mkondratek could you please check?
There was a problem hiding this comment.
Also, please add <override-text place="GoToAction" text="Cody: Confirm Code Edition"/>
or something along those lines (it is for search everywhere).
There was a problem hiding this comment.
text="Cody: Confirm Code Edition" that would be different from the text in the button and hence confusing imho
There was a problem hiding this comment.
Problem is that we have two "Edit Code" now. One to open edit code prompt and second for confirming the edit. they somehow need to have different names.
There was a problem hiding this comment.
I missed your second comment about ....
In this case: <override-text place="GoToAction" text="Cody: Edit Code"/>
Still we need to add Cody: part.
| @@ -285,6 +288,12 @@ | |||
| <override-text place="GoToAction" text="Cody: Dismiss"/> | |||
| </action> | |||
|
|
|||
| <action id="cody.inlineEditEditCode" | |||
| text="Edit Code" | |||
There was a problem hiding this comment.
I think text should not be Edit Code. We already have other Edit Code and I think both will be displayed in the key bindings settings with the same name (for button on the edit dialog we can have custom name, if needed).
There was a problem hiding this comment.
We have Edit Code... action (not the three dots!) - it's a common practice in JB that the actions that open dialogs or need some confirmation have ... suffix. IMHO it's a good enough to distinguish them (we clearly indicate what the shortcuts do and display them - it's super clear).
mkondratek
force-pushed
the
mkondratek/fix/command-enter
branch
from
b9a109b
to
c4cc72a
Compare
mkondratek
force-pushed
the
mkondratek/fix/command-enter
branch
from
c8a0446
to
f30e6cc
Compare
Fixes https://linear.app/sourcegraph/issue/CODY-2868.
Fixes https://github.com/sourcegraph/cody-issues/issues/307
Test plan