MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 11:53:49 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJ-CR-148260 LLM-12069 revert wrong merge conflict resolution in keymap test

Browse Source 
GitOrigin-RevId: 717b8d72524c17e80aa5379e83970a8f65c4d42b
This commit is contained in:
Andrey Sokolov
2024-10-31 17:42:13 +01:00
committed by intellij-monorepo-bot
parent 26507dd461
commit 08000327b8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/testFramework/extensions/src/com/intellij/keymap/KeymapsTestCase.java
View File

@@ -38,8 +38,8 @@ public abstract class KeymapsTestCase extends KeymapsTestCaseBase {
{"SUBTRACT", "CollapseTreeNode", "Graph.ZoomOut"}, {"SUBTRACT", "CollapseTreeNode", "Graph.ZoomOut"},
{"TAB", "EditorChooseLookupItemReplace", "NextTemplateVariable", "NextParameter", "EditorIndentSelection", {"TAB", "EditorChooseLookupItemReplace", "NextTemplateVariable", "NextParameter", "EditorIndentSelection",
"EditorTab", "ExpandLiveTemplateByTab", "BraceOrQuoteOut", "SplitChooser.NextWindow", "InsertInlineCompletionAction", "EditorTab", "ExpandLiveTemplateByTab", "BraceOrQuoteOut", "SplitChooser.NextWindow", "InsertInlineCompletionAction",
"Terminal.CommandCompletion", "CodeFloatingToolbar.GotoNextMenu", "AIAssistant.Editor.AcceptOneLineCompletion", "Terminal.CommandCompletion", "CodeFloatingToolbar.GotoNextMenu", "AIAssistant.Editor.AcceptOneLineCompletion",
"InlinePromptGenerateCodeAction", "InsertNextEditAction"}, "InlinePromptGenerateCodeAction"},
{"UP", "EditorUp", "Terminal.SelectBlockAbove"}, {"UP", "EditorUp", "Terminal.SelectBlockAbove"},
{"alt DOWN", "MethodDown", "ShowContent", "ShowSearchHistory", "JupyterNotebookMoveCellDownCommandModeAction", "NotebookMoveCellDownAction"}, {"alt DOWN", "MethodDown", "ShowContent", "ShowSearchHistory", "JupyterNotebookMoveCellDownCommandModeAction", "NotebookMoveCellDownAction"},
{"alt ENTER", "ShowIntentionActions", "Console.TableResult.EditValue", "JupyterNotebookRunCellInsertBelowCommandModeAction", {"alt ENTER", "ShowIntentionActions", "Console.TableResult.EditValue", "JupyterNotebookRunCellInsertBelowCommandModeAction",
@@ -244,7 +244,7 @@ public abstract class KeymapsTestCase extends KeymapsTestCaseBase {
{"TAB", "EditorChooseLookupItemReplace", "NextTemplateVariable", "NextParameter", "EditorIndentSelection", {"TAB", "EditorChooseLookupItemReplace", "NextTemplateVariable", "NextParameter", "EditorIndentSelection",
"EmacsStyleIndent", "ExpandLiveTemplateByTab", "BraceOrQuoteOut", "SplitChooser.NextWindow", "InsertInlineCompletionAction", "EmacsStyleIndent", "ExpandLiveTemplateByTab", "BraceOrQuoteOut", "SplitChooser.NextWindow", "InsertInlineCompletionAction",
"Terminal.CommandCompletion", "CodeFloatingToolbar.GotoNextMenu", "AIAssistant.Editor.AcceptOneLineCompletion", "Terminal.CommandCompletion", "CodeFloatingToolbar.GotoNextMenu", "AIAssistant.Editor.AcceptOneLineCompletion",
"InlinePromptGenerateCodeAction", "InsertNextEditAction"}, "InlinePromptGenerateCodeAction"},
{"alt MINUS", SECOND_STROKE, "RInsertAssignmentAction"}, {"alt MINUS", SECOND_STROKE, "RInsertAssignmentAction"},
{"alt SLASH", "CodeCompletion", "HippieCompletion"}, {"alt SLASH", "CodeCompletion", "HippieCompletion"},
{"control A", "EditorLineStart", "Terminal.MoveCaretToLineStart"}, {"control A", "EditorLineStart", "Terminal.MoveCaretToLineStart"},