feat: new mappings format for which-key v3. Forgot to push :)

lua/lazyvim/plugins/editor.lua

@@ -162,32 +162,47 @@ return {
   {
     "folke/which-key.nvim",
     event = "VeryLazy",
+    opts_extend = { "spec" },
     opts = {
-      plugins = { spelling = true },
-      defaults = {
-        mode = { "n", "v" },
-        ["g"] = { name = "+goto" },
-        ["gs"] = { name = "+surround" },
-        ["z"] = { name = "+fold" },
-        ["]"] = { name = "+next" },
-        ["["] = { name = "+prev" },
-        ["<leader><tab>"] = { name = "+tabs" },
-        ["<leader>b"] = { name = "+buffer" },
-        ["<leader>c"] = { name = "+code" },
-        ["<leader>f"] = { name = "+file/find" },
-        ["<leader>g"] = { name = "+git" },
-        ["<leader>gh"] = { name = "+hunks", ["_"] = "which_key_ignore" },
-        ["<leader>q"] = { name = "+quit/session" },
-        ["<leader>s"] = { name = "+search" },
-        ["<leader>u"] = { name = "+ui" },
-        ["<leader>w"] = { name = "+windows" },
-        ["<leader>x"] = { name = "+diagnostics/quickfix" },
+      defaults = {},
+      spec = {
+        {
+          mode = { "n", "v" },
+          { "<leader><tab>", group = "tabs" },
+          { "<leader>b", group = "buffer" },
+          { "<leader>c", group = "code" },
+          { "<leader>f", group = "file/find" },
+          { "<leader>g", group = "git" },
+          { "<leader>gh", group = "hunks" },
+          { "<leader>q", group = "quit/session" },
+          { "<leader>s", group = "search" },
+          { "<leader>u", group = "ui" },
+          { "<leader>w", group = "windows" },
+          { "<leader>x", group = "diagnostics/quickfix" },
+          { "[", group = "prev" },
+          { "]", group = "next" },
+          { "g", group = "goto" },
+          { "gs", group = "surround" },
+          { "z", group = "fold" },
+        },
+      },
+    },
+    keys = {
+      {
+        "<leader>?",
+        function()
+          require("which-key").show({ global = false })
+        end,
+        desc = "Buffer Local Keymaps (which-key)",
       },
     },
     config = function(_, opts)
       local wk = require("which-key")
       wk.setup(opts)
-      wk.register(opts.defaults)
+      if not vim.tbl_isempty(opts.defaults) then
+        LazyVim.warn("which-key: opts.defaults is deprecated. Please use opts.spec instead.")
+        wk.register(opts.defaults)
+      end
     end,
   },
 

lua/lazyvim/plugins/extras/editor/overseer.lua

@@ -64,7 +64,9 @@ return {
     "folke/which-key.nvim",
     optional = true,
     opts = {
-      defaults = { ["<leader>o"] = { name = "+overseer" } },
+      spec = {
+        { "<leader>o", group = "overseer" },
+      },
     },
   },
   {

lua/lazyvim/plugins/extras/lang/markdown.lua

@@ -100,6 +100,7 @@ return {
           headline_highlights = {},
           -- disable bullets for now. See https://github.com/lukas-reineke/headlines.nvim/issues/66
           bullets = {},
+          quote_string = false,
         }
         for i = 1, 6 do
           local hl = "Headline" .. i

lua/lazyvim/plugins/extras/lang/r.lua

@@ -21,22 +21,19 @@ return {
 
           -- Increase the width of which-key to handle the longer r-nvim descriptions
           local wk = require("which-key")
-          -- Workaround from https://github.com/folke/which-key.nvim/issues/514#issuecomment-1987286901
-          wk.register({
-            ["<localleader>"] = {
-              a = { name = "+(a)ll", ["🚫"] = "which_key_ignore" },
-              b = { name = "+(b)etween marks", ["🚫"] = "which_key_ignore" },
-              c = { name = "+(c)hunks", ["🚫"] = "which_key_ignore" },
-              f = { name = "+(f)unctions", ["🚫"] = "which_key_ignore" },
-              g = { name = "+(g)oto", ["🚫"] = "which_key_ignore" },
-              k = { name = "+(k)nit", ["🚫"] = "which_key_ignore" },
-              p = { name = "+(p)aragraph", ["🚫"] = "which_key_ignore" },
-              q = { name = "+(q)uarto", ["🚫"] = "which_key_ignore" },
-              r = { name = "+(r) general", ["🚫"] = "which_key_ignore" },
-              s = { name = "+(s)plit or (s)end", ["🚫"] = "which_key_ignore" },
-              t = { name = "+(t)erminal", ["🚫"] = "which_key_ignore" },
-              v = { name = "+(v)iew", ["🚫"] = "which_key_ignore" },
-            },
+          wk.add({
+            { "<localleader>a", group = "all" },
+            { "<localleader>b", group = "between marks" },
+            { "<localleader>c", group = "chunks" },
+            { "<localleader>f", group = "functions" },
+            { "<localleader>g", group = "goto" },
+            { "<localleader>k", group = "knit" },
+            { "<localleader>p", group = "paragraph" },
+            { "<localleader>q", group = "quarto" },
+            { "<localleader>r", group = "r general" },
+            { "<localleader>s", group = "split or send" },
+            { "<localleader>t", group = "terminal" },
+            { "<localleader>v", group = "view" },
           })
         end,
       },

lua/lazyvim/util/mini.lua

@@ -61,52 +61,51 @@ end
 
 -- register all text objects with which-key
 function M.ai_whichkey()
-  ---@type table<string, string|table>
-  local i = {
-    [" "] = "Whitespace",
-    ['"'] = 'Balanced "',
-    ["'"] = "Balanced '",
-    ["`"] = "Balanced `",
-    ["("] = "Balanced (",
-    [")"] = "Balanced ) including white-space",
-    [">"] = "Balanced > including white-space",
-    ["<lt>"] = "Balanced <",
-    ["]"] = "Balanced ] including white-space",
-    ["["] = "Balanced [",
-    ["}"] = "Balanced } including white-space",
-    ["{"] = "Balanced {",
-    ["?"] = "User Prompt",
-    _ = "Underscore",
-    a = "Argument",
-    b = "Balanced ), ], }",
-    c = "Class",
-    d = "Digit(s)",
-    e = "Word in CamelCase & snake_case",
-    f = "Function",
-    g = "Entire file",
-    i = "Indent",
-    o = "Block, conditional, loop",
-    q = "Quote `, \", '",
-    t = "Tag",
-    u = "Use/call function & method",
-    U = "Use/call without dot in name",
+  local objects = {
+    { " ", desc = "whitespace" },
+    { '"', desc = 'balanced "' },
+    { "'", desc = "balanced '" },
+    { "(", desc = "balanced (" },
+    { ")", desc = "balanced ) including white-space" },
+    { "<", desc = "balanced <" },
+    { ">", desc = "balanced > including white-space" },
+    { "?", desc = "user prompt" },
+    { "U", desc = "use/call without dot in name" },
+    { "[", desc = "balanced [" },
+    { "]", desc = "balanced ] including white-space" },
+    { "_", desc = "underscore" },
+    { "`", desc = "balanced `" },
+    { "a", desc = "argument" },
+    { "b", desc = "balanced )]}" },
+    { "c", desc = "class" },
+    { "d", desc = "digit(s)" },
+    { "e", desc = "word in CamelCase & snake_case" },
+    { "f", desc = "function" },
+    { "g", desc = "entire file" },
+    { "i", desc = "indent" },
+    { "o", desc = "block, conditional, loop" },
+    { "q", desc = "quote `\"'" },
+    { "t", desc = "tag" },
+    { "u", desc = "use/call function & method" },
+    { "{", desc = "balanced {" },
+    { "}", desc = "balanced } including white-space" },
   }
-  local a = vim.deepcopy(i)
-  for k, v in pairs(a) do
-    a[k] = v:gsub(" including.*", "")
-  end
 
-  local ic = vim.deepcopy(i)
-  local ac = vim.deepcopy(a)
-  for key, name in pairs({ n = "Next", l = "Last" }) do
-    i[key] = vim.tbl_extend("force", { name = "Inside " .. name .. " textobject" }, ic)
-    a[key] = vim.tbl_extend("force", { name = "Around " .. name .. " textobject" }, ac)
+  local ret = { mode = { "o", "x" } }
+  for prefix, name in pairs({
+    i = "inside",
+    a = "around",
+    il = "last",
+    ["in"] = "next",
+    al = "last",
+    an = "next",
+  }) do
+    ret[#ret + 1] = { prefix, group = name }
+    for _, obj in ipairs(objects) do
+      ret[#ret + 1] = { prefix .. obj[1], desc = obj.desc }
+    end
   end
-  require("which-key").register({
-    mode = { "o", "x" },
-    i = i,
-    a = a,
-  })
+  require("which-key").add(ret, { notify = false })
 end
 
 ---@param opts {skip_next: string, skip_ts: string[], skip_unbalanced: boolean, markdown: boolean}