@lzehrung/codegraph 2.4.0 → 3.0.1

package/dist/indexer/member-selection.d.ts

@@ -0,0 +1,46 @@
+import type { CallableIdentity } from "../languages/callable-arity.js";
+export type MemberScope = "any" | "static" | "instance";
+/** A consumer supplies indexed owners or graph ownership edges without changing lookup order. */
+export type MemberModel<Owner, Member> = {
+    ownerKey(owner: Owner): string;
+    members(owner: Owner): readonly Member[];
+    supertypes(owner: Owner, classOnly: boolean): readonly Owner[];
+    name(member: Member): string;
+    key(member: Member): string;
+    callable(member: Member): CallableIdentity | undefined;
+    scope(member: Member): MemberScope;
+    visible(member: Member, useFile: string): boolean;
+    /** Only needed by languages that inherit otherwise hidden overloads. */
+    sameSignature?(derived: Member, inherited: Member): boolean;
+};
+export type MemberSelection<Member> = {
+    status: "none";
+    named: false;
+} | {
+    status: "unique";
+    named: true;
+    member: Member;
+} | {
+    status: "ambiguous";
+    named: true;
+};
+export type MemberSelectionOptions = {
+    name: string;
+    argumentCount: number | null;
+    scope: MemberScope;
+    useFile: string;
+    phpCaseInsensitive?: boolean;
+    separateMemberScopes?: boolean;
+    classAncestorsOnly?: boolean;
+    startAtAncestor?: boolean;
+    keepUniqueArityMismatch?: boolean;
+    inheritOverloads?: boolean;
+    /** Ruby reopening uses the first indexed declaration for a method name. */
+    firstDeclarationWins?: boolean;
+};
+export declare function hasSeparateMemberScopes(languageId: string): boolean;
+/** Java, Kotlin, and C# inherit overloads beyond the first declaring class. */
+export declare function inheritsMemberOverloads(languageId: string): boolean;
+/** Level-order member lookup shared by navigation and the detailed call graph. */
+export declare function selectMember<Owner, Member>(starts: readonly Owner[], model: MemberModel<Owner, Member>, options: MemberSelectionOptions): MemberSelection<Member>;
+//# sourceMappingURL=member-selection.d.ts.map

package/dist/indexer/member-selection.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"member-selection.d.ts","sourceRoot":"","sources":["../../src/indexer/member-selection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAGtF,MAAM,MAAM,WAAW,GAAG,KAAK,GAAG,QAAQ,GAAG,UAAU,CAAC;AAExD,iGAAiG;AACjG,MAAM,MAAM,WAAW,CAAC,KAAK,EAAE,MAAM,IAAI;IACvC,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,CAAC;IAC/B,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,SAAS,MAAM,EAAE,CAAC;IACzC,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,GAAG,SAAS,KAAK,EAAE,CAAC;IAC/D,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS,CAAC;IACvD,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,CAAC;IACnC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;IAClD,wEAAwE;IACxE,aAAa,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;CAC7D,CAAC;AAEF,MAAM,MAAM,eAAe,CAAC,MAAM,IAC9B;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAE,GAChC;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,KAAK,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACjD;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,IAAI,CAAA;CAAE,CAAC;AAEzC,MAAM,MAAM,sBAAsB,GAAG;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,KAAK,EAAE,WAAW,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,2EAA2E;IAC3E,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC,CAAC;AAKF,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAEnE;AAGD,+EAA+E;AAC/E,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAEnE;AA+ED,kFAAkF;AAClF,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,EACxC,MAAM,EAAE,SAAS,KAAK,EAAE,EACxB,KAAK,EAAE,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,EACjC,OAAO,EAAE,sBAAsB,GAC9B,eAAe,CAAC,MAAM,CAAC,CAwFzB"}

package/dist/indexer/member-selection.js

