Skip to content

Commit cbccb3f

Browse files
ishulginintellij-monorepo-bot
authored andcommitted
[git] IJPL-173922 Move Git.Branches.Popup.SpeedSearch to shared module
GitOrigin-RevId: f629652c6734c2774c266450b3010a4875e1d201
1 parent 647795c commit cbccb3f

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

plugins/git4idea/resources/intellij.vcs.git.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -201,13 +201,6 @@
201201
<action class="git4idea.actions.branch.GitCheckoutFromInputAction"/>
202202
</group>
203203

204-
<group id="Git.Branches.Popup.SpeedSearch">
205-
<reference ref="EditorBackSpace"/>
206-
<reference ref="EditorCut"/>
207-
<reference ref="EditorPaste"/>
208-
<reference ref="$Undo"/>
209-
</group>
210-
211204
<group id="Git.Branch">
212205
<action class="git4idea.actions.ref.GitCheckoutAction"/>
213206
<action class="git4idea.actions.branch.GitCheckoutAsNewBranch"/>

plugins/git4idea/shared/resources/intellij.vcs.git.shared.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@
1313

1414
<action id="git.branches.show.tags" class="com.intellij.vcs.git.shared.actions.GitBranchesTreeShowTagsAction"/>
1515

16+
<group id="Git.Branches.Popup.SpeedSearch">
17+
<reference ref="EditorBackSpace"/>
18+
<reference ref="EditorCut"/>
19+
<reference ref="EditorPaste"/>
20+
<reference ref="$Undo"/>
21+
</group>
22+
1623
<group id="Git.Branches.Popup.Settings" class="com.intellij.vcs.git.shared.widget.actions.GitBranchesTreePopupSettings" icon="AllIcons.Actions.More">
1724
<group id="git.branches.popup.filter.by.separator" class="com.intellij.vcs.git.shared.widget.actions.GitBranchesTreePopupFilterSeparatorWithText"/>
1825
<action id="git.branches.popup.filter.by.action" class="com.intellij.vcs.git.shared.widget.actions.GitBranchesTreePopupFilterByAction"/>

plugins/git4idea/shared/src/com/intellij/vcs/git/shared/widget/actions/GitBranchesWidgetActions.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ object GitBranchesWidgetActions {
2222
@Language("devkit-action-id")
2323
const val TOP_LEVEL_ACTIONS_ACTION_GROUP: @NonNls String = "Git.Branches.List"
2424

25+
@Language("devkit-action-id")
26+
const val SPEED_SEARCH_ACTION_GROUP: @NonNls String = "Git.Branches.Popup.SpeedSearch"
27+
2528
val MAIN_POPUP_ACTION_PLACE: @NonNls String = ActionPlaces.getPopupPlace("GitBranchesPopup.TopLevel.Branch.Actions")
2629

2730
val NESTED_POPUP_ACTION_PLACE: @NonNls String = ActionPlaces.getPopupPlace("GitBranchesPopup.SingleRepo.Branch.Actions")

plugins/git4idea/shared/src/com/intellij/vcs/git/shared/widget/popup/GitBranchesTreePopupBase.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ abstract class GitBranchesTreePopupBase<T : GitBranchesTreePopupStepBase>(
329329
speedSearch.updatePattern(textInEditor)
330330
onSpeedSearchPatternChanged()
331331
}
332-
val group = am.getAction(SPEED_SEARCH_DEFAULT_ACTIONS_GROUP) as DefaultActionGroup
332+
val group = am.getAction(GitBranchesWidgetActions.SPEED_SEARCH_ACTION_GROUP) as DefaultActionGroup
333333
for (action in group.getChildren(am)) {
334334
registerAction(am.getId(action),
335335
KeymapUtil.getKeyStroke(action.shortcutSet),
@@ -736,8 +736,6 @@ abstract class GitBranchesTreePopupBase<T : GitBranchesTreePopupStepBase>(
736736
}
737737

738738
companion object {
739-
private const val SPEED_SEARCH_DEFAULT_ACTIONS_GROUP = "Git.Branches.Popup.SpeedSearch"
740-
741739
private inline val isNewUI
742740
get() = ExperimentalUI.isNewUI()
743741

0 commit comments

Comments
 (0)