From 08000327b80d2d7b23be54b651c573cfa9dcbe6f Mon Sep 17 00:00:00 2001 From: Andrey Sokolov Date: Thu, 31 Oct 2024 17:42:13 +0100 Subject: [PATCH] IJ-CR-148260 LLM-12069 revert wrong merge conflict resolution in keymap test GitOrigin-RevId: 717b8d72524c17e80aa5379e83970a8f65c4d42b --- .../extensions/src/com/intellij/keymap/KeymapsTestCase.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/testFramework/extensions/src/com/intellij/keymap/KeymapsTestCase.java b/platform/testFramework/extensions/src/com/intellij/keymap/KeymapsTestCase.java index b91dee26b0f3..6a2a1d840a74 100644 --- a/platform/testFramework/extensions/src/com/intellij/keymap/KeymapsTestCase.java +++ b/platform/testFramework/extensions/src/com/intellij/keymap/KeymapsTestCase.java @@ -38,8 +38,8 @@ public abstract class KeymapsTestCase extends KeymapsTestCaseBase { {"SUBTRACT", "CollapseTreeNode", "Graph.ZoomOut"}, {"TAB", "EditorChooseLookupItemReplace", "NextTemplateVariable", "NextParameter", "EditorIndentSelection", "EditorTab", "ExpandLiveTemplateByTab", "BraceOrQuoteOut", "SplitChooser.NextWindow", "InsertInlineCompletionAction", - "Terminal.CommandCompletion", "CodeFloatingToolbar.GotoNextMenu", "AIAssistant.Editor.AcceptOneLineCompletion", - "InlinePromptGenerateCodeAction", "InsertNextEditAction"}, + "Terminal.CommandCompletion", "CodeFloatingToolbar.GotoNextMenu", "AIAssistant.Editor.AcceptOneLineCompletion", + "InlinePromptGenerateCodeAction"}, {"UP", "EditorUp", "Terminal.SelectBlockAbove"}, {"alt DOWN", "MethodDown", "ShowContent", "ShowSearchHistory", "JupyterNotebookMoveCellDownCommandModeAction", "NotebookMoveCellDownAction"}, {"alt ENTER", "ShowIntentionActions", "Console.TableResult.EditValue", "JupyterNotebookRunCellInsertBelowCommandModeAction", @@ -244,7 +244,7 @@ public abstract class KeymapsTestCase extends KeymapsTestCaseBase { {"TAB", "EditorChooseLookupItemReplace", "NextTemplateVariable", "NextParameter", "EditorIndentSelection", "EmacsStyleIndent", "ExpandLiveTemplateByTab", "BraceOrQuoteOut", "SplitChooser.NextWindow", "InsertInlineCompletionAction", "Terminal.CommandCompletion", "CodeFloatingToolbar.GotoNextMenu", "AIAssistant.Editor.AcceptOneLineCompletion", - "InlinePromptGenerateCodeAction", "InsertNextEditAction"}, + "InlinePromptGenerateCodeAction"}, {"alt MINUS", SECOND_STROKE, "RInsertAssignmentAction"}, {"alt SLASH", "CodeCompletion", "HippieCompletion"}, {"control A", "EditorLineStart", "Terminal.MoveCaretToLineStart"},