token-goat 2.9.29 → 2.9.30

package/dist/{token-goat-chunk-KOPIR3KZ.mjs → token-goat-chunk-A3CK6N5Z.mjs}

@@ -25,11 +25,12 @@ import {
   extractSwift,
   extractThrift,
   extractWgsl
-} from "./token-goat-chunk-PGTH2U4C.mjs";
+} from "./token-goat-chunk-4JJS54TR.mjs";
 import {
   extractShellBannerHeading
-} from "./token-goat-chunk-VMFWNHGR.mjs";
-import "./token-goat-chunk-435UQTKD.mjs";
+} from "./token-goat-chunk-RHXKCZX3.mjs";
+import "./token-goat-chunk-EVMZJ27Z.mjs";
+import "./token-goat-chunk-HYBFA5X3.mjs";
 import {
   GENERIC_CLAUSE,
   assignBraceBlockSpans,
@@ -59,21 +60,21 @@ import {
   stripMultilineStringSpan,
   stripStringLiterals,
   stripXmlComments
-} from "./token-goat-chunk-7CPMDFGB.mjs";
-import "./token-goat-chunk-TGOXNAHW.mjs";
+} from "./token-goat-chunk-VL3YIFHZ.mjs";
 import "./token-goat-chunk-XB5KKOCG.mjs";
+import "./token-goat-chunk-7IN2MKDS.mjs";
+import "./token-goat-chunk-U4N3BN2W.mjs";
 import "./token-goat-chunk-YZAAZU2S.mjs";
 import "./token-goat-chunk-IVE6U7KV.mjs";
+import "./token-goat-chunk-Y4AFKTHK.mjs";
 import {
   countContentLines,
   escapeRegExp,
   pushAll
-} from "./token-goat-chunk-XYWPOSCN.mjs";
-import "./token-goat-chunk-TCQANXYC.mjs";
-import "./token-goat-chunk-NMTKNYGF.mjs";
-import "./token-goat-chunk-MELOKFDJ.mjs";
-import "./token-goat-chunk-Y4AFKTHK.mjs";
-import "./token-goat-chunk-JTKCQMQA.mjs";
+} from "./token-goat-chunk-GOLEOXZP.mjs";
+import "./token-goat-chunk-AM5V6GSX.mjs";
+import "./token-goat-chunk-FNFBKLRD.mjs";
+import "./token-goat-chunk-VES7EL7O.mjs";
 import {
   init_define_import_meta_env
 } from "./token-goat-chunk-A37V4PBF.mjs";