@@ -0,0 +1,169 @@
+import { foldPhpIdentifierCase } from "../util/identifiers.js";
+/** Static and instance members have independent lookup chains in these languages. */
+const SEPARATE_MEMBER_SCOPES = new Set(["js", "ts", "tsx", "ruby", "swift", "kotlin"]);
+export function hasSeparateMemberScopes(languageId) {
+    return SEPARATE_MEMBER_SCOPES.has(languageId);
+}
+const MAX_DEPTH = 16;
+/** Java, Kotlin, and C# inherit overloads beyond the first declaring class. */
+export function inheritsMemberOverloads(languageId) {
+    return languageId === "java" || languageId === "kotlin" || languageId === "csharp";
+}
+function accepts(range, count) {
+    return count === null || !range || (count >= range.minArgs && (range.maxArgs === null || count <= range.maxArgs));
+}
+/** Fold equivalent declarations only after their overload signatures have been checked. */
+function distinctCandidates(candidates, model, count) {
+    if (candidates.length < 2)
+        return candidates;
+    const groups = new Map();
+    for (const member of candidates) {
+        const key = model.key(member);
+        const group = groups.get(key);
+        if (group)
+            group.push(member);
+        else
+            groups.set(key, [member]);
+    }
+    const selected = [];
+    for (const group of groups.values()) {
+        const implementation = group.filter((member) => model.callable(member)?.role === "implementation");
+        if (implementation.length === 1 && group.length > 1) {
+            const signatures = group.filter((member) => model.callable(member)?.role === "signature");
+            if (signatures.length && !signatures.some((member) => accepts(model.callable(member)?.arity, count)))
+                continue;
+            selected.push(implementation[0]);
+            continue;
+        }
+        if (group.length > 1 && group.some((member) => model.callable(member)?.role)) {
+            selected.push(...group);
+            continue;
+        }
+        selected.push(group[0]);
+    }
+    return selected;
+}
+function memberNameMatches(member, model, options, queryName) {
+    const name = model.name(member);
+    if (!options.phpCaseInsensitive)
+        return name === queryName;
+    if (model.callable(member))
+        return foldPhpIdentifierCase(name) === queryName;
+    if (name === options.name)
+        return true;
+    return name.startsWith("$") && !options.name.startsWith("$") && name.slice(1) === options.name;
+}
+/** A hidden ancestor makes a mismatched shallow declaration no longer the only candidate. */
+function hasNamedAncestor(level, model, options, queryName) {
+    const seen = new Set(level.map((owner) => model.ownerKey(owner)));
+    let parents = level.flatMap((owner) => model.supertypes(owner, false));
+    for (let depth = 0; depth < MAX_DEPTH && parents.length; depth += 1) {
+        const next = [];
+        for (const owner of parents) {
+            const key = model.ownerKey(owner);
+            if (seen.has(key))
+                continue;
+            seen.add(key);
+            for (const member of model.members(owner)) {
+                if (memberNameMatches(member, model, options, queryName) &&
+                    model.visible(member, options.useFile) &&
+                    (!options.separateMemberScopes || options.scope === "any" || model.scope(member) === options.scope))
+                    return true;
+            }
+            next.push(...model.supertypes(owner, false));
+        }
+        parents = next;
+    }
+    return false;
+}
+/** Level-order member lookup shared by navigation and the detailed call graph. */
+export function selectMember(starts, model, options) {
+    let level = options.startAtAncestor ? starts.flatMap((owner) => model.supertypes(owner, true)) : [...starts];
+    const visited = new Set(starts.map((owner) => model.ownerKey(owner)));
+    const overloadState = options.inheritOverloads ? { subclasses: new Map(), declarations: [], accepted: [] } : null;
+    let lenient;
+    let named = false;
+    const queryName = options.phpCaseInsensitive ? foldPhpIdentifierCase(options.name) : options.name;
+    for (let depth = 0; depth < MAX_DEPTH && level.length; depth += 1) {
+        const candidates = [];
+        const owners = overloadState ? new Map() : undefined;
+        for (const owner of level) {
+            const ownerKey = model.ownerKey(owner);
+            for (const member of model.members(owner)) {
+                if (!memberNameMatches(member, model, options, queryName) || !model.visible(member, options.useFile))
+                    continue;
+                const matchesScope = options.scope === "any" || model.scope(member) === options.scope;
+                if (matchesScope || !options.separateMemberScopes)
+                    named = true;
+                if (matchesScope) {
+                    candidates.push(member);
+                    owners?.set(member, ownerKey);
+                }
+                if (options.firstDeclarationWins && (matchesScope || !options.separateMemberScopes))
+                    break;
+            }
+        }
+        const unique = distinctCandidates(candidates, model, options.argumentCount);
+        if (!overloadState) {
+            if (named) {
+                let match;
+                for (const member of unique) {
+                    if (!accepts(model.callable(member)?.arity, options.argumentCount))
+                        continue;
+                    if (match !== undefined)
+                        return { status: "ambiguous", named: true };
+                    match = member;
+                }
+                if (match !== undefined)
+                    return { status: "unique", named: true, member: match };
+                if (options.keepUniqueArityMismatch &&
+                    unique.length === 1 &&
+                    !hasNamedAncestor(level, model, options, queryName)) {
+                    return { status: "unique", named: true, member: unique[0] };
+                }
+                return { status: "ambiguous", named: true };
+            }
+        }
+        if (overloadState) {
+            for (const member of unique) {
+                const owner = owners?.get(member) ?? "";
+                const descendants = overloadState.subclasses.get(owner);
+                if (overloadState.declarations.some((entry) => descendants?.has(entry.owner) && model.sameSignature?.(entry.member, member)))
+                    continue;
+                overloadState.declarations.push({ member, owner });
+                if (accepts(model.callable(member)?.arity, options.argumentCount)) {
+                    overloadState.accepted.push({ member, owner });
+                }
+            }
+            if (lenient === undefined && depth === 0 && options.keepUniqueArityMismatch && unique.length === 1)
+                lenient = unique[0];
+        }
+        const next = [];
+        for (const owner of level) {
+            const child = model.ownerKey(owner);
+            for (const parent of model.supertypes(owner, !!options.classAncestorsOnly || !!options.startAtAncestor)) {
+                const key = model.ownerKey(parent);
+                if (overloadState) {
+                    const descendants = overloadState.subclasses.get(key) ?? new Set();
+                    descendants.add(child);
+                    for (const descendant of overloadState.subclasses.get(child) ?? [])
+                        descendants.add(descendant);
+                    overloadState.subclasses.set(key, descendants);
+                }
+                if (visited.has(key))
+                    continue;
+                visited.add(key);
+                next.push(parent);
+            }
+        }
+        level = next;
+    }
+    if (overloadState?.accepted.length === 1)
+        return { status: "unique", named: true, member: overloadState.accepted[0].member };
+    if (overloadState && overloadState.accepted.length > 1)
+        return { status: "ambiguous", named: true };
+    if (lenient !== undefined)
+        return { status: "unique", named: true, member: lenient };
+    return named ? { status: "ambiguous", named: true } : { status: "none", named: false };
+}
+//# sourceMappingURL=member-selection.js.map

package/dist/indexer/member-selection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"member-selection.js","sourceRoot":"","sources":["../../src/indexer/member-selection.ts"],"names":[],"mappings":"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"}

package/dist/indexer/name-lookup-policies/c-family.d.ts

@@ -1,7 +1,7 @@
 import type { GoToResult } from "../types.js";
 import type { BareNameUse, NameLookupPolicy } from "../name-resolution-types.js";
 export declare const cLookupPolicy: NameLookupPolicy;
-/** A qualified name (`ns::f`, `Box::make`) names a namespace or static member directly. */
+/** Qualifier lookup is lexical before the direct textual path can name a global declaration. */
 export declare function resolveCppQualifiedName(use: BareNameUse): GoToResult | undefined;
 export declare const cppLookupPolicy: NameLookupPolicy;
 //# sourceMappingURL=c-family.d.ts.map

