chore: formatting with stylua

main
olimorris 2022-03-03 21:15:37 +00:00
parent 4770626aec
commit 336909e742
3 changed files with 59 additions and 57 deletions

View File

@ -66,6 +66,7 @@ Persisted comes with the following defaults:
**Persisted** works well with plugins like `startify` or `dashboard`. It will never restore a session automatically, but you can of course write an autocmd that does exactly that. **Persisted** works well with plugins like `startify` or `dashboard`. It will never restore a session automatically, but you can of course write an autocmd that does exactly that.
Some example keybindings for the plugins functions are contained below: Some example keybindings for the plugins functions are contained below:
```lua ```lua
-- restore the session for the current directory and current branch (if `git_use_branch` is enabled) -- restore the session for the current directory and current branch (if `git_use_branch` is enabled)
vim.api.nvim_set_keymap("n", "<leader>qr", [[<cmd>lua require("persisted").load()<cr>]]) vim.api.nvim_set_keymap("n", "<leader>qr", [[<cmd>lua require("persisted").load()<cr>]])
@ -87,4 +88,5 @@ vim.api.nvim_set_keymap("n", "<leader>qt", [[<cmd>lua require("persisted").toggl
``` ```
### Helpers ### Helpers
**Persisted** sets a global variable, `vim.g.persisting`, which is set to `true` when the plugin is enabled. The author uses this to display an icon in their [statusline](https://github.com/olimorris/dotfiles/blob/0cdaee183c64f872778952f90f62b9366851101c/.config/nvim/lua/Oli/plugins/statusline.lua#L257). **Persisted** sets a global variable, `vim.g.persisting`, which is set to `true` when the plugin is enabled. The author uses this to display an icon in their [statusline](https://github.com/olimorris/dotfiles/blob/0cdaee183c64f872778952f90f62b9366851101c/.config/nvim/lua/Oli/plugins/statusline.lua#L257).

View File

@ -2,18 +2,18 @@ local M = {}
---@class PersistedOptions ---@class PersistedOptions
local defaults = { local defaults = {
dir = vim.fn.expand(vim.fn.stdpath("data") .. "/sessions/"), -- directory where session files are saved dir = vim.fn.expand(vim.fn.stdpath("data") .. "/sessions/"), -- directory where session files are saved
use_git_branch = false, -- create session files based on the branch of the git enabled repository use_git_branch = false, -- create session files based on the branch of the git enabled repository
autosave = true, -- automatically save session files autosave = true, -- automatically save session files
options = { "buffers", "curdir", "tabpages", "winsize" } -- session options used for saving options = { "buffers", "curdir", "tabpages", "winsize" }, -- session options used for saving
} }
---@type PersistedOptions ---@type PersistedOptions
M.options = {} M.options = {}
function M.setup(opts) function M.setup(opts)
M.options = vim.tbl_deep_extend("force", {}, defaults, opts or {}) M.options = vim.tbl_deep_extend("force", {}, defaults, opts or {})
vim.fn.mkdir(M.options.dir, "p") vim.fn.mkdir(M.options.dir, "p")
end end
return M return M

View File

@ -1,99 +1,99 @@
local Config = require("persisted.config") local config = require("persisted.config")
local M = {} local M = {}
local e = vim.fn.fnameescape local e = vim.fn.fnameescape
function M.get_current() function M.get_current()
local pattern = "/" local pattern = "/"
if vim.fn.has("win32") == 1 then if vim.fn.has("win32") == 1 then
pattern = "[\\:]" pattern = "[\\:]"
end end
local name = vim.fn.getcwd():gsub(pattern, "%%") local name = vim.fn.getcwd():gsub(pattern, "%%")
return Config.options.dir .. name .. get_branch() .. ".vim" return config.options.dir .. name .. get_branch() .. ".vim"
end end
function get_branch() function get_branch()
local git_enabled = (vim.fn.isdirectory(vim.fn.getcwd() .. "/.git") == 1) local git_enabled = (vim.fn.isdirectory(vim.fn.getcwd() .. "/.git") == 1)
if Config.options.use_git_branch and git_enabled then if config.options.use_git_branch and git_enabled then
local branch = vim.api.nvim_exec( local branch = vim.api.nvim_exec([[!git rev-parse --abbrev-ref HEAD 2>/dev/null]], true)
[[!git rev-parse --abbrev-ref HEAD 2>/dev/null]],
true)
-- The branch command returns two lines. We only need the second one -- The branch command returns two lines. We only need the second one
local lines = {} local lines = {}
for s in branch:gmatch("[^\r\n]+") do for s in branch:gmatch("[^\r\n]+") do
table.insert(lines, "_" .. s) table.insert(lines, "_" .. s)
end
return lines[2]:gsub("/", "%%")
end end
return lines[2]:gsub("/", "%%")
end
return "" return ""
end end
function M.get_last() function M.get_last()
local sessions = M.list() local sessions = M.list()
table.sort(sessions, function(a, b) table.sort(sessions, function(a, b)
return vim.loop.fs_stat(a).mtime.sec > vim.loop.fs_stat(b).mtime.sec return vim.loop.fs_stat(a).mtime.sec > vim.loop.fs_stat(b).mtime.sec
end) end)
return sessions[1] return sessions[1]
end end
function M.setup(opts) function M.setup(opts)
Config.setup(opts) config.setup(opts)
if Config.options.autosave then if config.options.autosave then
M.start() M.start()
end end
end end
function M.start() function M.start()
vim.cmd([[ vim.cmd([[
augroup Persisted augroup Persisted
autocmd! autocmd!
autocmd VimLeavePre * lua require("persisted").save() autocmd VimLeavePre * lua require("persisted").save()
augroup end augroup end
]]) ]])
vim.g.persisting = true vim.g.persisting = true
end end
function M.stop() function M.stop()
vim.cmd([[ vim.cmd([[
autocmd! Persisted autocmd! Persisted
augroup! Persisted augroup! Persisted
]]) ]])
vim.g.persisting = false vim.g.persisting = false
end end
function M.save() function M.save()
local tmp = vim.o.sessionoptions local tmp = vim.o.sessionoptions
vim.o.sessionoptions = table.concat(Config.options.options, ",") vim.o.sessionoptions = table.concat(config.options.options, ",")
vim.cmd("mks! " .. e(M.get_current())) vim.cmd("mks! " .. e(M.get_current()))
vim.o.sessionoptions = tmp vim.o.sessionoptions = tmp
vim.g.persisting = true vim.g.persisting = true
end
end end
function M.load(opt) function M.load(opt)
opt = opt or {} opt = opt or {}
local sfile = opt.last and M.get_last() or M.get_current() local session = opt.last and M.get_last() or M.get_current()
if sfile and vim.fn.filereadable(sfile) ~= 0 then if session and vim.fn.filereadable(session) ~= 0 then
vim.cmd("source " .. e(sfile)) vim.cmd("source " .. e(session))
vim.g.persisting = true vim.g.persisting = true
end end
end end
function M.list() function M.list()
return vim.fn.glob(Config.options.dir .. "*.vim", true, true) return vim.fn.glob(config.options.dir .. "*.vim", true, true)
end end
function M.toggle() function M.toggle()
if vim.g.persisting == nil then if vim.g.persisting == nil then
return M.load() return M.load()
end end
if vim.g.persisting then if vim.g.persisting then
return M.stop() return M.stop()
end end
return M.start() return M.start()
end end
return M return M