@@ -144,6 +145,13 @@ var PROPERTY_ARROW_RE = new RegExp(
 var CONSTRUCTOR_RE = new RegExp(
   `${MEMBER_INDENT}(?:(?:public|protected|private|internal|static)\\s+)*(${IDENT})\\s*\\(`
 );
+var FINALIZER_RE = new RegExp(`${MEMBER_INDENT}(?:(?:extern|unsafe)\\s+)*~\\s*(${IDENT})\\s*\\(`);
+var OPERATOR_RE = /\b(?:implicit|explicit)\s+operator\s([^(]+)\(|\boperator(\s+checked)?\s*([-+!~*/%&|^<>=]+|true|false)\s*\(/;
+var INDEXER_RE = /\bthis\s*\[/;
+var DECLARATION_PREFIX_RE = /^[\w@.<>,?[\]()\s]*$/;
+function isDeclarationPrefix(prefix) {
+  return DECLARATION_PREFIX_RE.test(prefix) && /\w/.test(prefix);
+}
 var CLASS_HEADER_RE = new RegExp(
   `^(?:(?:public|protected|private|internal|abstract|sealed|static|partial|readonly|ref|unsafe|file|new)\\s+)*(class|struct|interface|enum|record)(?:\\s+(?:class|struct))?\\s+(${IDENT})`
 );
@@ -159,9 +167,102 @@ function nextCodeLines(lines, from, count) {
   }
   return out;
 }
+var CS_REF_NOISE = /* @__PURE__ */ new Set([
+  "if",
+  "else",
+  "while",
+  "for",
+  "foreach",
+  "switch",
+  "case",
+  "catch",
+  "finally",
+  "using",
+  "lock",
+  "fixed",
+  "sizeof",
+  "typeof",
+  "nameof",
+  "default",
+  "checked",
+  "unchecked",
+  "delegate",
+  "return",
+  "throw",
+  "yield",
+  "base",
+  "this",
+  "new",
+  "var",
+  "async",
+  "await",
+  "get",
+  "set",
+  "init",
+  "add",
+  "remove",
+  "where",
+  "when",
+  "select",
+  "from",
+  "join",
+  "into",
+  "let",
+  "orderby",
+  "group",
+  "by",
+  "equals",
+  "on",
+  "ascending",
+  "descending",
+  "true",
+  "false",
+  "null",
+  "void",
+  "bool",
+  "byte",
+  "sbyte",
+  "short",
+  "ushort",
+  "int",
+  "uint",
+  "long",
+  "ulong",
+  "float",
+  "double",
+  "decimal",
+  "char",
+  "string",
+  "object",
+  "dynamic",
+  "public",
+  "private",
+  "protected",
+  "internal",
+  "static",
+  "readonly",
+  "volatile",
+  "virtual",
+  "override",
+  "abstract",
+  "sealed",
+  "extern",
+  "unsafe",
+  "partial",
+  "class",
+  "struct",
+  "interface",
+  "enum",
+  "record"
+]);
+var CS_NEW_CALL_RE = /\bnew\s+([A-Za-z_][A-Za-z0-9_.]*)(?:<[^>()]+>)?\s*(?:\(|(?=\{))/g;
+var CS_INVOCATION_RE = /(?:\b([A-Za-z_][A-Za-z0-9_]*)\s*(?:\.|\?\.)\s*|(?:\.|\?\.)\s*)?\b([A-Za-z_][A-Za-z0-9_]*)(?:\s*<[^>()\n]+>)?\s*\(/g;
+var CS_MULTILINE_INVOCATION_RE = /(?:\b([A-Za-z_][A-Za-z0-9_]*)\s*(?:\.|\?\.)\s*|(?:\.|\?\.)\s*)?\b([A-Za-z_][A-Za-z0-9_]*)(?:\s*<[^>()\n]+>)?\s*$/;
 function extractCsharp(content, filePath) {
   const symbols = [];
+  const refs = [];
   const imports = [];
+  const seenRefs = /* @__PURE__ */ new Set();
   const lines = content.split(/\r?\n/);
   const classStack = [];
   let braceDepth = 0;
@@ -169,6 +270,8 @@ function extractCsharp(content, filePath) {
   let mlState = null;
   let inFalseBlock = false;
   let falseNesting = 0;
+  let currentMember;
+  let memberBodyEntered = false;
   for (let i = 0; i < lines.length; i++) {
     const rawLine = lines[i] ?? "";
     const lineNum = i + 1;
@@ -219,16 +322,24 @@ function extractCsharp(content, filePath) {
       symbols.push(makeLineSymbol(filePath, cname, kind, lineNum, stripped.slice(0, 200), parent, lines, "c"));
       classStack.push({ name: cname, startDepth: braceDepth, bodyEntered: false });
     }
+    let ctorM = null;
+    let finM = null;
+    let methM = null;
+    let propM = null;
+    let headerM = null;
+    let arrowM = null;
     const frame = classStack.length > 0 ? classStack[classStack.length - 1] : null;
     if (frame !== null) {
       const depthInClass = braceDepth - frame.startDepth;
       if (depthInClass === 1) {
         const lineNoAttr = stripLeadingAttributes(line);
-        const ctorM = CONSTRUCTOR_RE.exec(lineNoAttr);
+        ctorM = CONSTRUCTOR_RE.exec(lineNoAttr);
         if (ctorM && stripVerbatim(ctorM[1] ?? "") === frame.name) {
           const sigEnd = line.indexOf("{");
           const sig = sigEnd >= 0 ? line.slice(0, sigEnd).trimEnd() : line.trimEnd();
           symbols.push(makeLineSymbol(filePath, frame.name, "method", lineNum, sig.slice(0, 200), frame.name, lines, "c"));
+          currentMember = frame.name;
+          memberBodyEntered = line.includes("{");
         }
         let isPropertyLine = false;
         const eventM = EVENT_RE.exec(lineNoAttr);
@@ -240,41 +351,191 @@ function extractCsharp(content, filePath) {
             if (declM) symbols.push(makeLineSymbol(filePath, stripVerbatim(declM[1] ?? ""), "var", lineNum, stripped.slice(0, 200), frame.name, lines, "c"));
           }
         }
-        const propM = isPropertyLine ? null : PROPERTY_RE.exec(lineNoAttr);
+        propM = isPropertyLine ? null : PROPERTY_RE.exec(lineNoAttr);
         if (propM) {
           isPropertyLine = true;
-          symbols.push(makeLineSymbol(filePath, stripVerbatim(propM[1] ?? ""), "var", lineNum, stripped.slice(0, 200), frame.name, lines, "c"));
+          const propName = stripVerbatim(propM[1] ?? "");
+          symbols.push(makeLineSymbol(filePath, propName, "var", lineNum, stripped.slice(0, 200), frame.name, lines, "c"));
+          currentMember = propName;
+          memberBodyEntered = line.includes("{");
         } else {
-          const headerM = PROPERTY_HEADER_RE.exec(lineNoAttr);
+          headerM = PROPERTY_HEADER_RE.exec(lineNoAttr);
           if (headerM) {
             const [braceLineNext = "", accessorLine = ""] = nextCodeLines(lines, i, 2);
             if (braceLineNext === "{" && (ALLMAN_ACCESSOR_RE.test(accessorLine) || ALLMAN_ACCESSOR_BODY_RE.test(accessorLine))) {
               isPropertyLine = true;
-              symbols.push(makeLineSymbol(filePath, stripVerbatim(headerM[1] ?? ""), "var", lineNum, stripped.slice(0, 200), frame.name, lines, "c"));
+              const propName = stripVerbatim(headerM[1] ?? "");
+              symbols.push(makeLineSymbol(filePath, propName, "var", lineNum, stripped.slice(0, 200), frame.name, lines, "c"));
+              currentMember = propName;
+              memberBodyEntered = false;
             }
           } else {
-            const arrowM = PROPERTY_ARROW_RE.exec(lineNoAttr);
+            arrowM = PROPERTY_ARROW_RE.exec(lineNoAttr);
             if (arrowM) {
               isPropertyLine = true;
-              symbols.push(makeLineSymbol(filePath, stripVerbatim(arrowM[1] ?? ""), "var", lineNum, stripped.slice(0, 200), frame.name, lines, "c"));
+              const propName = stripVerbatim(arrowM[1] ?? "");
+              symbols.push(makeLineSymbol(filePath, propName, "var", lineNum, stripped.slice(0, 200), frame.name, lines, "c"));
+              currentMember = propName;
+              memberBodyEntered = false;
             }
           }
         }
-        const methM = isPropertyLine ? null : METHOD_RE.exec(lineNoAttr);
+        let specialName = null;
+        let specialKind = "method";
+        finM = FINALIZER_RE.exec(lineNoAttr);
+        if (finM && stripVerbatim(finM[1] ?? "") === frame.name) specialName = `~${frame.name}`;
+        else finM = null;
+        const opM = specialName === null && !isPropertyLine ? OPERATOR_RE.exec(lineNoAttr) : null;
+        if (opM && isDeclarationPrefix(lineNoAttr.slice(0, opM.index))) specialName = opM[1] !== void 0 ? `operator ${opM[1].replace(/\s+/g, " ").trim()}` : `operator${opM[2] !== void 0 ? " checked " : ""}${opM[3] ?? ""}`;
+        const ixM = specialName === null && !isPropertyLine ? INDEXER_RE.exec(lineNoAttr) : null;
+        if (ixM && isDeclarationPrefix(lineNoAttr.slice(0, ixM.index))) {
+          specialName = "this[]";
+          specialKind = "var";
+        }
+        if (specialName !== null) {
+          isPropertyLine = true;
+          const sigEnd = line.indexOf("{");
+          const sig = sigEnd >= 0 ? line.slice(0, sigEnd).trimEnd() : line.trimEnd();
+          symbols.push(makeLineSymbol(filePath, specialName, specialKind, lineNum, sig.slice(0, 200), frame.name, lines, "c"));
+          currentMember = specialName;
+          memberBodyEntered = line.includes("{");
+        }
+        methM = isPropertyLine ? null : METHOD_RE.exec(lineNoAttr);
         if (methM) {
           const mname = stripVerbatim(methM[1] ?? "");
           if (mname && mname !== frame.name) {
             const sigEnd = line.indexOf("{");
             const sig = sigEnd >= 0 ? line.slice(0, sigEnd).trimEnd() : line.trimEnd();
             symbols.push(makeLineSymbol(filePath, mname, "method", lineNum, sig.slice(0, 200), frame.name, lines, "c"));
+            currentMember = mname;
+            memberBodyEntered = line.includes("{");
+          }
+        }
+      }
+    }
+    const isInterpolatedLine = rawLine.includes('$"') || rawLine.includes('$@"') || rawLine.includes('@$"');
+    const baseLine = isInterpolatedLine ? stripLineComment(rawLine) : stripLineComment(line);
+    const braceLine = stripStringLiterals(baseLine, { tripleQuotes: true });
+    if (!inFalseBlock && !stripped.startsWith("#")) {
+      const declSpans = [];
+      if (cm) {
+        const name = stripVerbatim(cm[2] ?? "");
+        declSpans.push({ name, col: line.indexOf(name) });
+      }
+      if (ctorM) {
+        const name = stripVerbatim(ctorM[1] ?? "");
+        declSpans.push({ name, col: line.indexOf(name) });
+      }
+      if (methM) {
+        const name = stripVerbatim(methM[1] ?? "");
+        declSpans.push({ name, col: line.indexOf(name) });
+      }
+      if (delM) {
+        const name = stripVerbatim(delM[1] ?? "");
+        declSpans.push({ name, col: line.indexOf(name) });
+      }
+      if (propM) {
+        const name = stripVerbatim(propM[1] ?? "");
+        declSpans.push({ name, col: line.indexOf(name) });
+      }
+      if (headerM) {
+        const name = stripVerbatim(headerM[1] ?? "");
+        declSpans.push({ name, col: line.indexOf(name) });
+      }
+      if (finM) declSpans.push({ name: stripVerbatim(finM[1] ?? ""), col: line.indexOf("~") + 1 });
+      if (arrowM) {
+        const name = stripVerbatim(arrowM[1] ?? "");
+        declSpans.push({ name, col: line.indexOf(name) });
+      }
+      const isDeclaration = (name, col) => declSpans.some((d) => d.name === name && Math.abs(d.col - col) <= 2);
+      const context = currentMember ?? (frame !== null ? frame.name : "");
+      for (const m of braceLine.matchAll(CS_NEW_CALL_RE)) {
+        const rawName = stripVerbatim(m[1] ?? "");
+        const name = rawName.includes(".") ? rawName.slice(rawName.lastIndexOf(".") + 1) : rawName;
+        if (name.length < 1 || CS_REF_NOISE.has(name)) continue;
+        const nameOffset = m[0].lastIndexOf(name);
+        const col = m.index !== void 0 ? m.index + (nameOffset >= 0 ? nameOffset : 0) : 0;
+        if (isDeclaration(name, col)) continue;
+        const key = `${name}\0${lineNum}`;
+        if (!seenRefs.has(key)) {
+          seenRefs.add(key);
+          refs.push({ filePath, name, line: lineNum, col, context });
+        }
+      }
+      for (const m of braceLine.matchAll(CS_INVOCATION_RE)) {
+        const callee = stripVerbatim(m[2] ?? "");
+        if (callee.length >= 1 && !CS_REF_NOISE.has(callee)) {
+          const dotIdx = m[0].indexOf(".");
+          const searchStart = dotIdx >= 0 ? m[0].lastIndexOf(".") + 1 : 0;
+          const calleeOffset = m[0].indexOf(callee, searchStart);
+          const col = m.index !== void 0 ? m.index + (calleeOffset >= 0 ? calleeOffset : 0) : 0;
+          if (!isDeclaration(callee, col)) {
+            const key = `${callee}\0${lineNum}`;
+            if (!seenRefs.has(key)) {
+              seenRefs.add(key);
+              refs.push({ filePath, name: callee, line: lineNum, col, context });
+            }
+          }
+        }
+        const receiver = m[1] !== void 0 ? stripVerbatim(m[1]) : "";
+        if (receiver.length > 1 && !CS_REF_NOISE.has(receiver)) {
+          const col = m.index !== void 0 ? m.index + m[0].indexOf(receiver) : 0;
+          if (!isDeclaration(receiver, col)) {
+            const key = `${receiver}\0${lineNum}`;
+            if (!seenRefs.has(key)) {
+              seenRefs.add(key);
+              refs.push({ filePath, name: receiver, line: lineNum, col, context });
+            }
+          }
+        }
+      }
+      const nextCode = nextCodeLines(lines, i, 1)[0];
+      if (nextCode?.startsWith("(")) {
+        const mlMatch = CS_MULTILINE_INVOCATION_RE.exec(braceLine);
+        if (mlMatch) {
+          const callee = stripVerbatim(mlMatch[2] ?? "");
+          if (callee.length >= 1 && !CS_REF_NOISE.has(callee)) {
+            const dotIdx = mlMatch[0].indexOf(".");
+            const searchStart = dotIdx >= 0 ? mlMatch[0].lastIndexOf(".") + 1 : 0;
+            const calleeOffset = mlMatch[0].indexOf(callee, searchStart);
+            const col = mlMatch.index !== void 0 ? mlMatch.index + (calleeOffset >= 0 ? calleeOffset : 0) : 0;
+            if (!isDeclaration(callee, col)) {
+              const key = `${callee}\0${lineNum}`;
+              if (!seenRefs.has(key)) {
+                seenRefs.add(key);
+                refs.push({ filePath, name: callee, line: lineNum, col, context });
+              }
+            }
+          }
+          const receiver = mlMatch[1] !== void 0 ? stripVerbatim(mlMatch[1]) : "";
+          if (receiver.length > 1 && !CS_REF_NOISE.has(receiver)) {
+            const col = mlMatch.index !== void 0 ? mlMatch.index + mlMatch[0].indexOf(receiver) : 0;
+            if (!isDeclaration(receiver, col)) {
+              const key = `${receiver}\0${lineNum}`;
+              if (!seenRefs.has(key)) {
+                seenRefs.add(key);
+                refs.push({ filePath, name: receiver, line: lineNum, col, context });
+              }
+            }
           }
         }
       }
     }
-    const braceLine = stripStringLiterals(stripLineComment(line));
     const openBraces = (braceLine.match(/\{/g) ?? []).length;
     const closeBraces = (braceLine.match(/\}/g) ?? []).length;
     braceDepth += openBraces - closeBraces;
+    if (currentMember !== void 0) {
+      if (!memberBodyEntered) {
+        if (openBraces > 0 && braceDepth > (frame?.startDepth ?? 0) + 1) {
+          memberBodyEntered = true;
+        } else if (stripped.endsWith(";")) {
+          currentMember = void 0;
+        }
+      } else if (frame === null || braceDepth <= frame.startDepth + 1) {
+        currentMember = void 0;
+        memberBodyEntered = false;
+      }
+    }
     const bracelessTop = classStack.length > 0 ? classStack[classStack.length - 1] : null;
     if (bracelessTop !== null && !bracelessTop.bodyEntered && braceDepth === bracelessTop.startDepth && (openBraces > 0 && openBraces === closeBraces || openBraces === 0 && closeBraces === 0 && stripped.endsWith(";"))) {
       classStack.pop();
@@ -293,7 +554,7 @@ function extractCsharp(content, filePath) {
       }
     }
   }
-  return { symbols, imports };
+  return { symbols, refs, imports };
 }
 
 // src/languages/php.ts
@@ -881,7 +1142,23 @@ function extractKotlin(content, filePath) {
 
 // src/languages/scala.ts
 init_define_import_meta_env();
-var SCALA_STRIP = { symbolLiterals: true };
+var SCALA_STRIP = { symbolLiterals: true, interpolatorPrefix: true };
+var MEMBER_KINDS = /* @__PURE__ */ new Set(["function", "val", "var"]);
+function withSpanEnd(sym, endLine, lines) {
+  if (endLine <= sym.lineStart) return sym;
+  return { ...sym, lineEnd: endLine, body: lines.slice(sym.lineStart - 1, endLine).join("\n") };
+}
+function indentedBodyEnd(lines, startLine, declIndent) {
+  let end = startLine;
+  for (let j = startLine; j < lines.length; j++) {
+    const text = lines[j] ?? "";
+    const trimmed = text.trim();
+    if (trimmed === "" || trimmed.startsWith("//")) continue;
+    if (indentOf(text) <= declIndent) break;
+    end = j + 1;
+  }
+  return end;
+}
 function indentOf(line) {
   return line.length - line.trimStart().length;
 }
@@ -911,6 +1188,11 @@ function extractScala(content, filePath) {
   let braceDepth = 0;
   let inComment = false;
   let mlState = null;
+  let lastCodeLine = 0;
+  const closeColonFrame = (frame, endLine) => {
+    const open = symbols[frame.symbolIndex];
+    if (open !== void 0) symbols[frame.symbolIndex] = withSpanEnd(open, endLine, lines);
+  };
   for (let i = 0; i < lines.length; i++) {
     const rawLine = lines[i] ?? "";
     const lineNum = i + 1;
@@ -933,9 +1215,13 @@ function extractScala(content, filePath) {
     const indent = indentOf(line);
     while (typeStack.length > 0) {
       const top = typeStack[typeStack.length - 1];
-      if (top.colonBody && indent <= top.declIndent) typeStack.pop();
-      else break;
+      if (!top.colonBody || indent > top.declIndent) break;
+      typeStack.pop();
+      const closesWithMarker = indent === top.declIndent && stripped === `end ${top.name}`;
+      closeColonFrame(top, closesWithMarker ? lineNum : lastCodeLine);
+      if (closesWithMarker) lastCodeLine = lineNum;
     }
+    lastCodeLine = lineNum;
     const colonTop = typeStack.length > 0 && typeStack[typeStack.length - 1].colonBody ? typeStack[typeStack.length - 1] : null;
     if (colonTop !== null && colonTop.bodyIndent === null) {
       colonTop.bodyIndent = indent;
@@ -974,7 +1260,7 @@ function extractScala(content, filePath) {
       const cname = unquoteName2(cm[1] ?? "");
       const parent = typeStack.length > 0 ? typeStack[typeStack.length - 1].name : void 0;
       symbols.push(makeLineSymbol(filePath, cname, "class", lineNum, stripped.slice(0, 200), parent, lines, "c"));
-      typeStack.push({ name: cname, startDepth: braceDepth, bodyEntered: false, openParens: 0, declIndent: indent, colonBody: opensColonBody, bodyIndent: null });
+      typeStack.push({ name: cname, startDepth: braceDepth, bodyEntered: false, openParens: 0, declIndent: indent, colonBody: opensColonBody, bodyIndent: null, symbolIndex: symbols.length - 1 });
       matched = true;
     }
     const om = !matched && typeDetectionGateOk && (!isIndented || typeStack.length > 0) ? OBJECT_RE.exec(stripped) : null;
@@ -982,7 +1268,7 @@ function extractScala(content, filePath) {
       const oname = unquoteName2(om[1] ?? "");
       const parent = typeStack.length > 0 ? typeStack[typeStack.length - 1].name : void 0;
       symbols.push(makeLineSymbol(filePath, oname, "object", lineNum, stripped.slice(0, 200), parent, lines, "c"));
-      typeStack.push({ name: oname, startDepth: braceDepth, bodyEntered: false, openParens: 0, declIndent: indent, colonBody: opensColonBody, bodyIndent: null });
+      typeStack.push({ name: oname, startDepth: braceDepth, bodyEntered: false, openParens: 0, declIndent: indent, colonBody: opensColonBody, bodyIndent: null, symbolIndex: symbols.length - 1 });
       matched = true;
     }
     const tm = !matched && typeDetectionGateOk && (!isIndented || typeStack.length > 0) ? TRAIT_RE.exec(stripped) : null;
@@ -990,7 +1276,7 @@ function extractScala(content, filePath) {
       const tname = unquoteName2(tm[1] ?? "");
       const parent = typeStack.length > 0 ? typeStack[typeStack.length - 1].name : void 0;
       symbols.push(makeLineSymbol(filePath, tname, "trait", lineNum, stripped.slice(0, 200), parent, lines, "c"));
-      typeStack.push({ name: tname, startDepth: braceDepth, bodyEntered: false, openParens: 0, declIndent: indent, colonBody: opensColonBody, bodyIndent: null });
+      typeStack.push({ name: tname, startDepth: braceDepth, bodyEntered: false, openParens: 0, declIndent: indent, colonBody: opensColonBody, bodyIndent: null, symbolIndex: symbols.length - 1 });
       matched = true;
     }
     const enm = !matched && typeDetectionGateOk && (!isIndented || typeStack.length > 0) ? ENUM_RE.exec(stripped) : null;
@@ -998,7 +1284,7 @@ function extractScala(content, filePath) {
       const enname = unquoteName2(enm[1] ?? "");
       const parent = typeStack.length > 0 ? typeStack[typeStack.length - 1].name : void 0;
       symbols.push(makeLineSymbol(filePath, enname, "enum", lineNum, stripped.slice(0, 200), parent, lines, "c"));
-      typeStack.push({ name: enname, startDepth: braceDepth, bodyEntered: false, openParens: 0, declIndent: indent, colonBody: opensColonBody, bodyIndent: null });
+      typeStack.push({ name: enname, startDepth: braceDepth, bodyEntered: false, openParens: 0, declIndent: indent, colonBody: opensColonBody, bodyIndent: null, symbolIndex: symbols.length - 1 });
       matched = true;
     }
     const frame = typeStack.length > 0 ? typeStack[typeStack.length - 1] : null;
@@ -1040,6 +1326,10 @@ function extractScala(content, filePath) {
         }
       }
     }
+    const lastSymbol = symbols[symbols.length - 1];
+    if (lastSymbol !== void 0 && lastSymbol.lineStart === lineNum && MEMBER_KINDS.has(lastSymbol.kind) && stripped.endsWith("=") && !stripped.includes("{")) {
+      symbols[symbols.length - 1] = withSpanEnd(lastSymbol, indentedBodyEnd(lines, lineNum, indent), lines);
+    }
     const braceLine = stripStringLiterals(line, SCALA_STRIP);
     if (frame !== null && !frame.bodyEntered) {
       const parenDelta2 = (braceLine.match(/\(/g) ?? []).length - (braceLine.match(/\)/g) ?? []).length;
@@ -1064,11 +1354,19 @@ function extractScala(content, filePath) {
       }
     }
   }
+  while (typeStack.length > 0) {
+    const top = typeStack.pop();
+    if (top.colonBody) closeColonFrame(top, lastCodeLine);
+  }
   return { symbols, imports };
 }
 
 // src/languages/lua.ts
 init_define_import_meta_env();
+function receiverName(fname) {
+  const parts = fname.split(/[.:]/);
+  return parts.length > 1 ? parts[parts.length - 2] : void 0;
+}
 function nearestFunctionName(stack) {
   for (let i = stack.length - 1; i >= 0; i--) {
     const frame = stack[i];
@@ -1160,7 +1458,7 @@ function extractLua(content, filePath) {
     if (fm) {
       const fname = fm[1] ?? "";
       const baseName = fname.split(/[.:]/).pop() ?? fname;
-      const parent = nearestFunctionName(funcStack);
+      const parent = receiverName(fname) ?? nearestFunctionName(funcStack);
       if (parent !== void 0) {
         symbols.push(makeLineSymbol(filePath, baseName, "function", lineNum, stripped.slice(0, 200), parent));
       } else {
@@ -1189,7 +1487,7 @@ function extractLua(content, filePath) {
     if (afm) {
       const fname = afm[1] ?? "";
       const baseName = fname.split(/[.:]/).pop() ?? fname;
-      const parent = nearestFunctionName(funcStack);
+      const parent = receiverName(fname) ?? nearestFunctionName(funcStack);
       if (parent !== void 0) {
         symbols.push(makeLineSymbol(filePath, baseName, "function", lineNum, stripped.slice(0, 200), parent));
       } else {
@@ -1249,7 +1547,7 @@ var DECLARE_RE = new RegExp(String.raw`^Declare\s+(?:(?:Ansi|Unicode|Auto|PtrSaf
 var VB6_PROPERTY_RE = new RegExp(String.raw`^Property\s+(?:Get|Let|Set)\s+(${ID})`, "i");
 var PROPERTY_RE2 = new RegExp(String.raw`^Property\s+(${ID})`, "i");
 var PROCEDURE_RE = new RegExp(String.raw`^(Sub|Function)\s+(${ID})`, "i");
-var OPERATOR_RE = /^Operator\s+([^\s(]+)\s*\(/i;
+var OPERATOR_RE2 = /^Operator\s+([^\s(]+)\s*\(/i;
 var EVENT_RE2 = new RegExp(String.raw`^Event\s+(${ID})`, "i");
 var CONST_RE3 = /^Const\s+(\S.*)$/i;
 var DIM_RE = /^Dim\s+(\S.*)$/i;
@@ -1578,7 +1876,7 @@ function extractVb(content, filePath) {
       else open(keyword, name, procedureKind(), stmt);
       continue;
     }
-    if ((m = OPERATOR_RE.exec(rest)) !== null) {
+    if ((m = OPERATOR_RE2.exec(rest)) !== null) {
       open("operator", m[1], "method", stmt);
       continue;
     }
@@ -1803,6 +2101,16 @@ function extractVhdl(content, filePath) {
 
 // src/languages/elixir.ts
 init_define_import_meta_env();
+function bracketDelta(line) {
+  const code = line.replace(/"(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*'/g, "");
+  return (code.match(/[([{]/g)?.length ?? 0) - (code.match(/[)\]}]/g)?.length ?? 0);
+}
+var DANGLING_RE = /(?:,|\bwhen|\band|\bor|\bin|&&|\|\||[+\-*/<>=!|&])\s*$/;
+var DO_KEYWORD_RE = /(?:^|[\s,)])do:/;
+var DO_KEYWORD_AT_EOL_RE = /(?:^|[\s,)])do:$/;
+function indentOf2(line) {
+  return line.length - line.trimStart().length;
+}
 function nearestDefName(stack) {
   for (let i = stack.length - 1; i >= 0; i--) {
     const frame = stack[i];
@@ -1822,6 +2130,30 @@ function extractElixir(content, filePath) {
   const lines = content.split(/\r?\n/);
   const moduleStack = [];
   let mlState = null;
+  let pending;
+  let keywordBody;
+  const extendDefSpan = (symbolIndex, lineEnd) => {
+    const open = symbols[symbolIndex];
+    if (open !== void 0 && lineEnd > open.lineStart) {
+      symbols[symbolIndex] = { ...open, lineEnd, body: lines.slice(open.lineStart - 1, lineEnd).join("\n") };
+    }
+  };
+  const trackKeywordBody = (symbolIndex, stripped) => {
+    const open = symbols[symbolIndex];
+    if (open !== void 0 && DO_KEYWORD_AT_EOL_RE.test(stripped)) {
+      keywordBody = { symbolIndex, headIndent: indentOf2(lines[open.lineStart - 1] ?? "") };
+    }
+  };
+  const settleDefHead = (name, stripped) => {
+    const symbolIndex = symbols.length - 1;
+    if (/\bdo\s*$/.test(stripped)) {
+      moduleStack.push({ name, endKeywordNeeded: true, isBlock: false, symbolIndex });
+    } else if (!DO_KEYWORD_RE.test(stripped)) {
+      pending = { name, symbolIndex, depth: bracketDelta(stripped), dangling: DANGLING_RE.test(stripped) };
+    } else {
+      trackKeywordBody(symbolIndex, stripped);
+    }
+  };
   for (let i = 0; i < lines.length; i++) {
     const rawLine = lines[i] ?? "";
     const lineNum = i + 1;
@@ -1829,9 +2161,37 @@ function extractElixir(content, filePath) {
     mlState = nextMlState;
     const line = stripLineComment(masked, ["#"]).trimEnd();
     const stripped = line.trim();
+    if (keywordBody !== void 0) {
+      if (rawLine.trim() === "") {
+        keywordBody = void 0;
+      } else if (stripped && indentOf2(masked) <= keywordBody.headIndent) {
+        keywordBody = void 0;
+      } else {
+        if (stripped) extendDefSpan(keywordBody.symbolIndex, lineNum);
+        continue;
+      }
+    }
     if (!stripped) {
       continue;
     }
+    if (pending !== void 0) {
+      const startsContinuation = /^(?:when\b|do\b|,|\|)/.test(stripped);
+      if (pending.depth <= 0 && !pending.dangling && !startsContinuation) {
+        pending = void 0;
+      } else {
+        pending.depth += bracketDelta(stripped);
+        pending.dangling = DANGLING_RE.test(stripped);
+        if (pending.depth <= 0 && /\bdo\s*$/.test(stripped)) {
+          moduleStack.push({ name: pending.name, endKeywordNeeded: true, isBlock: false, symbolIndex: pending.symbolIndex });
+          pending = void 0;
+        } else if (pending.depth <= 0 && DO_KEYWORD_RE.test(stripped)) {
+          extendDefSpan(pending.symbolIndex, lineNum);
+          trackKeywordBody(pending.symbolIndex, stripped);
+          pending = void 0;
+        }
+        continue;
+      }
+    }
     const opensDoBlock = /\bdo\s*$/.test(stripped);
     const opensFnBlock = /\bfn\b/.test(stripped) && !/\bend\b/.test(stripped) && /(?:fn|->)\s*$/.test(stripped);
     const modM = MODULE_RE.exec(stripped);
@@ -1868,9 +2228,7 @@ function extractElixir(content, filePath) {
       } else {
         symbols.push(makeLineSymbol(filePath, fname, "function", lineNum, stripped.slice(0, 200), void 0, lines, "hash"));
       }
-      if (opensDoBlock) {
-        moduleStack.push({ name: fname, endKeywordNeeded: true, isBlock: false, symbolIndex: symbols.length - 1 });
-      }
+      settleDefHead(fname, stripped);
       continue;
     }
     const pfm = PRIVATE_FUNC_RE.exec(stripped);
@@ -1882,9 +2240,7 @@ function extractElixir(content, filePath) {
       } else {
         symbols.push(makeLineSymbol(filePath, fname, "function", lineNum, stripped.slice(0, 200), void 0, lines, "hash"));
       }
-      if (opensDoBlock) {
-        moduleStack.push({ name: fname, endKeywordNeeded: true, isBlock: false, symbolIndex: symbols.length - 1 });
-      }
+      settleDefHead(fname, stripped);
       continue;
     }
     if (STRUCT_RE.test(stripped)) {
@@ -1915,12 +2271,14 @@ function extractElixir(content, filePath) {
 
 // src/languages/dart.ts
 init_define_import_meta_env();
+var DART_STRIP = { tripleQuotes: true, singleQuoteHoles: true };
 var CLASS_RE4 = /^(?:(?:abstract|base|interface|final|sealed|mixin)\s+)*class\s+([A-Za-z_][A-Za-z0-9_]*)/;
 var ENUM_RE2 = /^enum\s+([A-Za-z_][A-Za-z0-9_]*)/;
 var MIXIN_RE = /^(?:base\s+)?mixin\s+([A-Za-z_][A-Za-z0-9_]*)/;
 var EXTENSION_RE = new RegExp("^extension\\s+(?:([A-Za-z_][A-Za-z0-9_]*)\\s*(?:" + GENERIC_CLAUSE + ")?\\s+)?on\\s+");
 var EXTENSION_TYPE_RE = /^extension\s+type\s+([A-Za-z_][A-Za-z0-9_]*)/;
 var FUNC_RE5 = new RegExp("(?:^|\\s)(?:static\\s+)?(?:(?:void|Future|Stream|async|external)\\s+|[A-Za-z_][A-Za-z0-9_<>?]*(?:\\s*\\?)?\\s+)([A-Za-z_][A-Za-z0-9_]*)\\s*(?:" + GENERIC_CLAUSE + ")?\\s*\\(");
+var OPERATOR_RE3 = /(?:^|\s)(?:(?:external|abstract)\s+)*(?:[A-Za-z_][A-Za-z0-9_<>?,]*(?:\s*\?)?\s+)?operator\s*(\[\]=|\[\]|>>>|<<|>>|<=|>=|==|~\/|[-+*/%<>&|^~])\s*\(/;
 var GETTER_RE = /^(?:(?:static|external|abstract|covariant)\s+)*(?:[A-Za-z_][A-Za-z0-9_<>,?\s]*(?:\s*\?)?\s+)?get\s+([A-Za-z_][A-Za-z0-9_]*)/;
 var NAMED_CTOR_RE = /^(?:(?:const|factory|external)\s+)*([A-Za-z_][A-Za-z0-9_]*)\.([A-Za-z_][A-Za-z0-9_]*)\s*\(/;
 var UNNAMED_CTOR_RE = /^(?:(?:const|factory|external)\s+)*([A-Za-z_][A-Za-z0-9_]*)\s*\(/;
@@ -1950,11 +2308,11 @@ function extractDart(content, filePath) {
     const line = stripLineComment(blockStripped).trimEnd();
     const stripped = line.trim();
     if (!stripped) {
-      const braceLine2 = stripStringLiterals(line, { tripleQuotes: true });
+      const braceLine2 = stripStringLiterals(line, DART_STRIP);
       braceDepth += (braceLine2.match(/\{/g) ?? []).length - (braceLine2.match(/\}/g) ?? []).length;
       continue;
     }
-    const structural = stripStringLiterals(stripped, { tripleQuotes: true });
+    const structural = stripStringLiterals(stripped, DART_STRIP);
     const isIndented = line[0] === " " || line[0] === "	";
     const outerFrame = typeStack.length > 0 ? typeStack[typeStack.length - 1] : null;
     const outerDepthInType = outerFrame !== null ? braceDepth - outerFrame.startDepth : 0;
@@ -2029,6 +2387,11 @@ function extractDart(content, filePath) {
         if (!member && FIELD_START_RE.test(stripped)) {
           member = true;
         }
+        const om = !member ? OPERATOR_RE3.exec(structural) : null;
+        if (om) {
+          symbols.push(makeLineSymbol(filePath, om[1] ?? "", "function", lineNum, stripped.slice(0, 200), frame.name, lines, "c"));
+          member = true;
+        }
         const gm = !member ? GETTER_RE.exec(stripped) : null;
         if (gm) {
           symbols.push(makeLineSymbol(filePath, gm[1] ?? "", "function", lineNum, stripped.slice(0, 200), frame.name, lines, "c"));
@@ -2053,7 +2416,7 @@ function extractDart(content, filePath) {
         symbols.push(makeLineSymbol(filePath, fname, "function", lineNum, stripped.slice(0, 200), void 0, lines, "c"));
       }
     }
-    const braceLine = stripStringLiterals(line, { tripleQuotes: true });
+    const braceLine = stripStringLiterals(line, DART_STRIP);
     for (const ch of braceLine) {
       if (ch === "{") {
         braceDepth++;
@@ -2470,7 +2833,7 @@ var DOMAIN_RE = makeCreateRe("DOMAIN");
 var AGGREGATE_RE = makeCreateRe("AGGREGATE", OR_REPLACE);
 var POLICY_RE = makeCreateRe("POLICY");
 var RULE_RE = makeCreateRe("RULE", OR_REPLACE);
-var OPERATOR_RE2 = makeCreateRe("OPERATOR(?!\\s+(?:CLASS|FAMILY)\\b)", OR_REPLACE);
+var OPERATOR_RE4 = makeCreateRe("OPERATOR(?!\\s+(?:CLASS|FAMILY)\\b)", OR_REPLACE);
 var SYNONYM_RE = makeCreateRe("SYNONYM", `${OR_REPLACE}(?:PUBLIC\\s+)?`);
 var DATABASE_LINK_RE = makeCreateRe("DATABASE\\s+LINK", "(?:PUBLIC\\s+)?");
 var CLUSTER_RE = makeCreateRe("CLUSTER");
@@ -2496,7 +2859,7 @@ var PATTERNS = [
   [AGGREGATE_RE, "sql_aggregate"],
   [POLICY_RE, "sql_policy"],
   [RULE_RE, "sql_rule"],
-  [OPERATOR_RE2, "sql_operator"],
+  [OPERATOR_RE4, "sql_operator"],
   [SYNONYM_RE, "sql_synonym"],
   [DATABASE_LINK_RE, "sql_database_link"],
   [CLUSTER_RE, "sql_cluster"],
@@ -2788,6 +3151,26 @@ function plsqlStructure(noStrings, lineIndex, units, createStarts, filePath, roo
   }
   return { ends, children };
 }
+var BODY_KINDS = /* @__PURE__ */ new Set([
+  "sql_function",
+  "sql_procedure",
+  "sql_trigger",
+  "sql_type",
+  "sql_type_body",
+  "sql_package",
+  "sql_package_body",
+  "sql_rule"
+]);
+var BODY_OPENER_RE = /\b(?:BEGIN|DECLARE)\b|\$\w*\$|\bRETURN\s+[\w$#.%]+(?:\s+[\w$#.%=]+|\s*\([^()]*\)){0,16}?\s+(?:IS|AS)\b(?!\s+(?:NOT|NULL|TRUE|FALSE|DISTINCT|UNKNOWN)\b)/i;
+var QUOTED_IDENTIFIER_RE = /"[^"]*"|`[^`]*`|\[[^\]]*\]/g;
+function isBodylessFunction(kind, header) {
+  return kind === "sql_function" && !BODY_OPENER_RE.test(header.replace(QUOTED_IDENTIFIER_RE, " "));
+}
+function trimBlankTail(lines, start, end) {
+  let e = end;
+  while (e > start && (lines[e - 1] ?? "").trim() === "") e--;
+  return e;
+}
 function extractSql(content, filePath) {
   const symbols = [];
   const sections = [];
@@ -2809,8 +3192,8 @@ function extractSql(content, filePath) {
           const line = offsetToLine(lineIndex, m.index ?? 0);
           createStarts.push(m.index ?? 0);
           const semiIdx = findStatementTerminator(noStrings, m.index ?? 0);
-          if (semiIdx !== -1 && offsetToLine(lineIndex, semiIdx) === line) {
-            singleLineEndLines.set(`${name}\0${kind}\0${line}`, line);
+          if (semiIdx !== -1 && (offsetToLine(lineIndex, semiIdx) === line || !BODY_KINDS.has(kind) || isBodylessFunction(kind, noStrings.slice(m.index ?? 0, semiIdx)))) {
+            singleLineEndLines.set(`${name}\0${kind}\0${line}`, offsetToLine(lineIndex, semiIdx));
           } else if (PLSQL_UNIT_KINDS.has(kind)) {
             units.push({ name, kind, index: m.index ?? 0, matchEnd: (m.index ?? 0) + m[0].length, line });
           }
@@ -2824,10 +3207,13 @@ function extractSql(content, filePath) {
   sections.sort((a, b) => a.line - b.line);
   symbols.sort((a, b) => a.lineStart - b.lineStart);
   assignFlatEndLines(sections, totalLines);
+  const noLines = noStrings.split("\n");
   const pinned = propagateEndLinesToSymbols(symbols, sections).map((sym) => {
     const key = `${sym.name}\0${sym.kind}\0${sym.lineStart}`;
-    const pinnedEndLine = singleLineEndLines.get(key) ?? plsql.ends.get(key);
-    return pinnedEndLine !== void 0 && pinnedEndLine !== sym.lineEnd ? { ...sym, lineEnd: pinnedEndLine } : sym;
+    const semiEnd = singleLineEndLines.get(key);
+    const pinnedEndLine = semiEnd !== void 0 ? Math.min(semiEnd, sym.lineEnd) : plsql.ends.get(key);
+    const end = pinnedEndLine ?? trimBlankTail(noLines, sym.lineStart, sym.lineEnd);
+    return end !== sym.lineEnd ? { ...sym, lineEnd: end } : sym;
   });
   if (plsql.children.length === 0) return pinned;
   return [...pinned, ...plsql.children].sort((a, b) => a.lineStart - b.lineStart);
@@ -3055,6 +3441,103 @@ var FUNC_NAME = "[A-Za-z_][A-Za-z0-9_.+:-]*";
 var FUNC_KEYWORD_RE = new RegExp(`^function\\s+(${FUNC_NAME})\\s*(?:\\(\\s*\\))?`);
 var FUNC_POSIX_RE = new RegExp(`^(${FUNC_NAME})\\s*\\(\\s*\\)`);
 var VAR_RE3 = /^(?:(?:export|declare|readonly)\s+(?:-\w+\s+)*)?([A-Za-z_]\w*)=/;
+var COMPOUND_OPENERS = /* @__PURE__ */ new Set(["if", "for", "while", "until", "select", "case"]);
+var COMPOUND_CLOSERS = /* @__PURE__ */ new Set(["fi", "done", "esac"]);
+var COMPOUND_PREFIX_WORDS = /* @__PURE__ */ new Set(["then", "do", "else", "!", "time"]);
+var COMPOUND_BODY_START_RE = /^(?:if|for|while|until|select|case)\b/;
+var COMPOUND_SEGMENT_SPLIT_RE = /;|&&|\|\||\||&|\(|\{|\)|\}/;
+function cleanForScan(line) {
+  return stripStringLiterals(stripBashComment(line)).trim();
+}
+function compoundDelta(text) {
+  let delta = 0;
+  for (const segment of text.split(COMPOUND_SEGMENT_SPLIT_RE)) {
+    const words = segment.trim().split(/\s+/);
+    let w = 0;
+    while (w < words.length && COMPOUND_PREFIX_WORDS.has(words[w] ?? "")) w++;
+    const first = words[w] ?? "";
+    if (COMPOUND_OPENERS.has(first)) delta++;
+    else if (COMPOUND_CLOSERS.has(first)) delta--;
+  }
+  return delta;
+}
+var SUBSHELL_TOKEN_RE = /;;&|;;|;&|\|\||&&|[()]|[;&|]|[^\s()&;|]+/g;
+var CASE_ARM_ENDS = /* @__PURE__ */ new Set([";;", ";&", ";;&"]);
+var COMMAND_POSITION_WORDS = /* @__PURE__ */ new Set(["then", "do", "else", "elif", "!", "time", "{"]);
+var SubshellParenScanner = class {
+  depth = 0;
+  // One entry per open `case`: 'subject' until `in`, 'pattern' while reading an arm's pattern, 'body' inside an arm.
+  cases = [];
+  commandPosition = true;
+  // Feeds one cleaned line; true once the body's opening `(` has been closed.
+  closes(text) {
+    for (const tok of text.match(SUBSHELL_TOKEN_RE) ?? []) {
+      const top = this.cases.length - 1;
+      const state = this.cases[top];
+      if (state === "subject") {
+        if (tok === "in") this.cases[top] = "pattern";
+        continue;
+      }
+      if (state === "pattern") {
+        if (tok === "esac") {
+          this.cases.pop();
+          this.commandPosition = false;
+        } else if (tok === ")") {
+          this.cases[top] = "body";
+          this.commandPosition = true;
+        }
+        continue;
+      }
+      if (state === "body" && CASE_ARM_ENDS.has(tok)) {
+        this.cases[top] = "pattern";
+        continue;
+      }
+      if (tok === "(") {
+        this.depth++;
+        this.commandPosition = true;
+        continue;
+      }
+      if (tok === ")") {
+        this.depth--;
+        if (this.depth <= 0) return true;
+        this.commandPosition = false;
+        continue;
+      }
+      if (this.commandPosition && tok === "case") this.cases.push("subject");
+      else if (this.commandPosition && tok === "esac" && state === "body") this.cases.pop();
+      this.commandPosition = /^[;&|]/.test(tok) || COMMAND_POSITION_WORDS.has(tok);
+    }
+    this.commandPosition = true;
+    return false;
+  }
+};
+function findCompoundBodyEnd(lines, headerIdx, rest) {
+  let startIdx = headerIdx;
+  let text = rest;
+  if (text === "") {
+    let j = headerIdx + 1;
+    while (j < lines.length && cleanForScan(lines[j] ?? "") === "") j++;
+    if (j >= lines.length) return null;
+    startIdx = j;
+    text = cleanForScan(lines[j] ?? "");
+  }
+  const kind = text.startsWith("(") ? "paren" : text.startsWith("[[") ? "test" : COMPOUND_BODY_START_RE.test(text) ? "keyword" : null;
+  if (kind === null) return null;
+  let depth = 0;
+  const parens = kind === "paren" ? new SubshellParenScanner() : null;
+  for (let k = startIdx; k < lines.length; k++) {
+    const cur = k === startIdx ? text : cleanForScan(lines[k] ?? "");
+    if (parens !== null) {
+      if (parens.closes(cur)) return k + 1;
+    } else if (kind === "test") {
+      if (cur.includes("]]")) return k + 1;
+    } else {
+      depth += compoundDelta(cur);
+      if (depth <= 0) return k + 1;
+    }
+  }
+  return null;
+}
 function stripBashComment(line) {
   for (let i = 0; i < line.length; i++) {
     if (line[i] !== "#") continue;
@@ -3113,6 +3596,7 @@ function extractBash(content, filePath) {
   let awaitingFunctionBrace = false;
   let openFunctionIndex = null;
   let openHeadingIndex = null;
+  let skipUntil = 0;
   for (let i = 0; i < lines.length; i++) {
     const rawLine = lines[i] ?? "";
     const lineNum = i + 1;
@@ -3120,7 +3604,7 @@ function extractBash(content, filePath) {
       if (rawLine.trim() === heredocs[0]) heredocs.shift();
       continue;
     }
-    if (!inFunction && braceDepth === 0) {
+    if (!inFunction && braceDepth === 0 && lineNum > skipUntil) {
       const banner = extractShellBannerHeading(rawLine);
       if (banner !== null) {
         if (openHeadingIndex !== null) {
@@ -3155,6 +3639,7 @@ function extractBash(content, filePath) {
     const opened = findHeredocOpeners(noComment, arithmeticDepth);
     arithmeticDepth = opened.depth;
     heredocs.push(...opened.terminators);
+    if (lineNum <= skipUntil) continue;
     if (!stripped) continue;
     if (!inFunction && !awaitingFunctionBrace && braceDepth === 0) {
       const kwMatch = FUNC_KEYWORD_RE.exec(stripped);
@@ -3178,7 +3663,18 @@ function extractBash(content, filePath) {
           pushedIndex = symbols.length;
           symbols.push(makeLineSymbol(filePath, fname, "function", lineNum, stripped.slice(0, 200), void 0, lines, "hash"));
         }
-        if (fname) {
+        const rest = stripped.slice(funcMatch[0].length).trim();
+        const compoundEnd = fname && !rest.startsWith("{") ? findCompoundBodyEnd(lines, i, rest) : null;
+        if (compoundEnd !== null) {
+          if (pushedIndex !== null) {
+            const open = symbols[pushedIndex];
+            if (open !== void 0 && compoundEnd > lineNum) {
+              symbols[pushedIndex] = { ...open, lineEnd: compoundEnd, body: lines.slice(lineNum - 1, compoundEnd).join("\n") };
+            }
+          }
+          skipUntil = compoundEnd;
+          continue;
+        } else if (fname) {
           if (stripped.includes("{")) {
             const braceLine2 = stripStringLiterals(stripped);
             const openCount = (braceLine2.match(/\{/g) ?? []).length;
@@ -3292,7 +3788,7 @@ function maskContinuationAndDefines(text) {
   }
   return { noContinuation: contLines.join("\n"), forTargets: targetLines.join("\n") };
 }
-var TARGET_RE = /^((?:[^\t\n#:=]|:(?=[\\/])|\\#)(?:[^:\n#=]|:(?=[\\/])|\\#)*):{1,2}(?![:=])\s*(?:[^=\n]|$)/gm;
+var TARGET_RE = /^((?:[^\t\n#:=]|:(?=[\\/])|\\#)(?:[^:\n#=]|:(?=[\\/])|\\#)*):{1,2}(?![:=])(?![ \t]*(?:(?:override|export|private)[ \t]+)*[^\s:=#]+[ \t]*(?:[?+!]|:{0,3})=)\s*(?:[^=\n]|$)/gm;
 var DEFINE_RE2 = /^ *(?:(?:override|export|private)\s+)*define\s+([\w./%$()-]+)/gm;
 var SPECIAL_TARGETS = /* @__PURE__ */ new Set([
   ".PHONY",
@@ -4447,10 +4943,30 @@ function blankJsStringLiterals(content) {
 var FUNC_DECL_RE = /^(?:export\s+)?(?:default\s+)?(?:async\s+)?function\s*\*?\s+([A-Za-z_$][\w$]*)/;
 var CONST_DECL_RE = /^(?:export\s+)?const\s+([A-Za-z_$][\w$]*)\s*[:=]/;
 var CLASS_DECL_RE = /^(?:export\s+)?(?:default\s+)?(?:abstract\s+)?class\s+([A-Za-z_$][\w$]*)/;
+function declarationEndIdx(blanked, startIdx) {
+  let depth = 0;
+  for (let j = startIdx; j < blanked.length; j++) {
+    const line = blanked[j] ?? "";
+    for (const ch of line) {
+      if (ch === "(" || ch === "[" || ch === "{") depth++;
+      else if (ch === ")" || ch === "]" || ch === "}") depth--;
+    }
+    if (depth > 0) continue;
+    let k = j + 1;
+    while (k < blanked.length && (blanked[k] ?? "").trim() === "") k++;
+    if (j === startIdx && (blanked[k] ?? "").trimStart().startsWith("{")) {
+      j = k - 1;
+      continue;
+    }
+    return j;
+  }
+  return startIdx;
+}
 function extractTopLevelDeclarations(scriptContent, filePath, startLine) {
   const symbols = [];
   const commentFree = stripJsComments(scriptContent);
   const lines = blankJsStringLiterals(commentFree).split("\n");
+  const rawLines = scriptContent.split("\n");
   let depth = 0;
   for (let i = 0; i < lines.length; i++) {
     const rawLine = lines[i] ?? "";
@@ -4458,16 +4974,14 @@ function extractTopLevelDeclarations(scriptContent, filePath, startLine) {
     if (depth === 0 && trimmed) {
       const line = startLine + i;
       const fm = FUNC_DECL_RE.exec(trimmed);
-      if (fm?.[1]) {
-        symbols.push(makeLineSymbol(filePath, fm[1], "sfc_script_function", line));
-      } else {
-        const cm = CONST_DECL_RE.exec(trimmed);
-        if (cm?.[1]) {
-          symbols.push(makeLineSymbol(filePath, cm[1], "sfc_script_const", line));
-        } else {
-          const clm = CLASS_DECL_RE.exec(trimmed);
-          if (clm?.[1]) symbols.push(makeLineSymbol(filePath, clm[1], "sfc_script_class", line));
-        }
+      const cm = fm ? null : CONST_DECL_RE.exec(trimmed);
+      const clm = fm || cm ? null : CLASS_DECL_RE.exec(trimmed);
+      const name = fm?.[1] ?? cm?.[1] ?? clm?.[1];
+      if (name) {
+        const kind = fm ? "sfc_script_function" : cm ? "sfc_script_const" : "sfc_script_class";
+        const sym = makeLineSymbol(filePath, name, kind, line);
+        const endIdx = declarationEndIdx(lines, i);
+        symbols.push(endIdx > i ? { ...sym, lineEnd: startLine + endIdx, body: rawLines.slice(i, endIdx + 1).join("\n") } : sym);
       }
     }
     depth += (rawLine.match(/\{/g) ?? []).length - (rawLine.match(/\}/g) ?? []).length;
@@ -5401,6 +5915,16 @@ function readToken4(masked, i) {
   if (p === start) return void 0;
   return { word: masked.slice(start, p), start, end: p };
 }
+function readNameToken(masked, i) {
+  let p = i;
+  for (; ; ) {
+    while (isSpace4(masked[p])) p++;
+    if (masked[p] === "#" && masked[p + 1] === "^") p++;
+    if (masked[p] !== "^") break;
+    p = datumEnd2(masked, p + 1);
+  }
+  return readToken4(masked, p);
+}
 function extractClojure(content, filePath) {
   if (content.includes("\0")) return { symbols: [], imports: [] };
   const rawLines = content.split(/\r?\n/);
@@ -5421,7 +5945,7 @@ function extractClojure(content, filePath) {
       if (tok !== void 0) {
         const kind = DEFINERS4.get(tok.word.toLowerCase());
         if (kind !== void 0) {
-          const nameTok = readToken4(masked, tok.end);
+          const nameTok = readNameToken(masked, tok.end);
           const name = nameTok?.word.replace(/^:+/, "") ?? "";
           const idx = spans.open(name, kind, lineOf(i), owner());
           stack.push({ index: idx, depth });
@@ -5728,7 +6252,7 @@ function afterContext(rest) {
   const arrow = rest.indexOf("=>");
   return (arrow >= 0 ? rest.slice(arrow + 2) : rest).trimStart();
 }
-function classify(line) {
+function classify(line, continued = false) {
   let m;
   if (m = /^module\s+([A-Za-z_][A-Za-z0-9_.']*)/.exec(line)) return [{ kind: "module", name: m[1] }];
   if (m = /^(?:data|newtype)\s+(?:instance\s+)?([A-Z][A-Za-z0-9_']*)/.exec(line)) return [{ kind: "type", name: m[1] }];
@@ -5748,11 +6272,11 @@ function classify(line) {
   if (m = /^\(([^()]+)\)\s*::/.exec(line)) return [{ kind: "function", name: m[1].trim() }];
   if (m = /^([a-z_][A-Za-z0-9_']*)\b/.exec(line)) {
     const name = m[1];
-    if (!RESERVED_TOP.has(name) && hasTopLevelEquals(line)) return [{ kind: "function", name }];
+    if (!RESERVED_TOP.has(name) && (continued || hasTopLevelEquals(line))) return [{ kind: "function", name }];
     return void 0;
   }
   if (m = /^\(([^()]+)\)/.exec(line)) {
-    if (hasTopLevelEquals(line)) return [{ kind: "function", name: m[1].trim() }];
+    if (continued || hasTopLevelEquals(line)) return [{ kind: "function", name: m[1].trim() }];
   }
   return void 0;
 }
@@ -5761,7 +6285,15 @@ function extractHaskell(content, filePath) {
   const rawLines = content.split(/\r?\n/);
   const masked = maskHaskell(content);
   const maskedLines = masked.split(/\r?\n/);
-  const n = rawLines.length;
+  const n = rawLines.length > 1 && rawLines[rawLines.length - 1] === "" ? rawLines.length - 1 : rawLines.length;
+  const headContinues = (idx) => {
+    for (let j = idx + 1; j < n; j++) {
+      if ((maskedLines[j] ?? "").trim() === "") continue;
+      if (!/^\s/.test(rawLines[j] ?? "")) return false;
+      return /^(?:\|(?!\|)|=(?![=>])|::)/.test((maskedLines[j] ?? "").trim());
+    }
+    return false;
+  };
   const boundaries = [];
   for (let idx = 0; idx < n; idx++) {
     const raw = rawLines[idx] ?? "";
@@ -5769,7 +6301,7 @@ function extractHaskell(content, filePath) {
     const maskedLine = maskedLines[idx] ?? "";
     const trimmed = maskedLine.trim();
     if (trimmed === "") continue;
-    const defs = classify(trimmed);
+    const defs = classify(trimmed) ?? classify(trimmed, headContinues(idx));
     if (defs === void 0) {
       boundaries.push({ num: idx + 1, consumed: false });
       continue;
@@ -5786,6 +6318,17 @@ function extractHaskell(content, filePath) {
         boundaries[endIdx + 1].consumed = true;
         endIdx++;
       }
+      if (boundaries.some((o, k) => k !== i && o.num === b.num && o.def?.kind === "function")) {
+        let k = endIdx + 1;
+        while (k < boundaries.length && boundaries[k].def?.kind === "function" && boundaries[k].def?.name !== b.def.name) k++;
+        if (k < boundaries.length && boundaries[k].def?.kind === "function" && !boundaries[k].consumed) {
+          while (k < boundaries.length && boundaries[k].def?.kind === "function" && boundaries[k].def?.name === b.def.name) {
+            boundaries[k].consumed = true;
+            endIdx = k;
+            k++;
+          }
+        }
+      }
     }
     const next = boundaries[endIdx + 1];
     const lineEnd = Math.max(b.num, next !== void 0 ? next.num - 1 : n);
@@ -5935,7 +6478,7 @@ function extractOcaml(content, filePath) {
   const rawLines = content.split(/\r?\n/);
   const masked = maskOcaml(content);
   const maskedLines = masked.split(/\r?\n/);
-  const n = rawLines.length;
+  const n = rawLines.length > 1 && rawLines[rawLines.length - 1] === "" ? rawLines.length - 1 : rawLines.length;
   const boundaries = [];
   for (let idx = 0; idx < n; idx++) {
     const raw = rawLines[idx] ?? "";
@@ -5943,6 +6486,7 @@ function extractOcaml(content, filePath) {
     const maskedLine = maskedLines[idx] ?? "";
     const trimmed = maskedLine.trim();
     if (trimmed === "") continue;
+    if (/^end\b/.test(trimmed)) continue;
     const def = classify2(trimmed);
     boundaries.push(def === void 0 ? { num: idx + 1 } : { num: idx + 1, def });
   }
@@ -6297,7 +6841,7 @@ function sectionsToHeadingSymbols(sections, filePath) {
   }));
 }
 var ADAPTER_EXTRACTORS = {
-  csharp: (content, filePath) => assignBraceBlockSpans(extractCsharp(content, filePath).symbols, content, { lineComment: "//", stringEscapes: "csharp", rawStringQuotes: true }),
+  csharp: (content, filePath) => assignBraceBlockSpans(extractCsharp(content, filePath).symbols, content, { lineComment: "//", stringEscapes: "csharp", rawStringQuotes: true, expressionBodies: true, interpolation: "csharp" }),
   // Both halves walk the SAME masked text: the brace pass used to span raw file content, so it nested on braces in the inline HTML the extractor is no longer reading.
   php: (content, filePath) => {
     const code = maskPhpInlineHtml(content);
@@ -6338,13 +6882,13 @@ var ADAPTER_EXTRACTORS = {
     const r = extractTwig(content, filePath);
     return [...r.symbols, ...sectionsToHeadingSymbols(r.sections, filePath)];
   },
-  kotlin: (content, filePath) => assignBraceBlockSpans(extractKotlin(content, filePath).symbols, content, { lineComment: "//", nestedBlockComments: true, tripleQuote: true, tripleQuoteRunClose: "last" }),
-  swift: (content, filePath) => assignBraceBlockSpans(extractSwift(content, filePath).symbols, content, { lineComment: "//", nestedBlockComments: true, tripleQuote: true, tripleQuoteRunClose: "last", multilineLang: "swift" }),
-  scala: (content, filePath) => assignBraceBlockSpans(extractScala(content, filePath).symbols, content, { lineComment: "//", nestedBlockComments: true, tripleQuote: true, tripleQuoteRunClose: "last" }),
+  kotlin: (content, filePath) => assignBraceBlockSpans(extractKotlin(content, filePath).symbols, content, { lineComment: "//", nestedBlockComments: true, tripleQuote: true, tripleQuoteRunClose: "last", expressionBodies: "kotlin", interpolation: "kotlin" }),
+  swift: (content, filePath) => assignBraceBlockSpans(extractSwift(content, filePath).symbols, content, { lineComment: "//", nestedBlockComments: true, tripleQuote: true, tripleQuoteRunClose: "last", multilineLang: "swift", interpolation: "swift" }),
+  scala: (content, filePath) => assignBraceBlockSpans(extractScala(content, filePath).symbols, content, { lineComment: "//", nestedBlockComments: true, tripleQuote: true, tripleQuoteRunClose: "last", interpolation: "scala" }),
   lua: (content, filePath) => extractLua(content, filePath).symbols,
   vb: (content, filePath) => extractVb(content, filePath).symbols,
   elixir: (content, filePath) => extractElixir(content, filePath).symbols,
-  dart: (content, filePath) => assignBraceBlockSpans(extractDart(content, filePath).symbols, content, { lineComment: "//", nestedBlockComments: true, tripleQuote: true, tripleSingleQuote: true, tripleQuoteRunClose: "first" }),
+  dart: (content, filePath) => assignBraceBlockSpans(extractDart(content, filePath).symbols, content, { lineComment: "//", nestedBlockComments: true, tripleQuote: true, tripleSingleQuote: true, tripleQuoteRunClose: "first", interpolation: "dart" }),
   zig: (content, filePath) => assignBraceBlockSpans(extractZig(content, filePath).symbols, content, { lineComment: "//", blockComment: null, lineStringPrefix: "\\\\" }),
   r: (content, filePath) => extractR(content, filePath).symbols,
   graphql: (content, filePath) => extractGraphql(content, filePath).symbols,
@@ -6396,8 +6940,10 @@ var ADAPTER_EXTRACTORS = {
 };
 export {
   ADAPTER_EXTRACTORS,
+  assignBraceBlockSpans,
   extractAstro,
   extractCobol,
+  extractCsharp,
   extractNatural,
   extractSalesforceMetadata,
   extractSvelte,