@rohal12/spindle-lsp 0.15.53 → 0.15.54

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.53";
+    VERSION = false ? pkg.version : "0.15.54";
   }
 });
 
@@ -35316,7 +35316,7 @@ var init_workspace_model = __esm({
           const text3 = this.documents.getText(uri);
           if (!text3) continue;
           if (isMacroSource(uri)) {
-            found.push(...discoverMacros(text3));
+            for (const macro of discoverMacros(text3)) found.push(macro);
             continue;
           }
           for (const source of this.passages.getPassagesInDocument(uri)) {
@@ -35328,8 +35328,9 @@ var init_workspace_model = __esm({
             const isScript = passage.tags?.includes("script") ?? false;
             if (!isStoryInit && !isScript) continue;
             const content2 = this.markup.get(passage.uri)?.passages.find((p) => p.passage === passage)?.content ?? "";
-            if (isScript) found.push(...discoverMacros(content2));
-            else init.push(passage);
+            if (isScript) {
+              for (const macro of discoverMacros(content2)) found.push(macro);
+            } else init.push(passage);
           }
         }
         this.macros.setDiscoveredMacros(found);
@@ -35337,7 +35338,9 @@ var init_workspace_model = __esm({
         this.rescanWidgets();
         for (const passage of init) {
           const markup = this.markup.get(passage.uri)?.passages.find((p) => p.passage === passage);
-          if (markup) found.push(...storyInitMacros(markup));
+          if (markup) {
+            for (const macro of storyInitMacros(markup)) found.push(macro);
+          }
         }
         this.macros.setDiscoveredMacros(found);
       }
@@ -35909,6 +35912,12 @@ function buildReport(documents, workspace) {
   }
   const sources = widgetSources(passages, macros);
   const widgetList = [...sources].map(([definition2, passage]) => ({ definition: definition2, passage }));
+  const widgetNamesByPassage = /* @__PURE__ */ new Map();
+  for (const { definition: definition2, passage } of widgetList) {
+    const names = widgetNamesByPassage.get(passage.passage);
+    if (names) names.push(definition2.name);
+    else widgetNamesByPassage.set(passage.passage, [definition2.name]);
+  }
   const widgets = new Map(effectiveWidgetDefinitions([...sources.keys()]).map((definition2) => [
     definition2.name.toLowerCase(),
     { definition: definition2, passage: sources.get(definition2) }
@@ -35929,6 +35938,7 @@ function buildReport(documents, workspace) {
     markup,
     widgets,
     widgetList,
+    widgetNamesByPassage,
     invoked,
     variables: declarationsOf(workspace, "StoryVariables"),
     transients: declarationsOf(workspace, "StoryTransients"),
@@ -36348,7 +36358,6 @@ function argumentDiagnostics(passage, workspace, getPassageNames) {
 function widgetDiagnostics(passage, story, workspace) {
   if (!passage.isMarkup) return [];
   const diagnostics = [];
-  const macros = [...macroTokens(passage)];
   for (const token of passage.invocations) {
     if (workspace.getEffectiveMacro(token.name)) continue;
     const widget = story.widgets.get(token.name.toLowerCase());
@@ -36364,14 +36373,22 @@ function widgetDiagnostics(passage, story, workspace) {
     }
   }
   if (workspace.getEffectiveMacro("include")?.source !== "builtin") return diagnostics;
+  const includes = [...macroTokens(passage)].filter((token) => !token.isClose && token.name.toLowerCase() === "include").sort((a, b) => a.start - b.start);
   for (const piece of passage.pieces) {
     if (piece.kind !== "passage" || piece.macro !== "include") continue;
     const target = workspace.passages.getEffectivePassage(piece.name);
     if (!target?.tags?.includes("widget")) continue;
-    const defined = story.widgetList.filter((widget) => widget.passage.passage === target).map((widget) => widget.definition.name);
+    const defined = story.widgetNamesByPassage.get(target) ?? [];
     if (defined.length === 0) continue;
-    const include = macros.find((token) => !token.isClose && token.name.toLowerCase() === "include" && token.start <= piece.offset && piece.offset < token.end);
-    if (!include) continue;
+    let low = 0;
+    let high = includes.length;
+    while (low < high) {
+      const mid = low + high >>> 1;
+      if (includes[mid].start <= piece.offset) low = mid + 1;
+      else high = mid;
+    }
+    const include = includes[low - 1];
+    if (!include || piece.offset >= include.end) continue;
     const names = defined.map((name) => `{${name}}`).join(", ");
     diagnostics.push(makeDiag(
       passage.range(include.start, include.end),
@@ -89824,15 +89841,31 @@ var init_semantic_tokens = __esm({
 
 // src/plugins/code-actions.ts
 import { readFileSync as readFileSync7 } from "node:fs";
+import { createRequire as createCompilerRequire4 } from "node:module";
 import { basename as basename2, dirname as dirname5, join as join4 } from "node:path";
 import { fileURLToPath as fileURLToPath4, pathToFileURL as pathToFileURL6 } from "node:url";
 import { isDeepStrictEqual } from "node:util";
 function computeCodeActions(uri, diagnostics, workspace, options = {}) {
   const actions = [];
   const current2 = computeDiagnostics(uri, workspace);
+  const identity = (diag) => JSON.stringify([
+    diag.code,
+    diag.range.start.line,
+    diag.range.start.character,
+    diag.range.end.line,
+    diag.range.end.character
+  ]);
+  const byIdentity = /* @__PURE__ */ new Map();
+  for (const candidate of current2) {
+    const key = identity(candidate);
+    const group = byIdentity.get(key);
+    if (group) group.push(candidate);
+    else byIdentity.set(key, [candidate]);
+  }
   for (const diag of diagnostics) {
-    const fresh = current2.find((candidate) => candidate.code === diag.code && isDeepStrictEqual(candidate.range, diag.range) && isDeepStrictEqual(candidate.data, diag.data));
+    const fresh = byIdentity.get(identity(diag))?.find((candidate) => isDeepStrictEqual(candidate.range, diag.range) && isDeepStrictEqual(candidate.data, diag.data));
     if (!fresh && diag.code !== DiagnosticCode.NoStoryVariables) continue;
+    const firstAction = actions.length;
     switch (diag.code) {
       case DiagnosticCode.UndefinedMacro:
         actions.push(...fixUndefinedMacro(uri, diag, workspace, options));
@@ -89859,6 +89892,7 @@ function computeCodeActions(uri, diagnostics, workspace, options = {}) {
         actions.push(...fixBrokenLink(uri, diag, workspace));
         break;
     }
+    for (let i2 = firstAction; i2 < actions.length; i2++) actions[i2].diagnostics = [diag];
   }
   return actions;
 }
@@ -90119,7 +90153,7 @@ function fixBrokenLink(uri, diag, workspace) {
     });
   }
   const encoded = encodePassageName(name);
-  if (!workspace.passages.getPassage(name) && encoded !== void 0) {
+  if (!workspace.passages.getPassage(name) && encoded !== void 0 && emptyPassageIsDestination(name)) {
     const edit = insertLinesAt(text3, splitLines(text3).length, `
 :: ${encoded}
 `, lineEndingFor(workspace, uri));
@@ -90132,6 +90166,13 @@ function fixBrokenLink(uri, diag, workspace) {
   }
   return actions;
 }
+function emptyPassageIsDestination(name) {
+  const { StoryBuilder, passageOmission } = createCompilerRequire4(import.meta.url)("@rohal12/twee-ts");
+  const passage = { name, text: "", tags: [] };
+  const builder = new StoryBuilder();
+  builder.add(passage, []);
+  return passageOmission(builder.build(), passage, "twine2") === void 0;
+}
 function passageNameEdit(uri, diag, name, workspace) {
   const markup = workspace.markup.get(uri);
   const passage = markup?.passageAt(diag.range.start);
@@ -90203,18 +90244,23 @@ var init_code_actions = __esm({
       },
       initialize(ctx) {
         ctx.connection.onCodeAction((params) => {
-          const diagnostics = params.context.diagnostics.filter((d) => d.source === "spindle").map((d) => ({
-            range: {
-              start: { line: d.range.start.line, character: d.range.start.character },
-              end: { line: d.range.end.line, character: d.range.end.character }
-            },
-            // LSP 3.18 lets a message be markup; our diagnostics are always plain text
-            message: typeof d.message === "string" ? d.message : d.message.value,
-            severity: d.severity === 1 ? "error" : d.severity === 2 ? "warning" : d.severity === 3 ? "info" : "hint",
-            code: String(d.code ?? ""),
-            source: d.source ?? "spindle",
-            data: d.data
-          }));
+          const originals = /* @__PURE__ */ new Map();
+          const diagnostics = params.context.diagnostics.filter((d) => d.source === "spindle").map((d) => {
+            const diagnostic = {
+              range: {
+                start: { line: d.range.start.line, character: d.range.start.character },
+                end: { line: d.range.end.line, character: d.range.end.character }
+              },
+              // LSP 3.18 lets a message be markup; our diagnostics are always plain text
+              message: typeof d.message === "string" ? d.message : d.message.value,
+              severity: d.severity === 1 ? "error" : d.severity === 2 ? "warning" : d.severity === 3 ? "info" : "hint",
+              code: String(d.code ?? ""),
+              source: d.source ?? "spindle",
+              data: d.data
+            };
+            originals.set(diagnostic, d);
+            return diagnostic;
+          });
           const actions = computeCodeActions(
             params.textDocument.uri,
             diagnostics,
@@ -90224,9 +90270,7 @@ var init_code_actions = __esm({
           return actions.map((a) => ({
             title: a.title,
             kind: a.kind,
-            diagnostics: params.context.diagnostics.filter(
-              (d) => a.diagnosticCodes.includes(String(d.code))
-            ),
+            diagnostics: a.diagnostics?.map((d) => originals.get(d)) ?? [],
             edit: a.createFile ? {
               // Resource operations are only expressible via documentChanges
               documentChanges: [