chore(main): release 9.3.0 (#1603)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

CHANGELOG.md

@@ -1,5 +1,43 @@
 # Changelog
 
+## [9.3.0](https://github.com/LazyVim/LazyVim/compare/v9.2.0...v9.3.0) (2023-10-06)
+
+
+### Features
+
+* **bufremove:** ask to save changes before trying to remove a buffer ([54df3e2](https://github.com/LazyVim/LazyVim/commit/54df3e26aca5c5c4da746f210e6f7e7de30673bb))
+
+
+### Bug Fixes
+
+* **tailwind:** nil check for filetypes_include. Fixes [#1607](https://github.com/LazyVim/LazyVim/issues/1607) ([d8f4382](https://github.com/LazyVim/LazyVim/commit/d8f4382dd3850550076b33d64a5f455daf7e6450))
+
+
+### Performance Improvements
+
+* **config:** only enable LazyFile when opening a file from the cmdline ([11c9084](https://github.com/LazyVim/LazyVim/commit/11c9084ec576c8735a87550f7975640eb75e6ff7))
+
+## [9.2.0](https://github.com/LazyVim/LazyVim/compare/v9.1.1...v9.2.0) (2023-10-06)
+
+
+### Features
+
+* **conform:** ignore formatting errors for injected languages and fix condition example ([a1c5886](https://github.com/LazyVim/LazyVim/commit/a1c5886947e20059ad7802e71e0a82b413af6657))
+
+
+### Bug Fixes
+
+* **config:** fixed issues related to LazyFile. Fixes [#1601](https://github.com/LazyVim/LazyVim/issues/1601) ([6e0e01f](https://github.com/LazyVim/LazyVim/commit/6e0e01f5b4dd7e97abbb50241a207d36d0ce9cd5))
+* **elixir:** only enable credo when installed. Fixes [#1546](https://github.com/LazyVim/LazyVim/issues/1546) ([8a1de2b](https://github.com/LazyVim/LazyVim/commit/8a1de2b90a699bdfee704f3d4422e2ced18ae0f3))
+* **which-key:** change surround group key ([#1598](https://github.com/LazyVim/LazyVim/issues/1598)) ([f1ea518](https://github.com/LazyVim/LazyVim/commit/f1ea518e29a601b773d9c9c94489fc9d273c2dea))
+
+## [9.1.1](https://github.com/LazyVim/LazyVim/compare/v9.1.0...v9.1.1) (2023-10-05)
+
+
+### Bug Fixes
+
+* **ui:** include extmark signs in signcolumn. Fixes [#1596](https://github.com/LazyVim/LazyVim/issues/1596) ([337cfdb](https://github.com/LazyVim/LazyVim/commit/337cfdbec43003cb2c269e59b27167aa752bf41f))
+
 ## [9.1.0](https://github.com/LazyVim/LazyVim/compare/v9.0.2...v9.1.0) (2023-10-05)
 
 

doc/LazyVim.txt

@@ -1,4 +1,4 @@
-*LazyVim.txt*         For Neovim >= 0.8.0         Last change: 2023 October 05
+*LazyVim.txt*         For Neovim >= 0.8.0         Last change: 2023 October 06
 
 ==============================================================================
 Table of Contents                                  *LazyVim-table-of-contents*

lua/lazyvim/config/autocmds.lua

@@ -32,9 +32,6 @@ vim.api.nvim_create_autocmd({ "VimResized" }, {
 vim.api.nvim_create_autocmd("BufReadPost", {
   group = augroup("last_loc"),
   callback = function(event)
-    if event.data and event.data.lazy_file then
-      return
-    end
     local exclude = { "gitcommit" }
     local buf = event.buf
     if vim.tbl_contains(exclude, vim.bo[buf].filetype) then

lua/lazyvim/config/init.lua

@@ -2,6 +2,8 @@
 local M = {}
 
 M.lazy_version = ">=9.1.0"
+M.use_lazy_file = true
+M.lazy_file_events = { "BufReadPost", "BufNewFile" }
 
 ---@class LazyVimOptions
 local defaults = {
@@ -136,7 +138,9 @@ function M.setup(opts)
     end,
   })
 
-  M.lazy_file()
+  if M.use_lazy_file then
+    M.lazy_file()
+  end
 
   require("lazy.core.util").try(function()
     if type(M.colorscheme) == "function" then
@@ -155,31 +159,50 @@ end
 
 -- Properly load file based plugins without blocking the UI
 function M.lazy_file()
-  local events = {} ---@type {event: string, pattern?: string, buf: number, data?: any}[]
+  local events = {} ---@type {event: string, buf: number, data?: any}[]
 
   local function load()
     if #events == 0 then
       return
     end
+    local Event = require("lazy.core.handler.event")
+    local Util = require("lazy.core.util")
     vim.api.nvim_del_augroup_by_name("lazy_file")
+
+    Util.track({ event = "LazyVim.lazy_file" })
+
+    ---@type table<string,string[]>
+    local skips = { FileType = Event.get_augroups("FileType") }
+    for _, event in ipairs(events) do
+      skips[event.event] = skips[event.event] or Event.get_augroups(event.event)
+    end
+
     vim.api.nvim_exec_autocmds("User", { pattern = "LazyFile", modeline = false })
     for _, event in ipairs(events) do
-      vim.api.nvim_exec_autocmds(event.event, {
-        pattern = event.pattern,
-        modeline = false,
-        buffer = event.buf,
-        data = { lazy_file = true },
+      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",
+          exclude = skips.FileType,
+          buf = event.buf,
+        })
+      end
     end
     vim.api.nvim_exec_autocmds("CursorMoved", { modeline = false })
     events = {}
+    Util.track()
   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({ "BufReadPost", "BufWritePost", "BufNewFile" }, {
+  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)
@@ -229,6 +252,11 @@ function M.init()
   if not M.did_init then
     M.did_init = true
     vim.opt.rtp:append(require("lazy.core.config").spec.plugins.LazyVim.dir)
+
+    M.use_lazy_file = M.use_lazy_file and vim.fn.argc(-1) > 0
+    ---@diagnostic disable-next-line: undefined-field
+    M.use_lazy_file = M.use_lazy_file and require("lazy.core.handler.event").trigger_events == nil
+
     -- delay notifications till vim.notify was replaced or after 500ms
     require("lazyvim.util").lazy_notify()
 
@@ -240,16 +268,32 @@ function M.init()
     local add = Plugin.Spec.add
     ---@diagnostic disable-next-line: duplicate-set-field
     Plugin.Spec.add = function(self, plugin, ...)
-      if type(plugin) == "table" and M.renames[plugin[1]] then
-        require("lazy.core.util").warn(
-          ("Plugin `%s` was renamed to `%s`.\nPlease update your config for `%s`"):format(
-            plugin[1],
-            M.renames[plugin[1]],
-            self.importing or "LazyVim"
-          ),
-          { title = "LazyVim" }
-        )
-        plugin[1] = M.renames[plugin[1]]
+      if type(plugin) == "table" then
+        if M.renames[plugin[1]] then
+          require("lazy.core.util").warn(
+            ("Plugin `%s` was renamed to `%s`.\nPlease update your config for `%s`"):format(
+              plugin[1],
+              M.renames[plugin[1]],
+              self.importing or "LazyVim"
+            ),
+            { title = "LazyVim" }
+          )
+          plugin[1] = M.renames[plugin[1]]
+        end
+        if not M.use_lazy_file and plugin.event then
+          if plugin.event == "LazyFile" then
+            plugin.event = M.lazy_file_events
+          elseif type(plugin.event) == "table" then
+            local events = {} ---@type string[]
+            for _, event in ipairs(plugin.event) do
+              if event == "LazyFile" then
+                vim.list_extend(events, M.lazy_file_events)
+              else
+                events[#events + 1] = event
+              end
+            end
+          end
+        end
       end
       return add(self, plugin, ...)
     end

lua/lazyvim/plugins/editor.lua

@@ -282,7 +282,7 @@ return {
       defaults = {
         mode = { "n", "v" },
         ["g"] = { name = "+goto" },
-        ["gz"] = { name = "+surround" },
+        ["gs"] = { name = "+surround" },
         ["]"] = { name = "+next" },
         ["["] = { name = "+prev" },
         ["<leader><tab>"] = { name = "+tabs" },
@@ -387,9 +387,27 @@ return {
   -- buffer remove
   {
     "echasnovski/mini.bufremove",
-    -- stylua: ignore
+
     keys = {
-      { "<leader>bd", function() require("mini.bufremove").delete(0, false) end, desc = "Delete Buffer" },
+      {
+        "<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)" },
     },
   },

lua/lazyvim/plugins/extras/formatting/conform.lua

@@ -33,9 +33,10 @@ return {
       -- You can also define any custom formatters here.
       ---@type table<string,table>
       formatters = {
+        injected = { options = { ignore_errors = true } },
         -- -- Example of using dprint only when a dprint.json file is present
         -- dprint = {
-        --   condition = function(ctx)
+        --   condition = function(self, ctx)
         --     return vim.fs.find({ "dprint.json" }, { path = ctx.filename, upward = true })[1]
         --   end,
         -- },

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

@@ -33,6 +33,9 @@ return {
     "nvimtools/none-ls.nvim",
     optional = true,
     opts = function(_, opts)
+      if vim.fn.executable("credo") == 0 then
+        return
+      end
       local nls = require("null-ls")
       opts.sources = opts.sources or {}
       vim.list_extend(opts.sources, {
@@ -43,10 +46,13 @@ return {
   {
     "mfussenegger/nvim-lint",
     optional = true,
-    opts = {
-      linters_by_ft = {
+    opts = function(_, opts)
+      if vim.fn.executable("credo") == 0 then
+        return
+      end
+      opts.linters_by_ft = {
         elixir = { "credo" },
-      },
-    },
+      }
+    end,
   },
 }

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

@@ -27,7 +27,7 @@ return {
           end, opts.filetypes)
 
           -- Add additional filetypes
-          vim.list_extend(opts.filetypes, opts.filetypes_include)
+          vim.list_extend(opts.filetypes, opts.filetypes_include or {})
         end,
       },
     },

lua/lazyvim/util/ui.lua

@@ -1,15 +1,44 @@
 local M = {}
 
----@alias Sign {name:string, text:string, texthl:string}
+---@alias Sign {name:string, text:string, texthl:string, priority:number}
 
+-- Returns a list of regular and extmark signs sorted by priority (low to high)
 ---@return Sign[]
 ---@param buf number
 ---@param lnum number
 function M.get_signs(buf, lnum)
-  ---@diagnostic disable-next-line: no-unknown
-  return vim.tbl_map(function(sign)
-    return vim.fn.sign_getdefined(sign.name)[1]
+  -- Get regular signs
+  ---@type Sign[]
+  local signs = vim.tbl_map(function(sign)
+    ---@type Sign
+    local ret = vim.fn.sign_getdefined(sign.name)[1]
+    ret.priority = sign.priority
+    return ret
   end, vim.fn.sign_getplaced(buf, { group = "*", lnum = lnum })[1].signs)
+
+  -- Get extmark signs
+  local extmarks = vim.api.nvim_buf_get_extmarks(
+    buf,
+    -1,
+    { lnum - 1, 0 },
+    { lnum - 1, -1 },
+    { details = true, type = "sign" }
+  )
+  for _, extmark in pairs(extmarks) do
+    signs[#signs + 1] = {
+      name = extmark[4].sign_hl_group,
+      text = extmark[4].sign_text,
+      texthl = extmark[4].sign_hl_group,
+      priority = extmark[4].priority,
+    }
+  end
+
+  -- Sort by priority
+  table.sort(signs, function(a, b)
+    return (a.priority or 0) < (b.priority or 0)
+  end)
+
+  return signs
 end
 
 ---@return Sign?
@@ -66,7 +95,7 @@ function M.statuscolumn()
   for _, s in ipairs(M.get_signs(buf, vim.v.lnum)) do
     if s.name:find("GitSign") then
       right = s
-    elseif not left then
+    else
       left = s
     end
   end