summaryrefslogtreecommitdiffstatshomepage
path: root/nvim/.config
diff options
context:
space:
mode:
authorToby Vincent <tobyv13@gmail.com>2023-05-28 13:50:26 -0500
committerToby Vincent <tobyv13@gmail.com>2023-05-28 13:51:54 -0500
commite725cea1154f8ed6661af4ae80103c6ff1430fa8 (patch)
tree6a50c94dad7d527aeac04daabef537b5bbf872b7 /nvim/.config
parent4abc2c53658dc35995f4abb546d73392f1166c18 (diff)
revert(nvim): running on format was a mistake
This reverts commit 4abc2c5 (fix(nvim): move whitespace trim autocmd to null-ls, 2023-05-28).
Diffstat (limited to 'nvim/.config')
-rw-r--r--nvim/.config/nvim/lua/plugins/null-ls.lua2
-rw-r--r--nvim/.config/nvim/lua/tobyvin/autocmds.lua11
2 files changed, 11 insertions, 2 deletions
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",