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

Revert "IDEA-CR-44949: PY-34437 Duplicate shortcuts for Jupyter are explicitly allowed"

Browse Source 
This reverts commit 6e8343b5

Since it causes testDuplicateShortcuts failure until Jupyter actions are not in test scope.
This commit is contained in:
Anton Bragin
2019-03-14 16:02:25 +03:00
parent 76fcee260c
commit 8cc15ed5d4
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/testFramework/extensions/src/com/intellij/keymap/KeymapsTestCase.java
+15 -18
View File
@@ -40,8 +40,8 @@ public abstract class KeymapsTestCase extends KeymapsTestCaseBase {
{ "control 3", "GotoBookmark3", "FileChooser.GotoModule"},
{ "control ADD", "ExpandAll", "ExpandExpandableComponent", "ExpandRegion"},
{ "control DIVIDE", "CommentByLineComment", "Images.Editor.ActualSize", "Graph.ActualSize"},
{ "control DOWN", "EditorScrollDown", "EditorLookupDown", "MethodOverloadSwitchDown", "SearchEverywhere.NavigateToNextGroup", "JupyterSelectCellBelowAction"},
{ "control ENTER", "Console.Execute.Multiline", "DirDiffMenu.SynchronizeDiff.All", "EditorSplitLine", "ViewSource", "PyExecuteCellAction", "JupyterRunCellAction"},
{ "control DOWN", "EditorScrollDown", "EditorLookupDown", "MethodOverloadSwitchDown", "SearchEverywhere.NavigateToNextGroup"},
{ "control ENTER", "Console.Execute.Multiline", "DirDiffMenu.SynchronizeDiff.All", "EditorSplitLine", "ViewSource", "PyExecuteCellAction"},
{ "control EQUALS", "ExpandAll", "ExpandExpandableComponent", "ExpandRegion"},
{ "control F5", "Refresh", "Rerun"},
{ "control D", "EditorDuplicate", "Diff.ShowDiff", "CompareTwoFiles", "SendEOF", "FileChooser.GotoDesktop"},
@@ -54,7 +54,7 @@ public abstract class KeymapsTestCase extends KeymapsTestCaseBase {
{ "control SLASH", "CommentByLineComment", "Images.Editor.ActualSize", "Graph.ActualSize"},
{ "control SPACE", "CodeCompletion", "ChangesView.SetDefault"},
{ "control U", "GotoSuperMethod", "CommanderSwapPanels"},
{ "control UP", "EditorScrollUp", "EditorLookupUp", "MethodOverloadSwitchUp", "SearchEverywhere.NavigateToPrevGroup", "JupyterSelectCellAboveAction"},
{ "control UP", "EditorScrollUp", "EditorLookupUp", "MethodOverloadSwitchUp", "SearchEverywhere.NavigateToPrevGroup"},
{ "control SUBTRACT", "CollapseAll", "CollapseExpandableComponent", "CollapseRegion"},
{ "control alt A", "ChangesView.AddUnversioned", "Diagram.DeselectAll"},
{ "control alt K", "Git.Commit.And.Push.Executor", "Hg.Commit.And.Push.Executor"},
@@ -68,16 +68,13 @@ public abstract class KeymapsTestCase extends KeymapsTestCaseBase {
{ "control MINUS", "CollapseAll", "CollapseExpandableComponent", "CollapseRegion"},
{ "control PERIOD", "EditorChooseLookupItemDot", "CollapseSelection"},
{ "shift DELETE", "$Cut", "Maven.Uml.Exclude"},
{ "shift ENTER", "CollapseExpandableComponent", "Console.TableResult.EditValueMaximized", "DatabaseView.PropertiesAction", "EditorStartNewLine", "ExpandExpandableComponent", "OpenElementInNewWindow", "JupyterRunCellSelectBelowAction"},
{ "shift ENTER", "CollapseExpandableComponent", "Console.TableResult.EditValueMaximized", "DatabaseView.PropertiesAction", "EditorStartNewLine", "ExpandExpandableComponent", "OpenElementInNewWindow"},
{ "shift F4", "Debugger.EditTypeSource", "EditSourceInNewWindow"},
{ "shift F6", "RenameElement", "Git.Reword.Commit", "ShelvedChanges.Rename", "ChangesView.Rename"},
{ "shift F7", "PreviousDiff", "SmartStepInto"},
{ "shift TAB", "PreviousTemplateVariable", "PrevParameter", "EditorUnindentSelection", "PrevTemplateParameter", "SearchEverywhere.PrevTab"},
{ "shift alt ENTER", "Console.TableResult.EditValueMaximized", "JupyterDebugAction"},
{ "shift alt LEFT", "Diff.ApplyRightSide", "PreviousEditorTab"},
{ "shift alt RIGHT", "Diff.ApplyLeftSide", "NextEditorTab"},
{ "shift alt A", "JupyterInsertCellAboveAction", "VcsHistory.ShowAllAffected"},
{ "shift alt B", "JupyterInsertCellBelowAction", "tasks.open.in.browser"},
{ "shift alt L", "org.jetbrains.plugins.ruby.console.LoadInIrbConsoleAction", "context.load"},
{ "shift alt M", "ChangesView.Move", "Vcs.MoveChangedLinesToChangelist"},
{ "shift control D", "TagDocumentationNavigation", "Diff.ShowSettingsPopup", "Uml.ShowDiff", "Console.TableResult.CompareCells"},
@@ -111,14 +108,14 @@ public abstract class KeymapsTestCase extends KeymapsTestCaseBase {
{ "meta BACK_SPACE", "EditorDeleteLine", "$Delete"},
{ "control LEFT", "Diff.PrevChange", "PreviousTab"},
{ "control RIGHT", "Diff.NextChange", "NextTab"},
{ "control DOWN", "EditorLookupDown", "JupyterSelectCellBelowAction", "MethodDown", "ShowContent"},
{ "control UP", "EditorLookupUp", "JupyterSelectCellAboveAction", "MethodUp"},
{ "control DOWN", "ShowContent", "EditorLookupDown", "MethodDown"},
{ "control UP", "EditorLookupUp", "MethodUp"},
{ "control TAB", "Switcher", "Diff.FocusOppositePane"},
{ "shift control TAB", "Switcher", "Diff.FocusOppositePaneAndScroll"},
{ "meta L", "Vcs.Log.FocusTextFilter", "GotoLine"},
{ "meta R", "Refresh", "Rerun", "Replace", "org.jetbrains.plugins.ruby.rails.console.ReloadSources"},
{ "control O", "ExportToTextFile", "OverrideMethods", },
{ "control ENTER", "Generate", "JupyterRunCellAction", "NewElement", "PyExecuteCellAction"},
{ "control ENTER", "Generate", "NewElement", "PyExecuteCellAction"},
{ "control SPACE", "CodeCompletion", "ChangesView.SetDefault"},
{ "meta 1", "ActivateProjectToolWindow", "FileChooser.GotoHome", "DuplicatesForm.SendToLeft"},
{ "meta 2", "ActivateFavoritesToolWindow", "FileChooser.GotoProject", "DuplicatesForm.SendToRight"},
@@ -145,9 +142,9 @@ public abstract class KeymapsTestCase extends KeymapsTestCaseBase {
{ "BACK_SPACE", "$Delete", "EditorBackSpace", "Images.Thumbnails.UpFolder"},
{ "control LEFT", "Diff.PrevChange", "PreviousTab"},
{ "control RIGHT", "Diff.NextChange", "NextTab"},
{ "control DOWN", "EditorLookupDown", "JupyterSelectCellBelowAction", "MethodDown", "ShowContent"},
{ "control UP", "EditorLookupUp", "JupyterSelectCellAboveAction", "MethodUp"},
{ "control ENTER", "Generate", "JupyterRunCellAction", "NewElement", "PyExecuteCellAction"},
{ "control DOWN", "EditorLookupDown", "ShowContent", "MethodDown"},
{ "control UP", "EditorLookupUp", "MethodUp"},
{ "control ENTER", "Generate", "NewElement", "PyExecuteCellAction"},
{ "control F5", "Refresh", "Rerun"},
{ "control TAB", "Switcher", "Diff.FocusOppositePane"},
{ "control N", "Generate", "NewElement"},
@@ -179,8 +176,8 @@ public abstract class KeymapsTestCase extends KeymapsTestCaseBase {
{ "control SPACE", "EditorToggleStickySelection", "ChangesView.SetDefault"},
{ "control X,N", "Diff.NextChange", "NextTab"},
{ "control X,P", "Diff.PrevChange", "PreviousTab"},
{ "control UP", "EditorBackwardParagraph", "EditorLookupUp", "JupyterSelectCellAboveAction", "MethodOverloadSwitchUp", "SearchEverywhere.NavigateToPrevGroup"},
{ "control DOWN", "EditorForwardParagraph", "EditorLookupDown", "JupyterSelectCellBelowAction", "MethodOverloadSwitchDown", "SearchEverywhere.NavigateToNextGroup"},
{ "control UP", "EditorBackwardParagraph", "EditorLookupUp", "MethodOverloadSwitchUp", "SearchEverywhere.NavigateToPrevGroup"},
{ "control DOWN", "EditorForwardParagraph", "EditorLookupDown", "MethodOverloadSwitchDown", "SearchEverywhere.NavigateToNextGroup"},
{ "control alt A", "MethodUp", "ChangesView.AddUnversioned", "Diagram.DeselectAll"},
{ "control alt E", "MethodDown", "PerforceDirect.Edit", "Console.History.Browse"},
{ "control alt G", "GotoDeclaration", "org.jetbrains.plugins.ruby.rails.actions.generators.GeneratorsPopupAction", "Mvc.RunTarget"},
@@ -349,7 +346,7 @@ public abstract class KeymapsTestCase extends KeymapsTestCaseBase {
{ "F2", "Arrangement.Rule.Edit", "ChangesView.Rename", "Console.TableResult.EditValue", "Git.Reword.Commit", "GotoNextBookmark", "GuiDesigner.EditComponent", "GuiDesigner.EditGroup", "ShelvedChanges.Rename", "XDebugger.SetValue"},
{ "ctrl ADD", "EditorIncreaseFontSize", "ExpandAll", "ExpandExpandableComponent"},
{ "ctrl D", "CompareTwoFiles", "Diff.ShowDiff", "FileChooser.GotoDesktop", "SelectNextOccurrence", "SendEOF"},
{ "ctrl ENTER", "Console.Execute.Multiline", "DirDiffMenu.SynchronizeDiff.All", "EditorStartNewLine", "JupyterRunCellAction", "PyExecuteCellAction", "ViewSource"},
{ "ctrl ENTER", "Console.Execute.Multiline", "DirDiffMenu.SynchronizeDiff.All", "EditorStartNewLine", "PyExecuteCellAction", "ViewSource"},
{ "ctrl EQUALS", "EditorIncreaseFontSize", "ExpandAll", "ExpandExpandableComponent"},
{ "ctrl L", "EditorSelectWord", "Vcs.Log.FocusTextFilter"},
{ "ctrl M", "EditorMatchBrace", "TodoViewGroupByShowModules", "Vcs.ShowMessageHistory"},
@@ -360,7 +357,7 @@ public abstract class KeymapsTestCase extends KeymapsTestCaseBase {
{ "ctrl SUBTRACT", "CollapseAll", "CollapseExpandableComponent", "EditorDecreaseFontSize"},
{ "ctrl alt DOWN", "Console.TableResult.NextPage", "EditorCloneCaretBelow"},
{ "ctrl alt UP", "Console.TableResult.PreviousPage", "EditorCloneCaretAbove"},
{ "shift ENTER", "CollapseExpandableComponent", "Console.TableResult.EditValueMaximized", "DatabaseView.PropertiesAction", "EditorSplitLine", "ExpandExpandableComponent", "JupyterRunCellSelectBelowAction", "OpenElementInNewWindow"},
{ "shift ENTER", "CollapseExpandableComponent", "Console.TableResult.EditValueMaximized", "DatabaseView.PropertiesAction", "EditorSplitLine", "ExpandExpandableComponent", "OpenElementInNewWindow"},
{ "shift ctrl D", "Console.TableResult.CompareCells", "EditorDuplicate", "Uml.ShowDiff"},
{ "shift ctrl DOWN", "MoveLineDown", "ResizeToolWindowDown"},
{ "shift ctrl ENTER", "Console.Jpa.GenerateSql", "EditorStartNewLineBefore"},
@@ -384,7 +381,7 @@ public abstract class KeymapsTestCase extends KeymapsTestCaseBase {
{ "meta UP", "EditorTextStart", "SearchEverywhere.NavigateToPrevGroup"},
{ "meta alt DOWN", "Console.TableResult.NextPage", "GotoDeclaration"},
{ "meta alt G", "DatabaseView.SqlGenerator", "FindWordAtCaret", "org.jetbrains.plugins.ruby.rails.actions.generators.GeneratorsPopupAction"},
{ "shift ENTER", "CollapseExpandableComponent", "Console.TableResult.EditValueMaximized", "EditorSplitLine", "ExpandExpandableComponent", "JupyterRunCellSelectBelowAction", "OpenElementInNewWindow"},
{ "shift ENTER", "CollapseExpandableComponent", "Console.TableResult.EditValueMaximized", "EditorSplitLine", "ExpandExpandableComponent", "OpenElementInNewWindow"},
{ "shift meta D", "Console.TableResult.CompareCells", "EditorDuplicate", "Uml.ShowDiff"},
{ "shift meta ENTER", "Console.Jpa.GenerateSql", "EditorStartNewLineBefore"},
{ "shift meta T", "Images.ShowThumbnails", "ReopenClosedTab", "RunDashboard.ShowConfigurations"}