token-goat 2.9.14 → 2.9.16

package/dist/{token-goat-chunk-HF6H7RNK.mjs → token-goat-chunk-YPS64ACE.mjs}

@@ -1,6 +1,7 @@
 import { createRequire as __cjsRequire } from 'node:module';
 const require = __cjsRequire(import.meta.url);
 import {
+  GENERIC_CLAUSE,
   lastContentLine,
   makeLineSymbol,
   matchGroovySlashy,
@@ -9,7 +10,7 @@ import {
   stripMultilineStringSpan,
   stripNestedBlockCommentSpan,
   stripStringLiterals
-} from "./token-goat-chunk-POBYR64E.mjs";
+} from "./token-goat-chunk-R3X5TCPB.mjs";
 import {
   init_define_import_meta_env
 } from "./token-goat-chunk-A37V4PBF.mjs";
@@ -22,7 +23,7 @@ var IDENT = `(?:\`[^\`]+\`|[${IDENT_START}][${IDENT_CONT}]*)`;
 function unquoteIdent(name) {
   return name.startsWith("`") && name.endsWith("`") ? name.slice(1, -1) : name;
 }
-var GENERIC = "(?:<(?:[^<>]|<[^<>]*>)*>)?";
+var GENERIC = "(?:" + GENERIC_CLAUSE + ")?";
 var LEADING_ATTRIBUTE_RE = /^\s*(?:@[A-Za-z_][A-Za-z0-9_.]*(?:\((?:[^()]|\([^()]*\))*\))?\s+)+/;
 function stripLeadingAttributes(s) {
   return s.replace(LEADING_ATTRIBUTE_RE, "");
@@ -1747,6 +1748,15 @@ function isReturnType(typeText) {
   const last = first.split(".").pop() ?? "";
   return /^[A-Z]/.test(last);
 }
+function withoutTypeParams(code) {
+  if (!code.startsWith("<")) return code;
+  let depth = 0;
+  for (let i = 0; i < code.length; i++) {
+    if (code[i] === "<") depth++;
+    else if (code[i] === ">" && --depth === 0) return code.slice(i + 1).trimStart();
+  }
+  return code;
+}
 function matchGroovy(code, ctx) {
   const s = stripLeadingWords(code, MODIFIERS, true);
   const at = code.length - s.length;
@@ -1762,7 +1772,7 @@ function matchGroovy(code, ctx) {
     if (ctx.scope === "container" && TYPE_KINDS2.has(ctx.parentKind) && s.startsWith(ctx.parent) && /^\s*\(/.test(s.slice(ctx.parent.length))) {
       return { name: ctx.parent, kind: "constructor", end: "brace" };
     }
-    const fn = cFunctionHeader(s);
+    const fn = cFunctionHeader(withoutTypeParams(s));
     if (fn !== null && fn.qualifier === "" && isReturnType(fn.typeText)) return { name: fn.name, kind: member, end: "brace" };
   }
   if (ctx.insideFunction) return null;