From e725cea1154f8ed6661af4ae80103c6ff1430fa8 Mon Sep 17 00:00:00 2001 From: Toby Vincent Date: Sun, 28 May 2023 13:50:26 -0500 Subject: revert(nvim): running on format was a mistake This reverts commit 4abc2c5 (fix(nvim): move whitespace trim autocmd to null-ls, 2023-05-28). --- nvim/.config/nvim/lua/plugins/null-ls.lua | 2 -- nvim/.config/nvim/lua/tobyvin/autocmds.lua | 11 +++++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'nvim/.config/nvim') diff --git a/nvim/.config/nvim/lua/plugins/null-ls.lua b/nvim/.config/nvim/lua/plugins/null-ls.lua index cc62edb..8493d1a 100644 --- a/nvim/.config/nvim/lua/plugins/null-ls.lua +++ b/nvim/.config/nvim/lua/plugins/null-ls.lua @@ -31,8 +31,6 @@ function M.config() }), null_ls.builtins.diagnostics.djlint, null_ls.builtins.diagnostics.typos, - null_ls.builtins.formatting.trim_newlines, - null_ls.builtins.formatting.trim_whitespace, null_ls.builtins.formatting.prettier.with({ disabled_filetypes = { "json", "jsonc" }, extra_args = { "--prose-wrap=always" }, diff --git a/nvim/.config/nvim/lua/tobyvin/autocmds.lua b/nvim/.config/nvim/lua/tobyvin/autocmds.lua index aec9d9c..b01a8f6 100644 --- a/nvim/.config/nvim/lua/tobyvin/autocmds.lua +++ b/nvim/.config/nvim/lua/tobyvin/autocmds.lua @@ -110,6 +110,17 @@ vim.api.nvim_create_autocmd("BufWritePre", { desc = "Check for missing directory on write", }) +vim.api.nvim_create_autocmd("BufWritePre", { + group = augroup, + pattern = "*", + callback = function() + local cursor = vim.api.nvim_win_get_cursor(0) + vim.cmd("%s/\\s\\+$//e") + vim.api.nvim_win_set_cursor(0, cursor) + end, + desc = "Trim whitespace on write", +}) + vim.api.nvim_create_autocmd("FileType", { group = augroup, pattern = "qf", -- cgit v1.2.3-70-g09d2