Skip to content

vim-tweaks #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alonswartz merged 2 commits into from
May 25, 2025
Merged

vim-tweaks #99

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8dfe2db
vim: fix weekly notesium invocation to use g:notesium_bin
alonswartz May 25, 2025
1731c41
vim: refactor finder termopen to not use lambda
alonswartz May 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions vim/plugin/notesium.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,22 +65,25 @@ if has('nvim')
let l:buf = nvim_create_buf(v:false, v:true)
let l:win = nvim_open_win(l:buf, v:true, l:opts)

" Start the finder
call termopen(l:cmd, {
\ 'on_exit': {
\ job_id, exit_code, _ ->
\ notesium#finder_finalize(exit_code, l:buf, a:config['callback']) }})
" Set context and start the finder
let s:finder_ctx = { 'buf': l:buf, 'callback': a:config['callback'] }
call termopen(l:cmd, { 'on_exit': function('notesium#finder_on_exit') })

" Focus the terminal and switch to insert mode
call nvim_set_current_win(l:win)
call feedkeys('i', 'n')
endfunction

function! notesium#finder_finalize(exit_code, buf, callback) abort
function! notesium#finder_on_exit(job_id, exit_code, _signal) abort
" Unpack the context and cleanup
let l:buf = s:finder_ctx.buf
let l:Callback = s:finder_ctx.callback
unlet s:finder_ctx

" Capture buffer output, cleanup and validate
let l:output = trim(join(getbufline(a:buf, 1, '$'), "\n"))
if bufexists(a:buf)
execute 'bwipeout!' a:buf
let l:output = trim(join(getbufline(l:buf, 1, '$'), "\n"))
if bufexists(l:buf)
execute 'bwipeout!' l:buf
endif
if empty(l:output) || a:exit_code == 130
return
Expand All @@ -97,7 +100,7 @@ if has('nvim')
return
endif
let l:text = trim(join(l:parts[2:], ':'))
call a:callback(l:parts[0], l:parts[1], l:text)
call l:Callback(l:parts[0], l:parts[1], l:text)
endfunction

else
Expand Down Expand Up @@ -201,7 +204,7 @@ command! -nargs=* NotesiumWeekly
\ let s:diff = (s:day - s:startOfWeek + 7) % 7 |
\ let s:weekBegEpoch = s:epoch - (s:diff * 86400) |
\ let s:weekBegDate = strftime('%Y-%m-%d', s:weekBegEpoch) |
\ let s:output = system('notesium new --verbose --ctime='.s:weekBegDate.'T00:00:01') |
\ let s:output = system(g:notesium_bin.' new --verbose --ctime='.s:weekBegDate.'T00:00:01') |
\ let s:filepath = matchstr(s:output, 'path:\zs[^\n]*') |
\ execute 'edit' fnameescape(s:filepath) |
\ if getline(1) =~ '^\s*$' |
Expand Down