Merge branch 'main' into fix/lazygit/handle-remotes

.github/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "12.26.1"
+  ".": "12.26.2"
 }

.github/workflows/ci.yml

@@ -12,4 +12,3 @@ jobs:
     with:
       plugin: LazyVim
       repo: LazyVim/LazyVim
-      tests: true

.gitignore

@@ -1,8 +1,9 @@
 *.log
-.repro
-.tests
-build
-debug
-doc/tags
+/.repro
+/.tests
+/build
+/debug
+/doc/tags
 foo.*
+node_modules
 tt.*

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [12.26.2](https://github.com/LazyVim/LazyVim/compare/v12.26.1...v12.26.2) (2024-07-07)
+
+
+### Bug Fixes
+
+* **lualine:** check that trouble is installed ([d108169](https://github.com/LazyVim/LazyVim/commit/d108169e951fff8c65ed8dea89b058717cc48da5))
+
 ## [12.26.1](https://github.com/LazyVim/LazyVim/compare/v12.26.0...v12.26.1) (2024-07-06)
 
 

doc/LazyVim.txt

@@ -1,4 +1,4 @@
-*LazyVim.txt*               For Neovim               Last change: 2024 July 06
+*LazyVim.txt*               For Neovim               Last change: 2024 July 07
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

lua/lazyvim/config/init.lua

@@ -3,7 +3,7 @@ _G.LazyVim = require("lazyvim.util")
 ---@class LazyVimConfig: LazyVimOptions
 local M = {}
 
-M.version = "12.26.1" -- x-release-please-version
+M.version = "12.26.2" -- x-release-please-version
 LazyVim.config = M
 
 ---@class LazyVimOptions

lua/lazyvim/plugins/extras/editor/fzf.lua

@@ -190,12 +190,13 @@ return {
     end,
     config = function(_, opts)
       require("fzf-lua").setup(opts)
-      require("fzf-lua").register_ui_select(opts.ui_select or nil)
     end,
     init = function()
       LazyVim.on_very_lazy(function()
         vim.ui.select = function(...)
-          require("fzf-lua")
+          require("lazy").load({ plugins = { "fzf-lua" } })
+          local opts = LazyVim.opts("fzf-lua") or {}
+          require("fzf-lua").register_ui_select(opts.ui_select or nil)
           return vim.ui.select(...)
         end
       end)

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

@@ -137,4 +137,17 @@ return {
       },
     },
   },
+
+  -- Filetype icons
+  {
+    "echasnovski/mini.icons",
+    opts = {
+      file = {
+        [".go-version"] = { glyph = "", hl = "MiniIconsBlue" },
+      },
+      filetype = {
+        gotmpl = { glyph = "󰟓", hl = "MiniIconsGrey" },
+      },
+    },
+  },
 }

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

@@ -248,4 +248,22 @@ return {
       end
     end,
   },
+
+  -- Filetype icons
+  {
+    "echasnovski/mini.icons",
+    opts = {
+      file = {
+        [".eslintrc.js"] = { glyph = "󰱺", hl = "MiniIconsYellow" },
+        [".node-version"] = { glyph = "", hl = "MiniIconsGreen" },
+        [".prettierrc"] = { glyph = "", hl = "MiniIconsPurple" },
+        [".yarnrc.yml"] = { glyph = "", hl = "MiniIconsBlue" },
+        ["eslint.config.js"] = { glyph = "󰱺", hl = "MiniIconsYellow" },
+        ["package.json"] = { glyph = "", hl = "MiniIconsGreen" },
+        ["tsconfig.json"] = { glyph = "", hl = "MiniIconsAzure" },
+        ["tsconfig.build.json"] = { glyph = "", hl = "MiniIconsAzure" },
+        ["yarn.lock"] = { glyph = "", hl = "MiniIconsBlue" },
+      },
+    },
+  },
 }

lua/lazyvim/plugins/extras/util/chezmoi.lua

