@heroiclands/content-language-server 0.2.0 → 0.2.2

package/docs/content-language-server.md

@@ -37,13 +37,13 @@ An explicitly configured foreign project can be searched even when it is not a d
 
 ### Address completion
 
-Completion inside an unfinished `[[...` link searches the selected projects' saved indexes. The query matches anywhere in a note's full name, aliases, shortcode, short Address, or canonical Address. The existing `nameAscii` and `aliasesAscii` fields supply typeable forms of names with non-ASCII characters. The server builds lowercase search keys in memory when it loads an index and transliterates the query with the same rule. The JSONL format carries no separate search field.
+Completion inside a `[[...` link searches the selected projects' saved indexes, including when an editor inserts the closing `]]` after the cursor. The query matches anywhere in a note's full name, aliases, shortcode, short Address, or canonical Address. The existing `nameAscii` and `aliasesAscii` fields supply typeable forms of names with non-ASCII characters. The server builds lowercase search keys in memory when it loads an index and transliterates the query with the same rule. The JSONL format carries no separate search field.
 
-Each result identifies its owning package and canonical Address. Readable `note` content, systemless `none` targets, and game system documents stay selectable even when they share a Markdown file. An ordinary `[[link|text]]` defaults to `note`, while an embedded `![[link|text]]` defaults to `none` and uses `image` as the type of a bare shortcode. Stating a system selects that exact target: `[[macro-autoattack|Text]]` reaches the readable note, and `[[none-macro-autoattack|Text]]` reaches the Macro. An embed offers asset targets and can reach an icon with `![[icon-anvil|Anvil]]`.
+Each result identifies its owning package and canonical Address. Address completion items also carry `data.address` with that canonical Address, `data.display` with the authored name or exactly matched alias, and `data.exact` to distinguish a full name or alias match from a substring match. Editors can use these fields when completing a link's display text without merging targets that share a file or name. Readable `note` content, systemless `none` targets, and game system documents stay selectable even when they share a Markdown file. An ordinary `[[link|text]]` defaults to `note`, while an embedded `![[link|text]]` defaults to `none` and uses `image` as the type of a bare shortcode. Stating a system selects that exact target: `[[macro-autoattack|Text]]` reaches the readable note, and `[[none-macro-autoattack|Text]]` reaches the Macro. An embed offers asset targets and can reach an icon with `![[icon-anvil|Anvil]]`.
 
 The text edit inserts the shortest Address that parses to the selected target at the cursor. A local game system document can require `sohl-being-bctrncml`, while a target in another package requires a fully qualified Address. A `[[...#` query completes anchors from the selected note. Completion in a declared frontmatter Address field uses that field's type and system defaults: image, icon, and folder fields use `none`; other fields use their game system block or `note` outside one. Explicit system segments keep their stated meaning. Input `doc<type>` aliases select readable note records; generated records and completion candidates use the authored type.
 
-The server reads open buffer text to locate the cursor and replacement range. Candidate metadata comes from the saved JSONL index; unsaved frontmatter changes do not add candidates. Completion leaves existing display text and closed wikilinks alone. A missing foreign index is reported through the usual LSP status message while other indexed projects remain available.
+The server reads open buffer text to locate the cursor and replacement range. Candidate metadata comes from the saved JSONL index; unsaved frontmatter changes do not add candidates. Completion preserves closing brackets immediately after the cursor and ignores positions within existing display text. A missing foreign index is reported through the usual LSP status message while other indexed projects remain available.
 
 ## Foreign content projects
 

package/engine/content-language-server.mjs

@@ -82,6 +82,15 @@ function searchKey(value) {
     return typeof value === "string" ? (asciiName(value) ?? "").toLowerCase() : "";
 }
 
+/** Preserve the authored spelling when a query exactly names a note or alias. */
+function completionDisplay(record, query) {
+    const full = noteName(record);
+    const needle = searchKey(query);
+    const names = [full, ...(record.name?.aliases ?? [])];
+    const exact = needle ? names.find((name) => searchKey(name) === needle) : null;
+    return { display: exact ?? full, exact: Boolean(exact) };
+}
+
 /** Parse editor symbol filters without looking outside configured projects. */
 function symbolQuery(query) {
     let text = String(query ?? "").trim();
@@ -108,12 +117,13 @@ function symbolQuery(query) {
 }
 
 /** A completion item changes the Address text while its label remains readable. */
-function completionItem(label, detail, inserted, text, from, to, filterText) {
+function completionItem(label, detail, inserted, text, from, to, filterText, data) {
     return {
         label,
         kind: 18,
         detail,
         filterText,
+        ...(data ? { data } : {}),
         textEdit: {
             range: { start: positionAt(text, from), end: positionAt(text, to) },
             newText: inserted,
@@ -130,10 +140,11 @@ function mayCompleteAddress(text, offset) {
     const lineEnd = text.indexOf("\n", offset);
     const before = text.slice(lineStart, offset);
     const open = before.lastIndexOf("[[");
+    const after = text.slice(offset, lineEnd < 0 ? text.length : lineEnd);
     return (
         open >= 0 &&
         !before.slice(open + 2).includes("]]") &&
-        !text.slice(offset, lineEnd < 0 ? text.length : lineEnd).includes("]]")
+        (!after.includes("]]") || after.startsWith("]]"))
     );
 }
 
@@ -495,7 +506,8 @@ export class ContentWorkspace {
         const open = before.lastIndexOf("[[");
         if (open < 0 || before.slice(open + 2).includes("]]")) return null;
         const embed = open > 0 && before[open - 1] === "!";
-        if (text.slice(offset, lineEnd < 0 ? text.length : lineEnd).includes("]]")) return null;
+        const after = text.slice(offset, lineEnd < 0 ? text.length : lineEnd);
+        if (after.includes("]]") && !after.startsWith("]]")) return null;
         const from = lineStart + open + 2;
         const written = text.slice(from, offset);
         if (written.includes("|") || written.includes("[") || written.includes("]")) return null;
@@ -644,6 +656,10 @@ export class ContentWorkspace {
                         context.from,
                         context.to,
                         context.query,
+                        {
+                            address: canonical,
+                            ...completionDisplay(record, context.query),
+                        },
                     ),
                 );
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@heroiclands/content-language-server",
-    "version": "0.2.0",
+    "version": "0.2.2",
     "description": "Language server for HeroicLands content projects",
     "license": "GPL-3.0-or-later",
     "type": "module",