fix(extraction): C# record-struct kind fidelity + bodiless positional records (#831 follow-up) (#838)
The shipped grammar parses every record form as record_declaration (no record_struct_declaration node), so 'record struct' mis-kinded as class. classifyClassNode now distinguishes the value-type form by its struct keyword child, and extractStruct accepts bodiless positional records (the no-body gate is for C/C++ forward declarations) instead of crashing mid-file on them. Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 4.8
parent
ed117ef90b
commit
2c7bbd5387
@@ -38,6 +38,7 @@ and adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
- New `codegraph upgrade` command updates CodeGraph to the latest release in place — it detects how you installed (the standalone `install.sh` / `install.ps1` bundle, npm, or npx) and does the right thing for each, on macOS, Linux, and Windows. Use `codegraph upgrade --check` to see whether an update is available without installing, or `codegraph upgrade <version>` to move to a specific version. After upgrading it reminds you to re-index your projects so they pick up the newer engine's improvements. (#679)
|
||||
- `codegraph status` now flags when a project's index was built by an older engine than the one you're running and recommends re-indexing (also surfaced in `codegraph status --json`), so you know when a `codegraph index -f` or `codegraph sync` will add coverage a newer release introduced.
|
||||
- Cross-file impact and blast-radius coverage now spans **all 22 supported languages and 14 web frameworks**, each validated on a real-world repo — see the new coverage table in the README. This release ships the cross-file resolution behind it, including Lua and Luau `require`, Shopify OS 2.0 Liquid section templates, Delphi form code-behind, Rust cross-module calls and Rocket route macros, Swift Fluent relationships, and the SvelteKit / Nuxt / Vapor / Axum route conventions. The residual everywhere is genuine static-analysis frontiers (runtime dispatch, reflection / DI, framework-convention entry points), never hidden.
|
||||
- C# `record struct` and `readonly record struct` declarations now index with the correct `struct` kind, and positional one-liner records (`public record struct Money(decimal Amount);`) index reliably in every form — previously a bodiless value-type record could be skipped entirely and could halt extraction of the declarations following it in the same file. (#831) (C#)
|
||||
- C# types are now tracked by their namespace-qualified name. Same-named types in different namespaces — a domain entity and a DTO both called `CatalogBrand`, say — are told apart instead of collapsing into one arbitrary match, so a reference resolves to the right one and impact no longer conflates them. (C#)
|
||||
- ASP.NET Razor (`.cshtml`) and Blazor (`.razor`) markup are now parsed for code relationships. A `@model` / `@inherits` / `@inject` directive links the view to the C# view-model, base type, or service it names; a Blazor `<MyComponent/>` tag (plus `@typeof(...)` and generic `TItem="..."` arguments) links to the component class; and the C# inside `@code { }` / `@functions { }` / `@{ }` blocks is analyzed too, so services and types used in component logic are linked. A view-model, component, or service referenced only from markup is no longer reported as having no dependents, and editing it surfaces the views that use it. (ASP.NET, Blazor)
|
||||
- A Razor/Blazor type reference now resolves through the component's `@using` namespaces — including the folder's cascading `_Imports.razor` — so a simple name that exists in several namespaces lands on the right one. A `@model` / `<MyComponent>` / `@code` reference to `CatalogBrand` resolves to the `@using`'d DTO (`BlazorShared.Models.CatalogBrand`) rather than a same-named domain entity. (ASP.NET, Blazor)
|
||||
|
||||
@@ -1150,6 +1150,40 @@ public class OrderService
|
||||
expect(classNode?.visibility).toBe('public');
|
||||
});
|
||||
|
||||
it('indexes every record form with the right kind (#831)', () => {
|
||||
// The grammar parses ALL record forms as record_declaration — there is no
|
||||
// record_struct_declaration node — so the value-type forms are told apart
|
||||
// by their `struct` keyword child. Positional one-liners have no body
|
||||
// block and must still index (the no-body gate is for C/C++ forward
|
||||
// declarations, not records).
|
||||
const code = `
|
||||
namespace Fixture;
|
||||
|
||||
public record SimplePositional(int A);
|
||||
public record WithBody(int A) { public int DoubleIt() => A * 2; }
|
||||
public record class ExplicitClassRec(string Name);
|
||||
public record struct ValueRec(int X);
|
||||
public readonly record struct ReadonlyRec(int X, int Y);
|
||||
public record DerivedRec(int A, string B) : SimplePositional(A);
|
||||
public record GenericRec<T>(T Value);
|
||||
public partial record PartialRec(int A);
|
||||
`;
|
||||
const result = extractFromSource('Records.cs', code);
|
||||
const kindOf = (name: string) => result.nodes.find((n) => n.name === name)?.kind;
|
||||
|
||||
expect(kindOf('SimplePositional')).toBe('class');
|
||||
expect(kindOf('WithBody')).toBe('class');
|
||||
expect(kindOf('ExplicitClassRec')).toBe('class');
|
||||
expect(kindOf('DerivedRec')).toBe('class');
|
||||
expect(kindOf('GenericRec')).toBe('class');
|
||||
expect(kindOf('PartialRec')).toBe('class');
|
||||
// Value-type records are structs, not classes.
|
||||
expect(kindOf('ValueRec')).toBe('struct');
|
||||
expect(kindOf('ReadonlyRec')).toBe('struct');
|
||||
// Members of a bodied record still extract.
|
||||
expect(kindOf('DoubleIt')).toBe('method');
|
||||
});
|
||||
|
||||
it('indexes primary-constructor classes, including keyed-DI attribute params (#237)', () => {
|
||||
// C# 12 primary constructors (`class Foo(IDep dep) { … }`) are parsed
|
||||
// natively by the vendored tree-sitter-c-sharp 0.23.x grammar. The worst
|
||||
|
||||
@@ -56,13 +56,24 @@ export const csharpExtractor: LanguageExtractor = {
|
||||
preParse: blankCsharpPreprocessorDirectives,
|
||||
functionTypes: [],
|
||||
// Records are first-class type declarations in modern C# (DTOs, value objects,
|
||||
// MediatR/CQRS messages). `record` / `record class` parse as record_declaration
|
||||
// (reference type → class); `record struct` as record_struct_declaration (value
|
||||
// type → struct). Without these, references to a record never resolve (#237).
|
||||
// MediatR/CQRS messages). Without these, references to a record never resolve
|
||||
// (#237). The shipped grammar parses EVERY record form as record_declaration —
|
||||
// `record struct` / `readonly record struct` included (it has no
|
||||
// record_struct_declaration node; that structTypes entry is forward-compat
|
||||
// only) — so classifyClassNode tells the value-type form apart by its
|
||||
// `struct` keyword child. (#831 follow-up)
|
||||
classTypes: ['class_declaration', 'record_declaration'],
|
||||
methodTypes: ['method_declaration', 'constructor_declaration'],
|
||||
interfaceTypes: ['interface_declaration'],
|
||||
structTypes: ['struct_declaration', 'record_struct_declaration'],
|
||||
classifyClassNode: (node) => {
|
||||
if (node.type === 'record_declaration') {
|
||||
for (let i = 0; i < node.childCount; i++) {
|
||||
if (node.child(i)?.type === 'struct') return 'struct';
|
||||
}
|
||||
}
|
||||
return 'class';
|
||||
},
|
||||
enumTypes: ['enum_declaration'],
|
||||
enumMemberTypes: ['enum_member_declaration'],
|
||||
typeAliasTypes: [],
|
||||
|
||||
@@ -1238,8 +1238,10 @@ export class TreeSitterExtractor {
|
||||
if (!this.extractor) return;
|
||||
|
||||
// Skip forward declarations and type references (no body = not a definition)
|
||||
// — EXCEPT C# positional records (`record struct M(decimal Amount);`),
|
||||
// complete definitions with no body block. (#831)
|
||||
const body = getChildByField(node, this.extractor.bodyField);
|
||||
if (!body) return;
|
||||
if (!body && node.type !== 'record_declaration') return;
|
||||
|
||||
const name = extractName(node, this.source, this.extractor);
|
||||
const docstring = getPrecedingDocstring(node, this.source);
|
||||
@@ -1260,15 +1262,18 @@ export class TreeSitterExtractor {
|
||||
// `record struct M(decimal Amount)` which the grammar nests here).
|
||||
this.extractCsharpPrimaryCtorParamRefs(node, structNode.id);
|
||||
|
||||
// Push to stack for field extraction
|
||||
this.nodeStack.push(structNode.id);
|
||||
for (let i = 0; i < body.namedChildCount; i++) {
|
||||
const child = body.namedChild(i);
|
||||
if (child) {
|
||||
this.visitNode(child);
|
||||
// Push to stack for field extraction (bodiless positional records have
|
||||
// no members to visit)
|
||||
if (body) {
|
||||
this.nodeStack.push(structNode.id);
|
||||
for (let i = 0; i < body.namedChildCount; i++) {
|
||||
const child = body.namedChild(i);
|
||||
if (child) {
|
||||
this.visitNode(child);
|
||||
}
|
||||
}
|
||||
this.nodeStack.pop();
|
||||
}
|
||||
this.nodeStack.pop();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user