@rohal12/spindle-lsp 0.15.0 → 0.15.1

package/dist/bin.js

@@ -50,6 +50,15 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
+// src/version.ts
+var VERSION;
+var init_version = __esm({
+  "src/version.ts"() {
+    "use strict";
+    VERSION = false ? pkg.version : "0.15.1";
+  }
+});
+
 // node_modules/glob/dist/esm/index.min.js
 import { fileURLToPath as Wi } from "node:url";
 import { posix as mi, win32 as re } from "node:path";
@@ -23372,10 +23381,11 @@ function parsePassageHeader(rawLine, lineNumber) {
   const delimiter = /[\[\]{}]/g;
   delimiter.lastIndex = nameStart;
   const first = delimiter.exec(escaped);
-  const nameEnd = first?.index ?? line.length;
-  const name = line.slice(nameStart, nameEnd).trim();
+  const boundary = first?.index ?? line.length;
+  const nameEnd = escaped.slice(0, boundary).trimEnd().length;
+  const name = line.slice(nameStart, nameEnd).replace(/\\(.)/g, "$1").trim();
   if (!name) return null;
-  let rest = nameEnd;
+  let rest = boundary;
   let tags = [];
   if (escaped[rest] === "[") {
     const end = escaped.indexOf("]", rest + 1);
@@ -23400,14 +23410,13 @@ function parsePassageHeader(rawLine, lineNumber) {
     end: { line: lineNumber, character: line.length }
   };
   const nameCharStart = nameStart;
-  const nameCharEnd = nameCharStart + name.length;
+  const nameCharEnd = nameEnd;
   const nameRange = {
     start: { line: lineNumber, character: nameCharStart },
     end: { line: lineNumber, character: nameCharEnd }
   };
   return {
-    name: name.replace(/\\(.)/g, "$1"),
-    // unescape
+    name,
     tags,
     meta: meta3,
     headerRange,
@@ -31765,6 +31774,13 @@ var init_widget_registry = __esm({
       getAllWidgets() {
         return Array.from(this.widgets.values());
       }
+      /** The effective widget whose declared name contains the cursor. */
+      definitionAt(uri, position) {
+        return this.getAllWidgets().find((widget) => {
+          const { start, end } = widget.nameRange;
+          return widget.uri === uri && position.line === start.line && position.character >= start.character && position.character <= end.character;
+        });
+      }
       /**
        * Record the macros opened in a document (its tags and those in the labels
        * and attribute values that hold markup), replacing any previous record for
@@ -34007,6 +34023,10 @@ function structureDiagnostics(passage, workspace) {
     }
   };
   visit(passage.pairing.nodes, []);
+  for (const piece of passage.pieces) {
+    if (piece.kind !== "text") continue;
+    visit(pairMarkup(piece.tokens, { isBlock: (name) => workspace.isContainer(name) }).nodes, []);
+  }
   return diagnostics;
 }
 function parentDiagnostics(passage, token, ancestors, workspace) {
@@ -34539,7 +34559,7 @@ function formatSarif(results) {
         tool: {
           driver: {
             name: "spindle-lsp",
-            version: "0.1.0",
+            version: VERSION,
             rules: Array.from(ruleIds).map((id) => ({
               id,
               shortDescription: { text: `Spindle diagnostic ${id}` }
@@ -34556,6 +34576,7 @@ var sarifLevelMap;
 var init_sarif = __esm({
   "src/cli/reporters/sarif.ts"() {
     "use strict";
+    init_version();
     sarifLevelMap = {
       error: "error",
       warning: "warning",
@@ -34813,7 +34834,7 @@ async function loadPrettier(filePath) {
   if (!p) return void 0;
   try {
     const path = filePath?.startsWith("file:") ? fileURLToPath3(filePath) : filePath;
-    const resolved = await p.resolveConfig(path ?? resolve5(process.cwd(), "story.tw"));
+    const resolved = await p.resolveConfig(path ?? resolve5(process.cwd(), "story.tw"), { useCache: false });
     return { prettier: p, options: { tabWidth: 2, ...resolved ?? {} } };
   } catch {
     return { prettier: p, options: { tabWidth: 2 } };
@@ -34867,8 +34888,7 @@ async function formatLf2(text3, options) {
       }
     }
     if (passage.header) {
-      const header = PASSAGE_HEADER_REGEX.test(passage.header) ? normalizePassageHeader(passage.header) : passage.header;
-      resultLines.push(header.replace(/\s+$/, ""));
+      resultLines.push(normalizePassageHeader(passage.header));
     }
     if (passage.body === "") continue;
     const role = parsePassageHeader(passage.header, passage.startLine);
@@ -34889,26 +34909,14 @@ async function formatRange(text3, _range, options) {
   return formatDocument(text3, options);
 }
 function normalizePassageHeader(line) {
-  const headerMatch = line.match(/^::\s*(.*)/);
-  if (!headerMatch) return line;
-  const rest = headerMatch[1];
-  const unescaped = rest.replace(/\\./g, "ec");
-  const bracketIdx = unescaped.indexOf("[");
-  const braceIdx = unescaped.indexOf("{");
-  let name;
-  let suffix = "";
-  if (bracketIdx !== -1 && (braceIdx === -1 || bracketIdx < braceIdx)) {
-    name = rest.substring(0, bracketIdx).trim();
-    suffix = " " + rest.substring(bracketIdx).trim();
-  } else if (braceIdx !== -1) {
-    name = rest.substring(0, braceIdx).trim();
-    suffix = " " + rest.substring(braceIdx).trim();
-  } else {
-    name = rest.trim();
-  }
-  return `:: ${name}${suffix}`;
-}
-var PASSAGE_HEADER_REGEX, DEFAULT_DEDENTING2, BUILTIN_CONTAINERS, formatPlugin;
+  const header = parsePassageHeader(line, 0);
+  if (!header) return line;
+  const { start, end } = header.nameRange;
+  const name = line.slice(start.character, end.character);
+  const suffix = line.slice(end.character).trim();
+  return `:: ${name}${suffix ? ` ${suffix}` : ""}`;
+}
+var DEFAULT_DEDENTING2, BUILTIN_CONTAINERS, formatPlugin;
 var init_format = __esm({
   "src/plugins/format.ts"() {
     "use strict";
@@ -34916,7 +34924,6 @@ var init_format = __esm({
     init_passage_parser();
     init_segment();
     init_prettier_bridge();
-    PASSAGE_HEADER_REGEX = /^(::)\s*/;
     DEFAULT_DEDENTING2 = /* @__PURE__ */ new Set(["else", "elseif", "next", "case", "default"]);
     BUILTIN_CONTAINERS = new Set(builtinMacros.filter((m) => m.block).map((m) => m.name.toLowerCase()));
     formatPlugin = {
@@ -77681,6 +77688,30 @@ function getSignatureHelp(uri, position, workspace) {
       return { signatures, activeSignature, activeParameter };
     }
   }
+  if (macroInfo) {
+    const definitions = macroInfo.parameters === void 0 ? macroInfo.parameterDefs : void 0;
+    if (!definitions?.length) return null;
+    const parameters = definitions.map((parameter) => ({
+      label: parameter.required ? parameter.name : `[${parameter.name}]`,
+      documentation: [parameter.description, `Type: ${parameter.type}`].filter(Boolean).join("\n\n")
+    }));
+    const positional = definitions.every((p) => p.type === "string" || p.type === "number") && argument < parameters.length;
+    const documentation = [
+      macroInfo.description,
+      ...!positional ? parameters.map((p) => `${p.label}
+
+${p.documentation}`) : []
+    ].filter(Boolean).join("\n\n") || void 0;
+    return {
+      signatures: [{
+        label: `{${[macroName, ...parameters.map((p) => p.label)].join(" ")}}`,
+        documentation,
+        parameters: positional ? parameters : []
+      }],
+      activeSignature: 0,
+      activeParameter: positional ? argument : 0
+    };
+  }
   const widget = workspace.widgets.getWidget(macroName);
   if (widget && widget.params.length > 0) {
     const paramLabels = widget.params;
@@ -77885,6 +77916,8 @@ function findReferences(uri, position, workspace, includeDeclaration) {
   if (variable) {
     return variable.sigil === "%" ? findTransientReferences(variable.name, workspace, includeDeclaration) : findVariableReferences(variable.name, workspace, includeDeclaration);
   }
+  const declaration = workspace.widgets.definitionAt(uri, position);
+  if (declaration) return findWidgetReferences(declaration.name, workspace, includeDeclaration);
   const doc = workspace.markup.get(uri);
   const head = doc && macroHeadAt(doc, position);
   if (head) {
@@ -77963,6 +77996,7 @@ function findWidgetReferences(widgetName2, workspace, includeDeclaration) {
   if (includeDeclaration && widget) {
     locations.push({ uri: widget.uri, range: widget.range });
   }
+  if (workspace.macros.getMacro(widgetName2)) return locations;
   const lowerName2 = widgetName2.toLowerCase();
   const isBlock = widget?.block ?? false;
   for (const docUri of workspace.documents.getUris()) {
@@ -78241,12 +78275,8 @@ function resolveSymbolAtCursor(uri, position, workspace) {
   if (variable) {
     return { kind: "variable", name: variable.name, sigil: variable.sigil, range: variable.range };
   }
-  for (const widget of workspace.widgets.getAllWidgets()) {
-    const { start, end } = widget.nameRange;
-    if (widget.uri === uri && position.line === start.line && position.character >= start.character && position.character <= end.character) {
-      return { kind: "widget", name: widget.name, range: widget.nameRange };
-    }
-  }
+  const declaration = workspace.widgets.definitionAt(uri, position);
+  if (declaration) return { kind: "widget", name: declaration.name, range: declaration.nameRange };
   const doc = workspace.markup.get(uri);
   const head = doc && macroHeadAt(doc, position);
   if (head) {
@@ -79606,8 +79636,8 @@ var init_server4 = __esm({
 });
 
 // src/bin.ts
+init_version();
 var args = process.argv.slice(2);
-var VERSION = "0.15.0";
 var HELP = `spindle-lsp v${VERSION}
 Language Server Protocol server for Spindle story format