Commit9cb855a2Recorded12 Aug 2026Repositorysigil-lsp

Use monorepo-owned sigil-help package

Changed
 package.sgl                    |  8 ++++----
 test/gate-h2-help-migration.sh | 15 +++++----------
 test/test-help-integration.sgl |  4 ++--
 3 files changed, 11 insertions(+), 16 deletions(-)
Diff
package.sglmodified
@@ -7,7 +7,7 @@
7
(package
8
name: "sigil-lsp"
9
version: "0.16.1"
−10
sigil: "^0.17"
+10
sigil: "^0.18.6"
11
description: "Language Server Protocol implementation for Sigil"
12
url: "https://codeberg.org/sigil/sigil-lsp"
13
license: "BSD-3-Clause"
@@ -16,6 +16,6 @@
16
dependencies: (list
17
(from-git url: "codeberg:sigil/sigil-json" version: "^0.16.0")
18
(from-git url: "codeberg:sigil/sigil-log" version: "^0.16.0")
−19
(from-git url: "codeberg:sigil/sigil-args" version: "^0.16.0")
−20
(from-git url: "codeberg:sigil/sigil-format" version: "^0.16.0")
−21
(from-git url: "codeberg:sigil/sigil-help" version: "^0.16.0")))
+19
(from-git url: "codeberg:sigil/sigil" package: "sigil-args" version: "^0.18.6")
+20
(from-git url: "codeberg:sigil/sigil" package: "sigil-format" version: "^0.18.6")
+21
(from-git url: "codeberg:sigil/sigil" package: "sigil-help" version: "^0.18.6")))
test/gate-h2-help-migration.shmodified
@@ -2,15 +2,10 @@
2
set -euo pipefail
3
repo_root=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)
4
cd "$repo_root"
−5
help_source=${SIGIL_HELP_SOURCE:?set SIGIL_HELP_SOURCE to reviewed H1 checkout}
−6
[[ $(git -C "$help_source" rev-parse HEAD) == 57c0bf1ce234abaf6dbf4da41018caf149aee471 ]] || {
−7
printf 'FAIL: SIGIL_HELP_SOURCE is not reviewed H1\n' >&2; exit 1; }
−8
[[ $(readlink -f .sigil/deps/sigil-help) == $(readlink -f "$help_source") ]] || {
−9
printf 'FAIL: sigil-help dependency is not reviewed H1 checkout\n' >&2; exit 1; }
−10
rg -q -F 'codeberg:sigil/sigil-help' package.sgl
−11
if rg -n -F 'name: "sigil-help"' sigil.lock; then
−12
printf 'FAIL: redirect-satisfied sigil-help must not have a fabricated lock entry\n' >&2; exit 1
−13
fi
+5
monorepo_source=${SIGIL_MONOREPO_SOURCE:?set SIGIL_MONOREPO_SOURCE to the P2 Sigil checkout}
+6
[[ -f "$monorepo_source/packages/sigil-help/package.sgl" ]] || {
+7
printf 'FAIL: P2 monorepo does not provide sigil-help\n' >&2; exit 1; }
+8
rg -q -F 'url: "codeberg:sigil/sigil" package: "sigil-help"' package.sgl
9
rg -q -F '(search-docs "_sigil_lsp_warmup_")' src/sigil/lsp/server.sgl || {
10
printf 'FAIL: LSP initialized notification no longer warms the help index\n' >&2; exit 1; }
11
if rg -n '\(sigil docs([[:space:]]|\))|sigil-docs' src test README.md package.sgl sigil.lock \
@@ -19,4 +14,4 @@ if rg -n '\(sigil docs([[:space:]]|\))|sigil-docs' src test README.md package.sg
14
fi
15
sigil build --no-cache
16
sigil test --report
−22
printf 'PASS: LSP hover/completion/definition resolve reviewed sigil-help metadata\n'
+17
printf 'PASS: LSP hover/completion/definition resolve monorepo sigil-help metadata\n'
test/test-help-integration.sglmodified
@@ -33,11 +33,11 @@
33
(define definition-response (request "textDocument/definition" 5 3))
34
(rename-file held-json fixture-json)
35
−36
(test "LSP imports real reviewed sigil-help metadata"
+36
(test "LSP imports monorepo-owned reviewed sigil-help metadata"
37
(let ((details (load-module-details '(sigil help lookup))))
38
(assert-true (module-details? details))
39
(assert-true (string-find (module-details-file details)
−40
"task-sigil-help-migration/src/sigil/help/lookup.sgl"))))
+40
"packages/sigil-help/src/sigil/help/lookup.sgl"))))
41
42
(test "LSP hover request uses warmed compiler metadata"
43
(let* ((response hover-response)