Merge branch 'LazyVim:main' into gitui

CHANGELOG.md

@@ -1,5 +1,161 @@
 # Changelog
 
+## [11.2.0](https://github.com/LazyVim/LazyVim/compare/v11.1.2...v11.2.0) (2024-05-18)
+
+
+### Features
+
+* **extras:** added a recommended plugin/language section to `:LazyExtras` ([16eb3d9](https://github.com/LazyVim/LazyVim/commit/16eb3d947321992ebcddff6b997d403b41bd7411))
+* **extras:** added recommended detectors for all languages ([c292134](https://github.com/LazyVim/LazyVim/commit/c29213416b5e29fc56c465234dfd717f78a9e09f))
+* **extras:** added trouble-v3 and mini-hipatterns to recommended ([d514e2f](https://github.com/LazyVim/LazyVim/commit/d514e2fa93a449329c2de64d569846102f24de0e))
+* **extras:** tags some extras as recommended ([ef3bd3b](https://github.com/LazyVim/LazyVim/commit/ef3bd3bd027209812c41b1d772e766c0ef18c503))
+* **root:** added support for `*.xxx` root patterns ([03ea7f6](https://github.com/LazyVim/LazyVim/commit/03ea7f6f98a874e26d258dbfe5b196c2d7c6971f))
+
+
+### Bug Fixes
+
+* **bufferline:** force update bufferline after `BufDelete`. Closes [#3197](https://github.com/LazyVim/LazyVim/issues/3197) ([72abb89](https://github.com/LazyVim/LazyVim/commit/72abb893acc866ce574c66af7d9de861440a3a1f))
+* **comments:** better way of using ts-context-commentstring with native comments ([1d23c98](https://github.com/LazyVim/LazyVim/commit/1d23c98da138494fafdad6735d70c3d3375bb7b2))
+* **extras:** remove treesitter-rewrite extra for now ([180d951](https://github.com/LazyVim/LazyVim/commit/180d9516fd68ca8b881cf1028eeb65aa9c2e25b7))
+* **indent-blankline:** temp fix for `tbl_flatten` on `0.9.x` ([3a193d3](https://github.com/LazyVim/LazyVim/commit/3a193d3aa89c8ff0327abb3e60600eab154af93a))
+* **leap:** add label to renamed surround mappings key group ([#3211](https://github.com/LazyVim/LazyVim/issues/3211)) ([9c212d6](https://github.com/LazyVim/LazyVim/commit/9c212d655a05c42331443f5d0d6dcc982108ed0e))
+* **mini.starter:** buf_id in refresh() is not an identifier of valid … ([#3209](https://github.com/LazyVim/LazyVim/issues/3209)) ([dc66887](https://github.com/LazyVim/LazyVim/commit/dc66887b57ecdee8d33b5e07ca031288260e2971))
+* **refactoring:** add label to refactoring key group ([#3201](https://github.com/LazyVim/LazyVim/issues/3201)) ([39bec71](https://github.com/LazyVim/LazyVim/commit/39bec71ce9489eee288544dca22015147636ae4d))
+* **treesitter:** disable treesitter-rewrite extra for now. not ready yet ([87bb766](https://github.com/LazyVim/LazyVim/commit/87bb76612318f0c0b4fca675500e3afd0a9c6771))
+* **trouble-v3:** add neovim version check ([0892542](https://github.com/LazyVim/LazyVim/commit/08925421e840ac21f3feac28ee8b57319f0a4e59))
+* **util.toggle:** correctly toggle `inlay_hints` ([#3202](https://github.com/LazyVim/LazyVim/issues/3202)) ([23374f1](https://github.com/LazyVim/LazyVim/commit/23374f160a5b1b947681d55add56ab6ab15e219e))
+
+
+### Performance Improvements
+
+* **comments:** `vim.schedule` ts-context-commentstring integration ([c653c4a](https://github.com/LazyVim/LazyVim/commit/c653c4a9a5c0a3cd5101ce86a3640ee12067ffcd))
+* **yanky:** switch to shada backend. It seems much faster than sqlite ([4348836](https://github.com/LazyVim/LazyVim/commit/434883632cd6bc884f36da0282073307d585d6a1))
+
+## [11.1.2](https://github.com/LazyVim/LazyVim/compare/v11.1.1...v11.1.2) (2024-05-17)
+
+
+### Bug Fixes
+
+* **util:** use `bdelete` for buf remove ([19674e8](https://github.com/LazyVim/LazyVim/commit/19674e804787e205c587d153e8e9c4a3988e7f6c))
+
+## [11.1.1](https://github.com/LazyVim/LazyVim/compare/v11.1.0...v11.1.1) (2024-05-17)
+
+
+### Bug Fixes
+
+* **bufferline:** correctly configure bufferline to use the new bufremove util ([2e1c945](https://github.com/LazyVim/LazyVim/commit/2e1c945f61821eec818a1512bc05b45366c0dfeb))
+
+
+### Performance Improvements
+
+* **coding:** dont load `vim.snippet` early ([289c2f8](https://github.com/LazyVim/LazyVim/commit/289c2f81c43d39b31a8b46a4a84ab9feb61bb235))
+
+## [11.1.0](https://github.com/LazyVim/LazyVim/compare/v11.0.1...v11.1.0) (2024-05-17)
+
+
+### Features
+
+* **lsp:** document highlights now use native lsp. `vim-illuminate` is available as an extra ([cc99b21](https://github.com/LazyVim/LazyVim/commit/cc99b219ded16ec60120698d6e8f453c2f37132c))
+* **options:** new option to disable deprecation warnings. warnings will be hidden bydefault ([f8de965](https://github.com/LazyVim/LazyVim/commit/f8de965d3ec5712444a643b507bc9ddc7cb19d01))
+* **util:** `mini.bufremove` is no longer needed ([779de26](https://github.com/LazyVim/LazyVim/commit/779de263f173f7e6f181d1e8faa475be8b05167d))
+
+
+### Bug Fixes
+
+* deprecation warning on diagnostic.is_disabled ([960ec80](https://github.com/LazyVim/LazyVim/commit/960ec8079bb5960a510595dff21725ff403b2753))
+* **lsp:** dont try to highlight refs for deleted buffers ([87493af](https://github.com/LazyVim/LazyVim/commit/87493af2378fac7b518fd2c4db903cd3a2c27095))
+* **treesitter-rewrite:** add missed local Config ([#3188](https://github.com/LazyVim/LazyVim/issues/3188)) ([ec673a8](https://github.com/LazyVim/LazyVim/commit/ec673a83ff387e29ca42367b3aab3c311950a024))
+* **util.lsp:** add `desc` for keymaps reference ([#3193](https://github.com/LazyVim/LazyVim/issues/3193)) ([b1ea356](https://github.com/LazyVim/LazyVim/commit/b1ea356e6c676571907ce654ec3878c530c636ad))
+
+## [11.0.1](https://github.com/LazyVim/LazyVim/compare/v11.0.0...v11.0.1) (2024-05-16)
+
+
+### Bug Fixes
+
+* **news.md:** correct phrase to disable `inlay_hints` ([58cf6f9](https://github.com/LazyVim/LazyVim/commit/58cf6f971b78170aef5f26ccb79149213f4a692d))
+* **treesitter-rewrite:** show error in Extras only when enabled ([#3178](https://github.com/LazyVim/LazyVim/issues/3178)) ([639dfce](https://github.com/LazyVim/LazyVim/commit/639dfce0101cc6c0174e116872df91ccb30cb597))
+* **util:** get opts from parsing specs instead of plugins ([14872fa](https://github.com/LazyVim/LazyVim/commit/14872fa816fd770eba0f2b5efc69d5b29d4073fb))
+
+## [11.0.0](https://github.com/LazyVim/LazyVim/compare/v10.25.0...v11.0.0) (2024-05-16)
+
+
+### ⚠ BREAKING CHANGES
+
+* **util:** move `vim-startuptime` to an extra
+* **coding:** move `mini.ai` to an extra
+* **mini.surround:** move `mini.surround` to an extra
+* **ui:** move `mini.indentscope` to an extra
+* **ui:** moved treesitter-context to an extra. No longer a core plugin
+* **coding:** native snippets are now the default on Neovim 0.10. Install the luasnip extra to get luasnip back
+* **coding:** use native comments on 0.10, with support for ts_context_commentstring
+
+### Features
+
+* **coding:** move `mini.ai` to an extra ([4f4911f](https://github.com/LazyVim/LazyVim/commit/4f4911ff95bc35438a2b8dd2d058b15f105f2ff1))
+* **coding:** native snippets are now the default on Neovim 0.10. Install the luasnip extra to get luasnip back ([3c4ebd5](https://github.com/LazyVim/LazyVim/commit/3c4ebd522e7c475cfedcee5dfa7a008e798c404c))
+* **coding:** use native comments on 0.10, with support for ts_context_commentstring ([d999be7](https://github.com/LazyVim/LazyVim/commit/d999be7401783e0f3a610319fa1b327d38fa3e52))
+* **extras:** added extra for the `nvim-treesitter` rewrite. Some plugins are not compatible and will be disabled. ([2008146](https://github.com/LazyVim/LazyVim/commit/20081460b65bc7a117933b0dcebbcaa4dcb82b23))
+* **keymaps:** added leader-uI to open InspectTree ([3b74ef7](https://github.com/LazyVim/LazyVim/commit/3b74ef793fb7cd8964231393a57b9e3c846b7d1e))
+* **lsp:** enable inlay hints by default on Neovim 0.10 ([960e958](https://github.com/LazyVim/LazyVim/commit/960e958548adce7d96ff2e0c014ce2249897125e))
+* **mini.surround:** move `mini.surround` to an extra ([e37a699](https://github.com/LazyVim/LazyVim/commit/e37a699096ccb209c1babc29c1d5eeeab74102a1))
+* **ui:** move `mini.indentscope` to an extra ([69e6daa](https://github.com/LazyVim/LazyVim/commit/69e6daae2ccb4b7b7180e439c1b05d72d3c64e11))
+* **ui:** moved treesitter-context to an extra. No longer a core plugin ([03704e2](https://github.com/LazyVim/LazyVim/commit/03704e22998be9db17f114acc4060d714fe652fb))
+* **util:** move `vim-startuptime` to an extra ([66dc9c0](https://github.com/LazyVim/LazyVim/commit/66dc9c09d6356ddc7e5870a4aa74824d3623d315))
+* **util:** set_upvalue ([f02507b](https://github.com/LazyVim/LazyVim/commit/f02507b1598379250baab293c423f79c393e28e5))
+
+
+### Bug Fixes
+
+* **cmp:** never auto bracket for snippets and correct prev char check. Fixes [#2949](https://github.com/LazyVim/LazyVim/issues/2949) ([6e7ba50](https://github.com/LazyVim/LazyVim/commit/6e7ba50141b1cda415c9391fd345a1e428bad9b6))
+* **dap:** add debugger to filetypes mapping for launch.json ([#3165](https://github.com/LazyVim/LazyVim/issues/3165)) ([183d6ee](https://github.com/LazyVim/LazyVim/commit/183d6eea606556c8bd7f80a70660c54670e04649))
+* **dap:** use jsonc support from plenary. Same as the code from neoconf. Fixes [#3174](https://github.com/LazyVim/LazyVim/issues/3174) ([8dae76c](https://github.com/LazyVim/LazyVim/commit/8dae76c1fd6fb90199b56cda8b6ec21576d02eb5))
+* **health:** add warning when not using 0.10.0 ([9fe8b15](https://github.com/LazyVim/LazyVim/commit/9fe8b15928077cb0c20aeea111b42f9698c78330))
+* **treesitter-rewrite:** disable vim-illuminate ([b739eb3](https://github.com/LazyVim/LazyVim/commit/b739eb35033acaf20423920d103d5ad3e8350f23))
+
+## [10.25.0](https://github.com/LazyVim/LazyVim/compare/v10.24.0...v10.25.0) (2024-05-15)
+
+
+### Features
+
+* **extras:** add refactoring.nvim ([#3040](https://github.com/LazyVim/LazyVim/issues/3040)) ([73de8dd](https://github.com/LazyVim/LazyVim/commit/73de8dde2bb513337426d5ead862e4fc6dbb8fdf))
+* **lua_ls:** configure default lua_ls inlay hint settings ([91ead22](https://github.com/LazyVim/LazyVim/commit/91ead221167a722a8dd8651cb5c53bf5db4d1b4d))
+* **lua:** added `LazyVim` as a treesitter builtin ([a97fa3b](https://github.com/LazyVim/LazyVim/commit/a97fa3b7563eb2c5305c8f32461bb150d17e45ae))
+* **noice:** added keymap `<leader>snt` to show Noice messages in telescope. Fixes [#1306](https://github.com/LazyVim/LazyVim/issues/1306) ([914ca4a](https://github.com/LazyVim/LazyVim/commit/914ca4a455169916da4614d76c15d1d1bf22e9bc))
+* **omnisharp:** support neotest dotnet ([#3051](https://github.com/LazyVim/LazyVim/issues/3051)) ([a8659d0](https://github.com/LazyVim/LazyVim/commit/a8659d02b954ca320088aab48aad8a95b3bbb86c))
+* **snippet:** add friendly-snippets to native extra ([#2944](https://github.com/LazyVim/LazyVim/issues/2944)) ([12a48b8](https://github.com/LazyVim/LazyVim/commit/12a48b8ce1521fcac01b89099a4ca8bbc3547769))
+* **terraform:** ensure tflint is installed ([#2336](https://github.com/LazyVim/LazyVim/issues/2336)) ([16e6c86](https://github.com/LazyVim/LazyVim/commit/16e6c86b2778ba35696de5067ff033cc5bdbe6db))
+* **typescript:** configure inlayHint ([#2995](https://github.com/LazyVim/LazyVim/issues/2995)) ([2c86da7](https://github.com/LazyVim/LazyVim/commit/2c86da7c2df61c23366e4073312ab12fa6d7e424))
+* **vue:** add Vue.js support to LazyVim ([#3094](https://github.com/LazyVim/LazyVim/issues/3094)) ([f449025](https://github.com/LazyVim/LazyVim/commit/f4490252fb2262208923ba197eb521732a602ac1))
+
+
+### Bug Fixes
+
+* **ansible:** ansiblels not loading, keymap desc. ([#2739](https://github.com/LazyVim/LazyVim/issues/2739)) ([abb1ff0](https://github.com/LazyVim/LazyVim/commit/abb1ff0d600b3446b612390f0482cf92bdc84ab0))
+* **autocmds:** remove query from q-to-quit autocmd ([#2838](https://github.com/LazyVim/LazyVim/issues/2838)) ([9337db1](https://github.com/LazyVim/LazyVim/commit/9337db17c2f6082e10c97456185d8ba3fa473769))
+* **clangd:** update the attribute name for process ID ([#3047](https://github.com/LazyVim/LazyVim/issues/3047)) ([3c04789](https://github.com/LazyVim/LazyVim/commit/3c04789ef15bba15e8c0c71ef31db38c76b2ad67))
+* **cmp:** dont add autobrackets if prev char is a bracket. Closes [#2949](https://github.com/LazyVim/LazyVim/issues/2949) ([c70a78e](https://github.com/LazyVim/LazyVim/commit/c70a78e63137ec48e1c78b23413332716f572590))
+* **dap:** load vscode launch files with jsonc parser ([#1839](https://github.com/LazyVim/LazyVim/issues/1839)) ([543dead](https://github.com/LazyVim/LazyVim/commit/543dead590a949255fbbada9e1775c31ad654682))
+* **dial:** Fix dial commands in Visual line+block ([#2933](https://github.com/LazyVim/LazyVim/issues/2933)) ([1df3c5d](https://github.com/LazyVim/LazyVim/commit/1df3c5d70b2265f8582b0ed414f085e9066960da))
+* **dot:** remove `.env` => `sh` since this is already the default ([a0afe8f](https://github.com/LazyVim/LazyVim/commit/a0afe8fef9dc76b469a78435cdd3f2c5ee01f282))
+* **dot:** use syntax `sh` for dotenv files. Closes [#3145](https://github.com/LazyVim/LazyVim/issues/3145) ([42010d1](https://github.com/LazyVim/LazyVim/commit/42010d1dfbb0ba9c74c1ec0c93c5c9db21ebee47))
+* **extras.lang.typescript:** support `node` debug type along with `pwa-node` ([#2983](https://github.com/LazyVim/LazyVim/issues/2983)) ([d36e3a5](https://github.com/LazyVim/LazyVim/commit/d36e3a5c73c07f54b31c4ec5334f68ed5492123e))
+* **fzf-native:** try rebuilding fzf-native when needed. Fixes [#2464](https://github.com/LazyVim/LazyVim/issues/2464) ([39901c1](https://github.com/LazyVim/LazyVim/commit/39901c1f00eca36beb211978164744ae41be7781))
+* **gitsigns:** update deprecated hunk nav mappings ([#2935](https://github.com/LazyVim/LazyVim/issues/2935)) ([fc5ee49](https://github.com/LazyVim/LazyVim/commit/fc5ee49495093fe8e63b1648f81af371c2930129))
+* **keymaps:** better up/down keymaps description ([#1909](https://github.com/LazyVim/LazyVim/issues/1909)) ([36802fe](https://github.com/LazyVim/LazyVim/commit/36802fea198f536ac20c0e2514fc4f54cee2904b))
+* **lazyfile:** exclude `filetypedetect` from skips ([#3004](https://github.com/LazyVim/LazyVim/issues/3004)) ([c54eeb5](https://github.com/LazyVim/LazyVim/commit/c54eeb53905e8da27814f52eaf1ad63aeff4cbe4))
+* **lsp:** check if `diagnostics.signs` is disabled by user ([#2897](https://github.com/LazyVim/LazyVim/issues/2897)) ([6a25450](https://github.com/LazyVim/LazyVim/commit/6a2545025eb6fcc78998b8a4c6d121729980925b))
+* **pretty_path:** properly escape `%` characters ([e89653f](https://github.com/LazyVim/LazyVim/commit/e89653f4107724f53964a379337947490117a7dc))
+* **rust:** update creates.nvim src option to completion ([#3149](https://github.com/LazyVim/LazyVim/issues/3149)) ([8087283](https://github.com/LazyVim/LazyVim/commit/8087283fea62e5673764dfa13906eadb24110622))
+
+
+### Performance Improvements
+
+* **startup:** render a file opened from the cmdline as soon as possible and get rid of lazy_file logic ([965a469](https://github.com/LazyVim/LazyVim/commit/965a469ca8cb1d58b49c4e5d8b85430e8c6c0a25))
+* **treesitter:** dont let nvim-treesitter-textobjects stall loading treesitter ([8301096](https://github.com/LazyVim/LazyVim/commit/8301096c31f9855c74d5b732367b679bc8721b5e))
+* **treesitter:** load treesitter early during startup when opening a file from the cmdline ([b29d169](https://github.com/LazyVim/LazyVim/commit/b29d169afb7560ed4a9276e4379e28ffaed1a171))
+* **yanky:** `schedule_wrap` sqlite push to history to prevent blocking Neovim on copy/paste ([9047d04](https://github.com/LazyVim/LazyVim/commit/9047d041a8296e34ed7236e5344f5b927cd28f8b))
+* **yanky:** remove performance optim for sqlite since it has been merged upstream ([f25ac50](https://github.com/LazyVim/LazyVim/commit/f25ac504b896a522c645d456766adac2afa28801))
+
 ## [10.24.0](https://github.com/LazyVim/LazyVim/compare/v10.23.0...v10.24.0) (2024-05-12)
 
 

NEWS.md

@@ -1,5 +1,52 @@
 # What's new?
 
+## 11.x
+
+- `:LazyExtras` now has multiple new sections:
+
+  - **Enabled**: extras that are currently enabled
+  - **Recommended Languages**: language extras recommended for the current buffer / directory
+  - **Recommended Plugins**: extras that are recommended for most users
+  - **Plugins**: other plugin extras
+  - **Languages**: other language extras
+
+- new option `vim.g.deprecation_warnings` to disable deprecation warnings
+  Defaults to `false`. To disable, set it to `true` in your `options.lua`
+
+- `vim-illuminate` move to extras
+  Document highlights now use native lsp functionality by default
+
+Since Neovim 0.10 has been released, I've been working on a new version of **LazyVim**
+that is fully compatible with all the latest Neovim features.
+
+Additionally, some core plugins have been moved to extras.
+
+- `native snippets` are now the default on Neovim 0.10
+  Older versions of Neovim will use the new `luasnip` extra.
+
+- `native comments` are now the default on Neovim 0.10
+  Older versions of Neovim will use the new `mini-comment` extra.
+  `nvim-ts-context-commentstring` has been integrated in the native comments.
+
+- `inlay hints` have been in **LazyVim** for a while, but are now
+  enabled by default. To disable them:
+
+  ```lua
+  {
+    "nvim-lspconfig",
+    opts = {
+      inlay_hints = { enabled = false },
+    }
+  }
+  ```
+
+- plugins moved to extras:
+
+  - `mini.ai` which I couldn't live without, but not everyone needs it
+  - `mini.surround`
+  - `mini.indentscope` scopes are now also highlighted with `indent-blankline`
+  - `nvim-treesitter-context`
+
 ## 10.x
 
 - added new extra for [mini.diff](https://github.com/echasnovski/mini.nvim/blob/main/readmes/mini-diff.md)

README-DE.md

@@ -5,11 +5,11 @@
 <hr>
 
 <h4 align="center">
-  <a href="https://lazyvim.github.io/installation">Install</a>
+  <a href="https://lazyvim.github.io/installation">Installieren</a>
   ·
-  <a href="https://lazyvim.github.io/configuration">Configure</a>
+  <a href="https://lazyvim.github.io/configuration">Konfigurieren</a>
   ·
-  <a href="https://lazyvim.github.io">Docs</a>
+  <a href="https://lazyvim.github.io">Dokumentation</a>
 </h4>
 
 <div align="center"><p>
@@ -36,8 +36,8 @@
     </a>
 </div>
 
-LazyVim ist ein Neovim setup aufgebaut auf [💤 lazy.nvim](https://github.com/folke/lazy.nvim). 
+LazyVim ist ein Neovim-Setup aufgebaut auf [💤 lazy.nvim](https://github.com/folke/lazy.nvim). 
-Es erleichter das Anpassen und erweitern von Ihrer Konfiguration.
+Es erleichtert das Anpassen und Erweitern von Ihrer Konfiguration.
 Anstatt von vorne anzufangen oder eine vorgefertigte Distro zu verwenden, gibt LazyVim das beste aus 
 beiden Welten - die Flexibilität Ihre Konfiguration zu verändern und einzustellen wie Sie es wollen
 und die Einfachheit von einem vorgefertigten Setup.
@@ -52,7 +52,7 @@ und die Einfachheit von einem vorgefertigten Setup.
 - 💤 Passe deine Konfiguration einfach an und erweitere diese mit [lazy.nvim](https://github.com/folke/lazy.nvim)
 - 🚀 Extrem schnell
 - 🧹 Logische Voreinstellungen für optionen, autocmds und keymaps
-- 📦 Kommt mit einem Haufen vor Konfigurierten, ready to use Plugins
+- 📦 Kommt mit einem Haufen vorkonfigurierter, ready-to-use Plugins
 
 ## ⚡️ Vorraussetzungen
 
@@ -108,15 +108,15 @@ docker run -w /root -it --rm alpine:edge sh -uelic '
 
 </details>
 
-## 📂 File Structure
+## 📂 Dateistruktur
 
-The files under config will be automatically loaded at the appropriate time,
+Die Dateien unter `config` werden automatisch und zur richtigen Zeit geladen,
-so you don't need to require those files manually.
+sodass ein manuelles `require` nicht nötig ist.
-**LazyVim** comes with a set of default config files that will be loaded
+**LazyVim** bringt Konfigurationsdatein mit, die **_vor_** Ihren eigenen geladen werden -
-**_before_** your own. See [here](https://github.com/LazyVim/LazyVim/tree/main/lua/lazyvim/config)
+siehe [hier](https://github.com/LazyVim/LazyVim/tree/main/lua/lazyvim/config)
-
+Sie können eigene Plugins unter `lua/plugins/` hinzufügen. Alle Dateien innerhalb
-You can add your custom plugin specs under `lua/plugins/`. All files there
+dieses Ordners werden automatisch mit [lazy.nvim](https://github.com/folke/lazy.nvim)
-will be automatically loaded by [lazy.nvim](https://github.com/folke/lazy.nvim)
+geladen.
 
 <pre>
 ~/.config/nvim
@@ -133,6 +133,6 @@ will be automatically loaded by [lazy.nvim](https://github.com/folke/lazy.nvim)
 └── init.toml
 </pre>
 
-## ⚙️ Configuration
+## ⚙️ Konfiguration
 
-Refer to the [docs](https://lazyvim.github.io)
+Siehe [Dokumentation](https://lazyvim.github.io).

doc/LazyVim.txt

@@ -1,4 +1,4 @@
-*LazyVim.txt*           For Neovim >= 0.9.0           Last change: 2024 May 13
+*LazyVim.txt*           For Neovim >= 0.9.0           Last change: 2024 May 18
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

lua/lazyvim/config/autocmds.lua

@@ -59,7 +59,6 @@ vim.api.nvim_create_autocmd("FileType", {
     "lspinfo",
     "notify",
     "qf",
-    "query",
     "spectre_panel",
     "startuptime",
     "tsplayground",

lua/lazyvim/config/init.lua

@@ -275,6 +275,10 @@ function M.init()
   -- after installing missing plugins
   M.load("options")
 
+  if vim.g.deprecation_warnings == false then
+    vim.deprecate = function() end
+  end
+
   LazyVim.plugin.setup()
   M.json.load()
 end

lua/lazyvim/config/keymaps.lua

@@ -5,10 +5,10 @@
 local map = LazyVim.safe_keymap_set
 
 -- better up/down
-map({ "n", "x" }, "j", "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
+map({ "n", "x" }, "j", "v:count == 0 ? 'gj' : 'j'", { desc = "Down", expr = true, silent = true })
-map({ "n", "x" }, "<Down>", "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
+map({ "n", "x" }, "<Down>", "v:count == 0 ? 'gj' : 'j'", { desc = "Down", expr = true, silent = true })
-map({ "n", "x" }, "k", "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
+map({ "n", "x" }, "k", "v:count == 0 ? 'gk' : 'k'", { desc = "Up", expr = true, silent = true })
-map({ "n", "x" }, "<Up>", "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
+map({ "n", "x" }, "<Up>", "v:count == 0 ? 'gk' : 'k'", { desc = "Up", expr = true, silent = true })
 
 -- Move to window using the <ctrl> hjkl keys
 map("n", "<C-h>", "<C-w>h", { desc = "Go to Left Window", remap = true })
@@ -37,6 +37,8 @@ map("n", "[b", "<cmd>bprevious<cr>", { desc = "Prev Buffer" })
 map("n", "]b", "<cmd>bnext<cr>", { desc = "Next Buffer" })
 map("n", "<leader>bb", "<cmd>e #<cr>", { desc = "Switch to Other Buffer" })
 map("n", "<leader>`", "<cmd>e #<cr>", { desc = "Switch to Other Buffer" })
+map("n", "<leader>bd", LazyVim.ui.bufremove, { desc = "Delete Buffer" })
+map("n", "<leader>bD", "<cmd>:bd<cr>", { desc = "Delete Buffer and Window" })
 
 -- Clear search with <esc>
 map({ "i", "n" }, "<esc>", "<cmd>noh<cr><esc>", { desc = "Escape and Clear hlsearch" })
@@ -139,6 +141,7 @@ map("n", "<leader>qq", "<cmd>qa<cr>", { desc = "Quit All" })
 
 -- highlights under cursor
 map("n", "<leader>ui", vim.show_pos, { desc = "Inspect Pos" })
+map("n", "<leader>uI", "<cmd>InspectTree<cr>", { desc = "Inspect Tree" })
 
 -- LazyVim Changelog
 map("n", "<leader>L", function() LazyVim.news.changelog() end, { desc = "LazyVim Changelog" })

lua/lazyvim/config/options.lua

@@ -2,7 +2,7 @@
 vim.g.mapleader = " "
 vim.g.maplocalleader = "\\"
 
--- Enable LazyVim auto format
+-- LazyVim auto format
 vim.g.autoformat = true
 
 -- LazyVim root dir detection
@@ -25,21 +25,30 @@ vim.g.lazygit_config = true
 -- * powershell
 -- LazyVim.terminal.setup("pwsh")
 
+-- Hide deprecation warnings
+vim.g.deprecation_warnings = false
+
 local opt = vim.opt
 
 opt.autowrite = true -- Enable auto write
-
-if not vim.env.SSH_TTY then
 -- only set clipboard if not in ssh, to make sure the OSC 52
 -- integration works automatically. Requires Neovim >= 0.10.0
-  opt.clipboard = "unnamedplus" -- Sync with system clipboard
+opt.clipboard = vim.env.SSH_TTY and "" or "unnamedplus" -- Sync with system clipboard
-end
-
 opt.completeopt = "menu,menuone,noselect"
 opt.conceallevel = 2 -- Hide * markup for bold and italic, but not markers with substitutions
 opt.confirm = true -- Confirm to save changes before exiting modified buffer
 opt.cursorline = true -- Enable highlighting of the current line
 opt.expandtab = true -- Use spaces instead of tabs
+opt.fillchars = {
+  foldopen = "",
+  foldclose = "",
+  fold = " ",
+  foldsep = " ",
+  diff = "╱",
+  eob = " ",
+}
+opt.foldlevel = 99
+opt.formatexpr = "v:lua.require'lazyvim.util'.format.formatexpr()"
 opt.formatoptions = "jcroqlnt" -- tcqj
 opt.grepformat = "%f:%l:%c:%m"
 opt.grepprg = "rg --vimgrep"
@@ -66,11 +75,10 @@ opt.spelllang = { "en" }
 opt.splitbelow = true -- Put new windows below current
 opt.splitkeep = "screen"
 opt.splitright = true -- Put new windows right of current
+opt.statuscolumn = [[%!v:lua.require'lazyvim.util'.ui.statuscolumn()]]
 opt.tabstop = 2 -- Number of spaces tabs count for
 opt.termguicolors = true -- True color support
-if not vim.g.vscode then
+opt.timeoutlen = vim.g.vscode and 1000 or 300 -- Lower than default (1000) to quickly trigger which-key
-  opt.timeoutlen = 300 -- Lower than default (1000) to quickly trigger which-key
-end
 opt.undofile = true
 opt.undolevels = 10000
 opt.updatetime = 200 -- Save swap file and trigger CursorHold
@@ -78,38 +86,16 @@ opt.virtualedit = "block" -- Allow cursor to move where there is no text in visu
 opt.wildmode = "longest:full,full" -- Command-line completion mode
 opt.winminwidth = 5 -- Minimum window width
 opt.wrap = false -- Disable line wrap
-opt.fillchars = {
-  foldopen = "",
-  foldclose = "",
-  fold = " ",
-  foldsep = " ",
-  diff = "╱",
-  eob = " ",
-}
 
 if vim.fn.has("nvim-0.10") == 1 then
   opt.smoothscroll = true
-end
+  opt.foldexpr = "v:lua.require'lazyvim.util'.ui.foldexpr()"
-
+  opt.foldmethod = "expr"
--- Folding
+  opt.foldtext = ""
-vim.opt.foldlevel = 99
-
-if vim.fn.has("nvim-0.9.0") == 1 then
-  vim.opt.statuscolumn = [[%!v:lua.require'lazyvim.util'.ui.statuscolumn()]]
-  vim.opt.foldtext = "v:lua.require'lazyvim.util'.ui.foldtext()"
-end
-
--- HACK: causes freezes on <= 0.9, so only enable on >= 0.10 for now
-if vim.fn.has("nvim-0.10") == 1 then
-  vim.opt.foldmethod = "expr"
-  vim.opt.foldexpr = "v:lua.require'lazyvim.util'.ui.foldexpr()"
-  vim.opt.foldtext = ""
-  vim.opt.fillchars = "fold: "
 else
-  vim.opt.foldmethod = "indent"
+  opt.foldmethod = "indent"
+  opt.foldtext = "v:lua.require'lazyvim.util'.ui.foldtext()"
 end
 
-vim.o.formatexpr = "v:lua.require'lazyvim.util'.format.formatexpr()"
-
 -- Fix markdown indentation settings
 vim.g.markdown_recommended_style = 0

lua/lazyvim/health.lua

@@ -10,6 +10,9 @@ function M.check()
 
   if vim.fn.has("nvim-0.9.0") == 1 then
     ok("Using Neovim >= 0.9.0")
+    if vim.fn.has("nvim-0.10.0") == 0 then
+      warn("Use Neovim >= 0.10.0 for the best experience")
+    end
   else
     error("Neovim >= 0.9.0 is required")
   end

lua/lazyvim/plugins/coding.lua

@@ -83,59 +83,78 @@ return {
         end
         local entry = event.entry
         local item = entry:get_completion_item()
-        if vim.tbl_contains({ Kind.Function, Kind.Method }, item.kind) then
+        if vim.tbl_contains({ Kind.Function, Kind.Method }, item.kind) and item.insertTextFormat ~= 2 then
+          local cursor = vim.api.nvim_win_get_cursor(0)
+          local prev_char = vim.api.nvim_buf_get_text(0, cursor[1] - 1, cursor[2], cursor[1] - 1, cursor[2] + 1, {})[1]
+          if prev_char ~= "(" and prev_char ~= ")" then
             local keys = vim.api.nvim_replace_termcodes("()<left>", false, false, true)
             vim.api.nvim_feedkeys(keys, "i", true)
           end
+        end
       end)
     end,
   },
 
   -- snippets
-  {
+  vim.fn.has("nvim-0.10") == 1
-    "L3MON4D3/LuaSnip",
+      and {
-    build = (not LazyVim.is_win())
-        and "echo 'NOTE: jsregexp is optional, so not a big deal if it fails to build'; make install_jsregexp"
-      or nil,
-    dependencies = {
-      {
-        "rafamadriz/friendly-snippets",
-        config = function()
-          require("luasnip.loaders.from_vscode").lazy_load()
-        end,
-      },
-      {
         "nvim-cmp",
         dependencies = {
-          "saadparwaiz1/cmp_luasnip",
+          { "rafamadriz/friendly-snippets" },
+          { "garymjr/nvim-snippets", opts = { friendly_snippets = true } },
         },
         opts = function(_, opts)
           opts.snippet = {
             expand = function(args)
-              require("luasnip").lsp_expand(args.body)
+              vim.snippet.expand(args.body)
             end,
           }
-          table.insert(opts.sources, { name = "luasnip" })
+          table.insert(opts.sources, { name = "snippets" })
         end,
-      },
-    },
-    opts = {
-      history = true,
-      delete_check_events = "TextChanged",
-    },
-    -- stylua: ignore
         keys = {
           {
-        "<tab>",
+            "<Tab>",
             function()
-          return require("luasnip").jumpable(1) and "<Plug>luasnip-jump-next" or "<tab>"
+              if vim.snippet.active({ direction = 1 }) then
+                vim.schedule(function()
+                  vim.snippet.jump(1)
+                end)
+                return
+              end
+              return "<Tab>"
             end,
-        expr = true, silent = true, mode = "i",
+            expr = true,
+            silent = true,
+            mode = "i",
           },
-      { "<tab>", function() require("luasnip").jump(1) end, mode = "s" },
+          {
-      { "<s-tab>", function() require("luasnip").jump(-1) end, mode = { "i", "s" } },
+            "<Tab>",
+            function()
+              vim.schedule(function()
+                vim.snippet.jump(1)
+              end)
+            end,
+            silent = true,
+            mode = "s",
+          },
+          {
+            "<S-Tab>",
+            function()
+              if vim.snippet.active({ direction = -1 }) then
+                vim.schedule(function()
+                  vim.snippet.jump(-1)
+                end)
+                return
+              end
+              return "<S-Tab>"
+            end,
+            expr = true,
+            silent = true,
+            mode = { "i", "s" },
           },
         },
+      }
+    or { import = "lazyvim.plugins.extras.coding.luasnip", enabled = vim.fn.has("nvim-0.10") == 0 },
 
   -- auto pairs
   {
@@ -162,43 +181,6 @@ return {
     },
   },
 
-  -- Fast and feature-rich surround actions. For text that includes
-  -- surrounding characters like brackets or quotes, this allows you
-  -- to select the text inside, change or modify the surrounding characters,
-  -- and more.
-  {
-    "echasnovski/mini.surround",
-    keys = function(_, keys)
-      -- Populate the keys based on the user's options
-      local plugin = require("lazy.core.config").spec.plugins["mini.surround"]
-      local opts = require("lazy.core.plugin").values(plugin, "opts", false)
-      local mappings = {
-        { opts.mappings.add, desc = "Add Surrounding", mode = { "n", "v" } },
-        { opts.mappings.delete, desc = "Delete Surrounding" },
-        { opts.mappings.find, desc = "Find Right Surrounding" },
-        { opts.mappings.find_left, desc = "Find Left Surrounding" },
-        { opts.mappings.highlight, desc = "Highlight Surrounding" },
-        { opts.mappings.replace, desc = "Replace Surrounding" },
-        { opts.mappings.update_n_lines, desc = "Update `MiniSurround.config.n_lines`" },
-      }
-      mappings = vim.tbl_filter(function(m)
-        return m[1] and #m[1] > 0
-      end, mappings)
-      return vim.list_extend(mappings, keys)
-    end,
-    opts = {
-      mappings = {
-        add = "gsa", -- Add surrounding in Normal and Visual modes
-        delete = "gsd", -- Delete surrounding
-        find = "gsf", -- Find surrounding (to the right)
-        find_left = "gsF", -- Find surrounding (to the left)
-        highlight = "gsh", -- Highlight surrounding
-        replace = "gsr", -- Replace surrounding
-        update_n_lines = "gsn", -- Update `n_lines`
-      },
-    },
-  },
-
   -- comments
   {
     "JoosepAlviste/nvim-ts-context-commentstring",
@@ -206,112 +188,20 @@ return {
     opts = {
       enable_autocmd = false,
     },
-  },
+    init = function()
-  {
+      if vim.fn.has("nvim-0.10") == 1 then
-    "echasnovski/mini.comment",
+        vim.schedule(function()
-    event = "VeryLazy",
+          local get_option = vim.filetype.get_option
-    opts = {
+          vim.filetype.get_option = function(filetype, option)
-      options = {
+            return option == "commentstring" and require("ts_context_commentstring.internal").calculate_commentstring()
-        custom_commentstring = function()
+              or get_option(filetype, option)
-          return require("ts_context_commentstring.internal").calculate_commentstring() or vim.bo.commentstring
-        end,
-      },
-    },
-  },
-
-  -- Better text-objects
-  {
-    "echasnovski/mini.ai",
-    -- keys = {
-    --   { "a", mode = { "x", "o" } },
-    --   { "i", mode = { "x", "o" } },
-    -- },
-    event = "VeryLazy",
-    opts = function()
-      local ai = require("mini.ai")
-      return {
-        n_lines = 500,
-        custom_textobjects = {
-          o = ai.gen_spec.treesitter({
-            a = { "@block.outer", "@conditional.outer", "@loop.outer" },
-            i = { "@block.inner", "@conditional.inner", "@loop.inner" },
-          }, {}),
-          f = ai.gen_spec.treesitter({ a = "@function.outer", i = "@function.inner" }, {}),
-          c = ai.gen_spec.treesitter({ a = "@class.outer", i = "@class.inner" }, {}),
-          t = { "<([%p%w]-)%f[^<%w][^<>]->.-</%1>", "^<.->().*()</[^/]->$" },
-          d = { "%f[%d]%d+" }, -- digits
-          e = { -- Word with case
-            {
-              "%u[%l%d]+%f[^%l%d]",
-              "%f[%S][%l%d]+%f[^%l%d]",
-              "%f[%P][%l%d]+%f[^%l%d]",
-              "^[%l%d]+%f[^%l%d]",
-            },
-            "^().*()$",
-          },
-          g = function() -- Whole buffer, similar to `gg` and 'G' motion
-            local from = { line = 1, col = 1 }
-            local to = {
-              line = vim.fn.line("$"),
-              col = math.max(vim.fn.getline("$"):len(), 1),
-            }
-            return { from = from, to = to }
-          end,
-          u = ai.gen_spec.function_call(), -- u for "Usage"
-          U = ai.gen_spec.function_call({ name_pattern = "[%w_]" }), -- without dot in function name
-        },
-      }
-    end,
-    config = function(_, opts)
-      require("mini.ai").setup(opts)
-      -- register all text objects with which-key
-      LazyVim.on_load("which-key.nvim", function()
-        ---@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",
-          o = "Block, conditional, loop",
-          q = "Quote `, \", '",
-          t = "Tag",
-          u = "Use/call function & method",
-          U = "Use/call without dot in name",
-        }
-        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)
-        end
-        require("which-key").register({
-          mode = { "o", "x" },
-          i = i,
-          a = a,
-        })
         end)
+      end
     end,
   },
+  {
+    import = "lazyvim.plugins.extras.coding.mini-comment",
+    enabled = vim.fn.has("nvim-0.10") == 0,
+  },
 }

lua/lazyvim/plugins/editor.lua

@@ -391,8 +391,10 @@ return {
         end
 
         -- stylua: ignore start
-        map("n", "]h", gs.next_hunk, "Next Hunk")
+        map("n", "]h", function() gs.nav_hunk("next") end, "Next Hunk")
-        map("n", "[h", gs.prev_hunk, "Prev Hunk")
+        map("n", "[h", function() gs.nav_hunk("prev") end, "Prev Hunk")
+        map("n", "]H", function() gs.nav_hunk("last") end, "Last Hunk")
+        map("n", "[H", function() gs.nav_hunk("first") end, "First Hunk")
         map({ "n", "v" }, "<leader>ghs", ":Gitsigns stage_hunk<CR>", "Stage Hunk")
         map({ "n", "v" }, "<leader>ghr", ":Gitsigns reset_hunk<CR>", "Reset Hunk")
         map("n", "<leader>ghS", gs.stage_buffer, "Stage Buffer")
@@ -407,74 +409,6 @@ return {
     },
   },
 
-  -- Automatically highlights other instances of the word under your cursor.
-  -- This works with LSP, Treesitter, and regexp matching to find the other
-  -- instances.
-  {
-    "RRethy/vim-illuminate",
-    event = "LazyFile",
-    opts = {
-      delay = 200,
-      large_file_cutoff = 2000,
-      large_file_overrides = {
-        providers = { "lsp" },
-      },
-    },
-    config = function(_, opts)
-      require("illuminate").configure(opts)
-
-      local function map(key, dir, buffer)
-        vim.keymap.set("n", key, function()
-          require("illuminate")["goto_" .. dir .. "_reference"](false)
-        end, { desc = dir:sub(1, 1):upper() .. dir:sub(2) .. " Reference", buffer = buffer })
-      end
-
-      map("]]", "next")
-      map("[[", "prev")
-
-      -- also set it after loading ftplugins, since a lot overwrite [[ and ]]
-      vim.api.nvim_create_autocmd("FileType", {
-        callback = function()
-          local buffer = vim.api.nvim_get_current_buf()
-          map("]]", "next", buffer)
-          map("[[", "prev", buffer)
-        end,
-      })
-    end,
-    keys = {
-      { "]]", desc = "Next Reference" },
-      { "[[", desc = "Prev Reference" },
-    },
-  },
-
-  -- buffer remove
-  {
-    "echasnovski/mini.bufremove",
-
-    keys = {
-      {
-        "<leader>bd",
-        function()
-          local bd = require("mini.bufremove").delete
-          if vim.bo.modified then
-            local choice = vim.fn.confirm(("Save changes to %q?"):format(vim.fn.bufname()), "&Yes\n&No\n&Cancel")
-            if choice == 1 then -- Yes
-              vim.cmd.write()
-              bd(0)
-            elseif choice == 2 then -- No
-              bd(0, true)
-            end
-          else
-            bd(0)
-          end
-        end,
-        desc = "Delete Buffer",
-      },
-      -- stylua: ignore
-      { "<leader>bD", function() require("mini.bufremove").delete(0, true) end, desc = "Delete Buffer (Force)" },
-    },
-  },
-
   -- better diagnostics list and others
   {
     "folke/trouble.nvim",

lua/lazyvim/plugins/extras/coding/copilot.lua

@@ -1,5 +1,5 @@
 return {
-
+  recommended = true,
   -- copilot
   {
     "zbirenbaum/copilot.lua",

lua/lazyvim/plugins/extras/coding/luasnip.lua

@@ -0,0 +1,44 @@
+return {
+  "L3MON4D3/LuaSnip",
+  build = (not LazyVim.is_win())
+      and "echo 'NOTE: jsregexp is optional, so not a big deal if it fails to build'; make install_jsregexp"
+    or nil,
+  dependencies = {
+    {
+      "rafamadriz/friendly-snippets",
+      config = function()
+        require("luasnip.loaders.from_vscode").lazy_load()
+      end,
+    },
+    {
+      "nvim-cmp",
+      dependencies = {
+        "saadparwaiz1/cmp_luasnip",
+      },
+      opts = function(_, opts)
+        opts.snippet = {
+          expand = function(args)
+            require("luasnip").lsp_expand(args.body)
+          end,
+        }
+        table.insert(opts.sources, { name = "luasnip" })
+      end,
+    },
+  },
+  opts = {
+    history = true,
+    delete_check_events = "TextChanged",
+  },
+    -- stylua: ignore
+    keys = {
+      {
+        "<tab>",
+        function()
+          return require("luasnip").jumpable(1) and "<Plug>luasnip-jump-next" or "<tab>"
+        end,
+        expr = true, silent = true, mode = "i",
+      },
+      { "<tab>", function() require("luasnip").jump(1) end, mode = "s" },
+      { "<s-tab>", function() require("luasnip").jump(-1) end, mode = { "i", "s" } },
+    },
+}

lua/lazyvim/plugins/extras/coding/mini-ai.lua

@@ -0,0 +1,97 @@
+-- Better text-objects
+return {
+  "echasnovski/mini.ai",
+  desc = "Enhanced text objects",
+  recommended = true,
+  -- keys = {
+  --   { "a", mode = { "x", "o" } },
+  --   { "i", mode = { "x", "o" } },
+  -- },
+  event = "VeryLazy",
+  opts = function()
+    local ai = require("mini.ai")
+    return {
+      n_lines = 500,
+      custom_textobjects = {
+        o = ai.gen_spec.treesitter({
+          a = { "@block.outer", "@conditional.outer", "@loop.outer" },
+          i = { "@block.inner", "@conditional.inner", "@loop.inner" },
+        }, {}),
+        f = ai.gen_spec.treesitter({ a = "@function.outer", i = "@function.inner" }, {}),
+        c = ai.gen_spec.treesitter({ a = "@class.outer", i = "@class.inner" }, {}),
+        t = { "<([%p%w]-)%f[^<%w][^<>]->.-</%1>", "^<.->().*()</[^/]->$" },
+        d = { "%f[%d]%d+" }, -- digits
+        e = { -- Word with case
+          {
+            "%u[%l%d]+%f[^%l%d]",
+            "%f[%S][%l%d]+%f[^%l%d]",
+            "%f[%P][%l%d]+%f[^%l%d]",
+            "^[%l%d]+%f[^%l%d]",
+          },
+          "^().*()$",
+        },
+        g = function() -- Whole buffer, similar to `gg` and 'G' motion
+          local from = { line = 1, col = 1 }
+          local to = {
+            line = vim.fn.line("$"),
+            col = math.max(vim.fn.getline("$"):len(), 1),
+          }
+          return { from = from, to = to }
+        end,
+        u = ai.gen_spec.function_call(), -- u for "Usage"
+        U = ai.gen_spec.function_call({ name_pattern = "[%w_]" }), -- without dot in function name
+      },
+    }
+  end,
+  config = function(_, opts)
+    require("mini.ai").setup(opts)
+    -- register all text objects with which-key
+    LazyVim.on_load("which-key.nvim", function()
+      ---@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",
+        o = "Block, conditional, loop",
+        q = "Quote `, \", '",
+        t = "Tag",
+        u = "Use/call function & method",
+        U = "Use/call without dot in name",
+      }
+      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)
+      end
+      require("which-key").register({
+        mode = { "o", "x" },
+        i = i,
+        a = a,
+      })
+    end)
+  end,
+}

lua/lazyvim/plugins/extras/coding/mini-comment.lua

@@ -0,0 +1,13 @@
+return {
+  {
+    "echasnovski/mini.comment",
+    event = "VeryLazy",
+    opts = {
+      options = {
+        custom_commentstring = function()
+          return require("ts_context_commentstring.internal").calculate_commentstring() or vim.bo.commentstring
+        end,
+      },
+    },
+  },
+}

lua/lazyvim/plugins/extras/coding/mini-surround.lua

@@ -0,0 +1,36 @@
+-- Fast and feature-rich surround actions. For text that includes
+-- surrounding characters like brackets or quotes, this allows you
+-- to select the text inside, change or modify the surrounding characters,
+-- and more.
+return {
+  "echasnovski/mini.surround",
+  recommended = true,
+  keys = function(_, keys)
+    -- Populate the keys based on the user's options
+    local opts = LazyVim.opts("mini.surround")
+    local mappings = {
+      { opts.mappings.add, desc = "Add Surrounding", mode = { "n", "v" } },
+      { opts.mappings.delete, desc = "Delete Surrounding" },
+      { opts.mappings.find, desc = "Find Right Surrounding" },
+      { opts.mappings.find_left, desc = "Find Left Surrounding" },
+      { opts.mappings.highlight, desc = "Highlight Surrounding" },
+      { opts.mappings.replace, desc = "Replace Surrounding" },
+      { opts.mappings.update_n_lines, desc = "Update `MiniSurround.config.n_lines`" },
+    }
+    mappings = vim.tbl_filter(function(m)
+      return m[1] and #m[1] > 0
+    end, mappings)
+    return vim.list_extend(mappings, keys)
+  end,
+  opts = {
+    mappings = {
+      add = "gsa", -- Add surrounding in Normal and Visual modes
+      delete = "gsd", -- Delete surrounding
+      find = "gsf", -- Find surrounding (to the right)
+      find_left = "gsF", -- Find surrounding (to the left)
+      highlight = "gsh", -- Highlight surrounding
+      replace = "gsr", -- Replace surrounding
+      update_n_lines = "gsn", -- Update `n_lines`
+    },
+  },
+}

lua/lazyvim/plugins/extras/coding/native_snippets.lua

@@ -1,64 +0,0 @@
-if not vim.snippet then
-  LazyVim.warn("Native snippets are only supported on Neovim >= 0.10.0")
-  return {}
-end
-
-return {
-  desc = "Use native snippets instead of LuaSnip. Only works on Neovim >= 0.10!",
-  {
-    "L3MON4D3/LuaSnip",
-    enabled = false,
-  },
-  {
-    "nvim-cmp",
-    opts = {
-      snippet = {
-        expand = function(args)
-          vim.snippet.expand(args.body)
-        end,
-      },
-    },
-    keys = {
-      {
-        "<Tab>",
-        function()
-          if vim.snippet.active({ direction = 1 }) then
-            vim.schedule(function()
-              vim.snippet.jump(1)
-            end)
-            return
-          end
-          return "<Tab>"
-        end,
-        expr = true,
-        silent = true,
-        mode = "i",
-      },
-      {
-        "<Tab>",
-        function()
-          vim.schedule(function()
-            vim.snippet.jump(1)
-          end)
-        end,
-        silent = true,
-        mode = "s",
-      },
-      {
-        "<S-Tab>",
-        function()
-          if vim.snippet.active({ direction = -1 }) then
-            vim.schedule(function()
-              vim.snippet.jump(-1)
-            end)
-            return
-          end
-          return "<S-Tab>"
-        end,
-        expr = true,
-        silent = true,
-        mode = { "i", "s" },
-      },
-    },
-  },
-}

lua/lazyvim/plugins/extras/coding/yanky.lua

@@ -1,11 +1,10 @@
-return {
 -- better yank/paste
-  {
+return {
   "gbprod/yanky.nvim",
-    dependencies = not LazyVim.is_win() and { "kkharji/sqlite.lua" } or {},
+  recommended = true,
+  desc = "Better Yank/Paste",
   opts = {
-      highlight = { timer = 250 },
+    highlight = { timer = 150 },
-      ring = { storage = LazyVim.is_win() and "shada" or "sqlite" },
   },
   keys = {
         -- stylua: ignore
@@ -28,5 +27,4 @@ return {
     { "=p", "<Plug>(YankyPutAfterFilter)", desc = "Put After Applying a Filter" },
     { "=P", "<Plug>(YankyPutBeforeFilter)", desc = "Put Before Applying a Filter" },
   },
-  },
 }

lua/lazyvim/plugins/extras/dap/core.lua

@@ -12,6 +12,8 @@ end
 
 return {
   "mfussenegger/nvim-dap",
+  recommended = true,
+  desc = "Debugging support. Requires language specific adapters to be configured. (see lang extras)",
 
   dependencies = {
 
@@ -26,8 +28,6 @@ return {
       },
       opts = {},
       config = function(_, opts)
-        -- setup dap config by VsCode launch.json file
-        -- require("dap.ext.vscode").load_launchjs()
         local dap = require("dap")
         local dapui = require("dapui")
         dapui.setup(opts)
@@ -81,6 +81,11 @@ return {
         },
       },
     },
+
+    -- VsCode launch.json parser
+    {
+      "folke/neoconf.nvim",
+    },
   },
 
   -- stylua: ignore
@@ -115,5 +120,18 @@ return {
         { text = sign[1], texthl = sign[2] or "DiagnosticInfo", linehl = sign[3], numhl = sign[3] }
       )
     end
+
+    -- setup dap config by VsCode launch.json file
+    local vscode = require("dap.ext.vscode")
+    local _filetypes = require("mason-nvim-dap.mappings.filetypes")
+    local filetypes = vim.tbl_deep_extend("force", _filetypes, {
+      ["node"] = { "javascriptreact", "typescriptreact", "typescript", "javascript" },
+      ["pwa-node"] = { "javascriptreact", "typescriptreact", "typescript", "javascript" },
+    })
+    local json = require("plenary.json")
+    vscode.json_decode = function(str)
+      return vim.json.decode(json.json_strip_comments(str))
+    end
+    vscode.load_launchjs(nil, filetypes)
   end,
 }

lua/lazyvim/plugins/extras/editor/dial.lua

@@ -5,7 +5,9 @@ M.dials_by_ft = {}
 ---@param increment boolean
 ---@param g? boolean
 function M.dial(increment, g)
-  local is_visual = vim.fn.mode(true):sub(1, 1) == "v"
+  local mode = vim.fn.mode(true)
+  -- Use visual commands for VISUAL 'v', VISUAL LINE 'V' and VISUAL BLOCK '\22'
+  local is_visual = mode == "v" or mode == "V" or mode == "\22"
   local func = (increment and "inc" or "dec") .. (g and "_g" or "_") .. (is_visual and "visual" or "normal")
   local group = M.dials_by_ft[vim.bo.filetype] or "default"
   return require("dial.map")[func](group)
@@ -13,6 +15,8 @@ end
 
 return {
   "monaqa/dial.nvim",
+  recommended = true,
+  desc = "Increment and decrement numbers, dates, and more",
   -- stylua: ignore
   keys = {
     { "<C-a>", function() return M.dial(true) end, expr = true, desc = "Increment", mode = {"n", "v"} },

lua/lazyvim/plugins/extras/editor/illuminate.lua

@@ -0,0 +1,45 @@
+-- Automatically highlights other instances of the word under your cursor.
+-- This works with LSP, Treesitter, and regexp matching to find the other
+-- instances.
+return {
+  {
+    "RRethy/vim-illuminate",
+    event = "LazyFile",
+    opts = {
+      delay = 200,
+      large_file_cutoff = 2000,
+      large_file_overrides = {
+        providers = { "lsp" },
+      },
+    },
+    config = function(_, opts)
+      require("illuminate").configure(opts)
+
+      local function map(key, dir, buffer)
+        vim.keymap.set("n", key, function()
+          require("illuminate")["goto_" .. dir .. "_reference"](false)
+        end, { desc = dir:sub(1, 1):upper() .. dir:sub(2) .. " Reference", buffer = buffer })
+      end
+
+      map("]]", "next")
+      map("[[", "prev")
+
+      -- also set it after loading ftplugins, since a lot overwrite [[ and ]]
+      vim.api.nvim_create_autocmd("FileType", {
+        callback = function()
+          local buffer = vim.api.nvim_get_current_buf()
+          map("]]", "next", buffer)
+          map("[[", "prev", buffer)
+        end,
+      })
+    end,
+    keys = {
+      { "]]", desc = "Next Reference" },
+      { "[[", desc = "Prev Reference" },
+    },
+  },
+  {
+    "neovim/nvim-lspconfig",
+    opts = { document_highlight = { enabed = false } },
+  },
+}

lua/lazyvim/plugins/extras/editor/leap.lua

@@ -38,6 +38,7 @@ return {
   -- rename surround mappings from gs to gz to prevent conflict with leap
   {
     "echasnovski/mini.surround",
+    optional = true,
     opts = {
       mappings = {
         add = "gza", -- Add surrounding in Normal and Visual modes
@@ -50,6 +51,15 @@ return {
       },
     },
   },
+  {
+    "folke/which-key.nvim",
+    optional = true,
+    opts = {
+      defaults = {
+        ["gz"] = { name = "+surround" },
+      },
+    },
+  },
 
   -- makes some plugins dot-repeatable like leap
   { "tpope/vim-repeat", event = "VeryLazy" },

lua/lazyvim/plugins/extras/editor/refactoring.lua

@@ -122,4 +122,15 @@ return {
       end
     end,
   },
+
+  -- which key integration
+  {
+    "folke/which-key.nvim",
+    optional = true,
+    opts = {
+      defaults = {
+        ["<leader>r"] = { name = "+refactor" },
+      },
+    },
+  },
 }

lua/lazyvim/plugins/extras/editor/trouble-v3.lua

@@ -12,9 +12,18 @@ if vim.tbl_contains(Config.json.data.extras, "lazyvim.plugins.extras.editor.trou
       })
     end
   end
+  if vim.fn.has("nvim-0.9.2") == 0 then
+    LazyVim.error({
+      "Trouble v3 requires Neovim >= 0.9.2",
+      "Please update your Neovim version.",
+    })
+    return {}
+  end
 end
 
 return {
+  desc = "Trouble rewrite including document symbols and a lualine component",
+  recommended = true,
   {
     "folke/trouble.nvim",
     branch = "dev",

lua/lazyvim/plugins/extras/lang/ansible.lua

@@ -1,4 +1,10 @@
 return {
+  recommended = function()
+    return LazyVim.extras.wants({
+      ft = "yaml.ansible",
+      root = { "ansible.cfg", ".ansible-lint" },
+    })
+  end,
   {
     "nvim-treesitter/nvim-treesitter",
     opts = function(_, opts)

lua/lazyvim/plugins/extras/lang/clangd.lua

@@ -1,4 +1,17 @@
 return {
+  recommended = function()
+    return LazyVim.extras.wants({
+      ft = { "c", "cpp", "objc", "objcpp", "cuda", "proto" },
+      root = {
+        ".clangd",
+        ".clang-tidy",
+        ".clang-format",
+        "compile_commands.json",
+        "compile_flags.txt",
+        "configure.ac", -- AutoTools
+      },
+    })
+  end,
 
   -- Add C/C++ to treesitter
   {
@@ -144,7 +157,7 @@ return {
             type = "codelldb",
             request = "attach",
             name = "Attach to process",
-            processId = require("dap.utils").pick_process,
+            pid = require("dap.utils").pick_process,
             cwd = "${workspaceFolder}",
           },
         }

lua/lazyvim/plugins/extras/lang/cmake.lua

@@ -1,4 +1,10 @@
 return {
+  recommended = function()
+    return LazyVim.extras.wants({
+      ft = "cmake",
+      root = { "CMakePresets.json", "CTestConfig.cmake", "cmake" },
+    })
+  end,
   {
     "nvim-treesitter/nvim-treesitter",
     opts = function(_, opts)

lua/lazyvim/plugins/extras/lang/docker.lua

@@ -1,4 +1,10 @@
 return {
+  recommended = function()
+    return LazyVim.extras.wants({
+      ft = "dockerfile",
+      root = { "Dockerfile", "docker-compose.yml", "compose.yml", "docker-compose.yaml", "compose.yaml" },
+    })
+  end,
   {
     "nvim-treesitter/nvim-treesitter",
     opts = function(_, opts)

lua/lazyvim/plugins/extras/lang/elixir.lua

@@ -1,4 +1,10 @@
 return {
+  recommended = function()
+    return LazyVim.extras.wants({
+      ft = { "elixir", "eelixir", "heex", "surface" },
+      root = "mix.exs",
+    })
+  end,
   {
     "nvim-treesitter/nvim-treesitter",
     opts = function(_, opts)

lua/lazyvim/plugins/extras/lang/go.lua

@@ -1,4 +1,10 @@
 return {
+  recommended = function()
+    return LazyVim.extras.wants({
+      ft = { "go", "gomod", "gowork", "gotmpl" },
+      root = { "go.work", "go.mod" },
+    })
+  end,
   {
     "nvim-treesitter/nvim-treesitter",
     opts = function(_, opts)

lua/lazyvim/plugins/extras/lang/java.lua

@@ -16,6 +16,20 @@ local function extend_or_override(config, custom, ...)
 end
 
 return {
+  recommended = function()
+    return LazyVim.extras.wants({
+      ft = "java",
+      root = {
+        "build.gradle",
+        "build.gradle.kts",
+        "build.xml", -- Ant
+        "pom.xml", -- Maven
+        "settings.gradle", -- Gradle
+        "settings.gradle.kts", -- Gradle
+      },
+    })
+  end,
+
   -- Add java to treesitter.
   {
     "nvim-treesitter/nvim-treesitter",

lua/lazyvim/plugins/extras/lang/json.lua

@@ -1,4 +1,9 @@
 return {
+  recommended = function()
+    return LazyVim.extras.wants({
+      ft = { "json", "jsonc", "json5" },
+    })
+  end,
 
   -- add json to treesitter
   {

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

@@ -1,4 +1,10 @@
 return {
+  recommended = function()
+    return LazyVim.extras.wants({
+      ft = "markdown",
+      root = "README.md",
+    })
+  end,
   {
     "nvim-treesitter/nvim-treesitter",
     opts = function(_, opts)

lua/lazyvim/plugins/extras/lang/omnisharp.lua

@@ -1,4 +1,11 @@
 return {
+  recommended = function()
+    return LazyVim.extras.wants({
+      ft = { "cs", "vb" },
+      root = { "*.sln", "*.csproj", "omnisharp.json", "function.json" },
+    })
+  end,
+
   { "Hoffs/omnisharp-extended-lsp.nvim", lazy = true },
   {
     "nvim-treesitter/nvim-treesitter",
@@ -96,4 +103,18 @@ return {
       end
     end,
   },
+  {
+    "nvim-neotest/neotest",
+    optional = true,
+    dependencies = {
+      "Issafalcon/neotest-dotnet",
+    },
+    opts = {
+      adapters = {
+        ["neotest-dotnet"] = {
+          -- Here we can set options for neotest-dotnet
+        },
+      },
+    },
+  },
 }

lua/lazyvim/plugins/extras/lang/python.lua

@@ -9,6 +9,19 @@ local lsp = vim.g.lazyvim_python_lsp or "pyright"
 local ruff = vim.g.lazyvim_python_ruff or "ruff_lsp"
 
 return {
+  recommended = function()
+    return LazyVim.extras.wants({
+      ft = "python",
+      root = {
+        "pyproject.toml",
+        "setup.py",
+        "setup.cfg",
+        "requirements.txt",
+        "Pipfile",
+        "pyrightconfig.json",
+      },
+    })
+  end,
   {
     "nvim-treesitter/nvim-treesitter",
     opts = function(_, opts)

lua/lazyvim/plugins/extras/lang/ruby.lua

@@ -1,4 +1,10 @@
 return {
+  recommended = function()
+    return LazyVim.extras.wants({
+      ft = "ruby",
+      root = "Gemfile",
+    })
+  end,
   {
     "nvim-treesitter/nvim-treesitter",
     opts = function(_, opts)

lua/lazyvim/plugins/extras/lang/rust.lua

@@ -1,4 +1,10 @@
 return {
+  recommended = function()
+    return LazyVim.extras.wants({
+      ft = "rust",
+      root = { "Cargo.toml", "rust-project.json" },
+    })
+  end,
 
   -- Extend auto completion
   {

lua/lazyvim/plugins/extras/lang/scala.lua

@@ -3,6 +3,12 @@
 -- If you like you can setup your own key bindings.
 -- For minimalistic setup have a look at https://github.com/scalameta/nvim-metals/discussions/39
 return {
+  recommended = function()
+    return LazyVim.extras.wants({
+      ft = "scala",
+      root = { "build.sbt", "build.sc", "build.gradle", "pom.xml" },
+    })
+  end,
   {
     "hrsh7th/nvim-cmp",
     requires = {

lua/lazyvim/plugins/extras/lang/tailwind.lua

@@ -1,4 +1,18 @@
 return {
+  recommended = function()
+    return LazyVim.extras.wants({
+      root = {
+        "tailwind.config.js",
+        "tailwind.config.cjs",
+        "tailwind.config.mjs",
+        "tailwind.config.ts",
+        "postcss.config.js",
+        "postcss.config.cjs",
+        "postcss.config.mjs",
+        "postcss.config.ts",
+      },
+    })
+  end,
   {
     "neovim/nvim-lspconfig",
     opts = {

lua/lazyvim/plugins/extras/lang/terraform.lua

@@ -1,4 +1,11 @@
 return {
+  recommended = function()
+    return LazyVim.extras.wants({
+      ft = { "terraform", "hcl" },
+      root = ".terraform",
+    })
+  end,
+
   {
     "nvim-treesitter/nvim-treesitter",
     opts = function(_, opts)
@@ -18,6 +25,14 @@ return {
       },
     },
   },
+  -- ensure terraform tools are installed
+  {
+    "williamboman/mason.nvim",
+    opts = function(_, opts)
+      opts.ensure_installed = opts.ensure_installed or {}
+      vim.list_extend(opts.ensure_installed, { "tflint" })
+    end,
+  },
   {
     "nvimtools/none-ls.nvim",
     optional = true,

lua/lazyvim/plugins/extras/lang/tex.lua

@@ -1,4 +1,10 @@
 return {
+  recommended = function()
+    return LazyVim.extras.wants({
+      ft = { "tex", "plaintex", "bib" },
+      root = { ".latexmkrc", ".texlabroot", "texlabroot", "Tectonic.toml" },
+    })
+  end,
   {
     "folke/which-key.nvim",
     optional = true,

lua/lazyvim/plugins/extras/lang/typescript.lua

@@ -1,4 +1,28 @@
+local inlay_hints_settings = {
+  includeInlayEnumMemberValueHints = true,
+  includeInlayFunctionLikeReturnTypeHints = true,
+  includeInlayFunctionParameterTypeHints = true,
+  includeInlayParameterNameHints = "literal",
+  includeInlayParameterNameHintsWhenArgumentMatchesName = false,
+  includeInlayPropertyDeclarationTypeHints = true,
+  includeInlayVariableTypeHints = false,
+  includeInlayVariableTypeHintsWhenTypeMatchesName = false,
+}
+
 return {
+  recommended = function()
+    return LazyVim.extras.wants({
+      ft = {
+        "javascript",
+        "javascriptreact",
+        "javascript.jsx",
+        "typescript",
+        "typescriptreact",
+        "typescript.tsx",
+      },
+      root = { "tsconfig.json", "package.json", "jsconfig.json" },
+    })
+  end,
 
   -- add typescript to treesitter
   {
@@ -46,8 +70,13 @@ return {
               desc = "Remove Unused Imports",
             },
           },
-          ---@diagnostic disable-next-line: missing-fields
           settings = {
+            typescript = {
+              inlayHints = inlay_hints_settings,
+            },
+            javascript = {
+              inlayHints = inlay_hints_settings,
+            },
             completions = {
               completeFunctionCalls = true,
             },
@@ -87,6 +116,20 @@ return {
           },
         }
       end
+      if not dap.adapters["node"] then
+        dap.adapters["node"] = function(cb, config)
+          if config.type == "node" then
+            config.type = "pwa-node"
+          end
+          local nativeAdapter = dap.adapters["pwa-node"]
+          if type(nativeAdapter) == "function" then
+            nativeAdapter(cb, config)
+          else
+            cb(nativeAdapter)
+          end
+        end
+      end
+
       for _, language in ipairs({ "typescript", "javascript", "typescriptreact", "javascriptreact" }) do
         if not dap.configurations[language] then
           dap.configurations[language] = {

lua/lazyvim/plugins/extras/lang/vue.lua

@@ -1,4 +1,11 @@
 return {
+  recommended = function()
+    return LazyVim.extras.wants({
+      ft = "vue",
+      root = { "vue.config.js" },
+    })
+  end,
+
   {
     "nvim-treesitter/nvim-treesitter",
     opts = function(_, opts)

lua/lazyvim/plugins/extras/lang/yaml.lua

@@ -1,4 +1,9 @@
 return {
+  recommended = function()
+    return LazyVim.extras.wants({
+      ft = "yaml",
+    })
+  end,
 
   -- add yaml specific modules to treesitter
   {

lua/lazyvim/plugins/extras/test/core.lua

@@ -1,4 +1,6 @@
 return {
+  recommended = true,
+  desc = "Neotest support. Requires language specific adapters to be configured. (see lang extras)",
   {
     "folke/which-key.nvim",
     optional = true,

lua/lazyvim/plugins/extras/ui/mini-animate.lua

@@ -1,7 +1,7 @@
-return {
 -- animations
-  {
+return {
   "echasnovski/mini.animate",
+  recommended = true,
   event = "VeryLazy",
   opts = function()
     -- don't use animate when scrolling with the mouse
@@ -33,5 +33,4 @@ return {
       },
     }
   end,
-  },
 }

lua/lazyvim/plugins/extras/ui/mini-indentscope.lua

@@ -0,0 +1,42 @@
+return {
+  -- Active indent guide and indent text objects. When you're browsing
+  -- code, this highlights the current level of indentation, and animates
+  -- the highlighting.
+  {
+    "echasnovski/mini.indentscope",
+    version = false, -- wait till new 0.7.0 release to put it back on semver
+    event = "LazyFile",
+    opts = {
+      -- symbol = "▏",
+      symbol = "│",
+      options = { try_as_border = true },
+    },
+    init = function()
+      vim.api.nvim_create_autocmd("FileType", {
+        pattern = {
+          "help",
+          "alpha",
+          "dashboard",
+          "neo-tree",
+          "Trouble",
+          "trouble",
+          "lazy",
+          "mason",
+          "notify",
+          "toggleterm",
+          "lazyterm",
+        },
+        callback = function()
+          vim.b.miniindentscope_disable = true
+        end,
+      })
+    end,
+  },
+  {
+    "lukas-reineke/indent-blankline.nvim",
+    event = "LazyFile",
+    opts = {
+      scope = { enabled = false },
+    },
+  },
+}

lua/lazyvim/plugins/extras/ui/mini-starter.lua

@@ -63,12 +63,15 @@ return {
 
       vim.api.nvim_create_autocmd("User", {
         pattern = "LazyVimStarted",
-        callback = function()
+        callback = function(ev)
           local stats = require("lazy").stats()
           local ms = (math.floor(stats.startuptime * 100 + 0.5) / 100)
           local pad_footer = string.rep(" ", 8)
           starter.config.footer = pad_footer .. "⚡ Neovim loaded " .. stats.count .. " plugins in " .. ms .. "ms"
+          -- INFO: based on @echasnovski's recommendation (thanks a lot!!!)
+          if vim.bo[ev.buf].filetype == "starter" then
             pcall(starter.refresh)
+          end
         end,
       })
     end,

lua/lazyvim/plugins/extras/ui/treesitter-context.lua

@@ -0,0 +1,21 @@
+-- Show context of the current function
+return {
+  "nvim-treesitter/nvim-treesitter-context",
+  event = "LazyFile",
+  opts = { mode = "cursor", max_lines = 3 },
+  keys = {
+    {
+      "<leader>ut",
+      function()
+        local tsc = require("treesitter-context")
+        tsc.toggle()
+        if LazyVim.inject.get_upvalue(tsc.toggle, "enabled") then
+          LazyVim.info("Enabled Treesitter Context", { title = "Option" })
+        else
+          LazyVim.warn("Disabled Treesitter Context", { title = "Option" })
+        end
+      end,
+      desc = "Toggle Treesitter Context",
+    },
+  },
+}

lua/lazyvim/plugins/extras/util/mini-hipatterns.lua

@@ -5,6 +5,8 @@ M.hl = {}
 
 M.plugin = {
   "echasnovski/mini.hipatterns",
+  recommended = true,
+  desc = "Highlight colors in your code. Also includes Tailwind CSS support.",
   event = "LazyFile",
   opts = function()
     local hi = require("mini.hipatterns")

lua/lazyvim/plugins/extras/util/startuptime.lua

@@ -0,0 +1,8 @@
+-- measure startuptime
+return {
+  "dstein64/vim-startuptime",
+  cmd = "StartupTime",
+  config = function()
+    vim.g.startuptime_tries = 10
+  end,
+}

lua/lazyvim/plugins/formatting.lua

@@ -54,9 +54,7 @@ return {
           priority = 100,
           primary = true,
           format = function(buf)
-            local plugin = require("lazy.core.config").plugins["conform.nvim"]
+            local opts = LazyVim.opts("conform.nvim")
-            local Plugin = require("lazy.core.plugin")
-            local opts = Plugin.values(plugin, "opts", false)
             require("conform").format(LazyVim.merge({}, opts.format, { bufnr = buf }))
           end,
           sources = function(buf)

lua/lazyvim/plugins/lsp/init.lua

@@ -38,7 +38,7 @@ return {
       -- Be aware that you also will need to properly configure your LSP server to
       -- provide the inlay hints.
       inlay_hints = {
-        enabled = false,
+        enabled = true,
       },
       -- Enable this to enable the builtin LSP code lenses on Neovim >= 0.10.0
       -- Be aware that you also will need to properly configure your LSP server to
@@ -46,6 +46,10 @@ return {
       codelens = {
         enabled = false,
       },
+      -- Enable lsp cursor word highlighting
+      document_highlight = {
+        enabled = true,
+      },
       -- add any global capabilities here
       capabilities = {},
       -- options for vim.lsp.buf.format
@@ -75,6 +79,17 @@ return {
               completion = {
                 callSnippet = "Replace",
               },
+              doc = {
+                privateName = { "^_" },
+              },
+              hint = {
+                enable = true,
+                setType = false,
+                paramType = true,
+                paramName = "Disable",
+                semicolon = "Disable",
+                arrayIndex = "Disable",
+              },
             },
           },
         },
@@ -95,8 +110,7 @@ return {
     ---@param opts PluginLspOpts
     config = function(_, opts)
       if LazyVim.has("neoconf.nvim") then
-        local plugin = require("lazy.core.config").spec.plugins["neoconf.nvim"]
+        require("neoconf").setup(LazyVim.opts("neoconf.nvim"))
-        require("neoconf").setup(require("lazy.core.plugin").values(plugin, "opts", false))
       end
 
       -- setup autoformat
@@ -118,15 +132,20 @@ return {
         return ret
       end
 
+      LazyVim.lsp.words.setup(opts.document_highlight)
+
       -- diagnostics signs
       if vim.fn.has("nvim-0.10.0") == 0 then
+        if type(opts.diagnostics.signs) ~= "boolean" then
           for severity, icon in pairs(opts.diagnostics.signs.text) do
             local name = vim.diagnostic.severity[severity]:lower():gsub("^%l", string.upper)
             name = "DiagnosticSign" .. name
             vim.fn.sign_define(name, { text = icon, texthl = name, numhl = "" })
           end
         end
+      end
 
+      if vim.fn.has("nvim-0.10") == 1 then
         -- inlay hints
         if opts.inlay_hints.enabled then
           LazyVim.lsp.on_attach(function(client, buffer)
@@ -149,6 +168,7 @@ return {
             end
           end)
         end
+      end
 
       if type(opts.diagnostics.virtual_text) == "table" and opts.diagnostics.virtual_text.prefix == "icons" then
         opts.diagnostics.virtual_text.prefix = vim.fn.has("nvim-0.10.0") == 0 and "●"

lua/lazyvim/plugins/lsp/keymaps.lua

@@ -39,7 +39,9 @@ function M.get()
         end,
         desc = "Source Action",
         has = "codeAction",
-      }
+      },
+      { "]]", function() LazyVim.lsp.words.jump(vim.v.count1) end, has = "documentHighlight", desc = "Next Reference" },
+      { "[[", function() LazyVim.lsp.words.jump(-vim.v.count1) end, has = "documentHighlight", desc = "Next Reference" },
     }
   if LazyVim.has("inc-rename.nvim") then
     M._keys[#M._keys + 1] = {

lua/lazyvim/plugins/treesitter.lua

@@ -7,6 +7,7 @@ return {
     version = false, -- last release is way too old and doesn't work on Windows
     build = ":TSUpdate",
     event = { "LazyFile", "VeryLazy" },
+    lazy = vim.fn.argc(-1) == 0, -- load treesitter early when opening a file from the cmdline
     init = function(plugin)
       -- PERF: add nvim-treesitter queries to the rtp and it's custom query predicates early
       -- This is needed because a bunch of plugins no longer `require("nvim-treesitter")`, which
@@ -16,33 +17,6 @@ return {
       require("lazy.core.loader").add_to_rtp(plugin)
       require("nvim-treesitter.query_predicates")
     end,
-    dependencies = {
-      {
-        "nvim-treesitter/nvim-treesitter-textobjects",
-        config = function()
-          -- When in diff mode, we want to use the default
-          -- vim text objects c & C instead of the treesitter ones.
-          local move = require("nvim-treesitter.textobjects.move") ---@type table<string,fun(...)>
-          local configs = require("nvim-treesitter.configs")
-          for name, fn in pairs(move) do
-            if name:find("goto") == 1 then
-              move[name] = function(q, ...)
-                if vim.wo.diff then
-                  local config = configs.get_module("textobjects.move")[name] ---@type table<string,string>
-                  for key, query in pairs(config or {}) do
-                    if q == query and key:find("[%]%[][cC]") then
-                      vim.cmd("normal! " .. key)
-                      return
-                    end
-                  end
-                end
-                return fn(q, ...)
-              end
-            end
-          end
-        end,
-      },
-    },
     cmd = { "TSUpdateSync", "TSUpdate", "TSInstall" },
     keys = {
       { "<c-space>", desc = "Increment Selection" },
@@ -111,30 +85,37 @@ return {
         end, opts.ensure_installed)
       end
       require("nvim-treesitter.configs").setup(opts)
+      vim.schedule(function()
+        require("lazy").load({ plugins = { "nvim-treesitter-textobjects" } })
+      end)
     end,
   },
 
-  -- Show context of the current function
   {
-    "nvim-treesitter/nvim-treesitter-context",
+    "nvim-treesitter/nvim-treesitter-textobjects",
-    event = "LazyFile",
+    lazy = true,
-    enabled = true,
+    config = function()
-    opts = { mode = "cursor", max_lines = 3 },
+      -- When in diff mode, we want to use the default
-    keys = {
+      -- vim text objects c & C instead of the treesitter ones.
-      {
+      local move = require("nvim-treesitter.textobjects.move") ---@type table<string,fun(...)>
-        "<leader>ut",
+      local configs = require("nvim-treesitter.configs")
-        function()
+      for name, fn in pairs(move) do
-          local tsc = require("treesitter-context")
+        if name:find("goto") == 1 then
-          tsc.toggle()
+          move[name] = function(q, ...)
-          if LazyVim.inject.get_upvalue(tsc.toggle, "enabled") then
+            if vim.wo.diff then
-            LazyVim.info("Enabled Treesitter Context", { title = "Option" })
+              local config = configs.get_module("textobjects.move")[name] ---@type table<string,string>
-          else
+              for key, query in pairs(config or {}) do
-            LazyVim.warn("Disabled Treesitter Context", { title = "Option" })
+                if q == query and key:find("[%]%[][cC]") then
+                  vim.cmd("normal! " .. key)
+                  return
+                end
+              end
+            end
+            return fn(q, ...)
+          end
+        end
       end
     end,
-        desc = "Toggle Treesitter Context",
-      },
-    },
   },
 
   -- Automatically add closing tags for HTML and JSX

lua/lazyvim/plugins/ui.lua

@@ -71,9 +71,9 @@ return {
     opts = {
       options = {
         -- stylua: ignore
-        close_command = function(n) require("mini.bufremove").delete(n, false) end,
+        close_command = function(n) LazyVim.ui.bufremove(n) end,
         -- stylua: ignore
-        right_mouse_command = function(n) require("mini.bufremove").delete(n, false) end,
+        right_mouse_command = function(n) LazyVim.ui.bufremove(n) end,
         diagnostics = "nvim_lsp",
         always_show_bufferline = false,
         diagnostics_indicator = function(_, _, diag)
@@ -95,7 +95,7 @@ return {
     config = function(_, opts)
       require("bufferline").setup(opts)
       -- Fix bufferline when restoring a session
-      vim.api.nvim_create_autocmd("BufAdd", {
+      vim.api.nvim_create_autocmd({ "BufAdd", "BufDelete" }, {
         callback = function()
           vim.schedule(function()
             pcall(nvim_bufferline)
@@ -219,7 +219,7 @@ return {
         char = "│",
         tab_char = "│",
       },
-      scope = { enabled = false },
+      scope = { show_start = false, show_end = false },
       exclude = {
         filetypes = {
           "help",
@@ -237,39 +237,12 @@ return {
       },
     },
     main = "ibl",
-  },
+    config = function(_, opts)
-
+      if vim.fn.has("nvim-0.10.0") == 0 then
-  -- Active indent guide and indent text objects. When you're browsing
+        local utils = require("ibl.utils")
-  -- code, this highlights the current level of indentation, and animates
+        utils.tbl_join = vim.tbl_flatten
-  -- the highlighting.
+      end
-  {
+      require("ibl").setup(opts)
-    "echasnovski/mini.indentscope",
-    version = false, -- wait till new 0.7.0 release to put it back on semver
-    event = "LazyFile",
-    opts = {
-      -- symbol = "▏",
-      symbol = "│",
-      options = { try_as_border = true },
-    },
-    init = function()
-      vim.api.nvim_create_autocmd("FileType", {
-        pattern = {
-          "help",
-          "alpha",
-          "dashboard",
-          "neo-tree",
-          "Trouble",
-          "trouble",
-          "lazy",
-          "mason",
-          "notify",
-          "toggleterm",
-          "lazyterm",
-        },
-        callback = function()
-          vim.b.miniindentscope_disable = true
-        end,
-      })
     end,
   },
 
@@ -322,6 +295,7 @@ return {
       { "<leader>snh", function() require("noice").cmd("history") end, desc = "Noice History" },
       { "<leader>sna", function() require("noice").cmd("all") end, desc = "Noice All" },
       { "<leader>snd", function() require("noice").cmd("dismiss") end, desc = "Dismiss All" },
+      { "<leader>snt", function() require("noice").cmd("telescope") end, desc = "Noice Telescope" },
       { "<c-f>", function() if not require("noice.lsp").scroll(4) then return "<c-f>" end end, silent = true, expr = true, desc = "Scroll Forward", mode = {"i", "n", "s"} },
       { "<c-b>", function() if not require("noice.lsp").scroll(-4) then return "<c-b>" end end, silent = true, expr = true, desc = "Scroll Backward", mode = {"i", "n", "s"}},
     },

lua/lazyvim/plugins/util.lua

@@ -1,14 +1,5 @@
 return {
 
-  -- measure startuptime
-  {
-    "dstein64/vim-startuptime",
-    cmd = "StartupTime",
-    config = function()
-      vim.g.startuptime_tries = 10
-    end,
-  },
-
   -- Session management. This saves your session in the background,
   -- keeping track of open buffers, window arrangement, and more.
   -- You can restore sessions when returning through the dashboard.

lua/lazyvim/util/extras.lua

@@ -16,12 +16,15 @@ local Text = require("lazy.view.text")
 ---@field desc? string
 ---@field enabled boolean
 ---@field managed boolean
+---@field recommended? boolean
 ---@field row? number
+---@field section? string
 ---@field plugins string[]
 ---@field optional string[]
 
 ---@class lazyvim.util.extras
 local M = {}
+M.buf = 0
 
 ---@type LazyExtraSource[]
 M.sources = {
@@ -33,6 +36,24 @@ M.ns = vim.api.nvim_create_namespace("lazyvim.extras")
 ---@type string[]
 M.state = nil
 
+---@param opts {ft?: string|string[], root?: string|string[]}
+---@return boolean
+function M.wants(opts)
+  if opts.ft then
+    opts.ft = type(opts.ft) == "string" and { opts.ft } or opts.ft
+    for _, f in ipairs(opts.ft) do
+      if vim.bo[M.buf].filetype == f then
+        return true
+      end
+    end
+  end
+  if opts.root then
+    opts.root = type(opts.root) == "string" and { opts.root } or opts.root
+    return #LazyVim.root.detectors.pattern(M.buf, opts.root) > 0
+  end
+  return false
+end
+
 ---@return LazyExtra[]
 function M.get()
   M.state = M.state or LazyConfig.spec.modules
@@ -74,6 +95,12 @@ function M.get_extra(source, modname)
   table.sort(plugins)
   table.sort(optional)
 
+  ---@type boolean|(fun():boolean?)|nil
+  local recommended = require(modname).recommended or false
+  if type(recommended) == "function" then
+    recommended = recommended() or false
+  end
+
   ---@type LazyExtra
   return {
     source = source,
@@ -81,6 +108,7 @@ function M.get_extra(source, modname)
     module = modname,
     enabled = enabled,
     desc = require(modname).desc,
+    recommended = recommended,
     managed = vim.tbl_contains(Config.json.data.extras, modname) or not enabled,
     plugins = plugins,
     optional = optional,
@@ -97,6 +125,7 @@ local X = {}
 ---@return LazyExtraView
 function X.new()
   local self = setmetatable({}, { __index = X })
+  M.buf = vim.api.nvim_get_current_buf()
   self.float = Float.new({ title = "LazyVim Extras" })
   self.float:on_key("x", function()
     self:toggle()
@@ -186,8 +215,14 @@ function X:render()
     :append("<x>", "LazySpecial")
     :append(" key", "LazyComment")
     :nl()
+  for _, extra in ipairs(self.extras) do
+    extra.section = nil
+  end
   self:section({ enabled = true, title = "Enabled" })
-  self:section({ enabled = false, title = "Disabled" })
+  self:section({ recommended = true, include = "^lang%.", title = "Recommended Languages", empty = false })
+  self:section({ recommended = true, title = "Recommended Plugins", empty = false })
+  self:section({ title = "Plugins", exclude = "^lang%." })
+  self:section({ title = "Languages" })
 end
 
 ---@param extra LazyExtra
@@ -206,6 +241,9 @@ function X:extra(extra)
     self.text:append("  " .. LazyConfig.options.ui.icons.not_loaded .. " ", hl)
   end
   self.text:append(extra.name)
+  if extra.recommended then
+    self.text:append(" "):append(LazyConfig.options.ui.icons.favorite or " ", "LazyCommit")
+  end
   if extra.source.name ~= "LazyVim" then
     self.text:append(" "):append(LazyConfig.options.ui.icons.event .. " " .. extra.source.name, "LazyReasonEvent")
   end
@@ -221,16 +259,25 @@ function X:extra(extra)
   self.text:nl()
 end
 
----@param opts {enabled?:boolean, title?:string}
+---@param opts {enabled?:boolean, title:string, recommended?:boolean, include?:string, exclude?:string, empty?:boolean}
 function X:section(opts)
   opts = opts or {}
   ---@type LazyExtra[]
   local extras = vim.tbl_filter(function(extra)
-    return opts.enabled == nil or extra.enabled == opts.enabled
+    return extra.section == nil
+      and (opts.enabled == nil or extra.enabled == opts.enabled)
+      and (opts.recommended == nil or extra.recommended == opts.recommended)
+      and (opts.include == nil or extra.name:find(opts.include))
+      and (opts.exclude == nil or not extra.name:find(opts.exclude))
   end, self.extras)
 
+  if opts.empty == false and #extras == 0 then
+    return
+  end
+
   self.text:nl():append(opts.title .. ":", "LazyH2"):append(" (" .. #extras .. ")", "LazyComment"):nl()
   for _, extra in ipairs(extras) do
+    extra.section = opts.title
     self:extra(extra)
   end
 end

lua/lazyvim/util/init.lua

@@ -72,7 +72,7 @@ end
 
 ---@param name string
 function M.opts(name)
-  local plugin = require("lazy.core.config").plugins[name]
+  local plugin = require("lazy.core.config").spec.plugins[name]
   if not plugin then
     return {}
   end
@@ -170,4 +170,19 @@ function M.safe_keymap_set(mode, lhs, rhs, opts)
   end
 end
 
+---@generic T
+---@param list T[]
+---@return T[]
+function M.dedup(list)
+  local ret = {}
+  local seen = {}
+  for _, v in ipairs(list) do
+    if not seen[v] then
+      table.insert(ret, v)
+      seen[v] = true
+    end
+  end
+  return ret
+end
+
 return M

lua/lazyvim/util/inject.lua

@@ -31,4 +31,20 @@ function M.get_upvalue(func, name)
   end
 end
 
+function M.set_upvalue(func, name, value)
+  local i = 1
+  while true do
+    local n = debug.getupvalue(func, i)
+    if not n then
+      break
+    end
+    if n == name then
+      debug.setupvalue(func, i, value)
+      return
+    end
+    i = i + 1
+  end
+  LazyVim.error("upvalue not found: " .. name)
+end
+
 return M

lua/lazyvim/util/lsp.lua

@@ -21,7 +21,7 @@ function M.get_clients(opts)
   return opts and opts.filter and vim.tbl_filter(opts.filter, ret) or ret
 end
 
----@param on_attach fun(client, buffer)
+---@param on_attach fun(client:lsp.Client, buffer)
 function M.on_attach(on_attach)
   vim.api.nvim_create_autocmd("LspAttach", {
     callback = function(args)
@@ -125,4 +125,78 @@ function M.format(opts)
   end
 end
 
+---@alias LspWord {from:{[1]:number, [2]:number}, to:{[1]:number, [2]:number}, current?:boolean} 1-0 indexed
+M.words = {}
+M.words.ns = vim.api.nvim_create_namespace("vim_lsp_references")
+
+---@param opts? {enabled?: boolean}
+function M.words.setup(opts)
+  opts = opts or {}
+  if not opts.enabled then
+    return
+  end
+  local handler = vim.lsp.handlers["textDocument/documentHighlight"]
+  vim.lsp.handlers["textDocument/documentHighlight"] = function(err, result, ctx, config)
+    if not vim.api.nvim_buf_is_loaded(ctx.bufnr) then
+      return
+    end
+    return handler(err, result, ctx, config)
+  end
+
+  M.on_attach(function(client, buf)
+    if client.supports_method("textDocument/documentHighlight") then
+      vim.api.nvim_create_autocmd({ "CursorHold", "CursorHoldI", "CursorMoved", "CursorMovedI" }, {
+        group = vim.api.nvim_create_augroup("lsp_word_" .. buf, { clear = true }),
+        buffer = buf,
+        callback = function(ev)
+          if not M.words.at() then
+            if ev.event:find("CursorMoved") then
+              vim.lsp.buf.clear_references()
+            else
+              vim.lsp.buf.document_highlight()
+            end
+          end
+        end,
+      })
+    end
+  end)
+end
+
+---@return LspWord[]
+function M.words.get()
+  local cursor = vim.api.nvim_win_get_cursor(0)
+  return vim.tbl_map(function(extmark)
+    local ret = {
+      from = { extmark[2] + 1, extmark[3] },
+      to = { extmark[4].end_row + 1, extmark[4].end_col },
+    }
+    if cursor[1] >= ret.from[1] and cursor[1] <= ret.to[1] and cursor[2] >= ret.from[2] and cursor[2] <= ret.to[2] then
+      ret.current = true
+    end
+    return ret
+  end, vim.api.nvim_buf_get_extmarks(0, M.words.ns, 0, -1, { details = true }))
+end
+
+---@param words? LspWord[]
+---@return LspWord?, number?
+function M.words.at(words)
+  for idx, word in ipairs(words or M.words.get()) do
+    if word.current then
+      return word, idx
+    end
+  end
+end
+
+function M.words.jump(count)
+  local words = M.words.get()
+  local _, idx = M.words.at(words)
+  if not idx then
+    return
+  end
+  local target = words[idx + count]
+  if target then
+    vim.api.nvim_win_set_cursor(0, target.from)
+  end
+end
+
 return M

lua/lazyvim/util/plugin.lua

@@ -3,7 +3,6 @@ local Plugin = require("lazy.core.plugin")
 ---@class lazyvim.util.plugin
 local M = {}
 
-M.use_lazy_file = true
 M.lazy_file_events = { "BufReadPost", "BufNewFile", "BufWritePre" }
 
 ---@type table<string, string>
@@ -11,6 +10,8 @@ M.deprecated_extras = {
   ["lazyvim.plugins.extras.formatting.conform"] = "`conform.nvim` is now the default **LazyVim** formatter.",
   ["lazyvim.plugins.extras.linting.nvim-lint"] = "`nvim-lint` is now the default **LazyVim** linter.",
   ["lazyvim.plugins.extras.ui.dashboard"] = "`dashboard.nvim` is now the default **LazyVim** starter.",
+  ["lazyvim.plugins.extras.coding.native_snippets"] = "Native snippets are now the default for **Neovim >= 0.10**",
+  ["lazyvim.plugins.extras.ui.treesitter-rewrite"] = "Disabled `treesitter-rewrite` extra for now. Not ready yet.",
 }
 
 M.deprecated_modules = {
@@ -55,83 +56,44 @@ function M.extra_idx(name)
   end
 end
 
--- Properly load file based plugins without blocking the UI
 function M.lazy_file()
-  M.use_lazy_file = M.use_lazy_file and vim.fn.argc(-1) > 0
+  -- This autocmd will only trigger when a file was loaded from the cmdline.
+  -- It will render the file as quickly as possible.
+  vim.api.nvim_create_autocmd("BufReadPost", {
+    once = true,
+    callback = function(event)
+      -- Skip if we already entered vim
+      if vim.v.vim_did_enter == 1 then
+        return
+      end
+
+      -- Try to guess the filetype (may change later on during Neovim startup)
+      local ft = vim.filetype.match({ buf = event.buf })
+      if ft then
+        -- Add treesitter highlights and fallback to syntax
+        local lang = vim.treesitter.language.get_lang(ft)
+        if not (lang and pcall(vim.treesitter.start, event.buf, lang)) then
+          vim.bo[event.buf].syntax = ft
+        end
+
+        -- Trigger early redraw
+        vim.cmd([[redraw]])
+      end
+    end,
+  })
 
   -- Add support for the LazyFile event
   local Event = require("lazy.core.handler.event")
 
-  if M.use_lazy_file then
+  Event.mappings.LazyFile = { id = "LazyFile", event = M.lazy_file_events }
-    -- We'll handle delayed execution of events ourselves
-    Event.mappings.LazyFile = { id = "LazyFile", event = "User", pattern = "LazyFile" }
   Event.mappings["User LazyFile"] = Event.mappings.LazyFile
-  else
-    -- Don't delay execution of LazyFile events, but let lazy know about the mapping
-    Event.mappings.LazyFile = { id = "LazyFile", event = { "BufReadPost", "BufNewFile", "BufWritePre" } }
-    Event.mappings["User LazyFile"] = Event.mappings.LazyFile
-    return
-  end
-
-  local events = {} ---@type {event: string, buf: number, data?: any}[]
-
-  local done = false
-  local function load()
-    if #events == 0 or done then
-      return
-    end
-    done = true
-    vim.api.nvim_del_augroup_by_name("lazy_file")
-
-    ---@type table<string,string[]>
-    local skips = {}
-    for _, event in ipairs(events) do
-      local augroups = Event.get_augroups(event.event)
-      local groups = vim.tbl_filter(function(t)
-        return not vim.tbl_contains({ t }, "filetypedetect")
-      end, augroups)
-      skips[event.event] = skips[event.event] or groups
-    end
-
-    vim.api.nvim_exec_autocmds("User", { pattern = "LazyFile", modeline = false })
-    for _, event in ipairs(events) do
-      if vim.api.nvim_buf_is_valid(event.buf) then
-        Event.trigger({
-          event = event.event,
-          exclude = skips[event.event],
-          data = event.data,
-          buf = event.buf,
-        })
-        if vim.bo[event.buf].filetype then
-          Event.trigger({
-            event = "FileType",
-            buf = event.buf,
-          })
-        end
-      end
-    end
-    vim.api.nvim_exec_autocmds("CursorMoved", { modeline = false })
-    events = {}
-  end
-
-  -- schedule wrap so that nested autocmds are executed
-  -- and the UI can continue rendering without blocking
-  load = vim.schedule_wrap(load)
-
-  vim.api.nvim_create_autocmd(M.lazy_file_events, {
-    group = vim.api.nvim_create_augroup("lazy_file", { clear = true }),
-    callback = function(event)
-      table.insert(events, event)
-      load()
-    end,
-  })
 end
 
 function M.fix_imports()
   Plugin.Spec.import = LazyVim.inject.args(Plugin.Spec.import, function(_, spec)
     local dep = M.deprecated_extras[spec and spec.import]
     if dep then
-      dep = dep .. "\n" .. "Please remove the extra to hide this warning."
+      dep = dep .. "\n" .. "Please remove the extra from `lazyvim.json` to hide this warning."
       LazyVim.warn(dep, { title = "LazyVim", once = true, stacktrace = true, stacklevel = 6 })
       return false
     end

lua/lazyvim/util/root.lua

@@ -47,7 +47,17 @@ end
 function M.detectors.pattern(buf, patterns)
   patterns = type(patterns) == "string" and { patterns } or patterns
   local path = M.bufpath(buf) or vim.uv.cwd()
-  local pattern = vim.fs.find(patterns, { path = path, upward = true })[1]
+  local pattern = vim.fs.find(function(name)
+    for _, p in ipairs(patterns) do
+      if name == p then
+        return true
+      end
+      if p:sub(1, 1) == "*" and name:find(p:sub(2) .. "$") then
+        return true
+      end
+    end
+    return false
+  end, { path = path, upward = true })[1]
   return pattern and { vim.fs.dirname(pattern) } or {}
 end
 

lua/lazyvim/util/toggle.lua

@@ -43,7 +43,9 @@ local enabled = true
 function M.diagnostics()
   -- if this Neovim version supports checking if diagnostics are enabled
   -- then use that for the current state
-  if vim.diagnostic.is_disabled then
+  if vim.diagnostic.is_enabled then
+    enabled = vim.diagnostic.is_enabled()
+  elseif vim.diagnostic.is_disabled then
     enabled = not vim.diagnostic.is_disabled()
   end
   enabled = not enabled
@@ -65,7 +67,7 @@ function M.inlay_hints(buf, value)
     ih(buf, value)
   elseif type(ih) == "table" and ih.enable then
     if value == nil then
-      value = not ih.is_enabled(buf)
+      value = not ih.is_enabled({ bufnr = buf or 0 })
     end
     ih.enable(value, { bufnr = buf })
   end

lua/lazyvim/util/ui.lua

@@ -208,4 +208,47 @@ function M.foldexpr()
   return "0"
 end
 
+---@param buf number?
+function M.bufremove(buf)
+  buf = buf or 0
+  buf = buf == 0 and vim.api.nvim_get_current_buf() or buf
+
+  if vim.bo.modified then
+    local choice = vim.fn.confirm(("Save changes to %q?"):format(vim.fn.bufname()), "&Yes\n&No\n&Cancel")
+    if choice == 0 then -- Cancel
+      return
+    end
+    if choice == 1 then -- Yes
+      vim.cmd.write()
+    end
+  end
+
+  for _, win in ipairs(vim.fn.win_findbuf(buf)) do
+    vim.api.nvim_win_call(win, function()
+      if not vim.api.nvim_win_is_valid(win) or vim.api.nvim_win_get_buf(win) ~= buf then
+        return
+      end
+      -- Try using alternate buffer
+      local alt = vim.fn.bufnr("#")
+      if alt ~= buf and vim.fn.buflisted(alt) == 1 then
+        vim.api.nvim_win_set_buf(win, alt)
+        return
+      end
+
+      -- Try using previous buffer
+      local has_previous = pcall(vim.cmd, "bprevious")
+      if has_previous and buf ~= vim.api.nvim_win_get_buf(win) then
+        return
+      end
+
+      -- Create new listed buffer
+      local new_buf = vim.api.nvim_create_buf(true, false)
+      vim.api.nvim_win_set_buf(win, new_buf)
+    end)
+  end
+  if vim.api.nvim_buf_is_valid(buf) then
+    pcall(vim.cmd, "bdelete! " .. buf)
+  end
+end
+
 return M

queries/lua/highlights.scm

@@ -2,3 +2,6 @@
 
 ((identifier) @namespace.builtin
   (#eq? @namespace.builtin "vim"))
+
+((identifier) @namespace.builtin
+  (#eq? @namespace.builtin "LazyVim"))