gffranco
09b9bd98a3
Three reasons the plugin wasn't activating on `nvim --clean -u init.lua
foo.wiki`:
1. **File-name mismatch.** Vim's filetype-plugin runtime looks for
`ftplugin/<filetype>.vim` matching the *filetype name*. Our
filetype is `vimwiki` (per `ftdetect`) but the file was named
`ftplugin/nuwiki.vim` — so `:runtime! ftplugin/vimwiki.vim` from
the built-in FileType autocmd never found it, and none of the
`:Vimwiki*` / `:Nuwiki*` commands got defined. Same wart on the
syntax side. Renamed:
- `ftplugin/nuwiki.vim` → `ftplugin/vimwiki.vim`
- `syntax/nuwiki.vim` → `syntax/vimwiki.vim`
2. **`setfiletype` deferred to Neovim's bundled rule.** Neovim ships
a default `*.wiki → mediawiki` rule via `vim.filetype.add`, and
`:setfiletype vimwiki` is a no-op once a filetype has been set.
- `ftdetect/nuwiki.vim` now uses `set filetype=vimwiki` (force).
- `lua/nuwiki/init.lua`'s `setup()` also calls
`vim.filetype.add({ extension = { wiki = 'vimwiki', ... } })`
so the modern table-based detection picks us before the
bundled rule fires. Honours `config.options.file_extension`
so a user with a custom extension gets covered automatically.
3. **`foldmethod`/`foldexpr` are window-local options.**
`ftplugin.lua` was setting them with `nvim_set_option_value({ buf
= bufnr })`, which threw `'buf' cannot be passed for window-local
option 'foldmethod'` and aborted the rest of the per-buffer
attach. Switched to `vim.opt_local.*` (window-aware), applied on
the current window when the ftplugin fires, and re-applied via a
`BufWinEnter` autocmd so `:split` / `:vsplit` keep the fold mode.
Verified end-to-end with:
nvim --clean -u init.lua sample.wiki
→ filetype = vimwiki
→ :VimwikiTOC, :NuwikiIndex, … all defined
→ foldmethod = expr, foldexpr = v:lua.vim.lsp.foldexpr()
→ ftdetect, plugin, ftplugin, syntax all in :scriptnames
Total 377 tests still pass.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
124 lines
8.2 KiB
VimL
124 lines
8.2 KiB
VimL
" ftplugin/nuwiki.vim — per-buffer settings + Phase 19 command/keymap glue.
|
|
"
|
|
" Wires up:
|
|
" - basic edit-time options (commentstring, suffixesadd, …)
|
|
" - every `:Vimwiki*` / `:Nuwiki*` command from SPEC §12.10 that has a
|
|
" server-side counterpart (deferred §13.1 commands stub out with a
|
|
" "not yet implemented" notification)
|
|
" - on Neovim: keymaps + text objects + folding via
|
|
" `nuwiki.ftplugin.attach()`
|
|
|
|
if exists('b:did_ftplugin')
|
|
finish
|
|
endif
|
|
let b:did_ftplugin = 1
|
|
|
|
setlocal commentstring=%%\ %s
|
|
setlocal comments=:%%
|
|
setlocal formatoptions+=ron
|
|
setlocal suffixesadd=.wiki
|
|
setlocal iskeyword+=-
|
|
|
|
let b:undo_ftplugin = 'setlocal commentstring< comments< formatoptions< suffixesadd< iskeyword<'
|
|
|
|
if !has('nvim')
|
|
" Plain Vim — the buffer-local options above are all we ship. Vim users
|
|
" interact via the LSP client (vim-lsp / coc) which already exposes
|
|
" `:LspDefinition`, `:LspReferences`, `:LspRename`, etc.
|
|
finish
|
|
endif
|
|
|
|
" ===== Neovim path =====
|
|
|
|
" :Vimwiki* compat — every command dispatches to a Lua wrapper in
|
|
" `nuwiki.commands` that either issues a `workspace/executeCommand`
|
|
" or, for client-side operations, calls `vim.lsp.buf.*` directly.
|
|
|
|
command! -buffer -count VimwikiIndex lua require('nuwiki.commands').wiki_index(vim.v.count)
|
|
command! -buffer -count VimwikiTabIndex lua require('nuwiki.commands').wiki_tab_index(vim.v.count)
|
|
command! -buffer VimwikiUISelect lua require('nuwiki.commands').wiki_ui_select()
|
|
command! -buffer VimwikiDiaryIndex lua require('nuwiki.commands').diary_index()
|
|
command! -buffer VimwikiMakeDiaryNote lua require('nuwiki.commands').diary_today()
|
|
command! -buffer VimwikiMakeYesterdayDiaryNote lua require('nuwiki.commands').diary_yesterday()
|
|
command! -buffer VimwikiMakeTomorrowDiaryNote lua require('nuwiki.commands').diary_tomorrow()
|
|
command! -buffer VimwikiDiaryNextDay lua require('nuwiki.commands').diary_next()
|
|
command! -buffer VimwikiDiaryPrevDay lua require('nuwiki.commands').diary_prev()
|
|
command! -buffer VimwikiDiaryGenerateLinks lua require('nuwiki.commands').diary_generate_index()
|
|
|
|
command! -buffer VimwikiFollowLink lua vim.lsp.buf.definition()
|
|
command! -buffer VimwikiGoBackLink normal!
|
|
command! -buffer VimwikiSplitLink split | lua vim.lsp.buf.definition()
|
|
command! -buffer VimwikiVSplitLink vsplit | lua vim.lsp.buf.definition()
|
|
command! -buffer VimwikiTabnewLink tabnew | lua vim.lsp.buf.definition()
|
|
command! -buffer VimwikiTabDropLink tabnew | lua vim.lsp.buf.definition()
|
|
command! -buffer -nargs=1 VimwikiGoto lua require('nuwiki.commands').wiki_goto_page(<q-args>)
|
|
command! -buffer VimwikiBacklinks lua vim.lsp.buf.references()
|
|
command! -buffer VWB lua vim.lsp.buf.references()
|
|
command! -buffer -nargs=1 VimwikiSearch lvimgrep /<args>/ **
|
|
command! -buffer -nargs=1 VWS lvimgrep /<args>/ **
|
|
|
|
command! -buffer VimwikiDeleteFile lua require('nuwiki.commands').delete_file()
|
|
command! -buffer VimwikiRenameFile lua require('nuwiki.commands').rename_file()
|
|
|
|
command! -buffer VimwikiNextTask lua require('nuwiki.commands').next_task()
|
|
command! -buffer VimwikiToggleListItem lua require('nuwiki.commands').toggle_list_item()
|
|
command! -buffer VimwikiToggleRejectedListItem lua require('nuwiki.commands').reject_list_item()
|
|
command! -buffer VimwikiRemoveDone lua require('nuwiki.commands').list_remove_done()
|
|
command! -buffer -nargs=? VimwikiListChangeLvl lua require('nuwiki.commands').list_change_lvl()
|
|
|
|
command! -buffer Vimwiki2HTML lua require('nuwiki.commands').export_current()
|
|
command! -buffer Vimwiki2HTMLBrowse lua require('nuwiki.commands').export_browse()
|
|
command! -buffer -bang VimwikiAll2HTML execute (<bang>0 ? "lua require('nuwiki.commands').export_all_force()" : "lua require('nuwiki.commands').export_all()")
|
|
command! -buffer VimwikiRss lua require('nuwiki.commands').export_rss()
|
|
|
|
command! -buffer VimwikiTOC lua require('nuwiki.commands').toc_generate()
|
|
command! -buffer VimwikiGenerateLinks lua require('nuwiki.commands').links_generate()
|
|
command! -buffer VimwikiCheckLinks lua require('nuwiki.commands').check_links()
|
|
command! -buffer VimwikiFindOrphans lua require('nuwiki.commands').find_orphans()
|
|
|
|
command! -buffer VimwikiRebuildTags lua require('nuwiki.commands').tags_rebuild()
|
|
command! -buffer -nargs=? VimwikiSearchTags lua require('nuwiki.commands').tags_search(<q-args>)
|
|
command! -buffer -nargs=? VimwikiGenerateTagLinks lua require('nuwiki.commands').tags_generate_links(<q-args>)
|
|
|
|
" §13.1 deferred — stubs notify the user instead of erroring.
|
|
command! -buffer -nargs=1 VimwikiTable lua require('nuwiki.commands').table_insert()
|
|
command! -buffer VimwikiTableMoveColumnLeft lua require('nuwiki.commands').table_move_column_left()
|
|
command! -buffer VimwikiTableMoveColumnRight lua require('nuwiki.commands').table_move_column_right()
|
|
command! -buffer -nargs=1 VimwikiColorize lua require('nuwiki.commands').colorize()
|
|
command! -buffer VimwikiPasteLink lua require('nuwiki.commands').paste_link()
|
|
command! -buffer VimwikiPasteUrl lua require('nuwiki.commands').paste_url()
|
|
|
|
" Canonical :Nuwiki* aliases — P10.
|
|
command! -buffer -count NuwikiIndex lua require('nuwiki.commands').wiki_index(vim.v.count)
|
|
command! -buffer NuwikiTabIndex lua require('nuwiki.commands').wiki_tab_index(vim.v.count)
|
|
command! -buffer NuwikiUISelect lua require('nuwiki.commands').wiki_ui_select()
|
|
command! -buffer NuwikiDiaryIndex lua require('nuwiki.commands').diary_index()
|
|
command! -buffer NuwikiDiaryToday lua require('nuwiki.commands').diary_today()
|
|
command! -buffer NuwikiDiaryYesterday lua require('nuwiki.commands').diary_yesterday()
|
|
command! -buffer NuwikiDiaryTomorrow lua require('nuwiki.commands').diary_tomorrow()
|
|
command! -buffer NuwikiDiaryNext lua require('nuwiki.commands').diary_next()
|
|
command! -buffer NuwikiDiaryPrev lua require('nuwiki.commands').diary_prev()
|
|
command! -buffer NuwikiDiaryGenerateLinks lua require('nuwiki.commands').diary_generate_index()
|
|
command! -buffer NuwikiFollowLink lua vim.lsp.buf.definition()
|
|
command! -buffer NuwikiBacklinks lua vim.lsp.buf.references()
|
|
command! -buffer NuwikiDeleteFile lua require('nuwiki.commands').delete_file()
|
|
command! -buffer NuwikiRenameFile lua require('nuwiki.commands').rename_file()
|
|
command! -buffer NuwikiNextTask lua require('nuwiki.commands').next_task()
|
|
command! -buffer NuwikiToggleListItem lua require('nuwiki.commands').toggle_list_item()
|
|
command! -buffer NuwikiToggleRejected lua require('nuwiki.commands').reject_list_item()
|
|
command! -buffer NuwikiExport lua require('nuwiki.commands').export_current()
|
|
command! -buffer NuwikiExportBrowse lua require('nuwiki.commands').export_browse()
|
|
command! -buffer -bang NuwikiExportAll execute (<bang>0 ? "lua require('nuwiki.commands').export_all_force()" : "lua require('nuwiki.commands').export_all()")
|
|
command! -buffer NuwikiRss lua require('nuwiki.commands').export_rss()
|
|
command! -buffer NuwikiTOC lua require('nuwiki.commands').toc_generate()
|
|
command! -buffer NuwikiGenerateLinks lua require('nuwiki.commands').links_generate()
|
|
command! -buffer NuwikiCheckLinks lua require('nuwiki.commands').check_links()
|
|
command! -buffer NuwikiFindOrphans lua require('nuwiki.commands').find_orphans()
|
|
command! -buffer NuwikiRebuildTags lua require('nuwiki.commands').tags_rebuild()
|
|
command! -buffer -nargs=? NuwikiSearchTags lua require('nuwiki.commands').tags_search(<q-args>)
|
|
command! -buffer -nargs=? NuwikiGenerateTagLinks lua require('nuwiki.commands').tags_generate_links(<q-args>)
|
|
command! -buffer -nargs=1 NuwikiGoto lua require('nuwiki.commands').wiki_goto_page(<q-args>)
|
|
|
|
" Phase 19 buffer attach: keymaps + text objects + folding.
|
|
lua require('nuwiki.ftplugin').attach(0)
|