update nvim lastplace

usr/share/archboot/nvim/nvim-lastplace.lua

@@ -1,49 +1,131 @@
--- https://github.com/neovim/neovim/issues/16339
--- @hermitmaster cool! Wasn't aware someone ported this to Lua. 
--- I've taken a look and been able to reduce it down <50LOC which 
--- people can drop into the $XDG_CONFIG/nvim/plugin/*
+local fn = vim.fn
+local lastplace = {}
 
-local ignore_buftype = { "quickfix", "nofile", "help" }
-local ignore_filetype = { "gitcommit", "gitrebase", "svn", "hgcommit" }
-
-local function run()
-  if vim.tbl_contains(ignore_buftype, vim.bo.buftype) then
-    return
-  end
-
-  if vim.tbl_contains(ignore_filetype, vim.bo.filetype) then
-    -- reset cursor to first line
-    vim.cmd[[normal! gg]]
-    return
-  end
-
-  -- If a line has already been specified on the command line, we are done
-  --   nvim file +num
-  if vim.fn.line(".") > 1 then
-    return
-  end
-
-  local last_line = vim.fn.line([['"]])
-  local buff_last_line = vim.fn.line("$")
-
-  -- If the last line is set and the less than the last line in the buffer
-  if last_line > 0 and last_line <= buff_last_line then
-    local win_last_line = vim.fn.line("w$")
-    local win_first_line = vim.fn.line("w0")
-    -- Check if the last line of the buffer is the same as the win
-    if win_last_line == buff_last_line then
-      -- Set line to last line edited
-      vim.cmd[[normal! g`"]]
-      -- Try to center
-    elseif buff_last_line - last_line > ((win_last_line - win_first_line) / 2) - 1 then
-      vim.cmd[[normal! g`"zz]]
-    else
-      vim.cmd[[normal! G'"<c-e>]]
-    end
-  end
+local function split_on_comma(str)
+	local ret_tab = {}
+	if str == nil then
+		return nil
+	end
+	for word in string.gmatch(str, "([^,]+)") do
+		table.insert(ret_tab, word)
+	end
+	return ret_tab
 end
 
-vim.api.nvim_create_autocmd({'BufWinEnter', 'FileType'}, {
-  group    = vim.api.nvim_create_augroup('nvim-lastplace', {}),
-  callback = run
-})
+local function set_option(option, default)
+	-- Coalesce boolean options to integer 0 or 1
+	if type(lastplace.options[option]) == "boolean" then
+		lastplace.options[option] = lastplace.options[option] and 1 or 0
+	end
+
+	-- Set option to either the option value or the default
+	lastplace.options[option] = lastplace.options[option] or split_on_comma(vim.g[option]) or default
+end
+
+function lastplace.setup(options)
+	options = options or {}
+	lastplace.options = options
+	set_option("lastplace_ignore_buftype", { "quickfix", "nofile", "help" })
+	set_option("lastplace_ignore_filetype", { "gitcommit", "gitrebase", "svn", "hgcommit" })
+	set_option("lastplace_open_folds", 1)
+	if vim.fn.has("nvim-0.7") then
+		local group_name = "NvimLastplace"
+		vim.api.nvim_create_augroup(group_name, { clear = true })
+		vim.api.nvim_create_autocmd("BufRead", {
+			group = group_name,
+			callback = function(opts)
+				vim.api.nvim_create_autocmd("BufWinEnter", {
+					group = group_name,
+					buffer = opts.buf,
+					callback = function()
+						lastplace.lastplace_ft(opts.buf)
+					end,
+				})
+			end,
+		})
+	else
+		vim.cmd([[augroup NvimLastplace]])
+		vim.cmd([[  autocmd!]])
+		vim.cmd([[  autocmd BufWinEnter * lua require('nvim-lastplace').lastplace_buf()]])
+		if not vim.fn.has("nvim-0.5.1") then
+			vim.cmd([[  autocmd FileType * lua require('nvim-lastplace').lastplace_ft()]])
+		end
+		vim.cmd([[augroup end]])
+	end
+end
+
+local set_cursor_position = function()
+	local last_line = fn.line([['"]])
+	local buff_last_line = fn.line("$")
+	local window_last_line = fn.line("w$")
+	local window_first_line = fn.line("w0")
+	-- If the last line is set and the less than the last line in the buffer
+	if last_line > 0 and last_line <= buff_last_line then
+		-- Check if the last line of the buffer is the same as the window
+		if window_last_line == buff_last_line then
+			-- Set line to last line edited
+			vim.api.nvim_command([[keepjumps normal! g`"]])
+			-- Try to center
+		elseif buff_last_line - last_line > ((window_last_line - window_first_line) / 2) - 1 then
+			vim.api.nvim_command([[keepjumps normal! g`"zz]])
+		else
+			vim.api.nvim_command([[keepjumps normal! G'"<c-e>]])
+		end
+	end
+	if fn.foldclosed(".") ~= -1 and lastplace.options.lastplace_open_folds == 1 then
+		vim.api.nvim_command([[normal! zvzz]])
+	end
+end
+
+function lastplace.lastplace_buf()
+	-- Check if the buffer should be ignored
+	if vim.tbl_contains(lastplace.options.lastplace_ignore_buftype, vim.api.nvim_buf_get_option(0, "buftype")) then
+		return
+	end
+
+	if vim.fn.has("nvim-0.5.1") then
+		-- Check if the filetype should be ignored
+		if
+			vim.tbl_contains(lastplace.options.lastplace_ignore_filetype, vim.api.nvim_buf_get_option(0, "filetype"))
+		then
+			-- reset cursor to first line
+			vim.api.nvim_command([[normal! gg]])
+			return
+		end
+	end
+
+	-- If a line has already been specified on the command line, we are done
+	--   nvim file +num
+	if fn.line(".") > 1 then
+		return
+	end
+
+	set_cursor_position()
+end
+
+function lastplace.lastplace_ft(buffer)
+	-- Check if the buffer should be ignored
+	if vim.tbl_contains(lastplace.options.lastplace_ignore_buftype, vim.api.nvim_buf_get_option(buffer, "buftype")) then
+		return
+	end
+
+	-- Check if the filetype should be ignored
+	if
+		vim.tbl_contains(lastplace.options.lastplace_ignore_filetype, vim.api.nvim_buf_get_option(buffer, "filetype"))
+	then
+		-- reset cursor to first line
+		vim.api.nvim_command([[normal! gg]])
+		return
+	end
+
+	-- If a line has already been set by the BufReadPost event or on the command
+	-- line, we are done.
+	if fn.line(".") > 1 then
+		return
+	end
+
+	-- This shouldn't be reached but, better have it ;-)
+	set_cursor_position()
+end
+
+return lastplace