Merge branch 'nvim-lua:master' into master

README.md

@@ -81,13 +81,13 @@ git clone https://github.com/nvim-lua/kickstart.nvim.git "${XDG_CONFIG_HOME:-$HO
 If you're using `cmd.exe`:
 
 ```
-git clone https://github.com/nvim-lua/kickstart.nvim.git %localappdata%\nvim\
+git clone https://github.com/nvim-lua/kickstart.nvim.git "%localappdata%\nvim"
 ```
 
 If you're using `powershell.exe`
 
 ```
-git clone https://github.com/nvim-lua/kickstart.nvim.git $env:LOCALAPPDATA\nvim\
+git clone https://github.com/nvim-lua/kickstart.nvim.git "${env:LOCALAPPDATA}\nvim"
 ```
 
 </details>

init.lua

@@ -274,48 +274,46 @@ require('lazy').setup({
   { -- Useful plugin to show you pending keybinds.
     'folke/which-key.nvim',
     event = 'VimEnter', -- Sets the loading event to 'VimEnter'
-    config = function() -- This is the function that runs, AFTER loading
+    opts = {
-      require('which-key').setup {
+      icons = {
-        icons = {
+        -- set icon mappings to true if you have a Nerd Font
-          -- set icon mappings to true if you have a Nerd Font
+        mappings = vim.g.have_nerd_font,
-          mappings = vim.g.have_nerd_font,
+        -- If you are using a Nerd Font: set icons.keys to an empty table which will use the
-          -- If you are using a Nerd Font: set icons.keys to an empty table which will use the
+        -- default whick-key.nvim defined Nerd Font icons, otherwise define a string table
-          -- default whick-key.nvim defined Nerd Font icons, otherwise define a string table
+        keys = vim.g.have_nerd_font and {} or {
-          keys = vim.g.have_nerd_font and {} or {
+          Up = '<Up> ',
-            Up = '<Up> ',
+          Down = '<Down> ',
-            Down = '<Down> ',
+          Left = '<Left> ',
-            Left = '<Left> ',
+          Right = '<Right> ',
-            Right = '<Right> ',
+          C = '<C-…> ',
-            C = '<C-…> ',
+          M = '<M-…> ',
-            M = '<M-…> ',
+          D = '<D-…> ',
-            D = '<D-…> ',
+          S = '<S-…> ',
-            S = '<S-…> ',
+          CR = '<CR> ',
-            CR = '<CR> ',
+          Esc = '<Esc> ',
-            Esc = '<Esc> ',
+          ScrollWheelDown = '<ScrollWheelDown> ',
-            ScrollWheelDown = '<ScrollWheelDown> ',
+          ScrollWheelUp = '<ScrollWheelUp> ',
-            ScrollWheelUp = '<ScrollWheelUp> ',
+          NL = '<NL> ',
-            NL = '<NL> ',
+          BS = '<BS> ',
-            BS = '<BS> ',
+          Space = '<Space> ',
-            Space = '<Space> ',
+          Tab = '<Tab> ',
-            Tab = '<Tab> ',
+          F1 = '<F1>',
-            F1 = '<F1>',
+          F2 = '<F2>',
-            F2 = '<F2>',
+          F3 = '<F3>',
-            F3 = '<F3>',
+          F4 = '<F4>',
-            F4 = '<F4>',
+          F5 = '<F5>',
-            F5 = '<F5>',
+          F6 = '<F6>',
-            F6 = '<F6>',
+          F7 = '<F7>',
-            F7 = '<F7>',
+          F8 = '<F8>',
-            F8 = '<F8>',
+          F9 = '<F9>',
-            F9 = '<F9>',
+          F10 = '<F10>',
-            F10 = '<F10>',
+          F11 = '<F11>',
-            F11 = '<F11>',
+          F12 = '<F12>',
-            F12 = '<F12>',
-          },
         },
-      }
+      },
 
       -- Document existing key chains
-      require('which-key').add {
+      spec = {
         { '<leader>c', group = '[C]ode', mode = { 'n', 'x' } },
         { '<leader>d', group = '[D]ocument' },
         { '<leader>r', group = '[R]ename' },
@@ -323,8 +321,8 @@ require('lazy').setup({
         { '<leader>w', group = '[W]orkspace' },
         { '<leader>t', group = '[T]oggle' },
         { '<leader>h', group = 'Git [H]unk', mode = { 'n', 'v' } },
-      }
+      },
-    end,
+    },
   },
 
   -- NOTE: Plugins can specify dependencies.
@@ -675,7 +673,7 @@ require('lazy').setup({
       {
         '<leader>f',
         function()
-          require('conform').format { async = true, lsp_fallback = true }
+          require('conform').format { async = true, lsp_format = 'fallback' }
         end,
         mode = '',
         desc = '[F]ormat buffer',
@@ -688,9 +686,15 @@ require('lazy').setup({
         -- have a well standardized coding style. You can add additional
         -- languages here or re-enable it for the disabled ones.
         local disable_filetypes = { c = true, cpp = true }
+        local lsp_format_opt
+        if disable_filetypes[vim.bo[bufnr].filetype] then
+          lsp_format_opt = 'never'
+        else
+          lsp_format_opt = 'fallback'
+        end
         return {
           timeout_ms = 500,
-          lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype],
+          lsp_format = lsp_format_opt,
         }
       end,
       formatters_by_ft = {

lua/kickstart/plugins/neo-tree.lua

@@ -11,7 +11,7 @@ return {
   },
   cmd = 'Neotree',
   keys = {
-    { '\\', ':Neotree reveal<CR>', desc = 'NeoTree reveal' },
+    { '\\', ':Neotree reveal<CR>', desc = 'NeoTree reveal', silent = true },
   },
   opts = {
     filesystem = {