feat(nvim): migrate to conform for formatting

sbulav · Sep 18, 2023 · 3d78a82 · 3d78a82
1 parent 3dfcfc4
commit 3d78a82
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 67 deletions.
diff --git a/nvim/lua/config/autocommands.lua b/nvim/lua/config/autocommands.lua
@@ -65,3 +65,21 @@ vim.api.nvim_create_autocmd({ "BufEnter", "TermOpen" }, {
         vim.b.miniindentscope_disable = vim.tbl_contains({ "help", "terminal", "nofile", "prompt" }, vim.bo.buftype)
     end,
 })
+
+vim.api.nvim_create_user_command("FormatDisable", function(args)
+    if args.bang then
+        -- FormatDisable! will disable formatting just for this buffer
+        vim.b.disable_autoformat = true
+    else
+        vim.g.disable_autoformat = true
+    end
+end, {
+    desc = "Disable autoformat-on-save",
+    bang = true,
+})
+vim.api.nvim_create_user_command("FormatEnable", function()
+    vim.b.disable_autoformat = false
+    vim.g.disable_autoformat = false
+end, {
+    desc = "Re-enable autoformat-on-save",
+})
diff --git a/nvim/lua/lsp/formatting.lua b/nvim/lua/lsp/formatting.lua
diff --git a/nvim/lua/plugins/conform.lua b/nvim/lua/plugins/conform.lua
@@ -0,0 +1,19 @@
+-- formatters
+return {
+    "stevearc/conform.nvim",
+    event = "BufRead",
+    config = function()
+        require("conform").setup {
+            format_on_save = function(bufnr)
+                -- Disable with a global or buffer-local variable
+                if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
+                    return
+                end
+                return { async = true, timeout_ms = 500, lsp_fallback = true }
+            end,
+            formatters_by_ft = {
+                lua = { "stylua" },
+            },
+        }
+    end,
+}
diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua
@@ -116,7 +116,6 @@ return {
             require("lsp.utils").on_attach(function(client, buffer)
                 require("lsp.utils").custom_on_init()
                 require("lsp.utils").custom_on_attach(client, buffer)
-                require("lsp.formatting").custom_on_attach(client, buffer)
             end)
 
             local servers = opts.servers
@@ -143,26 +142,6 @@ return {
         end,
     },
 
-    -- -- formatters
-    {
-        "jose-elias-alvarez/null-ls.nvim",
-        event = "BufReadPre",
-        dependencies = { "mason.nvim" },
-        opts = function()
-            local nls = require "null-ls"
-            return {
-                sources = {
-                    nls.builtins.diagnostics.flake8,
-                    nls.builtins.formatting.alejandra,
-                    nls.builtins.formatting.gofmt,
-                    nls.builtins.formatting.goimports,
-                    nls.builtins.formatting.stylua,
-                },
-                on_attach = require("lsp.utils").custom_on_attach,
-            }
-        end,
-    },
-
     -- cmdline tools and lsp servers
     {