package/dist/indexer/name-lookup-policies/c-family.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"c-family.d.ts","sourceRoot":"","sources":["../../../src/indexer/name-lookup-policies/c-family.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAmC,MAAM,6BAA6B,CAAC;AAwBlH,eAAO,MAAM,aAAa,EAAE,gBAG3B,CAAC;AAEF,2FAA2F;AAC3F,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,WAAW,GAAG,UAAU,GAAG,SAAS,CAehF;AAED,eAAO,MAAM,eAAe,EAAE,gBAiE7B,CAAC"}
+{"version":3,"file":"c-family.d.ts","sourceRoot":"","sources":["../../../src/indexer/name-lookup-policies/c-family.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAmC,MAAM,6BAA6B,CAAC;AAwBlH,eAAO,MAAM,aAAa,EAAE,gBAG3B,CAAC;AAiCF,gGAAgG;AAChG,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,WAAW,GAAG,UAAU,GAAG,SAAS,CAsBhF;AAED,eAAO,MAAM,eAAe,EAAE,gBAiE7B,CAAC"}

package/dist/indexer/name-lookup-policies/c-family.js

@@ -1,9 +1,8 @@
 /** C and C++ additions to the shared name lookup order. */
 import { cTagRole } from "../../languages/definitions/c.js";
 import { AMBIGUOUS_CPP_OVERLOAD_REASON, AMBIGUOUS_CPP_USING_DECLARATION_REASON, AMBIGUOUS_CPP_USING_DIRECTIVE_REASON, AMBIGUOUS_STAR_IMPORT_REASON, } from "../ambiguous-resolution.js";
-import { cppBindingCallableShape } from "../cpp-callables.js";
 import { cppOutOfLineOwnerPath } from "../../graphs/symbol-graph-detailed/receiver-calls.js";
-import { cppStarImportClosure, cppUsingDeclarationTarget, resolveCppCallableBindings, resolveCppCollidingBinding, resolveCppUsingDirectiveName, resolveVisibleCppCallableName, } from "../navigation-cpp.js";
+import { cppQualifiedNameThroughVisiblePrefix, cppStarImportClosure, cppUsingDeclarationTarget, resolveCppCallableBindings, resolveCppCollidingBinding, resolveCppUsingDirectiveName, resolveVisibleCppCallableName, resolveCppVisibleStaticCallableName, } from "../navigation-cpp.js";
 import { resolveNamedDefinition } from "../navigation-local.js";
 import { okGoToResult } from "../navigation-provenance.js";
 const loadParsed = (use) => (file) => use.files.get(file);
@@ -22,25 +21,46 @@ export const cLookupPolicy = {
     cNamespace: cNamespaceOf,
     afterCrossModule: (state, resolved) => deferIncludedStarRecovery(state, resolved, cNamespaceOf(state.use.node)),
 };
+const AMBIGUOUS_CPP_NAMESPACE_ALIAS_REASON = "Ambiguous C++ namespace alias";
 /** A qualified name (`ns::f`, `Box::make`) names a namespace or static member directly. */
-export function resolveCppQualifiedName(use) {
-    const { index, mod, file, node, name, scopeIndex, parsed } = use;
-    if (!name.includes("::"))
-        return undefined;
-    const qualifiedBindings = scopeIndex.cppQualifiedFunctionBindings.get(name);
+function lookupCppQualifiedName(use, qualifiedName) {
+    const { index, mod, file, node, scopeIndex, parsed } = use;
+    const qualifiedBindings = scopeIndex.cppQualifiedFunctionBindings.get(qualifiedName);
     if (qualifiedBindings) {
         const selected = resolveCppCallableBindings(file, qualifiedBindings, node, parsed.source);
         if (!selected)
             return { status: "not_found", reason: AMBIGUOUS_CPP_OVERLOAD_REASON };
         return okGoToResult(index, selected, { resolution: "exact", confidence: "high" });
     }
-    const visible = resolveVisibleCppCallableName(index, mod, name, node, parsed.source, loadParsed(use));
+    const visible = resolveVisibleCppCallableName(index, mod, qualifiedName, node, parsed.source, loadParsed(use));
     if (visible !== undefined) {
         if (!visible)
             return { status: "not_found", reason: AMBIGUOUS_CPP_OVERLOAD_REASON };
         return okGoToResult(index, visible, { resolution: "exact", confidence: "high" });
     }
-    return resolveNamedDefinition(index, mod, file, parsed.sup, name) ?? undefined;
+    const staticMember = resolveCppVisibleStaticCallableName(index, mod, qualifiedName, node, parsed.source, loadParsed(use));
+    if (staticMember !== undefined) {
+        if (!staticMember)
+            return { status: "not_found", reason: AMBIGUOUS_CPP_OVERLOAD_REASON };
+        return okGoToResult(index, staticMember, { resolution: "exact", confidence: "high" });
+    }
+    return resolveNamedDefinition(index, mod, file, parsed.sup, qualifiedName) ?? undefined;
+}
+/** Qualifier lookup is lexical before the direct textual path can name a global declaration. */
+export function resolveCppQualifiedName(use) {
+    const { name } = use;
+    if (!name.includes("::"))
+        return undefined;
+    const rewritten = cppQualifiedNameThroughVisiblePrefix(use.index, use.mod, name, use.node, use.parsed.source, use.parsed.tree, loadParsed(use));
+    if (rewritten === null)
+        return { status: "not_found", reason: AMBIGUOUS_CPP_NAMESPACE_ALIAS_REASON };
+    if (rewritten !== undefined) {
+        return (lookupCppQualifiedName(use, rewritten) ?? {
+            status: "not_found",
+            reason: "No matching C++ declaration in the visible qualifier",
+        });
+    }
+    return lookupCppQualifiedName(use, name);
 }
 export const cppLookupPolicy = {
     beforeLexical: resolveCppQualifiedName,
@@ -88,7 +108,7 @@ export const cppLookupPolicy = {
     },
     beforeCrossModule({ use, closestBinding }) {
         const { index, mod, node, name, parsed } = use;
-        if (closestBinding?.kind === "function" && cppBindingCallableShape(closestBinding)) {
+        if (closestBinding?.kind === "function" && closestBinding.callable?.signature) {
             return { status: "not_found", reason: AMBIGUOUS_CPP_OVERLOAD_REASON };
         }
         const visible = resolveVisibleCppCallableName(index, mod, name, node, parsed.source, loadParsed(use));

package/dist/indexer/name-lookup-policies/c-family.js.map

@@ -1 +1 @@
-{"version":3,"file":"c-family.js","sourceRoot":"","sources":["../../../src/indexer/name-lookup-policies/c-family.ts"],"names":[],"mappings":"AAAA,2DAA2D;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAC5D,OAAO,EACL,6BAA6B,EAC7B,sCAAsC,EACtC,oCAAoC,EACpC,4BAA4B,GAC7B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,sDAAsD,CAAC;AAC7F,OAAO,EACL,oBAAoB,EACpB,yBAAyB,EACzB,0BAA0B,EAC1B,0BAA0B,EAC1B,4BAA4B,EAC5B,6BAA6B,GAC9B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAK3D,MAAM,UAAU,GACd,CAAC,GAAgB,EAAE,EAAE,CACrB,CAAC,IAAY,EAA4B,EAAE,CACzC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AAExB,+FAA+F;AAC/F,SAAS,yBAAyB,CAChC,KAAsB,EACtB,QAA2B,EAC3B,UAA0C;IAE1C,IAAI,QAAQ,EAAE,MAAM,KAAK,WAAW,IAAI,QAAQ,CAAC,MAAM,KAAK,4BAA4B;QAAE,OAAO,SAAS,CAAC;IAC3G,OAAO;QACL,MAAM,EAAE,UAAU;QAClB,OAAO,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,UAAU,EAAE;QAC9E,QAAQ,EAAE,QAAQ;KACnB,CAAC;AACJ,CAAC;AAED,MAAM,YAAY,GAAG,CAAC,IAAgE,EAAsB,EAAE,CAC5G,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC;AAEtC,MAAM,CAAC,MAAM,aAAa,GAAqB;IAC7C,UAAU,EAAE,YAAY;IACxB,gBAAgB,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,yBAAyB,CAAC,KAAK,EAAE,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;CAChH,CAAC;AAEF,2FAA2F;AAC3F,MAAM,UAAU,uBAAuB,CAAC,GAAgB;IACtD,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;IACjE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IAC3C,MAAM,iBAAiB,GAAG,UAAU,CAAC,4BAA4B,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC5E,IAAI,iBAAiB,EAAE,CAAC;QACtB,MAAM,QAAQ,GAAG,0BAA0B,CAAC,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAC1F,IAAI,CAAC,QAAQ;YAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,6BAA6B,EAAE,CAAC;QACrF,OAAO,YAAY,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;IACpF,CAAC;IACD,MAAM,OAAO,GAAG,6BAA6B,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;IACtG,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,IAAI,CAAC,OAAO;YAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,6BAA6B,EAAE,CAAC;QACpF,OAAO,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;IACnF,CAAC;IACD,OAAO,sBAAsB,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,SAAS,CAAC;AACjF,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAAqB;IAC/C,aAAa,EAAE,uBAAuB;IAEtC,0DAA0D;IAC1D,kBAAkB,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE;QACxC,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;QAC/C,MAAM,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC,yBAAyB,CAAC,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACrG,IAAI,CAAC,MAAM;YAAE,OAAO,SAAS,CAAC;QAC9B,MAAM,OAAO,GAAG,6BAA6B,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;QACxG,IAAI,OAAO;YAAE,OAAO,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;QAC/F,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,MAAM,QAAQ,GAAG,sBAAsB,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC9E,IAAI,QAAQ;gBAAE,OAAO,QAAQ,CAAC;QAChC,CAAC;QACD,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,sCAAsC,EAAE,CAAC;IACjF,CAAC;IAED,8FAA8F;IAC9F,wEAAwE;IACxE,QAAQ,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE,EAAE,IAAI;QACpC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC;QACjC,MAAM,kBAAkB,GACtB,CAAC,cAAc,IAAI,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,aAAa,CAAC,KAAK,cAAc,CAAC;QACvG,MAAM,aAAa,GAAG,CAAC,CAAC,qBAAqB,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACvF,IAAI,CAAC,kBAAkB,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,MAAM,EAAE,IAAI,KAAK,iBAAiB;YAAE,OAAO,IAAI,EAAE,CAAC;QACpG,OAAO;YACL,MAAM,EAAE,UAAU;YAClB,OAAO,EAAE,EAAE,IAAI,EAAE,wBAAwB,EAAE;YAC3C,QAAQ,EAAE,IAAI,EAAE;YAChB,MAAM,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,0CAA0C,EAAE;SACpF,CAAC;IACJ,CAAC;IAED,6FAA6F;IAC7F,WAAW,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE;QACjC,IAAI,CAAC,cAAc;YAAE,OAAO,SAAS,CAAC;QACtC,MAAM,SAAS,GAAG,0BAA0B,CAAC,GAAG,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACpG,IAAI,SAAS,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QAC9C,IAAI,CAAC,SAAS;YAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,6BAA6B,EAAE,CAAC;QACtF,OAAO,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;IACzF,CAAC;IAED,iBAAiB,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE;QACvC,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;QAC/C,IAAI,cAAc,EAAE,IAAI,KAAK,UAAU,IAAI,uBAAuB,CAAC,cAAc,CAAC,EAAE,CAAC;YACnF,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,6BAA6B,EAAE,CAAC;QACxE,CAAC;QACD,MAAM,OAAO,GAAG,6BAA6B,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;QACtG,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,IAAI,CAAC,OAAO;gBAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,6BAA6B,EAAE,CAAC;YACpF,OAAO,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;QACnF,CAAC;QACD,MAAM,QAAQ,GAAG,4BAA4B,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;QACtG,IAAI,QAAQ,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QAC7C,IAAI,CAAC,QAAQ;YAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,oCAAoC,EAAE,CAAC;QAC5F,OAAO,YAAY,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;IACrF,CAAC;IAED,gBAAgB,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAAC,yBAAyB,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,CAAC;IAE5F,+EAA+E;IAC/E,CAAC,YAAY,CAAC,KAAK,EAAE,GAAG;QACtB,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,OAAO;YAAE,IAAI,OAAO,GAAG,CAAC,QAAQ,KAAK,QAAQ;gBAAE,MAAM,GAAG,CAAC,QAAQ,CAAC;QACxF,KAAK,MAAM,SAAS,IAAI,oBAAoB,CAAC,KAAK,EAAE,GAAG,CAAC;YAAE,MAAM,SAAS,CAAC,IAAI,CAAC;IACjF,CAAC;CACF,CAAC"}
+{"version":3,"file":"c-family.js","sourceRoot":"","sources":["../../../src/indexer/name-lookup-policies/c-family.ts"],"names":[],"mappings":"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"}

package/dist/indexer/name-lookup-policies/implicit-self.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"implicit-self.d.ts","sourceRoot":"","sources":["../../../src/indexer/name-lookup-policies/implicit-self.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,gBAAgB,EAAmC,MAAM,6BAA6B,CAAC;AA8CrG,eAAO,MAAM,iBAAiB,EAAE,gBAe/B,CAAC;AAcF,eAAO,MAAM,kBAAkB,EAAE,gBAwBhC,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,eAAe,EAAE,gBAc7B,CAAC"}
+{"version":3,"file":"implicit-self.d.ts","sourceRoot":"","sources":["../../../src/indexer/name-lookup-policies/implicit-self.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAAE,gBAAgB,EAAmC,MAAM,6BAA6B,CAAC;AAiDrG,eAAO,MAAM,iBAAiB,EAAE,gBAiB/B,CAAC;AAcF,eAAO,MAAM,kBAAkB,EAAE,gBAwBhC,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,eAAe,EAAE,gBAc7B,CAAC"}

package/dist/indexer/name-lookup-policies/implicit-self.js

@@ -4,7 +4,8 @@
  * member lookup, which applies static scope and overload selection, and it takes precedence over
  * a same-named module-level name or import.
  */
-import { nearestMemberContainer, nodeInStaticMemberContext, } from "../../graphs/symbol-graph-detailed/receiver-calls.js";
+import { declaresMembers, nearestMemberContainer, nodeInStaticMemberContext, } from "../../graphs/symbol-graph-detailed/receiver-calls.js";
+import { sliceText } from "../../util/ast.js";
 import { csharpAliasQualifiedLookupName, implicitSelfCallee, isDirectKeywordMemberDeclaration, } from "../navigation-goto.js";
 import { csharpLookupName, definitionForBinding } from "../navigation-local.js";
 import { csharpUsingStaticFiles, withCsharpUsingStatic } from "./csharp-using-static.js";
@@ -28,14 +29,10 @@ function bindsTypeMethod({ closestBinding }) {
     const container = declaration ? nearestMemberContainer(declaration) : null;
     return !!declaration && !!container && isDirectKeywordMemberDeclaration(declaration, container);
 }
-/**
- * The use is the name of a same-scope overload that a later declaration replaced in the scope map
- * (`int Two(int a)` before `int Two(int a, int b)`). A declaration's own name resolves to that
- * declaration, not to the last overload.
- */
+/** An overload name at its declaration resolves to itself, not a later same-scope declaration. */
 function ownOverloadDeclaration({ use, closestBinding }) {
     const { node, file, parsed } = use;
-    for (let binding = closestBinding?.earlierSameScope; binding; binding = binding.earlierSameScope) {
+    for (let binding = closestBinding; binding; binding = binding.earlierSameScope ?? null) {
         if (binding.node?.startIndex !== node.startIndex || binding.node.endIndex !== node.endIndex)
             continue;
         const own = definitionForBinding(binding, file, node, parsed.sup, parsed.source, parsed.tree);
@@ -45,15 +42,24 @@ function ownOverloadDeclaration({ use, closestBinding }) {
 }
 /** The use is the callee of a receiverless call (`f()`). */
 const isImplicitSelfCall = ({ use }) => implicitSelfCallee(use.parsed.sup.id, use.node.parent ?? use.node)?.id === use.node.id;
+/** A nominal type is not a member of its own declaration or extension. */
+function namesEnclosingSwiftType(state, def) {
+    if (!declaresMembers(def))
+        return false;
+    const owner = nearestMemberContainer(state.use.node);
+    return sliceText(owner?.childForFieldName("name"), state.use.parsed.source) === state.lookupName;
+}
 export const swiftLookupPolicy = {
     fromClosestBinding: ownOverloadDeclaration,
     // Swift checks every bare name through `self`; method-local bindings still win.
     onLocal(state, local) {
-        if (!bindsAtFileScope(state) && !bindsTypeMethod(state))
+        if (namesEnclosingSwiftType(state, local) || (!bindsAtFileScope(state) && !bindsTypeMethod(state)))
             return undefined;
         return implicitSelf(state, lexical(state, local));
     },
     afterCrossModule(state, resolved) {
+        if (resolved?.status === "ok" && namesEnclosingSwiftType(state, resolved.definition))
+            return resolved;
         // A member reached only by name, not through `self`, is not a module-level target.
         const memberOnly = resolved?.status === "ok" && !!resolved.definition.isMember;
         return implicitSelf(state, memberOnly ? { status: "not_found", reason: "No matching Swift member definition" } : resolved);

package/dist/indexer/name-lookup-policies/implicit-self.js.map

@@ -1 +1 @@
-{"version":3,"file":"implicit-self.js","sourceRoot":"","sources":["../../../src/indexer/name-lookup-policies/implicit-self.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"implicit-self.js","sourceRoot":"","sources":["../../../src/indexer/name-lookup-policies/implicit-self.ts"],"names":[],"mappings":"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"}

package/dist/indexer/name-lookup-policies/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/indexer/name-lookup-policies/index.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AA2FpE,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,gBAAgB,CAExE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/indexer/name-lookup-policies/index.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAsHpE,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,gBAAgB,CAExE"}

package/dist/indexer/name-lookup-policies/index.js

@@ -6,6 +6,7 @@
 import { getCallArgumentCount } from "../../languages/callable-arity.js";
 import { rustTokenTreeNameFollowsSeparator } from "../../util/member-access.js";
 import { fileIdentityKey } from "../../util/paths.js";
+import { okGoToResult } from "../navigation-provenance.js";
 import { resolveImported } from "../navigation-resolve.js";
 import { typescriptOverloadImplementationAcceptsCount } from "../ts-callables.js";
 import { SymbolKind } from "../types.js";
@@ -43,9 +44,6 @@ const typescriptLookupPolicy = {
         const accepted = typescriptOverloadImplementationAcceptsCount({
             implementation: target,
             locals: targetModule.locals,
-            tree: targetContext.tree,
-            source: targetContext.source,
-            languageId: targetContext.sup.id,
             argumentCount,
         });
         return accepted ? undefined : { status: "not_found", reason: "No matching TypeScript overload signature" };
@@ -86,12 +84,39 @@ const rustLookupPolicy = {
         return { status: "not_found", reason: "No resolvable receiver inside a Rust macro token tree" };
     },
 };
+/** Go package aliases yield to closer local bindings. */
+const goLookupPolicy = {
+    moduleAliasIsUnshadowed: ({ use, closestBinding }) => !closestBinding || use.scopeIndex.allScopes[0]?.map.get(closestBinding.canonicalName) === closestBinding,
+};
+/** A Zig declaration initialized from an imported member names the source symbol. */
+const zigLookupPolicy = {
+    onLocal({ use, lookupName }, local) {
+        const binding = use.mod.imports.find((candidate) => candidate.kind === "named" &&
+            candidate.local === lookupName &&
+            candidate.localRange?.start.index === local.range.start.index &&
+            fileIdentityKey(local.file) === fileIdentityKey(use.file));
+        if (!binding || binding.kind !== "named")
+            return undefined;
+        const target = resolveImported(use.index, binding, binding.imported);
+        if (!target || "namespace" in target)
+            return { status: "not_found", reason: "Unresolved Zig symbol import" };
+        return okGoToResult(use.index, target, {
+            via: {
+                ...(typeof binding.resolved === "string" ? { importedFrom: binding.resolved } : {}),
+                exportedName: binding.imported,
+            },
+            resolution: "import",
+            confidence: "high",
+        });
+    },
+};
 const NO_POLICY = {};
 const POLICIES = {
     c: cLookupPolicy,
     cpp: cppLookupPolicy,
     csharp: csharpLookupPolicy,
     java: jvmLookupPolicy,
+    go: goLookupPolicy,
     kotlin: jvmLookupPolicy,
     php: phpLookupPolicy,
     python: pythonLookupPolicy,
@@ -99,6 +124,7 @@ const POLICIES = {
     swift: swiftLookupPolicy,
     ts: typescriptLookupPolicy,
     tsx: typescriptLookupPolicy,
+    zig: zigLookupPolicy,
 };
 export function nameLookupPolicyFor(languageId) {
     return POLICIES[languageId] ?? NO_POLICY;

package/dist/indexer/name-lookup-policies/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/indexer/name-lookup-policies/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/indexer/name-lookup-policies/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,iCAAiC,EAAE,MAAM,6BAA6B,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,4CAA4C,EAAE,MAAM,oBAAoB,CAAC;AAClF,OAAO,EAAoC,UAAU,EAAE,MAAM,aAAa,CAAC;AAE3E,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5F,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,8FAA8F;AAC9F,SAAS,mBAAmB,CAAC,MAAmB,EAAE,GAAc;IAC9D,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CACvB,CAAC,SAAS,EAAE,EAAE,CACZ,SAAS,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI;QAC3B,SAAS,CAAC,SAAS,KAAK,GAAG,CAAC,SAAS;QACrC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,KAAK,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CACxD,CAAC;AACJ,CAAC;AAED,0FAA0F;AAC1F,MAAM,sBAAsB,GAAqB;IAC/C,cAAc,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE;QACpC,IAAI,cAAc,EAAE,IAAI,KAAK,UAAU,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,KAAK,iBAAiB;YAAE,OAAO,SAAS,CAAC;QACzG,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,2CAA2C,EAAE,CAAC;IACtF,CAAC;IACD,gBAAgB,CAAC,EAAE,GAAG,EAAE,EAAE,QAAQ;QAChC,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;QAC7B,IAAI,IAAI,EAAE,IAAI,KAAK,iBAAiB,IAAI,QAAQ,EAAE,MAAM,KAAK,IAAI;YAAE,OAAO,SAAS,CAAC;QACpF,MAAM,MAAM,GAAG,QAAQ,CAAC,UAAU,CAAC;QACnC,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,QAAQ;YAAE,OAAO,SAAS,CAAC;QAC1D,MAAM,aAAa,GAAG,oBAAoB,CAAC,EAAE,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/G,MAAM,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QACxE,6FAA6F;QAC7F,IAAI,aAAa,KAAK,IAAI,IAAI,CAAC,YAAY,IAAI,CAAC,mBAAmB,CAAC,YAAY,EAAE,MAAM,CAAC;YAAE,OAAO,SAAS,CAAC;QAC5G,MAAM,aAAa,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACjD,IAAI,CAAC,aAAa,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,KAAK,IAAI,IAAI,aAAa,CAAC,GAAG,CAAC,EAAE,KAAK,KAAK,CAAC;YAAE,OAAO,SAAS,CAAC;QAC1G,MAAM,QAAQ,GAAG,4CAA4C,CAAC;YAC5D,cAAc,EAAE,MAAM;YACtB,MAAM,EAAE,YAAY,CAAC,MAAM;YAC3B,aAAa;SACd,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,2CAA2C,EAAE,CAAC;IAC7G,CAAC;IACD,qFAAqF;IACrF,CAAC,YAAY,CAAC,KAAK,EAAE,GAAG;QACtB,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YAC9B,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS;gBAAE,SAAS;YAC7D,MAAM,MAAM,GAAG,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC9F,IAAI,CAAC,MAAM,IAAI,WAAW,IAAI,MAAM;gBAAE,SAAS;YAC/C,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;YACpE,IAAI,YAAY,IAAI,mBAAmB,CAAC,YAAY,EAAE,MAAM,CAAC;gBAAE,MAAM,MAAM,CAAC,IAAI,CAAC;QACnF,CAAC;IACH,CAAC;CACF,CAAC;AAEF,+CAA+C;AAC/C,MAAM,kBAAkB,GAAqB;IAC3C,gBAAgB,CAAC,EAAE,GAAG,EAAE,EAAE,QAAQ;QAChC,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,KAAK,MAAM,IAAI,QAAQ,EAAE,MAAM,KAAK,IAAI;YAAE,OAAO,SAAS,CAAC;QACpF,IAAI,QAAQ,CAAC,UAAU,EAAE,UAAU,KAAK,WAAW;YAAE,OAAO,SAAS,CAAC;QACtE,qFAAqF;QACrF,yBAAyB;QACzB,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,oDAAoD,EAAE,CAAC;IAC/F,CAAC;CACF,CAAC;AAEF,uDAAuD;AACvD,MAAM,gBAAgB,GAAqB;IACzC,0FAA0F;IAC1F,0FAA0F;IAC1F,aAAa,CAAC,GAAG;QACf,IAAI,CAAC,iCAAiC,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,OAAO,SAAS,CAAC;QACnE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,uDAAuD,EAAE,CAAC;IAClG,CAAC;CACF,CAAC;AAEF,yDAAyD;AACzD,MAAM,cAAc,GAAqB;IACvC,uBAAuB,EAAE,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE,EAAE,EAAE,CACnD,CAAC,cAAc,IAAI,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,aAAa,CAAC,KAAK,cAAc;CAC3G,CAAC;AACF,qFAAqF;AACrF,MAAM,eAAe,GAAqB;IACxC,OAAO,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,KAAK;QAChC,MAAM,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAClC,CAAC,SAAS,EAAE,EAAE,CACZ,SAAS,CAAC,IAAI,KAAK,OAAO;YAC1B,SAAS,CAAC,KAAK,KAAK,UAAU;YAC9B,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK;YAC7D,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,CAC5D,CAAC;QACF,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO;YAAE,OAAO,SAAS,CAAC;QAC3D,MAAM,MAAM,GAAG,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;QACrE,IAAI,CAAC,MAAM,IAAI,WAAW,IAAI,MAAM;YAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,8BAA8B,EAAE,CAAC;QAC7G,OAAO,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE;YACrC,GAAG,EAAE;gBACH,GAAG,CAAC,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnF,YAAY,EAAE,OAAO,CAAC,QAAQ;aAC/B;YACD,UAAU,EAAE,QAAQ;YACpB,UAAU,EAAE,MAAM;SACnB,CAAC,CAAC;IACL,CAAC;CACF,CAAC;AACF,MAAM,SAAS,GAAqB,EAAE,CAAC;AAEvC,MAAM,QAAQ,GAA+C;IAC3D,CAAC,EAAE,aAAa;IAChB,GAAG,EAAE,eAAe;IACpB,MAAM,EAAE,kBAAkB;IAC1B,IAAI,EAAE,eAAe;IACrB,EAAE,EAAE,cAAc;IAClB,MAAM,EAAE,eAAe;IACvB,GAAG,EAAE,eAAe;IACpB,MAAM,EAAE,kBAAkB;IAC1B,IAAI,EAAE,gBAAgB;IACtB,KAAK,EAAE,iBAAiB;IACxB,EAAE,EAAE,sBAAsB;IAC1B,GAAG,EAAE,sBAAsB;IAC3B,GAAG,EAAE,eAAe;CACrB,CAAC;AAEF,MAAM,UAAU,mBAAmB,CAAC,UAAkB;IACpD,OAAO,QAAQ,CAAC,UAAU,CAAC,IAAI,SAAS,CAAC;AAC3C,CAAC"}

package/dist/indexer/name-lookup-policies/php.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"php.d.ts","sourceRoot":"","sources":["../../../src/indexer/name-lookup-policies/php.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAe,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAgBjF,eAAO,MAAM,eAAe,EAAE,gBA0D7B,CAAC"}
+{"version":3,"file":"php.d.ts","sourceRoot":"","sources":["../../../src/indexer/name-lookup-policies/php.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,EAAe,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAgBjF,eAAO,MAAM,eAAe,EAAE,gBAwE7B,CAAC"}

package/dist/indexer/name-lookup-policies/php.js

@@ -3,9 +3,9 @@
  * separate namespaces, so the syntactic role of the use selects which one a name can bind.
  */
 import { findClosestBinding } from "../navigation-local.js";
-import { findPhpImportAlias, inferPhpQualifiedReferenceImportType } from "../navigation-php.js";
+import { findPhpImportAlias, getPhpQualifiedReference, inferPhpQualifiedReferenceImportType, } from "../navigation-php.js";
 import { okGoToResult } from "../navigation-provenance.js";
-import { phpClassReferenceMatchesDefinition, phpReferenceRoleMatchesKind, resolveIndexedPhpClassReference, resolvePhpExplicitImport, resolvePhpSameScopeRoleDefinition, } from "../php-namespace-symbols.js";
+import { phpClassReferenceMatchesDefinition, phpReferenceRoleMatchesKind, resolveIndexedPhpClassReference, resolvePhpExplicitImport, resolvePhpNamespaceSymbol, resolvePhpSameScopeRoleDefinition, } from "../php-namespace-symbols.js";
 import { scopeNodesFor } from "../scope-nodes.js";
 /** A class-reference form (`new X`, `X::y`, a type) cannot bind a same-named function. */
 const isClassReference = (use) => inferPhpQualifiedReferenceImportType(use.node) === "class";
@@ -34,6 +34,13 @@ export const phpLookupPolicy = {
                 confidence: "high",
             });
         }
+        const qualified = getPhpQualifiedReference(node, parsed.source);
+        if (qualified?.includes("\\") && inferPhpQualifiedReferenceImportType(node) === "function") {
+            const target = resolvePhpNamespaceSymbol(index, parsed.source, parsed.tree, node, qualified, mod.imports, "function");
+            if (target)
+                return okGoToResult(index, target, { resolution: "php-qualified", confidence: "high" });
+            return { status: "not_found", reason: "No matching PHP qualified function" };
+        }
         if (!isClassReference(use))
             return undefined;
         const phpClass = resolveIndexedPhpClassReference(index, parsed.source, parsed.tree, node, lookupName, mod.imports);

package/dist/indexer/name-lookup-policies/php.js.map

@@ -1 +1 @@
-{"version":3,"file":"php.js","sourceRoot":"","sources":["../../../src/indexer/name-lookup-policies/php.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"php.js","sourceRoot":"","sources":["../../../src/indexer/name-lookup-policies/php.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EACL,kBAAkB,EAClB,wBAAwB,EACxB,oCAAoC,GACrC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EACL,kCAAkC,EAClC,2BAA2B,EAC3B,+BAA+B,EAC/B,wBAAwB,EACxB,yBAAyB,EACzB,iCAAiC,GAClC,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAIlD,0FAA0F;AAC1F,MAAM,gBAAgB,GAAG,CAAC,GAAgB,EAAW,EAAE,CAAC,oCAAoC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,OAAO,CAAC;AAEnH,MAAM,YAAY,GAAG,CAAC,GAAgB,EAAE,UAAkB,EAAE,GAAc,EAAW,EAAE,CACrF,kCAAkC,CAChC,GAAG,CAAC,KAAK,EACT,GAAG,CAAC,MAAM,CAAC,MAAM,EACjB,GAAG,CAAC,MAAM,CAAC,IAAI,EACf,GAAG,CAAC,IAAI,EACR,UAAU,EACV,GAAG,CAAC,GAAG,CAAC,OAAO,EACf,GAAG,CACJ,CAAC;AAEJ,MAAM,CAAC,MAAM,eAAe,GAAqB;IAC/C,aAAa,CAAC,GAAG,EAAE,UAAU;QAC3B,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;QACjE,MAAM,aAAa,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,yBAAyB,CAAC;QACrE,IAAI,aAAa,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,aAAa,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YAC3F,MAAM,QAAQ,GAAG,kBAAkB,CAAC,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;YAChH,IAAI,CAAC,QAAQ;gBAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,qCAAqC,EAAE,CAAC;YAC7F,OAAO,YAAY,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;QACpF,CAAC;QACD,sFAAsF;QACtF,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CACjC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,UAAU,IAAI,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,KAAK,IAAI,CAAC,QAAQ,CAClG,CAAC;QACF,IAAI,WAAW;YAAE,OAAO,YAAY,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;QACtG,MAAM,IAAI,GAAG,GAAG,CAAC,aAAa,IAAI,OAAO,CAAC;QAC1C,MAAM,OAAO,GAAG,kBAAkB,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAC5D,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,wBAAwB,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC9E,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE;gBAChC,GAAG,EAAE,EAAE,YAAY,EAAE,KAAK,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,CAAC,SAAS,EAAE;gBAChE,UAAU,EAAE,QAAQ;gBACpB,UAAU,EAAE,MAAM;aACnB,CAAC,CAAC;QACL,CAAC;QACD,MAAM,SAAS,GAAG,wBAAwB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAChE,IAAI,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,oCAAoC,CAAC,IAAI,CAAC,KAAK,UAAU,EAAE,CAAC;YAC3F,MAAM,MAAM,GAAG,yBAAyB,CACtC,KAAK,EACL,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,IAAI,EACX,IAAI,EACJ,SAAS,EACT,GAAG,CAAC,OAAO,EACX,UAAU,CACX,CAAC;YACF,IAAI,MAAM;gBAAE,OAAO,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;YACpG,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,oCAAoC,EAAE,CAAC;QAC/E,CAAC;QACD,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC;YAAE,OAAO,SAAS,CAAC;QAC7C,MAAM,QAAQ,GAAG,+BAA+B,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;QACnH,IAAI,CAAC,QAAQ;YAAE,OAAO,SAAS,CAAC;QAChC,OAAO,YAAY,CAAC,KAAK,EAAE,QAAQ,EAAE;YACnC,GAAG,EAAE,EAAE,YAAY,EAAE,QAAQ,CAAC,SAAS,EAAE;YACzC,UAAU,EAAE,eAAe;YAC3B,UAAU,EAAE,MAAM;SACnB,CAAC,CAAC;IACL,CAAC;IAED,4FAA4F;IAC5F,OAAO,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,cAAc,EAAE,EAAE,KAAK;QAChD,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;QACzC,IAAI,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC;YACnE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,uBAAuB,EAAE,CAAC;QAClE,CAAC;QACD,IAAI,2BAA2B,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC;YAAE,OAAO,SAAS,CAAC;QACpE,MAAM,SAAS,GAAG,cAAc;YAC9B,CAAC,CAAC,iCAAiC,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,cAAc,CAAC;YAC7G,CAAC,CAAC,IAAI,CAAC;QACT,IAAI,SAAS;YAAE,OAAO,YAAY,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;QAClG,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,6BAA6B,EAAE,CAAC;IACxE,CAAC;IAED,gBAAgB,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,EAAE,QAAQ;QAC5C,IAAI,QAAQ,EAAE,MAAM,KAAK,IAAI;YAAE,OAAO,SAAS,CAAC;QAChD,IAAI,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,UAAU,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YACjF,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,uBAAuB,EAAE,CAAC;QAClE,CAAC;QACD,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YACrE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,6BAA6B,EAAE,CAAC;QACxE,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF,CAAC"}

package/dist/indexer/name-resolution-types.d.ts

@@ -93,6 +93,8 @@ export type NameLookupPolicy = {
     cNamespace?(node: SyntaxNodeLike): "tag" | "ordinary" | undefined;
     /** Adjusts the cross-module result (arity, roles, member precedence, deferred recovery). */
     afterCrossModule?(state: NameLookupState, resolved: GoToResult | null): NameResolution | null | undefined;
+    /** Whether a file import alias remains visible at this use, after lexical shadowing. */
+    moduleAliasIsUnshadowed?(state: NameLookupState): boolean;
     /** Files a synchronous consumer loads before resolving names in a module of this language. */
     preloadFiles?(index: ProjectIndex, mod: ModuleIndex): Iterable<FileId>;
 };