@rohal12/spindle-lsp 0.15.16 → 0.15.17

package/dist/bin.js

@@ -55,7 +55,7 @@ var VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    VERSION = false ? pkg.version : "0.15.16";
+    VERSION = false ? pkg.version : "0.15.17";
   }
 });
 
@@ -31737,6 +31737,13 @@ var init_text = __esm({
 
 // src/core/parsing/passage-parser.ts
 import { createRequire as createCompilerRequire } from "node:module";
+function encodePassageName(name) {
+  if (!name || /[\r\n]/.test(name)) return void 0;
+  const encoded = name.replace(/[[\]{}\\]/g, "\\$&");
+  const { parseTwee } = createCompilerRequire(import.meta.url)("@rohal12/twee-ts");
+  const parsed = parseTwee(`:: ${encoded}`);
+  return parsed.passages.length === 1 && parsed.passages[0].name === name && !parsed.diagnostics.some((d) => d.level === "error") ? encoded : void 0;
+}
 function parsePassageHeader(rawLine, lineNumber) {
   const line = withoutCr(rawLine);
   const bomLength = /^\uFEFF*/.exec(line)[0].length;
@@ -33704,7 +33711,6 @@ function indexStoryDataTexts(texts) {
   const index = new PassageIndex();
   const byUri = /* @__PURE__ */ new Map();
   for (const text3 of texts) {
-    if (!text3.includes("StoryData")) continue;
     const uri = `story-format:${String(byUri.size).padStart(16, "0")}`;
     byUri.set(uri, text3);
     index.rebuild(uri, text3);
@@ -34502,6 +34508,8 @@ var init_diagnostic_codes = __esm({
     DiagnosticCode = {
       /** The Spindle the project targets is older than the oldest one supported. */
       UnsupportedSpindleVersion: "SP001",
+      /** A fatal Twee source error reported by the public compiler parser. */
+      TweeSyntaxError: "SP002",
       /** `unknown-macro`: a macro that is none of the built-in, configured or defined ones. */
       UndefinedMacro: "SP100",
       /** `unclosed-block`, `mismatched-closer`, `stray-closer` of a macro. */
@@ -34550,38 +34558,39 @@ var init_diagnostic_codes = __esm({
       LineTooLong: "SP500"
     };
     severityMap = {
-      SP001: "warning",
-      SP100: "warning",
-      SP101: "error",
-      SP102: "error",
-      SP104: "error",
-      SP105: "error",
-      SP106: "error",
-      SP107: "error",
-      SP108: "error",
-      SP109: "error",
-      SP110: "warning",
-      SP111: "error",
-      SP113: "error",
-      SP114: "error",
-      SP115: "error",
-      SP200: "error",
-      SP201: "error",
-      SP202: "info",
-      SP203: "warning",
-      SP205: "warning",
-      SP206: "warning",
-      SP207: "error",
-      SP208: "error",
-      SP300: "warning",
-      SP301: "warning",
-      SP302: "warning",
-      SP303: "hint",
-      SP304: "warning",
-      SP305: "warning",
-      SP400: "hint",
-      SP401: "hint",
-      SP500: "warning"
+      [DiagnosticCode.UnsupportedSpindleVersion]: "warning",
+      [DiagnosticCode.TweeSyntaxError]: "error",
+      [DiagnosticCode.UndefinedMacro]: "warning",
+      [DiagnosticCode.MalformedContainer]: "error",
+      [DiagnosticCode.MalformedElement]: "error",
+      [DiagnosticCode.IllegalClosingTag]: "error",
+      [DiagnosticCode.UnclosedMarkup]: "error",
+      [DiagnosticCode.CodeSyntaxError]: "error",
+      [DiagnosticCode.InvalidChildren]: "error",
+      [DiagnosticCode.ExpectedNoArguments]: "error",
+      [DiagnosticCode.ParameterTypeError]: "error",
+      [DiagnosticCode.ParameterWarning]: "warning",
+      [DiagnosticCode.TooManyArguments]: "error",
+      [DiagnosticCode.UnquotedPassageName]: "error",
+      [DiagnosticCode.ChildMaxExceeded]: "error",
+      [DiagnosticCode.ChildMinNotMet]: "error",
+      [DiagnosticCode.UndeclaredVariable]: "error",
+      [DiagnosticCode.PrimitiveFieldAccess]: "error",
+      [DiagnosticCode.NoStoryVariables]: "info",
+      [DiagnosticCode.UndeclaredTransient]: "warning",
+      [DiagnosticCode.TemporaryAssignedInLoop]: "warning",
+      [DiagnosticCode.ArrayMemberAccess]: "warning",
+      [DiagnosticCode.InvalidDeclaration]: "error",
+      [DiagnosticCode.ReservedVariableName]: "error",
+      [DiagnosticCode.BrokenPassageLink]: "warning",
+      [DiagnosticCode.WidgetArgCountMismatch]: "warning",
+      [DiagnosticCode.IncludeWidgetPassage]: "warning",
+      [DiagnosticCode.UnusedWidget]: "hint",
+      [DiagnosticCode.LinkRuntimeMismatch]: "warning",
+      [DiagnosticCode.LiteralLinkInterpolation]: "warning",
+      [DiagnosticCode.DeadEndPassage]: "hint",
+      [DiagnosticCode.UnreachablePassage]: "hint",
+      [DiagnosticCode.LineTooLong]: "warning"
     };
   }
 });
@@ -34833,12 +34842,14 @@ var init_story_variables_owner = __esm({
 });
 
 // src/plugins/diagnostics.ts
+import { createRequire as createCompilerRequire3 } from "node:module";
 function computeDiagnostics(uri, workspace, options) {
   if (!workspace.initialized) return [];
   if (!workspace.isSpindleProject()) return [];
   const doc = workspace.markup.get(uri);
-  if (!doc || doc.passages.length === 0) return [];
-  const diagnostics = [];
+  if (!doc || isMacroSource(uri)) return [];
+  const diagnostics = [...tweeDiagnostics(doc)];
+  if (doc.passages.length === 0) return diagnostics;
   const attempt = (check2) => {
     try {
       check2();
@@ -34869,6 +34880,27 @@ function computeDiagnostics(uri, workspace, options) {
   }
   return diagnostics.sort((a, b) => a.range.start.line - b.range.start.line || a.range.start.character - b.range.start.character);
 }
+function tweeDiagnostics(doc) {
+  const kept3 = tweeReports.get(doc);
+  if (kept3) return kept3;
+  const lines = splitLines(doc.text);
+  const indexed = new Set(doc.passages.map((p) => p.passage.headerEnd.start.line));
+  if (!lines.some((line, i2) => /^\uFEFF*::/.test(line) && (!indexed.has(i2) || /[[\]{}]/.test(line)))) {
+    tweeReports.set(doc, []);
+    return [];
+  }
+  const { parseTwee } = createCompilerRequire3(import.meta.url)("@rohal12/twee-ts");
+  const diagnostics = parseTwee(doc.text).diagnostics.filter((d) => d.level === "error").map((d) => {
+    const line = Math.min(Math.max((d.line ?? 1) - 1, 0), lines.length - 1);
+    return makeDiag(
+      { start: { line, character: 0 }, end: { line, character: lines[line].length } },
+      DiagnosticCode.TweeSyntaxError,
+      d.message
+    );
+  });
+  tweeReports.set(doc, diagnostics);
+  return diagnostics;
+}
 function storyReport(workspace) {
   const documents = [];
   for (const uri of workspace.passages.getDocumentUris()) {
@@ -35405,7 +35437,7 @@ function toLspDiagnostic(d) {
     data: d.data
   };
 }
-var reports, COMPILER_PASSAGES, MARKUP_CODES, text2, list2, VARIABLE_CODES, WILL_NOT_START, BRANCH_MACROS2, DIRECT_CHILD_MACROS, DEFERRED_CONTAINERS, SPINDLE_MACROS, diagnosticsPlugin;
+var tweeReports, reports, COMPILER_PASSAGES, MARKUP_CODES, text2, list2, VARIABLE_CODES, WILL_NOT_START, BRANCH_MACROS2, DIRECT_CHILD_MACROS, DEFERRED_CONTAINERS, SPINDLE_MACROS, diagnosticsPlugin;
 var init_diagnostics = __esm({
   "src/plugins/diagnostics.ts"() {
     "use strict";
@@ -35422,6 +35454,7 @@ var init_diagnostics = __esm({
     init_story_variables_owner();
     init_macro_sources();
     init_spindle_version();
+    tweeReports = /* @__PURE__ */ new WeakMap();
     reports = /* @__PURE__ */ new WeakMap();
     COMPILER_PASSAGES = /* @__PURE__ */ new Set(["StoryTitle", "StoryData"]);
     MARKUP_CODES = {
@@ -80094,7 +80127,11 @@ function gateRegistrations(target, methods, enabled, nested = {}) {
       }
       if (methods.includes(prop) && typeof value === "function") {
         return (handler, ...rest) => Reflect.apply(value, obj, [
-          (...args2) => enabled() ? handler(...args2) : null,
+          (...args2) => {
+            const allowed = enabled();
+            const answer = (yes) => yes ? handler(...args2) : null;
+            return typeof allowed === "boolean" ? answer(allowed) : allowed.then(answer);
+          },
           ...rest
         ]);
       }
@@ -81143,10 +81180,13 @@ function computeRename(uri, position, newName, workspace) {
       if (isReservedPassageName(newName)) {
         throw new RenameError(`Cannot rename to ${JSON.stringify(newName)}: it is a reserved passage name with a fixed meaning.`).at(uri, symbol2.range);
       }
+      const encoded = encodePassageName(newName);
       for (const declaration of workspace.passages.getPassages(symbol2.name)) {
-        const problem = passageHeaderProblem(newName);
-        if (problem) throw new RenameError(`Cannot rename to ${JSON.stringify(newName)}: ${problem}.`).at(declaration.uri, declaration.nameRange);
-        addEdit(declaration.uri, declaration.nameRange, escapePassageName(newName));
+        if (encoded === void 0) {
+          const reason = /[\r\n]/.test(newName) ? "a passage header is a single line" : "a passage header cannot represent that name exactly";
+          throw new RenameError(`Cannot rename to ${JSON.stringify(newName)}: ${reason}.`).at(declaration.uri, declaration.nameRange);
+        }
+        addEdit(declaration.uri, declaration.nameRange, encoded);
       }
       for (const { uri: refUri, ref: ref2, text: text3 } of refEdits) addEdit(refUri, ref2.range, text3);
       preserveEntryPassage(symbol2.name, newName, workspace, addEdit);
@@ -81295,12 +81335,6 @@ function preserveEntryPassage(oldName, newName, workspace, addEdit) {
 function isEntryField(key) {
   return readStoryData(JSON.stringify({ [key]: "Start" })).start === "Start";
 }
-function passageHeaderProblem(name) {
-  if (name.trim() === "") return "a passage name cannot be empty";
-  if (/[\r\n]/.test(name)) return "a passage header is a single line, so the name cannot contain a line break";
-  if (name !== name.trim()) return "a passage name cannot start or end with whitespace";
-  return null;
-}
 function unrepresentable(newName, where2) {
   return new RenameError(`Cannot rename to ${JSON.stringify(newName)}: it cannot be written inside ${where2}.`);
 }
@@ -81364,9 +81398,6 @@ function misreadRewrite(passage, edits, oldName, newName) {
   const owner = edits.filter((edit) => edit.ref.piece <= index).at(-1) ?? edits[0];
   return owner.ref;
 }
-function escapePassageName(name) {
-  return name.replace(/[[\]{}\\]/g, "\\$&");
-}
 function resolveSymbolAtCursor(uri, position, workspace) {
   const text3 = workspace.documents.getText(uri);
   if (text3 === void 0 || !workspace.hasPassages(uri)) return null;
@@ -82055,10 +82086,10 @@ function fixBrokenLink(uri, diag, workspace) {
       edits: [{ uri, ...edit }]
     });
   }
-  const header = `:: ${name.replace(/[\\[\]{}]/g, "\\$&")}`;
-  if (!workspace.passages.getPassage(name) && name.trim() === name && name !== "" && !/[\r\n]/.test(name)) {
+  const encoded = encodePassageName(name);
+  if (!workspace.passages.getPassage(name) && encoded !== void 0) {
     const edit = insertLinesAt(text3, splitLines(text3).length, `
-${header}
+:: ${encoded}
 `, lineEndingFor(workspace, uri));
     actions.push({
       title: `Create passage '${name}'`,
@@ -82517,6 +82548,10 @@ function startServer(args2) {
   let activePlugins = [];
   let workspaceRoot;
   let startupWarning;
+  let completeInitialScan;
+  const initialScan = new Promise((resolve8) => {
+    completeInitialScan = resolve8;
+  });
   connection.onInitialize((params) => {
     console.error("[spindle-lsp] onInitialize called");
     const initOptions = params.initializationOptions ?? {};
@@ -82544,7 +82579,10 @@ function startServer(args2) {
     activePlugins = loadPlugins(allPlugins, config2);
     console.error("[spindle-lsp] plugins loaded:", activePlugins.map((p) => p.id).join(", "));
     const model = workspace;
-    const pluginConnection = gateConnection(connection, () => model.isSpindleProject());
+    const pluginConnection = gateConnection(connection, async () => {
+      await initialScan;
+      return model.initialized && model.isSpindleProject();
+    });
     for (const plugin of activePlugins) {
       plugin.initialize({ connection: pluginConnection, workspace, config: config2 });
     }
@@ -82596,6 +82634,8 @@ function startServer(args2) {
           console.error("[spindle-lsp] workspace initialized, macros:", workspace.macros.getAllMacros().length);
         } catch (err) {
           console.error("[spindle-lsp] workspace scan failed:", err);
+        } finally {
+          completeInitialScan();
         }
       });
     }