chore(main): release 4.2.0 (#831)

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

CHANGELOG.md

@@ -1,5 +1,57 @@
 # Changelog
 
+## [4.2.0](https://github.com/LazyVim/LazyVim/compare/v4.1.1...v4.2.0) (2023-05-26)
+
+
+### Features
+
+* **hipatterns:** made tailwind ft and style configurable ([f7a6304](https://github.com/LazyVim/LazyVim/commit/f7a63042f9b6f2353d861ba4cec23789d0254b5b))
+* **lsp:** added `nvim-lspconfig.opts.format_notify`. Enable this to debug formatter issues. ([5eccaeb](https://github.com/LazyVim/LazyVim/commit/5eccaeb992217d47f111c78a3d519aae3d9a5edc))
+* **lsp:** added support for upcoming dynamic registration of formatters ([962fc6b](https://github.com/LazyVim/LazyVim/commit/962fc6bab43cdf68e5602fe06a54c7a5fac053b6))
+
+
+### Bug Fixes
+
+* **hipatterns:** reset hl groups when colorscheme changes ([b7a9259](https://github.com/LazyVim/LazyVim/commit/b7a925904ea30d85a96683df9980960ef349eacf))
+
+## [4.1.1](https://github.com/LazyVim/LazyVim/compare/v4.1.0...v4.1.1) (2023-05-26)
+
+
+### Bug Fixes
+
+* **hipatterns:** make it work on stable ([33f61b5](https://github.com/LazyVim/LazyVim/commit/33f61b58de3519ef568bc9591fb877a71a203a6d))
+* **hipatterns:** make sure priority is higher than the one for references ([b027beb](https://github.com/LazyVim/LazyVim/commit/b027bebeab30308f26f5cafe1642f3aa0e541ca3))
+
+## [4.1.0](https://github.com/LazyVim/LazyVim/compare/v4.0.0...v4.1.0) (2023-05-25)
+
+
+### Features
+
+* **hipatterns:** better tailwind fg colors ([c526ea3](https://github.com/LazyVim/LazyVim/commit/c526ea338b415a51fa78936b7044ec67d78528b2))
+
+## [4.0.0](https://github.com/LazyVim/LazyVim/compare/v3.7.2...v4.0.0) (2023-05-25)
+
+
+### ⚠ BREAKING CHANGES
+
+* remove nvim-colorizer.lua It actually wasn't even enabled and I'll add hipatterns with optional tailwind support soon
+
+### Features
+
+* added extra for mini.hipatterns with tailwind support ([7bc979a](https://github.com/LazyVim/LazyVim/commit/7bc979a7c1eacba16b60c324ae7bfab57b73a702))
+
+
+### Bug Fixes
+
+* remove nvim-colorizer.lua It actually wasn't even enabled and I'll add hipatterns with optional tailwind support soon ([9c7821e](https://github.com/LazyVim/LazyVim/commit/9c7821e681e264905d7f764aeddda78162a9d867))
+
+## [3.7.2](https://github.com/LazyVim/LazyVim/compare/v3.7.1...v3.7.2) (2023-05-25)
+
+
+### Bug Fixes
+
+* **telescope:** use last-known telescope commit to work on Neovim 0.8.0 when running in Neovim 0.8.0 ([877e63c](https://github.com/LazyVim/LazyVim/commit/877e63ca8ee5efe1420744f7a843dd4fd0215764))
+
 ## [3.7.1](https://github.com/LazyVim/LazyVim/compare/v3.7.0...v3.7.1) (2023-05-25)
 
 

doc/LazyVim.txt

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

lua/lazyvim/plugins/editor.lua

@@ -81,6 +81,7 @@ return {
   -- fuzzy finder
   {
     "nvim-telescope/telescope.nvim",
+    commit = vim.fn.has("nvim-0.9.0") == 0 and "057ee0f8783" or nil,
     cmd = "Telescope",
     version = false, -- telescope did only one release, so use HEAD for now
     keys = {

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

@@ -18,14 +18,6 @@ return {
       },
     },
   },
-  {
-    "NvChad/nvim-colorizer.lua",
-    opts = {
-      user_default_options = {
-        tailwind = true,
-      },
-    },
-  },
   {
     "hrsh7th/nvim-cmp",
     dependencies = {

lua/lazyvim/plugins/lsp/format.lua

@@ -2,16 +2,17 @@ local Util = require("lazy.core.util")
 
 local M = {}
 
-M.autoformat = true
+---@type PluginLspOpts
+M.opts = nil
 
 function M.toggle()
   if vim.b.autoformat == false then
     vim.b.autoformat = nil
-    M.autoformat = true
+    M.opts.autoformat = true
   else
-    M.autoformat = not M.autoformat
+    M.opts.autoformat = not M.opts.autoformat
   end
-  if M.autoformat then
+  if M.opts.autoformat then
     Util.info("Enabled format on save", { title = "Format" })
   else
     Util.warn("Disabled format on save", { title = "Format" })
@@ -24,42 +25,124 @@ function M.format(opts)
   if vim.b.autoformat == false and not (opts and opts.force) then
     return
   end
-  local ft = vim.bo[buf].filetype
-  local have_nls = package.loaded["null-ls"]
-    and (#require("null-ls.sources").get_available(ft, "NULL_LS_FORMATTING") > 0)
+
+  local formatters = M.get_formatters(buf)
+  local client_ids = vim.tbl_map(function(client)
+    return client.id
+  end, formatters.active)
+
+  if #client_ids == 0 then
+    return
+  end
+
+  if M.opts.format_notify then
+    M.notify(formatters)
+  end
 
   vim.lsp.buf.format(vim.tbl_deep_extend("force", {
     bufnr = buf,
     filter = function(client)
-      if have_nls then
-        return client.name == "null-ls"
-      end
-      return client.name ~= "null-ls"
+      return vim.tbl_contains(client_ids, client.id)
     end,
   }, require("lazyvim.util").opts("nvim-lspconfig").format or {}))
 end
 
-function M.on_attach(client, buf)
-  -- dont format if client disabled it
+---@param formatters LazyVimFormatters
+function M.notify(formatters)
+  local lines = { "# Active:" }
+
+  for _, client in ipairs(formatters.active) do
+    local line = "- **" .. client.name .. "**"
+    if client.name == "null-ls" then
+      line = line
+        .. " ("
+        .. table.concat(
+          vim.tbl_map(function(f)
+            return "`" .. f.name .. "`"
+          end, formatters.null_ls),
+          ", "
+        )
+        .. ")"
+    end
+    table.insert(lines, line)
+  end
+
+  if #formatters.available > 0 then
+    table.insert(lines, "")
+    table.insert(lines, "# Disabled:")
+    for _, client in ipairs(formatters.available) do
+      table.insert(lines, "- **" .. client.name .. "**")
+    end
+  end
+
+  vim.notify(table.concat(lines, "\n"), vim.log.levels.INFO, {
+    title = "Formatting",
+    on_open = function(win)
+      vim.api.nvim_win_set_option(win, "conceallevel", 3)
+      vim.api.nvim_win_set_option(win, "spell", false)
+      local buf = vim.api.nvim_win_get_buf(win)
+      vim.treesitter.start(buf, "markdown")
+    end,
+  })
+end
+
+-- Gets all lsp clients that support formatting.
+-- When a null-ls formatter is available for the current filetype,
+-- only null-ls formatters are returned.
+function M.get_formatters(bufnr)
+  local ft = vim.bo[bufnr].filetype
+  -- check if we have any null-ls formatters for the current filetype
+  local null_ls = package.loaded["null-ls"] and require("null-ls.sources").get_available(ft, "NULL_LS_FORMATTING") or {}
+
+  ---@class LazyVimFormatters
+  local ret = {
+    ---@type lsp.Client[]
+    active = {},
+    ---@type lsp.Client[]
+    available = {},
+    null_ls = null_ls,
+  }
+
+  ---@type lsp.Client[]
+  local clients = vim.lsp.get_active_clients({ bufnr = bufnr })
+  for _, client in ipairs(clients) do
+    if M.supports_format(client) then
+      if (#null_ls > 0 and client.name == "null-ls") or #null_ls == 0 then
+        table.insert(ret.active, client)
+      else
+        table.insert(ret.available, client)
+      end
+    end
+  end
+
+  return ret
+end
+
+-- Gets all lsp clients that support formatting
+-- and have not disabled it in their client config
+---@param client lsp.Client
+function M.supports_format(client)
   if
     client.config
     and client.config.capabilities
     and client.config.capabilities.documentFormattingProvider == false
   then
-    return
+    return false
   end
+  return client.supports_method("textDocument/formatting") or client.supports_method("textDocument/rangeFormatting")
+end
 
-  if client.supports_method("textDocument/formatting") then
-    vim.api.nvim_create_autocmd("BufWritePre", {
-      group = vim.api.nvim_create_augroup("LspFormat." .. buf, {}),
-      buffer = buf,
-      callback = function()
-        if M.autoformat then
-          M.format()
-        end
-      end,
-    })
-  end
+---@param opts PluginLspOpts
+function M.setup(opts)
+  M.opts = opts
+  vim.api.nvim_create_autocmd("BufWritePre", {
+    group = vim.api.nvim_create_augroup("LazyVimFormat", {}),
+    callback = function()
+      if M.opts.autoformat then
+        M.format()
+      end
+    end,
+  })
 end
 
 return M

lua/lazyvim/plugins/lsp/init.lua

@@ -35,6 +35,9 @@ return {
       capabilities = {},
       -- Automatically format on save
       autoformat = true,
+      -- Enable this to show formatters used in a notification
+      -- Useful for debugging formatter issues
+      format_notify = false,
       -- options for vim.lsp.buf.format
       -- `bufnr` and `filter` is handled by the LazyVim formatter,
       -- but can be also overridden when specified
@@ -77,10 +80,9 @@ return {
     config = function(_, opts)
       local Util = require("lazyvim.util")
       -- setup autoformat
-      require("lazyvim.plugins.lsp.format").autoformat = opts.autoformat
+      require("lazyvim.plugins.lsp.format").setup(opts)
       -- setup formatting and keymaps
       Util.on_attach(function(client, buffer)
-        require("lazyvim.plugins.lsp.format").on_attach(client, buffer)
         require("lazyvim.plugins.lsp.keymaps").on_attach(client, buffer)
       end)
 

lua/lazyvim/util/build.lua

@@ -276,7 +276,8 @@ function M.plugins(path)
       local text = vim.treesitter.get_node_text(node, source):sub(2, -2)
       if text:find("/") and #node:parent():field("name") == 0 then
         local plugin_node = node:parent():parent()
-        if plugin_node:named_child(0):field("value")[1]:id() ~= node:id() then
+        local first_child = plugin_node:named_child(0)
+        if first_child and first_child:field("value")[1] and first_child:field("value")[1]:id() ~= node:id() then
           plugin_node = node
         end
         local comment_node = plugin_node:parent():prev_named_sibling()
@@ -306,13 +307,13 @@ function M.plugins(path)
   end
 
   parser:parse()
-  if path ~= "extras/vscode.lua" then
-    parser:for_each_tree(function(tree)
-      local node = tree:root()
-      find_plugins(node)
-      -- print(vim.treesitter.query.get_node_text(node, str))
-    end)
-  end
+  -- if path ~= "extras/vscode.lua" then
+  parser:for_each_tree(function(tree)
+    local node = tree:root()
+    find_plugins(node)
+    -- print(vim.treesitter.query.get_node_text(node, str))
+  end)
+  -- end
 
   ---@type string[]
   local lines = {

lua/lazyvim/util/init.lua

@@ -27,20 +27,6 @@ function M.fg(name)
   return fg and { fg = string.format("#%06x", fg) }
 end
 
-function M.get_upvalue(func, name)
-  local i = 1
-  while true do
-    local n, v = debug.getupvalue(func, i)
-    if not n then
-      break
-    end
-    if n == name then
-      return v
-    end
-    i = i + 1
-  end
-end
-
 ---@param fn fun()
 function M.on_very_lazy(fn)
   vim.api.nvim_create_autocmd("User", {