@@ -88,4 +88,24 @@ return {
       table.insert(opts.config.center, 5, projects)
     end,
   },
+
+  -- Filetype icons
+  {
+    "echasnovski/mini.icons",
+    opts = {
+      file = {
+        [".chezmoiignore"] = { glyph = "", hl = "MiniIconsGrey" },
+        [".chezmoiremove"] = { glyph = "", hl = "MiniIconsGrey" },
+        [".chezmoiroot"] = { glyph = "", hl = "MiniIconsGrey" },
+        [".chezmoiversion"] = { glyph = "", hl = "MiniIconsGrey" },
+        ["bash.tmpl"] = { glyph = "", hl = "MiniIconsGrey" },
+        ["json.tmpl"] = { glyph = "", hl = "MiniIconsGrey" },
+        ["ps1.tmpl"] = { glyph = "󰨊", hl = "MiniIconsGrey" },
+        ["sh.tmpl"] = { glyph = "", hl = "MiniIconsGrey" },
+        ["toml.tmpl"] = { glyph = "", hl = "MiniIconsGrey" },
+        ["yaml.tmpl"] = { glyph = "", hl = "MiniIconsGrey" },
+        ["zsh.tmpl"] = { glyph = "", hl = "MiniIconsGrey" },
+      },
+    },
+  },
 }

lua/lazyvim/plugins/ui.lua

@@ -198,7 +198,7 @@ return {
       }
 
       -- do not add trouble symbols if aerial is enabled
-      if vim.g.trouble_lualine then
+      if vim.g.trouble_lualine and LazyVim.has("trouble.nvim") then
         local trouble = require("trouble")
         local symbols = trouble.statusline
           and trouble.statusline({
@@ -306,7 +306,16 @@ return {
   {
     "echasnovski/mini.icons",
     lazy = true,
-    opts = {},
+    opts = {
+      file = {
+        [".keep"] = { glyph = "󰊢", hl = "MiniIconsGrey" },
+        ["CODEOWNERS"] = { glyph = "", hl = "MiniIconsGreen" },
+        ["devcontainer.json"] = { glyph = "", hl = "MiniIconsAzure" },
+      },
+      filetype = {
+        dotenv = { glyph = "", hl = "MiniIconsYellow" },
+      },
+    },
     init = function()
       package.preload["nvim-web-devicons"] = function()
         require("mini.icons").mock_nvim_web_devicons()

tests/extras/extra_spec.lua

@@ -1,5 +1,7 @@
 ---@module 'luassert'
 
+local Icons = require("mini.icons")
+
 local Plugin = require("lazy.core.plugin")
 _G.LazyVim = require("lazyvim.util")
 
@@ -98,6 +100,28 @@ describe("Extra", function()
           )
         end)
       end
+
+      -- Icons
+      local icons = spec.plugins["mini.icons"]
+      if icons then
+        local icon_opts = Plugin.values(icons, "opts", false) or {}
+        local cats = { "directory", "file", "extension", "filetype", "lsp", "os" }
+        for _, cat in ipairs(cats) do
+          local cat_names = Icons.list(cat)
+          if icon_opts[cat] then
+            describe("does not set existing icons for " .. cat, function()
+              for icon_name in pairs(icon_opts[cat]) do
+                it(icon_name, function()
+                  assert.is_false(
+                    vim.tbl_contains(cat_names, icon_name),
+                    "Icon " .. icon_name .. " already exists:\n" .. vim.inspect({ Icons.get(cat, icon_name) })
+                  )
+                end)
+              end
+            end)
+          end
+        end
+      end
     end)
   end
 end)

tests/minit.lua

@@ -11,5 +11,6 @@ require("lazy.minit").setup({
     "williamboman/mason-lspconfig.nvim",
     "williamboman/mason.nvim",
     "nvim-treesitter/nvim-treesitter",
+    { "echasnovski/mini.icons", opts = {} },
   },
 })