@lzehrung/codegraph 2.3.30 → 2.4.0

package/dist/util/member-access-tables.js

@@ -0,0 +1,285 @@
+/**
+ * Per-language member-access, receiver, and ancestry tables for `./member-access.ts`, keyword
+ * navigation, and the detailed graph passes. Rows are keyed by language id, following the
+ * trivia-table precedent in `./trivia-tables.ts`: walkers keep the algorithms; this table keeps
+ * the per-language node types, extraction shapes, receiver keywords, and ancestry forms.
+ *
+ * Every registered language has a row. A document, style, or data format row carries only
+ * `omittedReason`; a source-language row declares each capability it has and names a one-line
+ * reason for each capability it omits, so an omission cannot flip silently.
+ * `tests/member-access-tables.test.ts` asserts both halves and re-derives every declared node
+ * type from that language's pinned grammar.
+ */
+/** C models dotted access as `field_expression`; C++ also exposes scoped `qualified_identifier`. */
+const C_FIELD_ACCESS_SHAPE = {
+    nodeTypes: ["field_expression"],
+    object: { field: "argument", fallbackIndex: 0 },
+    property: { field: "field", fallbackIndex: 2 },
+};
+const CPP_QUALIFIED_ACCESS_SHAPE = {
+    nodeTypes: ["qualified_identifier"],
+    object: { field: "scope", fallbackIndex: 0 },
+    property: { field: "name", fallbackIndex: 2 },
+};
+const THIS_SUPER_RECEIVERS = { own: ["this"], instanceOwn: ["this"], supertype: ["super"] };
+const SELF_RECEIVERS = { own: ["self"], instanceOwn: ["self"], supertype: ["super"] };
+export const MEMBER_ACCESS_ROWS = {
+    adoc: { omittedReason: "AsciiDoc document format; embedded code blocks parse as their own language." },
+    astro: { omittedReason: "Astro document format; scripts parse as js/ts and templates as html." },
+    c: {
+        memberAccessShapes: [C_FIELD_ACCESS_SHAPE],
+        receiverKeywordsOmittedReason: "C has no receiver keyword; member access always names an explicit object or pointer.",
+        memberCallNamesFreeFunctionOmittedReason: "A member expression names a field of an object, not a free function.",
+    },
+    cpp: {
+        memberAccessShapes: [C_FIELD_ACCESS_SHAPE, CPP_QUALIFIED_ACCESS_SHAPE],
+        receiverKeywords: { own: ["this"], instanceOwn: ["this"], supertype: [] },
+        receiverAncestry: { clauses: [{ nodeType: "base_class_clause", relation: "extends" }] },
+        memberCallNamesFreeFunctionOmittedReason: "A member call on an object or parameter cannot name a namespace free function.",
+    },
+    css: { omittedReason: "Style language; no member-access concept." },
+    csharp: {
+        extraTraversalTypes: ["qualified_name", "alias_qualified_name"],
+        extraMemberAccessTypes: ["alias_qualified_name"],
+        memberAccessShapes: [
+            {
+                nodeTypes: ["alias_qualified_name"],
+                object: { field: "alias", fallbackIndex: 0 },
+                property: { field: "name", fallbackIndex: 2 },
+            },
+            { object: { index: 0 }, property: { index: 2 } },
+        ],
+        receiverKeywords: { own: ["this"], instanceOwn: ["this"], supertype: ["base"] },
+        receiverAncestry: {
+            clauses: [{ nodeType: "base_list", relation: "superclass-first", supertype: "first-child" }],
+        },
+        memberCallNamesFreeFunctionOmittedReason: "Extension methods are members; a free function is not called with member syntax.",
+    },
+    go: {
+        extraTraversalTypes: ["qualified_type"],
+        extraMemberAccessTypes: ["qualified_type"],
+        memberAccessShapes: [{ nodeTypes: ["qualified_type"], object: { namedIndex: 0 }, property: { namedIndex: 1 } }],
+        // Go has no receiver keyword: a method call's receiver is an ordinary value. The row still
+        // exists so go receivers must be proven rather than falling back to a bare name.
+        receiverKeywords: { own: [], instanceOwn: [], supertype: [] },
+        receiverAncestry: {
+            clauses: [],
+            embeds: [
+                { body: "interface_type", member: "type_elem" },
+                {
+                    body: "struct_type",
+                    memberList: "field_declaration_list",
+                    member: "field_declaration",
+                    typeField: "type",
+                    nameless: true,
+                },
+            ],
+        },
+        memberCallNamesFreeFunction: true,
+    },
+    hbs: { omittedReason: "Handlebars document format; embedded scripts parse as their own language." },
+    html: { omittedReason: "Document format; embedded scripts parse as their own language." },
+    java: {
+        memberAccessShapes: [
+            {
+                nodeTypes: ["method_invocation"],
+                object: { field: "object", fallbackIndex: 0 },
+                property: { field: "name", fallbackIndex: 2 },
+            },
+            {
+                nodeTypes: ["scoped_identifier", "scoped_type_identifier"],
+                object: { field: "scope", fallbackIndex: 0 },
+                property: { field: "name", fallbackIndex: 2 },
+            },
+        ],
+        receiverKeywords: THIS_SUPER_RECEIVERS,
+        receiverAncestry: {
+            clauses: [
+                { nodeType: "superclass", relation: "extends", supertype: "all" },
+                { nodeType: "super_interfaces", relation: "implements" },
+            ],
+        },
+        memberCallNamesFreeFunctionOmittedReason: "A method call names a member of the receiver type, not a free function.",
+    },
+    js: {
+        memberAccessOmittedReason: "The shared generic default already reads member_expression's object and property fields.",
+        receiverKeywords: THIS_SUPER_RECEIVERS,
+        receiverAncestry: { clauses: [{ nodeType: "class_heritage", relation: "extends", supertype: "all" }] },
+        memberCallNamesFreeFunctionOmittedReason: "Member syntax names an object property; a free function is not called that way.",
+    },
+    kotlin: {
+        memberAccessShapes: [
+            { nodeTypes: ["navigation_expression"], object: { namedIndex: 0 }, property: { navigation: true } },
+        ],
+        navigationFallbackLastChild: true,
+        receiverKeywords: THIS_SUPER_RECEIVERS,
+        receiverAncestry: {
+            clauses: [{ nodeType: "delegation_specifiers", relation: "superclass-first", supertype: "first-child" }],
+        },
+        memberCallNamesFreeFunction: true,
+    },
+    less: { omittedReason: "Style language; no member-access concept." },
+    markdown: { omittedReason: "Document format; fenced code blocks parse as their own language." },
+    mdx: { omittedReason: "MDX document format; scripts parse as js/ts and templates as html." },
+    php: {
+        extraMemberAccessTypes: [
+            "member_call_expression",
+            "nullsafe_member_call_expression",
+            "scoped_call_expression",
+            "class_constant_access_expression",
+        ],
+        memberAccessShapes: [
+            {
+                nodeTypes: ["member_call_expression", "nullsafe_member_call_expression"],
+                object: { field: "object", fallbackIndex: 0 },
+                property: { field: "name", fallbackIndex: 2 },
+            },
+            {
+                nodeTypes: ["scoped_call_expression"],
+                object: { field: "scope", fallbackIndex: 0 },
+                property: { field: "name", fallbackIndex: 2 },
+            },
+            {
+                nodeTypes: ["class_constant_access_expression"],
+                object: { namedIndex: 0 },
+                property: { namedIndex: 1 },
+            },
+        ],
+        receiverKeywords: { own: ["$this", "self", "static"], instanceOwn: ["$this"], supertype: ["parent"] },
+        receiverAncestry: {
+            clauses: [
+                { nodeType: "base_clause", relation: "extends", supertype: "all" },
+                { nodeType: "class_interface_clause", relation: "implements" },
+                { nodeType: "use_declaration", relation: "trait", each: true },
+            ],
+        },
+        memberCallNamesFreeFunctionOmittedReason: "A member or scoped call names a class member, not a free function.",
+    },
+    python: {
+        memberExpressionType: "attribute",
+        memberAccessShapes: [
+            { object: { field: "object", fallbackIndex: 0 }, property: { field: "attribute", fallbackIndex: 2 } },
+        ],
+        receiverKeywords: { own: ["self", "cls"], instanceOwn: ["self"], supertype: ["super"] },
+        receiverKeywordCallShape: true,
+        receiverAncestry: { clauses: [{ nodeType: "argument_list", relation: "extends" }] },
+        memberCallNamesFreeFunctionOmittedReason: "Attribute access names a member; a free function is not called that way.",
+    },
+    rst: { omittedReason: "reStructuredText document format; embedded code blocks parse as their own language." },
+    ruby: {
+        memberExpressionType: "call",
+        memberAccessShapes: [
+            {
+                nodeTypes: ["scope_resolution"],
+                object: { field: "scope", fallbackIndex: 0 },
+                property: { field: "name", fallbackIndex: 2 },
+            },
+            // Ruby models every other member access as a `call` node with receiver and method fields.
+            { object: { field: "receiver", fallbackIndex: 0 }, property: { field: "method", fallbackIndex: 2 } },
+        ],
+        receiverKeywords: { own: ["self"], instanceOwn: ["self"], supertype: [] },
+        receiverAncestry: {
+            clauses: [{ nodeType: "superclass", relation: "extends", supertype: "all" }],
+            mixinCalls: ["include", "extend", "prepend"],
+        },
+        memberCallNamesFreeFunctionOmittedReason: "A call with a receiver names a method, not a free function.",
+    },
+    rust: {
+        memberAccessShapes: [
+            {
+                nodeTypes: ["scoped_identifier"],
+                object: { field: "path", fallbackIndex: 0 },
+                property: { field: "name", fallbackIndex: 2 },
+            },
+        ],
+        receiverKeywords: { own: ["self", "Self"], instanceOwn: ["self"], supertype: [] },
+        memberCallNamesFreeFunctionOmittedReason: "Methods are members; a free function is not invoked with member syntax.",
+    },
+    scss: { omittedReason: "Style language; no member-access concept." },
+    svelte: { omittedReason: "Svelte component format; script blocks parse as js/ts and templates as html." },
+    sql: { omittedReason: "Data language; no member-access concept." },
+    swift: {
+        memberAccessShapes: [
+            { nodeTypes: ["navigation_expression"], object: { namedIndex: 0 }, property: { navigation: true } },
+        ],
+        receiverKeywords: SELF_RECEIVERS,
+        receiverAncestry: {
+            clauses: [
+                {
+                    nodeType: "inheritance_specifier",
+                    relation: "superclass-first",
+                    each: true,
+                    supertype: "first-match",
+                },
+            ],
+        },
+        memberCallNamesFreeFunctionOmittedReason: "Extension methods are members; a free function is not called with member syntax.",
+    },
+    ts: {
+        memberAccessOmittedReason: "The shared generic default already reads member_expression's object and property fields.",
+        receiverKeywords: THIS_SUPER_RECEIVERS,
+        receiverAncestry: {
+            clauses: [
+                { nodeType: "extends_clause", relation: "extends", field: "value", supertype: "all" },
+                { nodeType: "implements_clause", relation: "implements" },
+            ],
+        },
+        memberCallNamesFreeFunctionOmittedReason: "Member syntax names an object property; a free function is not called that way.",
+    },
+    tsx: {
+        memberAccessOmittedReason: "The shared generic default already reads member_expression's object and property fields.",
+        receiverKeywords: THIS_SUPER_RECEIVERS,
+        receiverAncestry: {
+            clauses: [
+                { nodeType: "extends_clause", relation: "extends", field: "value", supertype: "all" },
+                { nodeType: "implements_clause", relation: "implements" },
+            ],
+        },
+        memberCallNamesFreeFunctionOmittedReason: "Member syntax names an object property; a free function is not called that way.",
+    },
+    vue: { omittedReason: "Vue component format; script blocks parse as js/ts and templates as html." },
+    zig: {
+        memberAccessOmittedReason: "No per-language extraction today; the shared generic default is zig's behavior.",
+        receiverKeywords: { own: ["self"], instanceOwn: ["self"], supertype: [] },
+        memberCallNamesFreeFunctionOmittedReason: "A member call names a container member, not a free function.",
+    },
+};
+/** Every language that declares receiver keywords, guarded by the registry-consistency test. */
+export const receiverKeywordLanguageIds = Object.keys(MEMBER_ACCESS_ROWS).filter((languageId) => MEMBER_ACCESS_ROWS[languageId].receiverKeywords !== undefined);
+/** Languages that emit proven receiver `calls` edges from the shared keyword table. */
+export function supportsReceiverCallEdges(languageId) {
+    return MEMBER_ACCESS_ROWS[languageId]?.receiverKeywords !== undefined;
+}
+/** Languages where goto and references require proven receivers and do not fall back to a bare name. */
+export function supportsReceiverMemberNavigation(languageId) {
+    return MEMBER_ACCESS_ROWS[languageId]?.receiverKeywords !== undefined;
+}
+export function keywordReceiverKind(languageId, receiverName) {
+    const keywords = MEMBER_ACCESS_ROWS[languageId]?.receiverKeywords;
+    if (!keywords)
+        return null;
+    if (keywords.own.includes(receiverName))
+        return "own";
+    if (keywords.supertype.includes(receiverName))
+        return "supertype";
+    return null;
+}
+/**
+ * Instance-own keywords (`this`, `$this`) require instance members.
+ * Other own keywords name the declaring type and may still bind instance members
+ * (PHP `self::` / `static::` late static binding), so they do not force a static-only filter.
+ */
+export function ownReceiverMemberScope(languageId, receiverName) {
+    const keywords = MEMBER_ACCESS_ROWS[languageId]?.receiverKeywords;
+    if (!keywords?.own.includes(receiverName))
+        return null;
+    return keywords.instanceOwn.includes(receiverName) ? "instance" : "any";
+}
+export function isKeywordReceiver(languageId, receiverName) {
+    return keywordReceiverKind(languageId, receiverName) !== null;
+}
+/** Whether `receiver.name()` can refer to a free function rather than only a member. */
+export function memberSyntaxNamesFreeFunction(languageId) {
+    return !!MEMBER_ACCESS_ROWS[languageId]?.memberCallNamesFreeFunction;
+}
+//# sourceMappingURL=member-access-tables.js.map

