Skip to content
This repository was archived by the owner on Jul 16, 2024. It is now read-only.

Commit f4fe0a6

Browse files
towrytowry
committed
fix: fzf picker as ui select, emit the number index
1 parent 2b676bc commit f4fe0a6

File tree

2 files changed

+72
-66
lines changed

2 files changed

+72
-66
lines changed

‎lua/user/plugins/essential.lua

+51-51
Original file line numberDiff line numberDiff line change
@@ -306,22 +306,22 @@ pack.plug({
306306
local wk = require('which-key')
307307
wk.setup({
308308
plugins = {
309-
marks = true, -- shows a list of your marks on ' and `
309+
marks = true, -- shows a list of your marks on ' and `
310310
registers = true, -- shows your registers on " in NORMAL or <C-r> in INSERT mode
311311
-- the presets plugin, adds help for a bunch of default keybindings in Neovim
312312
-- No actual key bindings are created
313313
spelling = {
314-
enabled = true, -- enabling this will show WhichKey when pressing z= to select spelling suggestions
314+
enabled = true, -- enabling this will show WhichKey when pressing z= to select spelling suggestions
315315
suggestions = 20, -- how many suggestions should be shown in the list?
316316
},
317317
presets = {
318-
operators = true, -- adds help for operators like d, y, ...
319-
motions = true, -- adds help for motions
318+
operators = true, -- adds help for operators like d, y, ...
319+
motions = true, -- adds help for motions
320320
text_objects = true, -- help for text objects triggered after entering an operator
321-
windows = false, -- default bindings on <c-w>, already taken care by hydra.
322-
nav = false, -- misc bindings to work with windows
323-
z = true, -- bindings for folds, spelling and others prefixed with z
324-
g = true, -- bindings for prefixed with g
321+
windows = false, -- default bindings on <c-w>, already taken care by hydra.
322+
nav = false, -- misc bindings to work with windows
323+
z = true, -- bindings for folds, spelling and others prefixed with z
324+
g = true, -- bindings for prefixed with g
325325
},
326326
},
327327
operators = { gc = 'Comments' },
@@ -338,26 +338,26 @@ pack.plug({
338338
},
339339
popup_mappings = {
340340
scroll_down = '<c-d>', -- binding to scroll down inside the popup
341-
scroll_up = '<c-u>', -- binding to scroll up inside the popup
341+
scroll_up = '<c-u>', -- binding to scroll up inside the popup
342342
},
343343
window = {
344-
border = 'none', -- none, single, double, shadow
345-
position = 'bottom', -- bottom, top
346-
margin = { 1, 0, 1, 0 }, -- extra window margin [top, right, bottom, left]
344+
border = 'none', -- none, single, double, shadow
345+
position = 'bottom', -- bottom, top
346+
margin = { 1, 0, 1, 0 }, -- extra window margin [top, right, bottom, left]
347347
padding = { 1, 2, 1, 2 }, -- extra window padding [top, right, bottom, left]
348-
winblend = 0, -- value between 0-100 0 for fully opaque and 100 for fully transparent
348+
winblend = 0, -- value between 0-100 0 for fully opaque and 100 for fully transparent
349349
},
350350
layout = {
351351
height = { min = 4, max = 25 }, -- min and max height of the columns
352352
width = { min = 20, max = 50 }, -- min and max width of the columns
353-
spacing = 3, -- spacing between columns
354-
align = 'left', -- align columns left, center or right
353+
spacing = 3, -- spacing between columns
354+
align = 'left', -- align columns left, center or right
355355
},
356356
ignore_missing = false,
357357
hidden = { '<CR>', '^:', '^ ', '^call ', '^lua ' }, -- hide mapping boilerplate
358-
show_help = false, -- show a help message in the command line for using WhichKey
359-
show_keys = true, -- show the currently pressed key and its label as a message in the command line
360-
triggers = 'auto', -- automatically setup triggers
358+
show_help = false, -- show a help message in the command line for using WhichKey
359+
show_keys = true, -- show the currently pressed key and its label as a message in the command line
360+
triggers = 'auto', -- automatically setup triggers
361361
triggers_nowait = {
362362
',',
363363
-- marks
@@ -675,42 +675,42 @@ pack.plug({
675675
miniclue.gen_clues.marks(),
676676
-- miniclue.gen_clues.registers(),
677677
miniclue.gen_clues.z(),
678-
{ mode = 'n', keys = '<Leader>a', desc = '+AI Assistant' },
679-
{ mode = 'v', keys = '<Leader>a', desc = '+AI Assistant' },
680-
{ mode = 'x', keys = '<Leader>a', desc = '+AI Assistant' },
681-
{ mode = 'n', keys = '<Leader>n', desc = '+Normal mode utils' },
678+
{ mode = 'n', keys = '<Leader>a', desc = '+AI Assistant' },
679+
{ mode = 'v', keys = '<Leader>a', desc = '+AI Assistant' },
680+
{ mode = 'x', keys = '<Leader>a', desc = '+AI Assistant' },
681+
{ mode = 'n', keys = '<Leader>n', desc = '+Normal mode utils' },
682682
{ mode = 'n', keys = '<LocalLeader>a', desc = '+AI Assistant' },
683683
{ mode = 'n', keys = '<LocalLeader>x', desc = '+Tmux' },
684-
{ mode = 'n', keys = 'ga', desc = '+TextChanges' },
685-
{ mode = 'n', keys = 'gao', desc = '+Current word case change' },
684+
{ mode = 'n', keys = 'ga', desc = '+TextChanges' },
685+
{ mode = 'n', keys = 'gao', desc = '+Current word case change' },
686686
-- gh<key> for gitsigns.
687-
{ mode = 'n', keys = '<Leader>g', desc = '+Git' },
688-
{ mode = 'x', keys = '<Leader>g', desc = '+Git' },
689-
{ mode = 'n', keys = '<Leader>f', desc = '+Finder' },
690-
{ mode = 'x', keys = '<Leader>f', desc = '+Finder' },
691-
{ mode = 'v', keys = '<Leader>f', desc = '+Finder' },
692-
{ mode = 'n', keys = '<Leader>c', desc = '+Code' },
693-
{ mode = 'x', keys = '<Leader>c', desc = '+Code' },
694-
{ mode = 'v', keys = '<Leader>c', desc = '+Code' },
695-
{ mode = 'n', keys = '<Leader>/', desc = '+Outline|Terms' },
696-
{ mode = 'n', keys = '<Leader>v', desc = '+Trails' },
697-
{ mode = 'n', keys = '<Leader>z', desc = '+Extended' },
698-
{ mode = 'n', keys = '<Leader>m', desc = '+Motion' },
699-
{ mode = 'n', keys = '<Leader>mj', desc = '+Join' },
700-
{ mode = 'n', keys = '<Leader>b', desc = '+Buffer' },
701-
{ mode = 'n', keys = '<Leader>p', desc = '+Projects' },
702-
{ mode = 'n', keys = '<Leader>t', desc = '+Tools|Toggle' },
703-
{ mode = 'x', keys = '<Leader>t', desc = '+Tools|Toggle' },
704-
{ mode = 'n', keys = '<Leader>to', desc = 'Toggle options' },
705-
{ mode = 'n', keys = '<Leader>w', desc = '+Workspace' },
706-
{ mode = 'n', keys = '<Leader>s', desc = '+Search|Replace' },
707-
{ mode = 'x', keys = '<Leader>s', desc = '+Search|Replace' },
708-
{ mode = 'n', keys = '<Leader>sg', desc = '+Grep' },
709-
{ mode = 'n', keys = '<Leader>r', desc = '+Runner|Debugger' },
710-
{ mode = 'n', keys = '<Leader>ro', desc = '+Overseer' },
687+
{ mode = 'n', keys = '<Leader>g', desc = '+Git' },
688+
{ mode = 'x', keys = '<Leader>g', desc = '+Git' },
689+
{ mode = 'n', keys = '<Leader>f', desc = '+Finder' },
690+
{ mode = 'x', keys = '<Leader>f', desc = '+Finder' },
691+
{ mode = 'v', keys = '<Leader>f', desc = '+Finder' },
692+
{ mode = 'n', keys = '<Leader>c', desc = '+Code' },
693+
{ mode = 'x', keys = '<Leader>c', desc = '+Code' },
694+
{ mode = 'v', keys = '<Leader>c', desc = '+Code' },
695+
{ mode = 'n', keys = '<Leader>/', desc = '+Outline|Terms' },
696+
{ mode = 'n', keys = '<Leader>v', desc = '+Trails' },
697+
{ mode = 'n', keys = '<Leader>z', desc = '+Extended' },
698+
{ mode = 'n', keys = '<Leader>m', desc = '+Motion' },
699+
{ mode = 'n', keys = '<Leader>mj', desc = '+Join' },
700+
{ mode = 'n', keys = '<Leader>b', desc = '+Buffer' },
701+
{ mode = 'n', keys = '<Leader>p', desc = '+Projects' },
702+
{ mode = 'n', keys = '<Leader>t', desc = '+Tools|Toggle' },
703+
{ mode = 'x', keys = '<Leader>t', desc = '+Tools|Toggle' },
704+
{ mode = 'n', keys = '<Leader>to', desc = 'Toggle options' },
705+
{ mode = 'n', keys = '<Leader>w', desc = '+Workspace' },
706+
{ mode = 'n', keys = '<Leader>s', desc = '+Search|Replace' },
707+
{ mode = 'x', keys = '<Leader>s', desc = '+Search|Replace' },
708+
{ mode = 'n', keys = '<Leader>sg', desc = '+Grep' },
709+
{ mode = 'n', keys = '<Leader>r', desc = '+Runner|Debugger' },
710+
{ mode = 'n', keys = '<Leader>ro', desc = '+Overseer' },
711711
---
712-
{ mode = 'n', keys = 'gh', desc = '+Gitsigns' },
713-
{ mode = 'x', keys = 'gh', desc = '+Gitsigns' },
712+
{ mode = 'n', keys = 'gh', desc = '+Gitsigns' },
713+
{ mode = 'x', keys = 'gh', desc = '+Gitsigns' },
714714
--- windows
715715
miniclue.gen_clues.windows(),
716716
{ mode = 'n', keys = '<C-w>a' },
@@ -747,7 +747,7 @@ pack.plug({
747747
name = 'registers',
748748
cmd = 'Registers',
749749
keys = {
750-
{ '"', mode = { 'n', 'v' } },
750+
{ '"', mode = { 'n', 'v' } },
751751
{ '<C-R>', mode = 'i' },
752752
},
753753
opts = {

‎lua/user/plugins/finder.lua

+21-15
Original file line numberDiff line numberDiff line change
@@ -1084,20 +1084,26 @@ plug({
10841084
},
10851085
})
10861086

1087-
-- fzflua.register_ui_select({
1088-
-- winopts = {
1089-
-- fullscreen = false,
1090-
-- height = 0.6,
1091-
-- width = 0.75,
1092-
-- },
1093-
-- fzf_opts = {
1094-
-- ['--ansi'] = '',
1095-
-- ['--info'] = 'inline',
1096-
-- ------===
1097-
-- ['--delimiter'] = '[\\.]',
1098-
-- ['--with-nth'] = '2..',
1099-
-- -------===
1100-
-- },
1101-
-- })
1087+
local enable_fzf_select = true
1088+
1089+
if not enable_fzf_select then
1090+
return
1091+
end
1092+
1093+
fzflua.register_ui_select({
1094+
winopts = {
1095+
fullscreen = false,
1096+
height = 0.6,
1097+
width = 0.75,
1098+
},
1099+
fzf_opts = {
1100+
-- ['--ansi'] = '',
1101+
-- ['--info'] = 'inline',
1102+
------===
1103+
['--delimiter'] = '[BEGIN{FS="."}]',
1104+
['--with-nth'] = '2..',
1105+
-------===
1106+
},
1107+
})
11021108
end,
11031109
})

0 commit comments

Comments
 (0)