diff --git a/platform/platform-resources/src/keymaps/$default.xml b/platform/platform-resources/src/keymaps/$default.xml index dc6552b4540b..9b79926f17e9 100644 --- a/platform/platform-resources/src/keymaps/$default.xml +++ b/platform/platform-resources/src/keymaps/$default.xml @@ -911,13 +911,19 @@ - + + + + + + + - - + + diff --git a/platform/platform-resources/src/keymaps/Default for GNOME.xml b/platform/platform-resources/src/keymaps/Default for GNOME.xml index 36990ec96214..7dd458354f8f 100644 --- a/platform/platform-resources/src/keymaps/Default for GNOME.xml +++ b/platform/platform-resources/src/keymaps/Default for GNOME.xml @@ -30,9 +30,6 @@ - - - diff --git a/platform/platform-resources/src/keymaps/Default for KDE.xml b/platform/platform-resources/src/keymaps/Default for KDE.xml index 138214bb778f..eb9ba085a2b4 100644 --- a/platform/platform-resources/src/keymaps/Default for KDE.xml +++ b/platform/platform-resources/src/keymaps/Default for KDE.xml @@ -79,9 +79,6 @@ - - - diff --git a/platform/platform-resources/src/keymaps/Default for XWin.xml b/platform/platform-resources/src/keymaps/Default for XWin.xml index 1435b2c5640f..b4510af6eb52 100644 --- a/platform/platform-resources/src/keymaps/Default for XWin.xml +++ b/platform/platform-resources/src/keymaps/Default for XWin.xml @@ -1,14 +1,10 @@ - - - + + - - - diff --git a/platform/platform-resources/src/keymaps/Mac OS X 10.5+.xml b/platform/platform-resources/src/keymaps/Mac OS X 10.5+.xml index 800e1641c500..b542f58e71fc 100644 --- a/platform/platform-resources/src/keymaps/Mac OS X 10.5+.xml +++ b/platform/platform-resources/src/keymaps/Mac OS X 10.5+.xml @@ -213,9 +213,15 @@ - + + + + + + + diff --git a/platform/platform-resources/src/keymaps/Mac OS X.xml b/platform/platform-resources/src/keymaps/Mac OS X.xml index f08bce04c65c..292c436abf2c 100644 --- a/platform/platform-resources/src/keymaps/Mac OS X.xml +++ b/platform/platform-resources/src/keymaps/Mac OS X.xml @@ -231,9 +231,15 @@ - + + + + + + + diff --git a/platform/platform-resources/src/keymaps/Xcode.xml b/platform/platform-resources/src/keymaps/Xcode.xml index d11d041bb485..8986390531f1 100644 --- a/platform/platform-resources/src/keymaps/Xcode.xml +++ b/platform/platform-resources/src/keymaps/Xcode.xml @@ -22,9 +22,16 @@ + + + + + + + diff --git a/platform/testFramework/extensions/src/com/intellij/keymap/KeymapsTestCase.java b/platform/testFramework/extensions/src/com/intellij/keymap/KeymapsTestCase.java index 979c21b081c5..7f8caae4c8b3 100644 --- a/platform/testFramework/extensions/src/com/intellij/keymap/KeymapsTestCase.java +++ b/platform/testFramework/extensions/src/com/intellij/keymap/KeymapsTestCase.java @@ -1,4 +1,4 @@ -// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.keymap; import com.intellij.util.containers.ContainerUtil; @@ -30,6 +30,7 @@ public abstract class KeymapsTestCase extends KeymapsTestCaseBase { "SearchEverywhere.CompleteCommand", "SearchEverywhere.NextTab"}, { "LEFT", "EditorLeft", "Vcs.Log.GoToChild"}, { "RIGHT", "EditorRight", "Vcs.Log.GoToParent"}, + { "alt 9", "ActivateCommitToolWindow", "ActivateVersionControlToolWindow"}, { "alt DOWN", "ShowContent", "MethodDown", "Arrangement.Rule.Match.Condition.Move.Down", "ShowSearchHistory"}, { "alt UP", "MethodUp", "Arrangement.Rule.Match.Condition.Move.Up"}, { "alt F1", "SelectIn", "ProjectViewChangeView"}, @@ -137,6 +138,7 @@ public abstract class KeymapsTestCase extends KeymapsTestCaseBase { { "meta 1", "ActivateProjectToolWindow", "FileChooser.GotoHome", "DuplicatesForm.SendToLeft"}, { "meta 2", "ActivateFavoritesToolWindow", "FileChooser.GotoProject", "DuplicatesForm.SendToRight"}, { "meta 3", "ActivateFindToolWindow", "FileChooser.GotoModule"}, + { "meta 9", "ActivateCommitToolWindow", "ActivateVersionControlToolWindow"}, { "meta N", "FileChooser.NewFolder", "Generate", "NewElement"}, { "meta O", "GotoClass", "GotoChangedFile"}, { "shift ctrl LEFT", "Diff.ApplyRightSide", "PreviousEditorTab"}, @@ -169,6 +171,7 @@ public abstract class KeymapsTestCase extends KeymapsTestCaseBase { { "meta 1", "ActivateProjectToolWindow", "FileChooser.GotoHome", "DuplicatesForm.SendToLeft"}, { "meta 2", "ActivateFavoritesToolWindow", "FileChooser.GotoProject", "DuplicatesForm.SendToRight"}, { "meta 3", "ActivateFindToolWindow", "FileChooser.GotoModule"}, + { "meta 9", "ActivateCommitToolWindow", "ActivateVersionControlToolWindow"}, { "shift ctrl LEFT", "Diff.ApplyRightSide", "PreviousEditorTab"}, { "shift ctrl RIGHT", "Diff.ApplyLeftSide", "NextEditorTab"}, { "shift meta LEFT", "EditorLineStartWithSelection", "ResizeToolWindowLeft"}, @@ -393,13 +396,11 @@ public abstract class KeymapsTestCase extends KeymapsTestCaseBase { // @formatter:on @NonNls protected static final Set DEFAULT_UNKNOWN_ACTION_IDS = ContainerUtil.set( - "ActivateVersionControlToolWindow", "ActivateFavoritesToolWindow", "ActivateCommanderToolWindow", "ActivateDebugToolWindow", - "ActivateServicesToolWindow", "ActivateFindToolWindow", - "ActivateHierarchyToolWindow", "ActivateMessagesToolWindow", "ActivateProjectToolWindow", "ActivateRunToolWindow", - "ActivateStructureToolWindow", "ActivateTODOToolWindow", "ActivateWebToolWindow", "ActivatePaletteToolWindow", - "ActivateTerminalToolWindow", - "IDEtalk.SearchUserHistory", "IDEtalk.SearchUserHistory", "IDEtalk.Rename", - "CIDR.Lang.Cpp.GenerateDefinitions", + "ActivateCommitToolWindow", "ActivateVersionControlToolWindow", "ActivateFavoritesToolWindow", "ActivateCommanderToolWindow", + "ActivateDebugToolWindow", "ActivateServicesToolWindow", "ActivateFindToolWindow", "ActivateHierarchyToolWindow", + "ActivateMessagesToolWindow", "ActivateProjectToolWindow", "ActivateRunToolWindow", "ActivateStructureToolWindow", + "ActivateTODOToolWindow", "ActivateWebToolWindow", "ActivatePaletteToolWindow", "ActivateTerminalToolWindow", + "IDEtalk.SearchUserHistory", "IDEtalk.SearchUserHistory", "IDEtalk.Rename", "CIDR.Lang.Cpp.GenerateDefinitions", "" ); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/VcsActionPromoter.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/VcsActionPromoter.java index 87de298ffc73..c01ee58bfda9 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/VcsActionPromoter.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/VcsActionPromoter.java @@ -1,18 +1,4 @@ -/* - * Copyright 2000-2013 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.vcs.actions; import com.intellij.openapi.actionSystem.ActionManager; @@ -34,6 +20,7 @@ public class VcsActionPromoter implements ActionPromoter { List reorderedActions = new ArrayList<>(actions); List reorderedIds = ContainerUtil.map(reorderedActions, it -> am.getId(it)); + reorderActionPair(reorderedActions, reorderedIds, "ActivateCommitToolWindow", "ActivateVersionControlToolWindow"); reorderActionPair(reorderedActions, reorderedIds, "Vcs.MoveChangedLinesToChangelist", "ChangesView.Move"); reorderActionPair(reorderedActions, reorderedIds, "Vcs.RollbackChangedLines", "ChangesView.Revert");