@@ -55,10 +55,10 @@ func NewLocalCommitsController(
5555func (self * LocalCommitsController ) GetKeybindings (opts types.KeybindingsOpts ) []* types.Binding {
5656 editCommitKey := opts .Config .Universal .Edit
5757
58- outsideFilterModeBindings := []* types.Binding {
58+ bindings := []* types.Binding {
5959 {
6060 Key : opts .GetKey (opts .Config .Commits .SquashDown ),
61- Handler : self .withItemsRange (self .squashDown ),
61+ Handler : opts . Guards . OutsideFilterMode ( self .withItemsRange (self .squashDown ) ),
6262 GetDisabledReason : self .require (
6363 self .itemRangeSelected (
6464 self .midRebaseCommandEnabled ,
@@ -71,7 +71,7 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
7171 },
7272 {
7373 Key : opts .GetKey (opts .Config .Commits .MarkCommitAsFixup ),
74- Handler : self .withItemsRange (self .fixup ),
74+ Handler : opts . Guards . OutsideFilterMode ( self .withItemsRange (self .fixup ) ),
7575 GetDisabledReason : self .require (
7676 self .itemRangeSelected (
7777 self .midRebaseCommandEnabled ,
@@ -115,7 +115,7 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
115115 },
116116 {
117117 Key : opts .GetKey (editCommitKey ),
118- Handler : self .withItemsRange (self .edit ),
118+ Handler : opts . Guards . OutsideFilterMode ( self .withItemsRange (self .edit ) ),
119119 GetDisabledReason : self .require (
120120 self .itemRangeSelected (self .midRebaseCommandEnabled ),
121121 ),
@@ -129,7 +129,7 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
129129 // we're calling it 'quick-start interactive rebase' to differentiate it from
130130 // when you manually select the base commit.
131131 Key : opts .GetKey (opts .Config .Commits .StartInteractiveRebase ),
132- Handler : self .quickStartInteractiveRebase ,
132+ Handler : opts . Guards . OutsideFilterMode ( self .quickStartInteractiveRebase ) ,
133133 GetDisabledReason : self .require (self .notMidRebase (self .c .Tr .AlreadyRebasing ), self .canFindCommitForQuickStart ),
134134 Description : self .c .Tr .QuickStartInteractiveRebase ,
135135 Tooltip : utils .ResolvePlaceholderString (self .c .Tr .QuickStartInteractiveRebaseTooltip , map [string ]string {
@@ -138,7 +138,7 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
138138 },
139139 {
140140 Key : opts .GetKey (opts .Config .Commits .PickCommit ),
141- Handler : self .withItems (self .pick ),
141+ Handler : opts . Guards . OutsideFilterMode ( self .withItems (self .pick ) ),
142142 GetDisabledReason : self .require (
143143 self .itemRangeSelected (self .pickEnabled ),
144144 ),
@@ -147,7 +147,7 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
147147 },
148148 {
149149 Key : opts .GetKey (opts .Config .Commits .CreateFixupCommit ),
150- Handler : self .withItem (self .createFixupCommit ),
150+ Handler : opts . Guards . OutsideFilterMode ( self .withItem (self .createFixupCommit ) ),
151151 GetDisabledReason : self .require (self .singleItemSelected ()),
152152 Description : self .c .Tr .CreateFixupCommit ,
153153 Tooltip : utils .ResolvePlaceholderString (
@@ -159,7 +159,7 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
159159 },
160160 {
161161 Key : opts .GetKey (opts .Config .Commits .SquashAboveCommits ),
162- Handler : self .squashFixupCommits ,
162+ Handler : opts . Guards . OutsideFilterMode ( self .squashFixupCommits ) ,
163163 GetDisabledReason : self .require (
164164 self .notMidRebase (self .c .Tr .AlreadyRebasing ),
165165 ),
@@ -169,7 +169,7 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
169169 },
170170 {
171171 Key : opts .GetKey (opts .Config .Commits .MoveDownCommit ),
172- Handler : self .withItemsRange (self .moveDown ),
172+ Handler : opts . Guards . OutsideFilterMode ( self .withItemsRange (self .moveDown ) ),
173173 GetDisabledReason : self .require (self .itemRangeSelected (
174174 self .midRebaseMoveCommandEnabled ,
175175 self .canMoveDown ,
@@ -178,7 +178,7 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
178178 },
179179 {
180180 Key : opts .GetKey (opts .Config .Commits .MoveUpCommit ),
181- Handler : self .withItemsRange (self .moveUp ),
181+ Handler : opts . Guards . OutsideFilterMode ( self .withItemsRange (self .moveUp ) ),
182182 GetDisabledReason : self .require (self .itemRangeSelected (
183183 self .midRebaseMoveCommandEnabled ,
184184 self .canMoveUp ,
@@ -187,25 +187,18 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
187187 },
188188 {
189189 Key : opts .GetKey (opts .Config .Commits .PasteCommits ),
190- Handler : self .paste ,
190+ Handler : opts . Guards . OutsideFilterMode ( self .paste ) ,
191191 GetDisabledReason : self .require (self .canPaste ),
192192 Description : self .c .Tr .PasteCommits ,
193193 DisplayStyle : & style .FgCyan ,
194194 },
195195 {
196196 Key : opts .GetKey (opts .Config .Commits .MarkCommitAsBaseForRebase ),
197- Handler : self .withItem (self .markAsBaseCommit ),
197+ Handler : opts . Guards . OutsideFilterMode ( self .withItem (self .markAsBaseCommit ) ),
198198 GetDisabledReason : self .require (self .singleItemSelected ()),
199199 Description : self .c .Tr .MarkAsBaseCommit ,
200200 Tooltip : self .c .Tr .MarkAsBaseCommitTooltip ,
201201 },
202- }
203-
204- for _ , binding := range outsideFilterModeBindings {
205- binding .Handler = opts .Guards .OutsideFilterMode (binding .Handler )
206- }
207-
208- bindings := append (outsideFilterModeBindings , []* types.Binding {
209202 // overriding this navigation keybinding because we might need to load
210203 // more commits on demand
211204 {
@@ -251,7 +244,7 @@ func (self *LocalCommitsController) GetKeybindings(opts types.KeybindingsOpts) [
251244 Tooltip : self .c .Tr .OpenLogMenuTooltip ,
252245 OpensMenu : true ,
253246 },
254- }... )
247+ }
255248
256249 return bindings
257250}
0 commit comments