package/dist/util/member-access-tables.js.map

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

package/dist/util/member-access.d.ts

@@ -17,6 +17,14 @@ export declare function isMemberObjectIdentifier(nodeType: string): boolean;
 /** Identifier-like nodes that can name a receiver, including Ruby `@ivar`/`@@cvar`. */
 export declare function isReceiverNameNode(sup: LanguageSupport, nodeType: string): boolean;
 export declare function isMemberReferencePropertyIdentifier(sup: LanguageSupport, nodeType: string): boolean;
+/**
+ * The text used to classify a receiver as an own-type or supertype keyword. Ordinarily this is
+ * the receiver node's own source spelling, but a language whose row sets `receiverKeywordCallShape`
+ * may also spell a keyword receiver as a zero-argument call to that keyword - Python's `super()`,
+ * which (unlike `self`/`cls`) has no bare-name form. Only unwrap that call when its callee is
+ * not shadowed by a visible lexical binding.
+ */
+export declare function receiverKeywordText(sup: LanguageSupport, node: SyntaxNodeLike, source: string, hasLexicalBinding: (callee: SyntaxNodeLike) => boolean): string;
 export declare function getNavigationExpressionProperty(sup: LanguageSupport, expr: SyntaxNodeLike): SyntaxNodeLike | null;
 export declare function getMemberAccessParts(sup: LanguageSupport, memberNode: SyntaxNodeLike): MemberAccessParts;
 export declare function collectMemberAccessChain(args: {
@@ -25,4 +33,13 @@ export declare function collectMemberAccessChain(args: {
     chainNode: SyntaxNodeLike;
     constStringOf?: Map<string, string>;
 }): MemberAccessChain | null;
+/**
+ * Whether a name inside a Rust macro token tree follows a `.` or `::` separator, ignoring comments:
+ * `counter.bump()` with a block comment after the dot is still a member call, and `m::run()` with
+ * one after the `::` is still a path call. Raw
+ * tokens cannot prove such a receiver, so both consumers stay conservative there.
+ */
+export declare function rustTokenTreeNameFollowsSeparator(name: SyntaxNodeLike): boolean;
+/** Whether a Rust token tree is (nested in) the arguments of a standard expression macro. */
+export declare function rustTokenTreeHoldsExpressions(tokenTree: SyntaxNodeLike): boolean;
 //# sourceMappingURL=member-access.d.ts.map

package/dist/util/member-access.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"member-access.d.ts","sourceRoot":"","sources":["../../src/util/member-access.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAG5D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC;IAC9B,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,eAAe,GAAG,MAAM,CAKpE;AAED,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,eAAe,GAAG,MAAM,EAAE,CAE5E;AAED,wBAAgB,sCAAsC,CAAC,GAAG,EAAE,eAAe,GAAG,MAAM,EAAE,CAErF;AAED,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC,CAW5E;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAsBtF;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAWlE;AAED,uFAAuF;AACvF,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAElF;AAED,wBAAgB,mCAAmC,CAAC,GAAG,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEnG;AAED,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,cAAc,GAAG,cAAc,GAAG,IAAI,CAajH;AAiBD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,eAAe,EAAE,UAAU,EAAE,cAAc,GAAG,iBAAiB,CAwDxG;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE;IAC7C,GAAG,EAAE,eAAe,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,cAAc,CAAC;IAC1B,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC,GAAG,iBAAiB,GAAG,IAAI,CA0C3B"}
+{"version":3,"file":"member-access.d.ts","sourceRoot":"","sources":["../../src/util/member-access.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAI5D,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC;IAC9B,QAAQ,EAAE,cAAc,GAAG,IAAI,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,cAAc,CAAC;IACrB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAsBF,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,eAAe,GAAG,MAAM,CAGpE;AAED,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,eAAe,GAAG,MAAM,EAAE,CAE5E;AAED,wBAAgB,sCAAsC,CAAC,GAAG,EAAE,eAAe,GAAG,MAAM,EAAE,CAErF;AAED,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC,CAS5E;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,cAAc,GAAG,OAAO,CAMtF;AAED,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAWlE;AAED,uFAAuF;AACvF,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAElF;AAED,wBAAgB,mCAAmC,CAAC,GAAG,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEnG;AAID;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,eAAe,EACpB,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,OAAO,GACrD,MAAM,CAUR;AAED,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,cAAc,GAAG,cAAc,GAAG,IAAI,CAajH;AAgBD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,eAAe,EAAE,UAAU,EAAE,cAAc,GAAG,iBAAiB,CAiBxG;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE;IAC7C,GAAG,EAAE,eAAe,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,cAAc,CAAC;IAC1B,aAAa,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC,GAAG,iBAAiB,GAAG,IAAI,CA+C3B;AAID;;;;;GAKG;AACH,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAU/E;AAgCD,6FAA6F;AAC7F,wBAAgB,6BAA6B,CAAC,SAAS,EAAE,cAAc,GAAG,OAAO,CAYhF"}

package/dist/util/member-access.js

@@ -1,12 +1,28 @@
 import { sliceText, unquote } from "./ast.js";
+import { isKeywordReceiver, MEMBER_ACCESS_ROWS } from "./member-access-tables.js";
+/**
+ * Member-access node types accepted for every language. The list is deliberately wider than any
+ * one grammar: node types are language-scoped in practice, so an over-broad shared list cannot
+ * cross-match between two parses.
+ */
+const GENERIC_MEMBER_ACCESS_TYPES = {
+    member_access_expression: true,
+    qualified_name: true,
+    field_access: true,
+    method_invocation: true,
+    scoped_identifier: true,
+    scoped_type_identifier: true,
+    qualified_identifier: true,
+    call: true,
+    scope_resolution: true,
+    field_expression: true,
+    attribute: true,
+    navigation_expression: true,
+};
 export function memberExpressionTypeFor(sup) {
     if (sup.nodeTypes.memberExpression)
         return sup.nodeTypes.memberExpression;
-    if (sup.id === "python")
-        return "attribute";
-    if (sup.id === "ruby")
-        return "call";
-    return "member_expression";
+    return MEMBER_ACCESS_ROWS[sup.id]?.memberExpressionType ?? "member_expression";
 }
 export function memberPropertyIdentifierTypes(sup) {
     return [...(sup.nodeTypes.propertyIdentifier ?? ["property_identifier"])];
@@ -21,34 +37,14 @@ export function memberAccessTraversalTypes(sup) {
         "subscript_expression",
         "optional_chain",
     ]);
-    if (sup.id === "go")
-        types.add("qualified_type");
-    if (sup.id === "python")
-        types.add("attribute");
-    if (sup.id === "kotlin" || sup.id === "swift")
-        types.add("navigation_expression");
+    for (const nodeType of MEMBER_ACCESS_ROWS[sup.id]?.extraTraversalTypes ?? [])
+        types.add(nodeType);
     return types;
 }
 export function isMemberAccessNode(sup, node) {
-    const memberExpressionType = memberExpressionTypeFor(sup);
-    return (node.type === memberExpressionType ||
-        (sup.id === "go" && node.type === "qualified_type") ||
-        (sup.id === "php" &&
-            (node.type === "member_call_expression" ||
-                node.type === "nullsafe_member_call_expression" ||
-                node.type === "scoped_call_expression")) ||
-        node.type === "member_access_expression" ||
-        node.type === "qualified_name" ||
-        node.type === "field_access" ||
-        node.type === "method_invocation" ||
-        node.type === "scoped_identifier" ||
-        node.type === "scoped_type_identifier" ||
-        node.type === "qualified_identifier" ||
-        node.type === "call" ||
-        node.type === "scope_resolution" ||
-        node.type === "field_expression" ||
-        node.type === "attribute" ||
-        node.type === "navigation_expression");
+    return (node.type === memberExpressionTypeFor(sup) ||
+        GENERIC_MEMBER_ACCESS_TYPES[node.type] ||
+        (MEMBER_ACCESS_ROWS[sup.id]?.extraMemberAccessTypes?.includes(node.type) ?? false));
 }
 export function isMemberObjectIdentifier(nodeType) {
     return (nodeType === "identifier" ||
@@ -67,6 +63,26 @@ export function isReceiverNameNode(sup, nodeType) {
 export function isMemberReferencePropertyIdentifier(sup, nodeType) {
     return memberReferencePropertyIdentifierTypes(sup).includes(nodeType);
 }
+const RECEIVER_KEYWORD_CALL_NODE_TYPES = { call: true, call_expression: true };
+/**
+ * The text used to classify a receiver as an own-type or supertype keyword. Ordinarily this is
+ * the receiver node's own source spelling, but a language whose row sets `receiverKeywordCallShape`
+ * may also spell a keyword receiver as a zero-argument call to that keyword - Python's `super()`,
+ * which (unlike `self`/`cls`) has no bare-name form. Only unwrap that call when its callee is
+ * not shadowed by a visible lexical binding.
+ */
+export function receiverKeywordText(sup, node, source, hasLexicalBinding) {
+    const text = sliceText(node, source).trim();
+    if (!MEMBER_ACCESS_ROWS[sup.id]?.receiverKeywordCallShape || !RECEIVER_KEYWORD_CALL_NODE_TYPES[node.type]) {
+        return text;
+    }
+    const callee = node.childForFieldName("function") ?? node.namedChildren[0] ?? null;
+    const args = node.childForFieldName("arguments") ?? node.childForFieldName("argument_list");
+    if (!callee || (args && args.namedChildren.length))
+        return text;
+    const calleeText = sliceText(callee, source).trim();
+    return isKeywordReceiver(sup.id, calleeText) && !hasLexicalBinding(callee) ? calleeText : text;
+}
 export function getNavigationExpressionProperty(sup, expr) {
     const suffix = expr.namedChildren.find((child) => child.type === "navigation_suffix") ?? expr.child(1);
     if (!suffix)
@@ -77,77 +93,34 @@ export function getNavigationExpressionProperty(sup, expr) {
         suffix.child(0);
     if (fromSuffix)
         return fromSuffix;
-    if (sup.id === "kotlin") {
+    if (MEMBER_ACCESS_ROWS[sup.id]?.navigationFallbackLastChild) {
         return expr.namedChildren[expr.namedChildren.length - 1] ?? expr.child(2);
     }
     return null;
 }
 /**
- * Builds {@link MemberAccessParts} from a member-access node by tree-sitter
- * field name, falling back to positional children (object → child 0,
- * property → child 2) when a field is absent.
+ * Extracts one member-access child by tree-sitter field name, falling back to a positional child
+ * when the field is absent, or reading it directly by (named) child index.
  *
  * Most languages model member access as `<object>.<property>`, so per-language
- * branches only supply their field names instead of repeating this shape.
+ * rows in `./member-access-tables.ts` only supply their field names instead of
+ * repeating this shape.
  */
-function fieldParts(node, objectField, propertyField) {
-    return {
-        object: node.childForFieldName(objectField) ?? node.child(0),
-        property: node.childForFieldName(propertyField) ?? node.child(2),
-    };
+function shapeChild(memberNode, child) {
+    if ("field" in child)
+        return memberNode.childForFieldName(child.field) ?? memberNode.child(child.fallbackIndex);
+    if ("index" in child)
+        return memberNode.child(child.index);
+    return memberNode.namedChildren[child.namedIndex] ?? memberNode.child(child.namedIndex);
 }
 export function getMemberAccessParts(sup, memberNode) {
-    if (sup.id === "c" || sup.id === "cpp") {
-        if (memberNode.type === "field_expression")
-            return fieldParts(memberNode, "argument", "field");
-        if (memberNode.type === "qualified_identifier")
-            return fieldParts(memberNode, "scope", "name");
-    }
-    if (sup.id === "python") {
-        return fieldParts(memberNode, "object", "attribute");
-    }
-    if (sup.id === "csharp") {
-        return {
-            object: memberNode.child(0),
-            property: memberNode.child(2),
-        };
-    }
-    if (sup.id === "java") {
-        if (memberNode.type === "method_invocation") {
-            return fieldParts(memberNode, "object", "name");
-        }
-        if (memberNode.type === "scoped_identifier" || memberNode.type === "scoped_type_identifier") {
-            return fieldParts(memberNode, "scope", "name");
-        }
-    }
-    if (sup.id === "ruby") {
-        if (memberNode.type === "scope_resolution") {
-            return fieldParts(memberNode, "scope", "name");
-        }
-        return fieldParts(memberNode, "receiver", "method");
-    }
-    if (sup.id === "php") {
-        if (memberNode.type === "member_call_expression" || memberNode.type === "nullsafe_member_call_expression") {
-            return fieldParts(memberNode, "object", "name");
-        }
-        if (memberNode.type === "scoped_call_expression") {
-            return fieldParts(memberNode, "scope", "name");
-        }
-    }
-    if (sup.id === "rust" && memberNode.type === "scoped_identifier") {
-        return fieldParts(memberNode, "path", "name");
-    }
-    if (sup.id === "go" && memberNode.type === "qualified_type") {
-        return {
-            object: memberNode.namedChildren[0] ?? memberNode.child(0),
-            property: memberNode.namedChildren[1] ?? memberNode.child(1),
-        };
-    }
-    if ((sup.id === "kotlin" || sup.id === "swift") && memberNode.type === "navigation_expression") {
-        return {
-            object: memberNode.namedChildren[0] ?? memberNode.child(0),
-            property: getNavigationExpressionProperty(sup, memberNode),
-        };
+    // A shape without `nodeTypes` is the language's catch-all and must be its row's last entry.
+    const shape = MEMBER_ACCESS_ROWS[sup.id]?.memberAccessShapes?.find((candidate) => candidate.nodeTypes === undefined || candidate.nodeTypes.includes(memberNode.type));
+    if (shape) {
+        const property = "navigation" in shape.property
+            ? getNavigationExpressionProperty(sup, memberNode)
+            : shapeChild(memberNode, shape.property);
+        return { object: shapeChild(memberNode, shape.object), property };
     }
     return {
         object: memberNode.childForFieldName("object") ?? memberNode.child(0),
@@ -171,12 +144,18 @@ export function collectMemberAccessChain(args) {
             names.push(unquote(sliceText(propNode, args.source)));
             return;
         }
-        if (propNode.type !== "identifier")
+        let nameNode = propNode;
+        if (args.sup.id === "csharp" && nameNode.type === "generic_name") {
+            nameNode = nameNode.childForFieldName("name") ?? nameNode.namedChildren[0] ?? nameNode;
+        }
+        if (nameNode.type !== "identifier")
             return;
-        const keyName = sliceText(propNode, args.source);
+        const keyName = sliceText(nameNode, args.source);
         const value = args.constStringOf?.get(keyName);
         if (typeof value === "string")
             names.push(value);
+        else if (args.sup.id === "csharp")
+            names.push(keyName);
     };
     while (current && traversalTypes.has(current.type)) {
         if (current.type === "subscript_expression") {
@@ -198,4 +177,70 @@ export function collectMemberAccessChain(args) {
         return null;
     return { base: current, names };
 }
+const RUST_COMMENT_NODE_TYPES = new Set(["line_comment", "block_comment"]);
+/**
+ * Whether a name inside a Rust macro token tree follows a `.` or `::` separator, ignoring comments:
+ * `counter.bump()` with a block comment after the dot is still a member call, and `m::run()` with
+ * one after the `::` is still a path call. Raw
+ * tokens cannot prove such a receiver, so both consumers stay conservative there.
+ */
+export function rustTokenTreeNameFollowsSeparator(name) {
+    const tree = name.parent;
+    if (tree?.type !== "token_tree")
+        return false;
+    let previous = null;
+    for (let index = 0;; index += 1) {
+        const child = tree.child(index);
+        if (!child || child.startIndex >= name.startIndex)
+            break;
+        if (!RUST_COMMENT_NODE_TYPES.has(child.type))
+            previous = child;
+    }
+    return previous?.type === "." || previous?.type === "::";
+}
+/**
+ * Standard Rust macros whose arguments are ordinary expressions (after an optional format string
+ * or target). Any other macro, and every `macro_rules!` definition, takes raw tokens whose meaning
+ * depends on its expansion, so `name(...)` inside them is not a proven call.
+ */
+const RUST_EXPRESSION_ARGUMENT_MACROS = new Set([
+    "assert",
+    "assert_eq",
+    "assert_ne",
+    "debug_assert",
+    "debug_assert_eq",
+    "debug_assert_ne",
+    "dbg",
+    "eprint",
+    "eprintln",
+    "format",
+    "format_args",
+    "panic",
+    "print",
+    "println",
+    "todo",
+    "unimplemented",
+    "unreachable",
+    "vec",
+    "write",
+    "writeln",
+]);
+const RUST_STANDARD_CRATES = new Set(["std", "core", "alloc"]);
+/** Whether a Rust token tree is (nested in) the arguments of a standard expression macro. */
+export function rustTokenTreeHoldsExpressions(tokenTree) {
+    let current = tokenTree;
+    while (current?.type === "token_tree")
+        current = current.parent;
+    if (current?.type !== "macro_invocation")
+        return false;
+    const macro = current.childForFieldName("macro");
+    if (!macro)
+        return false;
+    // `my_dsl::println!` is a custom macro that only shares a name; a path proves a standard macro
+    // only when it is rooted at a standard crate (`std::println!`, `::core::assert!`).
+    const segments = macro.text.replace(/\s+/g, "").replace(/^::/, "").split("::");
+    const name = segments.pop();
+    const standardPath = !segments.length || (segments.length === 1 && RUST_STANDARD_CRATES.has(segments[0]));
+    return standardPath && RUST_EXPRESSION_ARGUMENT_MACROS.has(name);
+}
 //# sourceMappingURL=member-access.js.map