Skip to content

Commit 8b05f55

Browse files
TheLeoPTheLeoP
committed
fixup! feat(clue): add clues for [ and ]
1 parent 1cc837e commit 8b05f55

File tree

3 files changed

+181
-286
lines changed

3 files changed

+181
-286
lines changed

‎lua/mini/clue.lua‎

Lines changed: 21 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -812,161 +812,56 @@ end
812812
--- <
813813
---@return table Array of clues.
814814
MiniClue.gen_clues.square_bracket = function()
815-
local ob_d_clue = vim.fn.has('nvim-0.10') == 1
816-
and { mode = 'n', keys = '[d', desc = 'Go to previous diagnostic in file' }
817-
or { mode = 'n', keys = '[d', desc = 'Show first macro definition of word under cursor' }
818-
local cb_d_clue = vim.fn.has('nvim-0.10') == 1 and { mode = 'n', keys = ']d', desc = 'Go to next diagnostic in file' }
819-
or { mode = 'n', keys = ']d', desc = 'Show first macro definition, below cursor, of word under cursor' }
820-
821-
local ob_D_clue = vim.fn.has('nvim-0.11') == 1
822-
and { mode = 'n', keys = '[D', desc = 'Go to first diagnostic in file' }
823-
or { mode = 'n', keys = '[D', desc = 'List all macro definitions of word under cursor' }
824-
local cb_D_clue = vim.fn.has('nvim-0.11') == 1 and { mode = 'n', keys = ']D', desc = 'Go to last diagnostic in file' }
825-
or { mode = 'n', keys = ']D', desc = 'List all macro definitions, below cursor, of word under cursor' }
826-
827-
local ob_q_clue = vim.fn.has('nvim-0.11') == 1 and { mode = 'n', keys = '[q', desc = 'Go to previous qflist entry' }
828-
or {}
829-
local cb_q_clue = vim.fn.has('nvim-0.11') == 1 and { mode = 'n', keys = ']q', desc = 'Go to next qflist entry' } or {}
830-
local ob_Q_clue = vim.fn.has('nvim-0.11') == 1 and { mode = 'n', keys = '[Q', desc = 'Go to first qflist entry' }
831-
or {}
832-
local cb_Q_clue = vim.fn.has('nvim-0.11') == 1 and { mode = 'n', keys = ']Q', desc = 'Go to last qflist entry' } or {}
833-
local ob_ctrl_Q_clue = vim.fn.has('nvim-0.11') == 1
834-
and { mode = 'n', keys = '[<C-Q>', desc = 'Go to last qflist entry in previous file' }
835-
or {}
836-
local cb_ctrl_Q_clue = vim.fn.has('nvim-0.11') == 1
837-
and { mode = 'n', keys = ']<C-Q>', desc = 'Go to firt qflist entry in next file' }
838-
or {}
839-
840-
local ob_l_clue = vim.fn.has('nvim-0.11') == 1 and { mode = 'n', keys = '[l', desc = 'Go to previous loclist entry' }
841-
or {}
842-
local cb_l_clue = vim.fn.has('nvim-0.11') == 1 and { mode = 'n', keys = ']l', desc = 'Go to next loclist entry' }
843-
or {}
844-
local ob_L_clue = vim.fn.has('nvim-0.11') == 1 and { mode = 'n', keys = '[L', desc = 'Go to first loclist entry' }
845-
or {}
846-
local cb_L_clue = vim.fn.has('nvim-0.11') == 1 and { mode = 'n', keys = ']L', desc = 'Go to last loclist entry' }
847-
or {}
848-
local ob_ctrl_L_clue = vim.fn.has('nvim-0.11') == 1
849-
and { mode = 'n', keys = '[<C-L>', desc = 'Go to last loclist entry in previous file' }
850-
or {}
851-
local cb_ctrl_L_clue = vim.fn.has('nvim-0.11') == 1
852-
and { mode = 'n', keys = ']<C-L>', desc = 'Go to firt loclist entry in next file' }
853-
or {}
854-
855-
local ob_t_clue = vim.fn.has('nvim-0.11') == 1 and { mode = 'n', keys = '[t', desc = 'Go to previous matching tag' }
856-
or {}
857-
local cb_t_clue = vim.fn.has('nvim-0.11') == 1 and { mode = 'n', keys = ']t', desc = 'Go to next matching tag' } or {}
858-
local ob_T_clue = vim.fn.has('nvim-0.11') == 1 and { mode = 'n', keys = '[T', desc = 'Go to first matching tag' }
859-
or {}
860-
local cb_T_clue = vim.fn.has('nvim-0.11') == 1 and { mode = 'n', keys = ']T', desc = 'Go to last matching tag' } or {}
861-
local ob_ctrl_T_clue = vim.fn.has('nvim-0.11') == 1
862-
and { mode = 'n', keys = '[<C-T>', desc = 'Show previous matching tag in preview' }
863-
or {}
864-
local cb_ctrl_T_clue = vim.fn.has('nvim-0.11') == 1
865-
and { mode = 'n', keys = ']<C-T>', desc = 'Show next matching tag in preview' }
866-
or {}
867-
868-
local ob_a_clue = vim.fn.has('nvim-0.11') == 1 and { mode = 'n', keys = '[a', desc = 'Go to previous arglist entry' }
869-
or {}
870-
local cb_a_clue = vim.fn.has('nvim-0.11') == 1 and { mode = 'n', keys = ']a', desc = 'Go to next arglist entry' }
871-
or {}
872-
local ob_A_clue = vim.fn.has('nvim-0.11') == 1 and { mode = 'n', keys = '[A', desc = 'Go to first arglist entry' }
873-
or {}
874-
local cb_A_clue = vim.fn.has('nvim-0.11') == 1 and { mode = 'n', keys = ']A', desc = 'Go to last arglist entry' }
875-
or {}
876-
877-
local ob_b_clue = vim.fn.has('nvim-0.11') == 1 and { mode = 'n', keys = '[b', desc = 'Go to previous buffer' } or {}
878-
local cb_b_clue = vim.fn.has('nvim-0.11') == 1 and { mode = 'n', keys = ']b', desc = 'Go to next buffer' } or {}
879-
local ob_B_clue = vim.fn.has('nvim-0.11') == 1 and { mode = 'n', keys = '[B', desc = 'Go to first buffer' } or {}
880-
local cb_B_clue = vim.fn.has('nvim-0.11') == 1 and { mode = 'n', keys = ']B', desc = 'Go to last buffer' } or {}
881-
882-
local ob_space_clue = vim.fn.has('nvim-0.11') == 1
883-
and { mode = 'n', keys = '[<space>', desc = 'Add empty newline above cursor' }
884-
or {}
885-
local cb_space_clue = vim.fn.has('nvim-0.11') == 1
886-
and { mode = 'n', keys = ']<space>', desc = 'Add empty newline below cursor' }
887-
or {}
888-
889815
--stylua: ignore
890816
return {
891-
{ mode = 'n', keys = '[<C-D>', desc = 'Jump to first macro definition of word under cursor', },
892-
{ mode = 'n', keys = '[<C-I>', desc = 'Jump to first occurrence of word under cursor', },
817+
{ mode = 'n', keys = '[<C-D>', desc = 'Go to first macro definition word under cursor', },
818+
{ mode = 'n', keys = '[<C-I>', desc = 'Go to first occurrence word under cursor', },
893819
{ mode = 'n', keys = '[%', desc = 'Go to previous unmatched group' },
894-
{ mode = 'n', keys = '[#', desc = 'Go to previous unmatched #if, #else or #ifdef' },
820+
{ mode = 'n', keys = '[#', desc = 'Go to previous unmatched #if/#else/#ifdef' },
895821
{ mode = 'n', keys = "['", desc = 'Go to previous lowercase mark on first non-blank' },
896822
{ mode = 'n', keys = '[`', desc = 'Go to previous lowercase mark' },
897823
{ mode = 'n', keys = '[(', desc = "Go to previous unmatched '('" },
898824
{ mode = 'n', keys = '[/', desc = 'Go to previous start of a C comment' },
899825
{ mode = 'n', keys = '[*', desc = 'Go to previous start of a C comment' },
900-
{ mode = 'n', keys = '[I', desc = 'List all lines with word under cursor', },
901-
ob_D_clue,
826+
{ mode = 'n', keys = '[I', desc = 'Show lines with word under cursor', },
827+
{ mode = 'n', keys = '[D', desc = 'Show macro definitions word under cursor' },
902828
{ mode = 'n', keys = '[p', desc = 'Paste with current line indent' },
903829
{ mode = 'n', keys = '[P', desc = 'Paste with current line indent' },
904-
{ mode = 'n', keys = '[<MiddleMouse>', desc = 'Paste with current line indent' },
905830
{ mode = 'n', keys = '[[', desc = 'Go to previous section' },
906831
{ mode = 'n', keys = '[]', desc = 'Go to previous SECTION' },
907832
{ mode = 'n', keys = '[c', desc = 'Go to previous change' },
908-
ob_d_clue,
909-
{ mode = 'n', keys = '[f', desc = 'Edit file under cursor + jump line' },
910-
{ mode = 'n', keys = '[i', desc = 'Show first lines with word under cursor', },
833+
{ mode = 'n', keys = '[d', desc = 'Show first macro definition word under cursor' },
834+
{ mode = 'n', keys = '[f', desc = 'Edit file under cursor' },
835+
{ mode = 'n', keys = '[i', desc = 'Show first line with word under cursor', },
911836
{ mode = 'n', keys = '[m', desc = 'Go to previous start of method' },
912837
{ mode = 'n', keys = '[M', desc = 'Go to previous end of method' },
913838
{ mode = 'n', keys = '[s', desc = 'Go to previous misspelled word' },
914-
{ mode = 'n', keys = '[z', desc = 'Jump to start of current open fold' },
839+
{ mode = 'n', keys = '[z', desc = 'Go to start of current open fold' },
915840
{ mode = 'n', keys = '[{', desc = "Go to previous unmatched '{'" },
916-
{ mode = 'n', keys = ']<C-D>', desc = 'Jump to first macro definition, below cursor, of word under cursor below cursor', },
917-
{ mode = 'n', keys = ']<C-I>', desc = 'Jump to first occurrence, below cursow, of word under cursor', },
841+
{ mode = 'n', keys = ']<C-D>', desc = 'Go to next macro definition word under cursor', },
842+
{ mode = 'n', keys = ']<C-I>', desc = 'Go to next occurrence word under cursor', },
918843
{ mode = 'n', keys = ']%', desc = 'Go to next unmatched group' },
919844
{ mode = 'n', keys = ']#', desc = 'Go to next unmatched #if, #else or #ifdef' },
920845
{ mode = 'n', keys = "]'", desc = "Go to next lowercase mark on first non-blank" },
921846
{ mode = 'n', keys = ']`', desc = 'Go to next lowercase mark' },
922-
{ mode = 'n', keys = '])', desc = "Go to next unmatched '('" },
923-
{ mode = 'n', keys = ']/', desc = 'Go to previous start of a C comment' },
924-
{ mode = 'n', keys = ']*', desc = 'Go to previous start of a C comment' },
925-
cb_D_clue,
926-
{ mode = 'n', keys = ']I', desc = 'List all lines, below cursor, with word under cursor', },
847+
{ mode = 'n', keys = '])', desc = "Go to next unmatched ')'" },
848+
{ mode = 'n', keys = ']/', desc = 'Go to next end of a C comment' },
849+
{ mode = 'n', keys = ']*', desc = 'Go to next end of a C comment' },
850+
{ mode = 'n', keys = ']D', desc = 'Show below macro definitions word under cursor' },
851+
{ mode = 'n', keys = ']I', desc = 'Show lines below with word under cursor', },
927852
{ mode = 'n', keys = ']P', desc = 'Paste with current line indent' },
928853
{ mode = 'n', keys = '][', desc = 'Go to next SECTION' },
929854
{ mode = 'n', keys = ']]', desc = 'Go to next section' },
930855
{ mode = 'n', keys = ']c', desc = 'Go to next change' },
931-
cb_d_clue,
932-
{ mode = 'n', keys = ']f', desc = 'Edit file under cursor + jump line' },
933-
{ mode = 'n', keys = ']i', desc = 'Show first lines, below cursor, with word under cursor', },
856+
{ mode = 'n', keys = ']d', desc = 'Show next macro definition word under cursor' },
857+
{ mode = 'n', keys = ']f', desc = 'Edit file under cursor' },
858+
{ mode = 'n', keys = ']i', desc = 'Show next line with word under cursor', },
934859
{ mode = 'n', keys = ']m', desc = 'Go to next start of method' },
935860
{ mode = 'n', keys = ']M', desc = 'Go to next end of method' },
936861
{ mode = 'n', keys = ']p', desc = 'Paste with current line indent' },
937862
{ mode = 'n', keys = ']s', desc = 'Go to next misspelled word' },
938-
{ mode = 'n', keys = ']z', desc = 'Jump to end of current open fold' },
939-
{ mode = 'n', keys = ']}', desc = "Go to next unmatched '{'" },
940-
{ mode = 'n', keys = ']<MiddleMouse>', desc = 'Paste with current line indent' },
941-
942-
ob_q_clue,
943-
cb_q_clue,
944-
ob_Q_clue,
945-
cb_Q_clue,
946-
ob_ctrl_Q_clue,
947-
cb_ctrl_Q_clue,
948-
ob_l_clue,
949-
cb_l_clue,
950-
ob_L_clue,
951-
cb_L_clue,
952-
ob_ctrl_L_clue,
953-
cb_ctrl_L_clue,
954-
ob_t_clue,
955-
cb_t_clue,
956-
ob_T_clue,
957-
cb_T_clue,
958-
ob_ctrl_T_clue,
959-
cb_ctrl_T_clue,
960-
ob_a_clue,
961-
cb_a_clue,
962-
ob_A_clue,
963-
cb_A_clue,
964-
ob_b_clue,
965-
cb_b_clue,
966-
ob_B_clue,
967-
cb_B_clue,
968-
ob_space_clue,
969-
cb_space_clue,
863+
{ mode = 'n', keys = ']z', desc = 'Go to end of current open fold' },
864+
{ mode = 'n', keys = ']}', desc = "Go to next unmatched '}'" },
970865
}
971866
end
972867

0 commit comments

Comments
 (0)