Skip to content

Commit 14b3006

Browse files
gennaro-tedescogennaro-tedesco
authored
Merge pull request #59 from gennaro-tedesco/autoload_prompt
Autoload prompt
2 parents aec03d5 + a6229ea commit 14b3006

File tree

5 files changed

+123
-72
lines changed

5 files changed

+123
-72
lines changed

‎README.md‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ require("nvim-possession").setup({
8383
-- useful to restore file trees, file managers or terminals
8484
-- function()
8585
-- require('FTerm').open()
86-
-- require('nvim-tree').toggle(false, true)
86+
-- require("nvim-tree.api").tree.toggle()
8787
-- end
8888

8989
---@type possession.Hls
@@ -117,7 +117,15 @@ require("nvim-possession").setup({
117117
})
118118
```
119119

120-
This autoloads sessions when starting neovim without file arguments (i. e. `$ nvim `) and in case such sessions explicitly contain a reference to the current working directory (you must have `vim.go.ssop+=curdir`); this is by design as this plugin intends to be as less invasive as possible.
120+
This autoloads sessions when starting neovim without file arguments (i. e. `$ nvim `) and in case such sessions explicitly contain a reference to the current working directory (you must have `vim.go.ssop+=curdir`). If more than one session in the current working directory exists, you can either specify
121+
122+
```lua
123+
require("nvim-possession").setup({
124+
autoprompt = true -- default false
125+
})
126+
```
127+
128+
to be presented with a fuzzy prompt or default automatically to load the topmost sorted session (see `sort = require("nvim-possession.sorting")` in [Usage](#-usage-and-advanced-configuration)).
121129

122130
Sessions are automatically saved before quitting, should buffers be added or removed to them. This defaults to `true` (as it is generally expected behaviour), if you want to opt-out specify
123131

@@ -185,7 +193,7 @@ After loading a session you may want to specify additional actions to run that m
185193
require("nvim-possession").setup({
186194
post_hook = function()
187195
require("FTerm").open()
188-
require('nvim-tree').toggle(false, true)
196+
require("nvim-tree.api").tree.toggle()
189197
vim.lsp.buf.format()
190198
end
191199
})

‎doc/possession.txt‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*possession.txt* For Neovim >= 0.8.0 Last change: 2025 January 31
1+
*possession.txt* For Neovim >= 0.8.0 Last change: 2025 March 19
22

33
==============================================================================
44
Table of Contents *possession-table-of-contents*
@@ -112,7 +112,7 @@ however if you really want to do so:
112112
-- useful to restore file trees, file managers or terminals
113113
-- function()
114114
-- require('FTerm').open()
115-
-- require('nvim-tree').toggle(false, true)
115+
-- require("nvim-tree.api").tree.toggle()
116116
-- end
117117

118118
---@type possession.Hls
@@ -150,8 +150,18 @@ directory at startup, specify
150150

151151
This autoloads sessions when starting neovim without file arguments (i. e. `$
152152
nvim`) and in case such sessions explicitly contain a reference to the current
153-
working directory (you must have `vim.go.ssop+=curdir`); this is by design as
154-
this plugin intends to be as less invasive as possible.
153+
working directory (you must have `vim.go.ssop+=curdir`). If more than one
154+
session in the current working directory exists, you can either specify
155+
156+
>lua
157+
require("nvim-possession").setup({
158+
autoprompt = true -- default false
159+
})
160+
<
161+
162+
to be presented with a fuzzy prompt or default automatically to load the
163+
topmost sorted session (see `sort = require("nvim-possession.sorting")` in
164+
|possession-usage|).
155165

156166
Sessions are automatically saved before quitting, should buffers be added or
157167
removed to them. This defaults to `true` (as it is generally expected
@@ -239,7 +249,7 @@ finders or set specific options. To do so you can use
239249
require("nvim-possession").setup({
240250
post_hook = function()
241251
require("FTerm").open()
242-
require('nvim-tree').toggle(false, true)
252+
require("nvim-tree.api").tree.toggle()
243253
vim.lsp.buf.format()
244254
end
245255
})

‎lua/nvim-possession/config.lua‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ M.sessions = {
99
sessions_prompt = "sessions:",
1010
}
1111

12+
---@type boolean
1213
M.autoload = false
14+
---@type boolean
15+
M.autoprompt = false
16+
---@type boolean
1317
M.autosave = true
1418
M.autoswitch = {
1519
enable = false,

‎lua/nvim-possession/init.lua‎

Lines changed: 49 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ local M = {}
1212
---require("nvim-possession").status()
1313
---@param user_opts table
1414
M.setup = function(user_opts)
15+
local notification_title = "📌 nvim-possession"
1516
local fzf_ok, fzf = pcall(require, "fzf-lua")
1617
if not fzf_ok then
17-
print("fzf-lua required as dependency")
18+
vim.notify("fzf-lua required as dependency", vim.log.levels.WARN, { title = notification_title })
1819
return
1920
end
2021

@@ -31,7 +32,7 @@ M.setup = function(user_opts)
3132
---return if path does not exist
3233
M.new = function()
3334
if vim.fn.finddir(user_config.sessions.sessions_path) == "" then
34-
print("sessions_path does not exist")
35+
vim.notify("sessions_path does not exist", vim.log.levels.WARN, { title = notification_title })
3536
return
3637
end
3738

@@ -40,9 +41,13 @@ M.setup = function(user_opts)
4041
if next(vim.fs.find(name, { path = user_config.sessions.sessions_path })) == nil then
4142
vim.cmd.mksession({ args = { user_config.sessions.sessions_path .. name } })
4243
vim.g[user_config.sessions.sessions_variable] = vim.fs.basename(name)
43-
print("saved in: " .. user_config.sessions.sessions_path .. name)
44+
vim.notify(
45+
"saved in: " .. user_config.sessions.sessions_path .. name,
46+
vim.log.levels.INFO,
47+
{ title = notification_title }
48+
)
4449
else
45-
print("session already exists")
50+
vim.notify("session already exists", vim.log.levels.INFO, { title = notification_title })
4651
end
4752
end
4853
end
@@ -58,10 +63,10 @@ M.setup = function(user_opts)
5863
user_config.save_hook()
5964
end
6065
vim.cmd.mksession({ args = { user_config.sessions.sessions_path .. cur_session }, bang = true })
61-
print("updated session: " .. cur_session)
66+
vim.notify("updated session: " .. cur_session, vim.log.levels.INFO, { title = notification_title })
6267
end
6368
else
64-
print("no session loaded")
69+
vim.notify("no session loaded", vim.log.levels.INFO, { title = notification_title })
6570
end
6671
end
6772

@@ -87,69 +92,50 @@ M.setup = function(user_opts)
8792
local confirm = vim.fn.confirm("delete session?", "&Yes\n&No", 2)
8893
if confirm == 1 then
8994
os.remove(session)
90-
print("deleted " .. session)
95+
vim.notify("deleted " .. session, vim.log.levels.INFO, { title = notification_title })
9196
if vim.g[user_config.sessions.sessions_variable] == vim.fs.basename(session) then
9297
vim.g[user_config.sessions.sessions_variable] = nil
9398
end
9499
end
95100
end
96101
fzf.config.set_action_helpstr(M.delete_selected, "delete-session")
97102

98-
--delete current active session
103+
---delete current active session
99104
M.delete = function()
100105
local cur_session = vim.g[user_config.sessions.sessions_variable]
101106
if cur_session ~= nil then
102107
local confirm = vim.fn.confirm("delete session " .. cur_session .. "?", "&Yes\n&No", 2)
103108
if confirm == 1 then
104109
local session_path = user_config.sessions.sessions_path .. cur_session
105110
os.remove(session_path)
106-
print("deleted " .. session_path)
111+
vim.notify("deleted " .. session_path, vim.log.levels.INFO, { title = notification_title })
107112
if vim.g[user_config.sessions.sessions_variable] == vim.fs.basename(session_path) then
108113
vim.g[user_config.sessions.sessions_variable] = nil
109114
end
110115
end
111116
else
112-
print("no active session")
117+
vim.notify("no active session", vim.log.levels.WARN, { title = notification_title })
113118
end
114119
end
115120

116121
---list all existing sessions and their files
117-
---return fzf picker
118-
M.list = function()
122+
---@param cwd boolean|nil
123+
M.list = function(cwd)
119124
local iter = vim.uv.fs_scandir(user_config.sessions.sessions_path)
120125
if iter == nil then
121-
print("session folder " .. user_config.sessions.sessions_path .. " does not exist")
126+
vim.notify(
127+
"session folder " .. user_config.sessions.sessions_path .. " does not exist",
128+
vim.log.levels.WARN,
129+
{ title = notification_title }
130+
)
122131
return
123132
end
124-
local next = vim.uv.fs_scandir_next(iter)
125-
if next == nil then
126-
print("no saved sessions")
133+
local next_dir = vim.uv.fs_scandir_next(iter)
134+
if next_dir == nil then
135+
vim.notify("no saved sessions", vim.log.levels.WARN, { title = notification_title })
127136
return
128137
end
129138

130-
local function list_sessions(fzf_cb)
131-
local sessions = {}
132-
for name, type in vim.fs.dir(user_config.sessions.sessions_path) do
133-
if type == "file" then
134-
local stat = vim.uv.fs_stat(user_config.sessions.sessions_path .. name)
135-
if stat then
136-
table.insert(sessions, { name = name, mtime = stat.mtime })
137-
end
138-
end
139-
end
140-
table.sort(sessions, function(a, b)
141-
if type(user_config.sort) == "function" then
142-
return user_config.sort(a, b)
143-
else
144-
return sort.alpha_sort(a, b)
145-
end
146-
end)
147-
for _, sess in ipairs(sessions) do
148-
fzf_cb(sess.name)
149-
end
150-
fzf_cb()
151-
end
152-
153139
local opts = {
154140
user_config = user_config,
155141
prompt = user_config.sessions.sessions_icon .. user_config.sessions.sessions_prompt,
@@ -171,11 +157,33 @@ M.setup = function(user_opts)
171157
}
172158
opts = require("fzf-lua.config").normalize_opts(opts, {})
173159
opts = require("fzf-lua.core").set_header(opts, { "actions" })
174-
fzf.fzf_exec(list_sessions, opts)
160+
161+
---autoload mechanism
162+
if cwd then
163+
local sessions_in_cwd = utils.list_sessions(user_config, cwd)
164+
if next(sessions_in_cwd) == nil then
165+
vim.notify("no session to autoload", vim.log.levels.WARN, { title = notification_title })
166+
return nil
167+
elseif #sessions_in_cwd == 1 or not user_config.autoprompt then
168+
vim.cmd.source(user_config.sessions.sessions_path .. sessions_in_cwd[1])
169+
vim.g[user_config.sessions.sessions_variable] = vim.fs.basename(sessions_in_cwd[1])
170+
if type(user_config.post_hook) == "function" then
171+
user_config.post_hook()
172+
end
173+
return nil
174+
end
175+
end
176+
---standard list load mechanism
177+
fzf.fzf_exec(function(fzf_cb)
178+
for _, sess in ipairs(utils.list_sessions(user_config, cwd)) do
179+
fzf_cb(sess)
180+
end
181+
fzf_cb()
182+
end, opts)
175183
end
176184

177185
if user_config.autoload and vim.fn.argc() == 0 then
178-
utils.autoload(user_config)
186+
M.list(true)
179187
end
180188

181189
if user_config.autosave then

‎lua/nvim-possession/utils.lua‎

Lines changed: 44 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,39 @@
1+
local sort = require("nvim-possession.sorting")
12
local M = {}
23

4+
---return the list of available sessions
5+
---@param user_config table
6+
---@return table
7+
M.list_sessions = function(user_config, cwd)
8+
local sessions = {}
9+
for name, type in vim.fs.dir(user_config.sessions.sessions_path) do
10+
if type == "file" then
11+
local stat = vim.uv.fs_stat(user_config.sessions.sessions_path .. name)
12+
if stat then
13+
table.insert(sessions, { name = name, mtime = stat.mtime })
14+
end
15+
end
16+
end
17+
table.sort(sessions, function(a, b)
18+
if type(user_config.sort) == "function" then
19+
return user_config.sort(a, b)
20+
else
21+
return sort.alpha_sort(a, b)
22+
end
23+
end)
24+
local session_names = {}
25+
for _, sess in ipairs(sessions) do
26+
if cwd then
27+
if M.is_in_cwd(sess.name, user_config) then
28+
table.insert(session_names, sess.name)
29+
end
30+
else
31+
table.insert(session_names, sess.name)
32+
end
33+
end
34+
return session_names
35+
end
36+
337
---return the list of files in the session
438
---@param file string
539
---@return table
@@ -25,24 +59,25 @@ M.session_files = function(file)
2559
return buffers
2660
end
2761

28-
---return the first session whose dir corresponds to cwd
29-
---@param sessions_path string
30-
---@return string|nil
31-
M.session_in_cwd = function(sessions_path)
62+
---checks whether a session is contained in the cwd
63+
---@param session string
64+
---@param user_config table
65+
---@return boolean
66+
M.is_in_cwd = function(session, user_config)
3267
local session_dir, dir_pat = "", "^cd%s*"
33-
for file, type in vim.fs.dir(sessions_path) do
34-
if type == "file" then
35-
for line in io.lines(sessions_path .. file) do
68+
for file, type in vim.fs.dir(user_config.sessions.sessions_path) do
69+
if type == "file" and file == session then
70+
for line in io.lines(user_config.sessions.sessions_path .. file) do
3671
if string.find(line, dir_pat) then
3772
session_dir = vim.uv.fs_realpath(vim.fs.normalize((line:gsub("cd%s*", ""))))
3873
if session_dir == vim.fn.getcwd() then
39-
return file
74+
return true
4075
end
4176
end
4277
end
4378
end
4479
end
45-
return nil
80+
return false
4681
end
4782

4883
---check if an item is in a list
@@ -58,20 +93,6 @@ M.is_in_list = function(value, list)
5893
return false
5994
end
6095

61-
---if any of the existing sessions contains the cwd
62-
---then load it on startup directly
63-
---@param config table
64-
M.autoload = function(config)
65-
local session = M.session_in_cwd(config.sessions.sessions_path)
66-
if session ~= nil then
67-
vim.cmd.source(config.sessions.sessions_path .. session)
68-
vim.g[config.sessions.sessions_variable] = vim.fs.basename(session)
69-
end
70-
if type(config.post_hook) == "function" then
71-
config.post_hook()
72-
end
73-
end
74-
7596
---check if a session is loaded and save it automatically
7697
---without asking for prompt
7798
---@param config table

0 commit comments

Comments
 (0)