From 6fd66f486e210e35b4c375691fbfd61a611b6027 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Fri, 13 Oct 2023 12:21:38 +0200
Subject: [PATCH] feat(conform): use conform.nvim `opts.format` options for
 formatting with conform

---
 lua/lazyvim/plugins/formatting.lua | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/lua/lazyvim/plugins/formatting.lua b/lua/lazyvim/plugins/formatting.lua
index 855e356e..b40245ea 100644
--- a/lua/lazyvim/plugins/formatting.lua
+++ b/lua/lazyvim/plugins/formatting.lua
@@ -1,3 +1,8 @@
+local Util = require("lazyvim.util")
+
+---@type ConformOpts
+local format_opts = {}
+
 return {
   {
     "stevearc/conform.nvim",
@@ -23,7 +28,7 @@ return {
           priority = 100,
           primary = true,
           format = function(buf)
-            require("conform").format({ bufnr = buf })
+            require("conform").format(Util.merge(format_opts, { bufnr = buf }))
           end,
           sources = function(buf)
             local ret = require("conform").list_formatters(buf)
@@ -34,7 +39,12 @@ return {
         })
       end)
     end,
+    ---@class ConformOpts
     opts = {
+      -- LazyVim will use these options when formatting with the conform.nvim formatter
+      format = {
+        timeout_ms = 1000,
+      },
       formatters_by_ft = {
         lua = { "stylua" },
         fish = { "fish_indent" },
@@ -53,6 +63,7 @@ return {
         -- },
       },
     },
+    ---@param opts ConformOpts
     config = function(_, opts)
       opts.formatters = opts.formatters or {}
       for name, formatter in pairs(opts.formatters) do
@@ -63,6 +74,17 @@ return {
           end
         end
       end
+      for _, key in ipairs({ "format_on_save", "format_after_save" }) do
+        if opts[key] then
+          Util.warn(
+            ("Don't set `opts.%s` for `conform.nvim`.\n**LazyVim** will use the conform formatter automatically"):format(
+              key
+            )
+          )
+          opts[key] = nil
+        end
+      end
+      format_opts = opts.format
       require("conform").setup(opts)
     end,
   },