feat(coc): auto-register the language server with coc.nvim
coc users had to hand-maintain a coc-settings.json `languageserver.nuwiki`
entry, which didn't track g:nuwiki_wikis / g:vimwiki_list / the global
shorthand and meant editing JSON per wiki. nuwiki now registers itself
programmatically: on the first .wiki buffer it calls
coc#config('languageserver.nuwiki', {…}) with the s:settings() payload
(same config the vim-lsp path sends). coc reacts to the languageserver
config change (onDidChangeConfiguration → registerClientsByConfig) and
starts the server for the open buffer.
Details:
- Reliable coc detection via :CocConfig (exists('*coc#config') can't be
trusted — it doesn't trigger autoload in Vim 9.2). The coc#config call
is wrapped in try/catch and autoloads coc.vim itself; falls back to the
printed snippet only if coc genuinely isn't there.
- Deferred to User CocNvimInit when coc's node service isn't up yet.
- Opt out with g:nuwiki_no_coc_register (then we just print the snippet).
Dogfooded in start-vim-coc.sh: dropped the manual coc-settings.json
languageserver block; the harness now relies on auto-registration from
g:nuwiki_* (real-user flow). New harness test-coc-register-vim (7 checks,
stubbed coc#config) asserts the injected payload incl. the folded global
shorthand; wired into CI. README coc section rewritten (zero-config).
Rust 573 passed, clippy clean, all harnesses green.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -124,3 +124,5 @@ jobs:
|
|||||||
run: ./development/tests/test-vimwiki-compat-vim.sh
|
run: ./development/tests/test-vimwiki-compat-vim.sh
|
||||||
- name: run Neovim global-shorthand harness
|
- name: run Neovim global-shorthand harness
|
||||||
run: ./development/tests/test-global-shorthand.sh
|
run: ./development/tests/test-global-shorthand.sh
|
||||||
|
- name: run Vim coc-registration harness
|
||||||
|
run: ./development/tests/test-coc-register-vim.sh
|
||||||
|
|||||||
@@ -82,9 +82,9 @@ Neovim) instead of relying on a plugin-manager build hook.
|
|||||||
Older releases fall back to a `vim.lsp.start` autocmd but aren't
|
Older releases fall back to a `vim.lsp.start` autocmd but aren't
|
||||||
officially supported.
|
officially supported.
|
||||||
- **Vim 9+** — needs a third-party LSP client:
|
- **Vim 9+** — needs a third-party LSP client:
|
||||||
[`vim-lsp`](https://github.com/prabirshrestha/vim-lsp) (recommended,
|
[`vim-lsp`](https://github.com/prabirshrestha/vim-lsp) or
|
||||||
auto-registered) or [`coc.nvim`](https://github.com/neoclide/coc.nvim)
|
[`coc.nvim`](https://github.com/neoclide/coc.nvim) — both
|
||||||
(one-time `coc-settings.json` entry — see [Vim LSP client
|
auto-registered, no manual config (see [Vim LSP client
|
||||||
setup](#vim-lsp-client-setup)).
|
setup](#vim-lsp-client-setup)).
|
||||||
- **Rust toolchain (1.83+ stable)** — only needed when building the
|
- **Rust toolchain (1.83+ stable)** — only needed when building the
|
||||||
binary from source; pre-built release downloads skip this.
|
binary from source; pre-built release downloads skip this.
|
||||||
@@ -145,10 +145,18 @@ auto-enables it. Your wiki settings (`g:nuwiki_wiki_root`,
|
|||||||
`g:nuwiki_wikis`, …) are forwarded as the server's initialization
|
`g:nuwiki_wikis`, …) are forwarded as the server's initialization
|
||||||
options.
|
options.
|
||||||
|
|
||||||
**coc.nvim** — [`coc.nvim`](https://github.com/neoclide/coc.nvim) reads
|
**coc.nvim** — also zero configuration. nuwiki registers itself with
|
||||||
its server list from `coc-settings.json`, which the plugin can't edit
|
[`coc.nvim`](https://github.com/neoclide/coc.nvim) programmatically
|
||||||
on your behalf, so add the entry once yourself (open it with
|
(`coc#config('languageserver.nuwiki', …)`) when the first `.wiki` buffer
|
||||||
`:CocConfig`):
|
loads, forwarding the same wiki settings (`g:nuwiki_wiki_root`,
|
||||||
|
`g:nuwiki_wikis`, your `g:vimwiki_*` config, the global shorthand, …) as
|
||||||
|
the server's initialization options. **No `coc-settings.json`
|
||||||
|
`languageserver` entry needed** — change your wiki config and reload; the
|
||||||
|
new settings are picked up.
|
||||||
|
|
||||||
|
To manage the entry yourself instead, set `let g:nuwiki_no_coc_register = 1`
|
||||||
|
and add it to `coc-settings.json` manually (nuwiki then just prints the
|
||||||
|
snippet on first load):
|
||||||
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
|
|||||||
+61
-16
@@ -136,22 +136,7 @@ function! nuwiki#lsp#start() abort
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
if exists(':CocConfig') == 2 || exists('*coc#config')
|
if exists(':CocConfig') == 2 || exists('*coc#config')
|
||||||
" coc.nvim — coc reads its server list from coc-settings.json.
|
call s:register_with_coc(l:bin)
|
||||||
" We can't inject it dynamically without owning the file, so just point
|
|
||||||
" the user at the snippet. `initializationOptions` carries wiki_root etc.
|
|
||||||
" to the server exactly like the vim-lsp registration above — without it
|
|
||||||
" the server resolves links against its default root, so existing pages
|
|
||||||
" look broken and follow-to-create lands in the wrong directory.
|
|
||||||
echohl WarningMsg
|
|
||||||
echom 'nuwiki: coc.nvim detected. Add this to your coc-settings.json:'
|
|
||||||
echom ' "languageserver": {'
|
|
||||||
echom ' "nuwiki": {'
|
|
||||||
echom ' "command": "' . l:bin . '",'
|
|
||||||
echom ' "filetypes": ["vimwiki"],'
|
|
||||||
echom ' "initializationOptions": ' . json_encode(s:settings())
|
|
||||||
echom ' }'
|
|
||||||
echom ' }'
|
|
||||||
echohl None
|
|
||||||
return
|
return
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@@ -162,6 +147,66 @@ function! nuwiki#lsp#start() abort
|
|||||||
echohl None
|
echohl None
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
|
" ===== coc.nvim integration =====
|
||||||
|
"
|
||||||
|
" Register the nuwiki language server with coc *programmatically* via
|
||||||
|
" coc#config, so users don't have to hand-maintain a coc-settings.json entry
|
||||||
|
" per wiki. The config (wiki roots, per-wiki keys, the vimwiki/nuwiki global
|
||||||
|
" shorthand) comes from s:settings() — the same payload the vim-lsp path sends.
|
||||||
|
" coc reacts to the `languageserver` config change, registers the server, and
|
||||||
|
" starts it for the open vimwiki buffer.
|
||||||
|
"
|
||||||
|
" Opt out with `let g:nuwiki_no_coc_register = 1` to manage the entry in
|
||||||
|
" coc-settings.json yourself (we then just print the snippet).
|
||||||
|
function! s:register_with_coc(bin) abort
|
||||||
|
if get(g:, 'nuwiki_no_coc_register', 0)
|
||||||
|
call s:print_coc_snippet(a:bin)
|
||||||
|
return
|
||||||
|
endif
|
||||||
|
let s:coc_bin = a:bin
|
||||||
|
if get(g:, 'coc_service_initialized', 0)
|
||||||
|
call s:coc_register()
|
||||||
|
else
|
||||||
|
" coc hasn't finished starting its node service yet — defer until it has,
|
||||||
|
" otherwise the updateConfig notification is sent to a service that isn't
|
||||||
|
" listening.
|
||||||
|
augroup nuwiki_coc_register
|
||||||
|
autocmd!
|
||||||
|
autocmd User CocNvimInit ++once call s:coc_register()
|
||||||
|
augroup END
|
||||||
|
endif
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
function! s:coc_register() abort
|
||||||
|
let l:cfg = s:settings()
|
||||||
|
" Call coc#config directly — `exists('*coc#config')` can't be trusted because
|
||||||
|
" it doesn't trigger autoloading, so we let the call autoload coc.vim and
|
||||||
|
" fall back to the manual snippet only if coc genuinely isn't there.
|
||||||
|
try
|
||||||
|
call coc#config('languageserver.nuwiki', {
|
||||||
|
\ 'command': s:coc_bin,
|
||||||
|
\ 'filetypes': ['vimwiki'],
|
||||||
|
\ 'initializationOptions': l:cfg,
|
||||||
|
\ 'settings': { 'nuwiki': l:cfg },
|
||||||
|
\ })
|
||||||
|
catch /^Vim\%((\a\+)\)\=:E11[78]/
|
||||||
|
call s:print_coc_snippet(s:coc_bin)
|
||||||
|
endtry
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
function! s:print_coc_snippet(bin) abort
|
||||||
|
echohl WarningMsg
|
||||||
|
echom 'nuwiki: coc.nvim detected. Add this to your coc-settings.json:'
|
||||||
|
echom ' "languageserver": {'
|
||||||
|
echom ' "nuwiki": {'
|
||||||
|
echom ' "command": "' . a:bin . '",'
|
||||||
|
echom ' "filetypes": ["vimwiki"],'
|
||||||
|
echom ' "initializationOptions": ' . json_encode(s:settings())
|
||||||
|
echom ' }'
|
||||||
|
echom ' }'
|
||||||
|
echohl None
|
||||||
|
endfunction
|
||||||
|
|
||||||
function! s:bin_path() abort
|
function! s:bin_path() abort
|
||||||
if exists('g:nuwiki_binary_path') && filereadable(g:nuwiki_binary_path)
|
if exists('g:nuwiki_binary_path') && filereadable(g:nuwiki_binary_path)
|
||||||
return g:nuwiki_binary_path
|
return g:nuwiki_binary_path
|
||||||
|
|||||||
@@ -72,46 +72,14 @@ ensure_coc() {
|
|||||||
|
|
||||||
write_coc_settings() {
|
write_coc_settings() {
|
||||||
mkdir -p "$DEV_DIR"
|
mkdir -p "$DEV_DIR"
|
||||||
# Mirror what the vim-lsp client sends (autoload/nuwiki/lsp.vim s:settings()):
|
# No `languageserver.nuwiki` block here on purpose: this dogfoods nuwiki's
|
||||||
# both `initializationOptions` (sent on initialize) and `settings.nuwiki`
|
# *programmatic* coc registration (autoload/nuwiki/lsp.vim → coc#config). The
|
||||||
# (served via workspace/configuration). Without these the server falls back
|
# plugin registers the server itself from g:nuwiki_* (set in the vimrc),
|
||||||
# to its own default wiki_root (~/vimwiki) instead of $WIKI_DIR, so it can't
|
# exactly the "no hand-written coc-settings.json" flow real users get. Only
|
||||||
# resolve links (e.g. Notes shows as broken) or create-on-follow correctly.
|
# the jump-command preference (the <CR>-opens-a-tab reproducer) lives here.
|
||||||
# toc_header_level / html_header_numbering are set to non-defaults so the
|
|
||||||
# dev wiki exercises them: :NuwikiTOC writes `== Contents ==` (level 2) and
|
|
||||||
# HTML export numbers headings. coc reads this file verbatim, so these are
|
|
||||||
# the values the server actually receives.
|
|
||||||
cat > "$COC_SETTINGS" <<EOF
|
cat > "$COC_SETTINGS" <<EOF
|
||||||
{
|
{
|
||||||
"coc.preferences.jumpCommand": "$COC_JUMP",
|
"coc.preferences.jumpCommand": "$COC_JUMP"
|
||||||
"languageserver": {
|
|
||||||
"nuwiki": {
|
|
||||||
"command": "$REPO_ROOT/bin/nuwiki-ls",
|
|
||||||
"filetypes": ["vimwiki"],
|
|
||||||
"initializationOptions": {
|
|
||||||
"wiki_root": "$WIKI_DIR",
|
|
||||||
"file_extension": ".wiki",
|
|
||||||
"syntax": "vimwiki",
|
|
||||||
"log_level": "info",
|
|
||||||
"toc_header_level": 2,
|
|
||||||
"html_header_numbering": 2,
|
|
||||||
"html_header_numbering_sym": " -",
|
|
||||||
"diagnostic": { "link_severity": "warn" }
|
|
||||||
},
|
|
||||||
"settings": {
|
|
||||||
"nuwiki": {
|
|
||||||
"wiki_root": "$WIKI_DIR",
|
|
||||||
"file_extension": ".wiki",
|
|
||||||
"syntax": "vimwiki",
|
|
||||||
"log_level": "info",
|
|
||||||
"toc_header_level": 2,
|
|
||||||
"html_header_numbering": 2,
|
|
||||||
"html_header_numbering_sym": " -",
|
|
||||||
"diagnostic": { "link_severity": "warn" }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
@@ -146,6 +114,12 @@ let g:nuwiki_file_extension = '.wiki'
|
|||||||
let g:nuwiki_syntax = 'vimwiki'
|
let g:nuwiki_syntax = 'vimwiki'
|
||||||
let g:nuwiki_diary_rel_path = 'diary'
|
let g:nuwiki_diary_rel_path = 'diary'
|
||||||
let g:nuwiki_log_level = 'info'
|
let g:nuwiki_log_level = 'info'
|
||||||
|
" nuwiki auto-registers itself with coc from these globals (no coc-settings.json
|
||||||
|
" languageserver block). Display settings exercise the global shorthand:
|
||||||
|
" :NuwikiTOC writes `== Contents ==` (level 2) and HTML export numbers headings.
|
||||||
|
let g:nuwiki_toc_header_level = 2
|
||||||
|
let g:nuwiki_html_header_numbering = 2
|
||||||
|
let g:nuwiki_html_header_numbering_sym = ' -'
|
||||||
|
|
||||||
filetype plugin indent on
|
filetype plugin indent on
|
||||||
syntax enable
|
syntax enable
|
||||||
|
|||||||
Executable
+71
@@ -0,0 +1,71 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
#
|
||||||
|
# development/tests/test-coc-register-vim.sh — programmatic coc.nvim
|
||||||
|
# registration for the Vim client.
|
||||||
|
#
|
||||||
|
# nuwiki#lsp#start() registers the language server with coc via coc#config so
|
||||||
|
# users don't hand-maintain coc-settings.json. This harness stubs coc#config
|
||||||
|
# (a real autoload/coc.vim on the runtimepath, since Vim's exists('*coc#config')
|
||||||
|
# goes through the autoload mechanism) to record what nuwiki injects, then runs
|
||||||
|
# test-coc-register-vim.vim and asserts the payload.
|
||||||
|
#
|
||||||
|
# Exit code: 0 when every check passes, 1 on any FAIL or missing output.
|
||||||
|
# Skips (exit 0) when vim is not installed.
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
|
||||||
|
|
||||||
|
log() { printf '\033[1;34m[coc-register]\033[0m %s\n' "$*"; }
|
||||||
|
|
||||||
|
if ! command -v vim >/dev/null 2>&1; then
|
||||||
|
log 'vim not installed — skipping'
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
TMP="$(mktemp -d -t nuwiki-coc-test-XXXXXX)"
|
||||||
|
trap 'rm -rf "$TMP"' EXIT
|
||||||
|
|
||||||
|
# Stub coc#config as a real autoload function so exists('*coc#config') resolves
|
||||||
|
# it. It records the last call into g:_recorded for the test to assert.
|
||||||
|
mkdir -p "$TMP/stub/autoload"
|
||||||
|
cat > "$TMP/stub/autoload/coc.vim" <<'EOF'
|
||||||
|
function! coc#config(section, value) abort
|
||||||
|
let g:_recorded = {'section': a:section, 'value': deepcopy(a:value)}
|
||||||
|
endfunction
|
||||||
|
EOF
|
||||||
|
|
||||||
|
OUT="$TMP/coc.out"
|
||||||
|
VIMRC="$TMP/vimrc"
|
||||||
|
cat > "$VIMRC" <<EOF
|
||||||
|
set nocompatible
|
||||||
|
" Stub dir first so its autoload/coc.vim is the one that resolves.
|
||||||
|
let &runtimepath = '$TMP/stub' . ',' . '$REPO_ROOT' . ',' . &runtimepath
|
||||||
|
" coc.nvim defines :CocConfig at startup; nuwiki uses that as the reliable
|
||||||
|
" 'coc is present' signal. Stub it so the coc branch is taken.
|
||||||
|
command! -nargs=0 CocConfig echo ''
|
||||||
|
EOF
|
||||||
|
|
||||||
|
log 'running Vim coc-registration harness…'
|
||||||
|
NUWIKI_COC_OUT="$OUT" \
|
||||||
|
timeout 30 vim -e -s -u "$VIMRC" \
|
||||||
|
-c "source $REPO_ROOT/development/tests/test-coc-register-vim.vim" \
|
||||||
|
</dev/null >"$TMP/vim.log" 2>&1 || true
|
||||||
|
|
||||||
|
if [[ ! -f "$OUT" ]]; then
|
||||||
|
echo 'coc-registration harness produced no output' >&2
|
||||||
|
echo '--- vim log ---' >&2
|
||||||
|
cat "$TMP/vim.log" >&2 || true
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
cat "$OUT"
|
||||||
|
PASSED="$(grep -c '^PASS ' "$OUT" || true)"
|
||||||
|
FAILED="$(grep -c '^FAIL ' "$OUT" || true)"
|
||||||
|
echo "SUMMARY: ${PASSED} passed, ${FAILED} failed"
|
||||||
|
|
||||||
|
if [[ "$FAILED" -ne 0 ]]; then
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
log 'coc registration OK ✓'
|
||||||
|
exit 0
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
" development/tests/test-coc-register-vim.vim — programmatic coc.nvim
|
||||||
|
" registration. Relies on a stub autoload/coc.vim (created by the wrapper) that
|
||||||
|
" records coc#config calls into g:_recorded. Drives nuwiki#lsp#start()'s coc
|
||||||
|
" branch and asserts the exact languageserver config nuwiki injects (command,
|
||||||
|
" filetypes, and the s:settings() payload with the global shorthand folded in).
|
||||||
|
" Writes PASS/FAIL to $NUWIKI_COC_OUT.
|
||||||
|
|
||||||
|
let s:out = []
|
||||||
|
function! s:check(desc, cond) abort
|
||||||
|
call add(s:out, (a:cond ? 'PASS ' : 'FAIL ') . a:desc)
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
" Pretend coc's node service is already up so registration runs synchronously.
|
||||||
|
let g:coc_service_initialized = 1
|
||||||
|
let g:_recorded = {}
|
||||||
|
|
||||||
|
" Make sure the vim-lsp branch is NOT taken.
|
||||||
|
if exists('g:lsp_loaded') | unlet g:lsp_loaded | endif
|
||||||
|
|
||||||
|
" A readable, executable 'binary' so nuwiki#lsp#start() gets past its check.
|
||||||
|
let g:nuwiki_binary_path = executable('true') ? exepath('true') : '/usr/bin/true'
|
||||||
|
|
||||||
|
" Config: single-wiki shorthand + a global display setting that must fold into
|
||||||
|
" the wiki the server sees (the global shorthand).
|
||||||
|
let g:nuwiki_wiki_root = '/tmp/realwiki'
|
||||||
|
let g:nuwiki_toc_header_level = 2
|
||||||
|
|
||||||
|
call nuwiki#lsp#start()
|
||||||
|
|
||||||
|
let s:r = get(g:, '_recorded', {})
|
||||||
|
call s:check('coc#config was called', !empty(s:r))
|
||||||
|
call s:check('section is languageserver.nuwiki', get(s:r, 'section', '') ==# 'languageserver.nuwiki')
|
||||||
|
let s:v = get(s:r, 'value', {})
|
||||||
|
call s:check('command is the binary', get(s:v, 'command', '') ==# g:nuwiki_binary_path)
|
||||||
|
call s:check('filetypes = [vimwiki]', get(s:v, 'filetypes', []) == ['vimwiki'])
|
||||||
|
let s:io = get(s:v, 'initializationOptions', {})
|
||||||
|
call s:check('initOpts has wiki_root', get(s:io, 'wiki_root', '') ==# '/tmp/realwiki')
|
||||||
|
call s:check('global toc_header_level folded into payload', get(s:io, 'toc_header_level', 0) == 2)
|
||||||
|
call s:check('settings.nuwiki mirrors initOpts', get(get(s:v, 'settings', {}), 'nuwiki', {}) ==# s:io)
|
||||||
|
|
||||||
|
call writefile(s:out, $NUWIKI_COC_OUT)
|
||||||
|
qa!
|
||||||
Reference in New Issue
Block a user