[hvitved]

Summary

Preserve source locations in item expansions of include! calls, so module declarations resolve relative to the included file rather than the include invocation.

Use rust-analyzer's resolved include targets and source spans instead of parsing arguments or treating expansion offsets as source offsets. Cache each included file's location data, and extend QL crate membership and nested module lookup to follow included files.

Add regressions for nested includes, qualified and shadowed macro names, alternate delimiters, comments, trailing commas, computed include paths, crate-root references, exported macros, and derives in included files. Regenerate the affected location expectations.

Fixes #23009.

[Copilot]

🟡 Changes recommended

Incorrect source-range mapping and resolving nested includes relative to the outer file produce wrong locations and can leave modules unresolved or incorrectly resolved.

6 open issues

• Map expansion ranges to the included file's source spans · New
• Resolve nested includes relative to the containing file · New
• Cache per-file location data during extraction · New
• Apply include handling only to the built-in macro · New
• Accept valid include! delimiters, comments, and trailing commas · New
• Include expanded files in crate source-file membership · New

What changed in this PR

This PR updates Rust extraction so item expansions from literal include! calls retain the included file’s location, allowing module declarations to resolve relative to that file rather than the invocation.

Changes:

• Adds included-file context and file-aware location emission to the extractor.
• Adds a regression for calling a function in a module declared by an included tree/mod.rs.
• Updates location expectations and inline path-resolution checks. Computed include paths remain outside scope.

File	Description
rust/​ql/​test/​library-tests/​path-resolution/​path-resolution.expected	Updates expected module and path-resolution results.
rust/​ql/​test/​library-tests/​path-resolution/​main.rs	Adds the include invocation and regression call.
rust/​ql/​test/​library-tests/​path-resolution/​included/​tree/​mod.rs	Declares the included module.
rust/​ql/​test/​library-tests/​path-resolution/​included/​tree/​included_module.rs	Provides the regression’s target function.
rust/​ql/​test/​extractor-tests/​macro-expansion/​test.expected	Updates macro-expansion location expectations.
rust/​ql/​test/​extractor-tests/​macro-expansion/​PrintAst.expected	Updates printed AST locations for included items.
rust/​ql/​test/​extractor-tests/​generated/​MacroItems/​MacroItems.expected	Updates generated MacroItems location expectations.
rust/​ql/​lib/​utils/​test/​PathResolutionInlineExpectationsTest.qll	Excludes unqualified include macro paths from inline checks.
rust/​extractor/​src/​translate/​base.rs	Adds include-file contexts and file-aware location emission.
rust/​extractor/​src/​rust_analyzer.rs	Passes virtual filesystem access into semantic file information.

_{Review effort: Max}

[Copilot]

🟡 Changes recommended

Critical defects in include handling still cause incorrect module and macro resolution, missing or spurious crate membership, and lost control-flow graphs for generated code.

6 open issues

• Map nested macro module spans through their invocation site · New
• Archive and classify OUT_DIR include targets · New
• Allow explicit includes across crate entry-point boundaries · New
• Restrict crate membership to items in the active include expansion · New
• Resolve included modules relative to the include file’s directory · New
• Preserve diagnostics for macros in included files · New

6 resolved since last review

• Resolve nested includes relative to the containing file
• Map expansion ranges to the included file's source spans
• Include expanded files in crate source-file membership
• Accept valid include! delimiters, comments, and trailing commas
• Apply include handling only to the built-in macro
• Cache per-file location data during extraction

_{Review effort: Max}

[Copilot]

🟡 Changes recommended

Included-source handling incorrectly excludes compiled code from quality analysis and can omit generated sibling modules or their source control-flow graphs.

4 open issues

• Schedule generated sibling modules as source inputs · New
• Distinguish included-only files from compilation-skipped files · New
• Preserve argument spans in macros inside included files · New
• Move include-library outside the parent test input tree · New

1 previously missed issue

In code that hasn't changed since last review

Attribute include parse errors to the erroneous source line

rust/​extractor/​src/​translate/​base.rs:596

For a syntax error directly in the included text, this still passes the outer include! call as the diagnostic owner. emit_macro_expansion_parse_errors then maps the expansion's error range through that call, whose syntax belongs to the invoking file, so the warning is attributed to the include site instead of the erroneous included line. Map include-expansion parse errors through expanded.value and add a direct syntax-error case to the diagnostics fixture.

6 resolved since last review

• Resolve included modules relative to the include file’s directory
• Restrict crate membership to items in the active include expansion
• Allow explicit includes across crate entry-point boundaries
• Archive and classify OUT_DIR include targets
• Map nested macro module spans through their invocation site
• Preserve diagnostics for macros in included files

_{Review effort: Max}

[Copilot]

🟡 Changes recommended

Unresolved critical regressions bypass source exclusions, overwrite feature-enabled dependency output, and break initializer data flow and macro shadowing for included code.

6 open issues

• Recursive and included files bypass source exclusions · New
• Dependency fallback overwrites preferred-workspace extraction · New
• Included macro definitions use incorrect expansion order · New
• Include-target initializers lack a control-flow scope · New
• Source deduplication persists across manifest changes · New
• Inactive standalone ASTs inflate missing-expansion statistics · New

4 resolved since last review

• Distinguish included-only files from compilation-skipped files
• Schedule generated sibling modules as source inputs
• Move include-library outside the parent test input tree
• Preserve argument spans in macros inside included files

_{Review effort: Max}

[Copilot]

🟡 Changes recommended

Critical include-handling defects can misresolve nested macros, omit source text for valid include targets, and allow excluded files into source analysis.

6 open issues

• Archive valid include targets omitted by Rust input discovery · New
• Apply path exclusions to source classification steps · New
• Preserve nested include order when resolving shadowed macros · New
• Avoid re-extracting explicitly selected module files · New
• Restrict include filtering to inactive standalone file copies · New
• Assess downstream alert changes with DCA results · New

6 resolved since last review

• Include-target initializers lack a control-flow scope
• Included macro definitions use incorrect expansion order
• Dependency fallback overwrites preferred-workspace extraction
• Recursive and included files bypass source exclusions
• Inactive standalone ASTs inflate missing-expansion statistics
• Source deduplication persists across manifest changes

_{Review effort: Max}