MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[terminal] IJPL-215236 Refactor: rename terminal command completion up/down actions

Browse Source 
Inherit editor's shortcuts instead of defining our own.
Give them consistent action IDs
Give them more meaningful user-visible action names.
Add text override for Search Everywhere.

GitOrigin-RevId: 71ba0395c21fa1c0cd0513d9a56e265123ec9795
This commit is contained in:
Konstantin Hudyakov
2025-10-27 20:01:16 +00:00
committed by intellij-monorepo-bot
parent e78b829479
commit 938b098c7b
5 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/testFramework/extensions/src/com/intellij/keymap/KeymapsTestCase.java
+2 -2
View File
@@ -20,7 +20,7 @@ public abstract class KeymapsTestCase extends KeymapsTestCaseBase {
{"BACK_SPACE", "EditorBackSpace", "FileChooser.GoToParent"},
{"C", "Uml.CollapseNodes", "JupyterNotebookCopyCellCommandModeAction"},
{"DELETE", "$Delete", "DatabaseView.DropAction", "JupyterNotebookDeleteCellCommandModeAction"},
{"DOWN", "EditorDown", "Terminal.SelectBlockBelow", "Terminal.DownCommandCompletion", "JupyterSelectCellBelowCommandModeAction"},
{"DOWN", "EditorDown", "Terminal.SelectBlockBelow", "JupyterSelectCellBelowCommandModeAction"},
{"ENTER", "Console.Execute", "Console.TableResult.EditValue", "DirDiffMenu.SynchronizeDiff", "EditorChooseLookupItem",
"EditorEnter", "NextTemplateVariable", "Git.Log.Branches.Change.Branch.Filter", "SplitChooser.Split",
"JupyterMarkdownDestroyControllerAction", "Console.TableResult.GotoReferencedResult"},
@@ -41,7 +41,7 @@ public abstract class KeymapsTestCase extends KeymapsTestCaseBase {
"EditorTab", "ExpandLiveTemplateByTab", "BraceOrQuoteOut", "SplitChooser.NextWindow", "InsertInlineCompletionAction",
"Terminal.CommandCompletion", "CodeFloatingToolbar.GotoNextMenu", "AIAssistant.Editor.AcceptOneLineCompletion",
"InlinePromptGenerateCodeAction", "InsertNextEditAction"},
{"UP", "EditorUp", "Terminal.SelectBlockAbove", "Terminal.UpCommandCompletion", "JupyterSelectCellAboveCommandModeAction"},
{"UP", "EditorUp", "Terminal.SelectBlockAbove", "JupyterSelectCellAboveCommandModeAction"},
{"alt DOWN", "MethodDown", "ShowContent", "ShowSearchHistory", "JupyterNotebookMoveCellDownCommandModeAction", "NotebookMoveCellDownAction"},
{"alt ENTER", "ShowIntentionActions", "Console.TableResult.EditValue", "JupyterNotebookRunCellInsertBelowCommandModeAction",
"Console.TableResult.GotoReferencedResult"},
plugins/terminal/frontend/resources/intellij.terminal.frontend.xml
+6 -4
View File
@@ -96,11 +96,13 @@
use-shortcut-of="EditorChooseLookupItem">
<override-text place="GoToAction"/>
</action>
<action id="Terminal.UpCommandCompletion" class="com.intellij.terminal.frontend.action.TerminalCompletionUpAction">
<keyboard-shortcut first-keystroke="UP" keymap="$default"/>
<action id="Terminal.CommandCompletion.SelectSuggestionAbove" class="com.intellij.terminal.frontend.action.TerminalCompletionUpAction"
use-shortcut-of="EditorUp">
<override-text place="GoToAction"/>
</action>
<action id="Terminal.DownCommandCompletion" class="com.intellij.terminal.frontend.action.TerminalCompletionDownAction">
<keyboard-shortcut first-keystroke="DOWN" keymap="$default"/>
<action id="Terminal.CommandCompletion.SelectSuggestionBelow" class="com.intellij.terminal.frontend.action.TerminalCompletionDownAction"
use-shortcut-of="EditorDown">
<override-text place="GoToAction"/>
</action>
<action id="Terminal.Escape" class="com.intellij.terminal.frontend.action.TerminalEscapeAction" use-shortcut-of="EditorEscape"/>
<action id="Terminal.OpenInReworkedTerminal" class="com.intellij.terminal.frontend.action.RevealFileInReworkedTerminalAction"
plugins/terminal/frontend/src/com/intellij/terminal/frontend/view/impl/TerminalEventDispatcher.kt
+2 -2
View File
@@ -238,8 +238,8 @@ private class TerminalEventDispatcher(
"Terminal.Find",
"Terminal.CommandCompletion.Invoke",
"Terminal.CommandCompletion.InsertSuggestion",
"Terminal.UpCommandCompletion",
"Terminal.DownCommandCompletion",
"Terminal.CommandCompletion.SelectSuggestionAbove",
"Terminal.CommandCompletion.SelectSuggestionBelow",
"Terminal.InsertInlineCompletion",
)
plugins/terminal/resources/messages/TerminalBundle.properties
+4 -2
View File
@@ -37,8 +37,10 @@ action.Terminal.CommandCompletion.Invoke.text=Call Command Completion
action.Terminal.CommandCompletion.Invoke.GoToAction.text=Call Command Completion (Terminal)
action.Terminal.CommandCompletion.InsertSuggestion.text=Insert Command Completion Suggestion
action.Terminal.CommandCompletion.InsertSuggestion.GoToAction.text=Insert Command Completion Suggestion (Terminal)
action.Terminal.UpCommandCompletion.text=Terminal Completion Up
action.Terminal.DownCommandCompletion.text=Terminal Completion Down
action.Terminal.CommandCompletion.SelectSuggestionAbove.text=Select Suggestion Above
action.Terminal.CommandCompletion.SelectSuggestionAbove.GoToAction.text=Select Suggestion Above (Terminal)
action.Terminal.CommandCompletion.SelectSuggestionBelow.text=Select Suggestion Below
action.Terminal.CommandCompletion.SelectSuggestionBelow.GoToAction.text=Select Suggestion Below (Terminal)
action.Terminal.InsertInlineCompletion.text=Insert Inline Proposal
action.Terminal.InsertInlineCompletion.GoToAction.text=Insert Inline Proposal (Terminal)
action.Terminal.ShowDocumentation.text=Show Documentation
plugins/terminal/tests/src/com/intellij/terminal/tests/reworked/frontend/completion/TerminalCompletionFixture.kt
+2 -2
View File
@@ -106,11 +106,11 @@ class TerminalCompletionFixture(val project: Project, val testRootDisposable: Di
}
fun downCompletionPopup() {
runActionById("Terminal.DownCommandCompletion")
runActionById("Terminal.CommandCompletion.SelectSuggestionBelow")
}
fun upCompletionPopup() {
runActionById("Terminal.UpCommandCompletion")
runActionById("Terminal.CommandCompletion.SelectSuggestionAbove")
}
/**