- reinit v1
This commit is contained in:
McAuley Penney
2021-12-20 21:26:33 -07:00
parent 1720fb50d0
commit 25715ac21f
3 changed files with 27 additions and 118 deletions

View File

@@ -1,54 +1,20 @@
local M = {
config = {
eof_quant = -1,
fmts = {
"sof",
"eof",
"multi",
"ws"
}
}
}
-- MP
function M.setup(user_config)
-- integrate user configuration
M.config = vim.tbl_deep_extend("force", M.config, user_config or {})
vim.cmd[[
augroup Tidy
au!
au BufWritePre * lua require( "tidy" ).tidy_up()
augroup END
]]
end
local M = {}
function M.tidy_up()
local cmd_mods = ":keepjumps keeppatterns silent! "
local patterns = {
-- delete all lines at end of buffer, see sources
eof = [[0;/^\%(\n*.\)\@!/ + ]] .. M.config.eof_quant .. ",$d",
-- compress all instances of multiple newlines into one, see sources
multi = [[:%s/\n\{2,}/\r\r/e]],
-- delete all new lines at beginning of file
sof = [[%s/\%^\n*/]],
-- delete all whitespace, see sources
ws = [[%s/\s\+$//e]]
}
-- get tuple of cursor position before making changes
local pos = vim.api.nvim_win_get_cursor(0)
local pos = vim.api.nvim_win_get_cursor( 0 )
-- execute chosen patterns
for _, fmt_type in ipairs(M.config.fmts) do
vim.cmd(cmd_mods .. patterns[fmt_type])
end
-- delete all whitespace, see source 1
vim.cmd[[:keepjumps keeppatterns %s/\s\+$//e]]
-- delete all lines at end of buffer, see source 2
vim.cmd[[:keepjumps keeppatterns silent! 0;/^\%(\n*.\)\@!/,$d]]
-- get row count after line deletion
local end_row = vim.api.nvim_buf_line_count(0)
local end_row = vim.api.nvim_buf_line_count( 0 )
--[[
if the row value in the original cursor
@@ -63,7 +29,7 @@ function M.tidy_up()
pos[1] = end_row
end
vim.api.nvim_win_set_cursor(0, pos)
vim.api.nvim_win_set_cursor( 0, pos )
end
return M