@rohal12/spindle-lsp 0.15.8 → 0.15.9

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.8";
+    VERSION = false ? pkg.version : "0.15.9";
   }
 });
 
@@ -31645,6 +31645,10 @@ var init_macro_registry2 = __esm({
       getMacro(name) {
         return this.resolve(name.toLowerCase());
       }
+      /** A project's explicit schema takes precedence over runtime signature metadata. */
+      hasConfiguredParameters(name) {
+        return this.configEntries.get(name.toLowerCase())?.parameters !== void 0;
+      }
       /** Check if a macro is a block (container) macro. */
       isBlock(name) {
         return this.getMacro(name)?.block ?? false;
@@ -32653,11 +32657,7 @@ var init_macro_supplements = __esm({
       },
       computed: {
         name: "computed",
-        description: "Evaluates an expression and outputs the result.\n\nUsage: `{computed expression}`",
-        parameters: ["...text"],
-        parameterDocs: [
-          { name: "expression", documentation: "Expression whose result is output." }
-        ]
+        description: "Assigns an expression's value to a variable and recomputes it when its dependencies change. The target must be a story ($), temporary (_) or local (@) variable. This macro produces no output; display the variable to show its value.\n\nUsage: `{computed _total = 1 + 2}Value: {_total}`"
       },
       print: {
         name: "print",
@@ -32670,7 +32670,7 @@ var init_macro_supplements = __esm({
       do: {
         name: "do",
         container: true,
-        description: "Displays its contents. Can be updated dynamically.\n\nUsage:\n\n```\n{do}\n  ...\n{/do}\n```",
+        description: "Executes JavaScript statements in its body. The body is code and produces no markup output.\n\nUsage:\n\n```\n{do}\n  _total = 1 + 2;\n{/do}\nValue: {_total}\n```",
         parameters: []
       },
       link: {
@@ -32810,7 +32810,7 @@ var init_macro_supplements = __esm({
       },
       passage: {
         name: "passage",
-        description: "Outputs the name of the current passage.\n\nUsage: `{passage}`",
+        description: "Renders the current passage's contents in a layout. Put this slot in StoryInterface; placing it in the current passage itself recursively renders that passage. To display the passage's name, use `{print currentPassage().name}`.\n\nUsage in StoryInterface: `<main>{passage}</main>`",
         parameters: []
       },
       textbox: {
@@ -34457,6 +34457,7 @@ function parentDiagnostics(passage, token, ancestors, workspace) {
   const name = token.name.toLowerCase();
   const parents = workspace.macros.getMacro(name)?.parents;
   if (!parents || parents.length === 0 || BRANCH_MACROS2.has(name)) return [];
+  if (workspace.macros.getAllMacros().some((macro) => macro.source === "user" && macro.name.toLowerCase() !== "listbox" && macro.subMacros.some((sub) => sub.toLowerCase() === name))) return [];
   const allowed = new Set(parents.map((parent) => parent.toLowerCase()));
   const parentList = parents.join(", ");
   const range2 = passage.range(token.start, token.end);
@@ -80046,10 +80047,11 @@ function getSignatureHelp(uri, position, workspace) {
   const typing = argumentsBeingTyped(argsBefore);
   const argument = typing.length - 1;
   const macroInfo = workspace.macros.getMacro(macroName);
-  if (macroInfo && macroInfo.parameters && macroInfo.parameters.length > 0) {
+  const schema = macroInfo?.parameterDefs?.length && !workspace.macros.hasConfiguredParameters(macroName) ? void 0 : macroInfo?.parameters;
+  if (macroInfo && schema && schema.length > 0) {
     const described = describeSignatures(
       macroName,
-      macroInfo.parameters,
+      schema,
       macroInfo.description ?? void 0,
       macroInfo.parameterDocs
     );
@@ -80064,10 +80066,10 @@ function getSignatureHelp(uri, position, workspace) {
     }
   }
   if (macroInfo) {
-    const definitions = macroInfo.parameters === void 0 ? macroInfo.parameterDefs : void 0;
+    const definitions = schema === void 0 ? macroInfo.parameterDefs : void 0;
     if (!definitions?.length) return null;
     const parameters = definitions.map((parameter) => ({
-      label: parameter.required ? parameter.name : `[${parameter.name}]`,
+      label: parameter.required || parameter.type === "separator" ? 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;