@lzehrung/codegraph 2.3.26 → 2.3.28

package/dist/util/lines.js

@@ -6,4 +6,18 @@ export function collectLineStartOffsets(source) {
     }
     return lineStarts;
 }
+export function positionAtOffset(lineStarts, index) {
+    let low = 0;
+    let high = lineStarts.length - 1;
+    while (low < high) {
+        const middle = Math.ceil((low + high) / 2);
+        if (lineStarts[middle] <= index) {
+            low = middle;
+        }
+        else {
+            high = middle - 1;
+        }
+    }
+    return { line: low + 1, column: index - lineStarts[low] + 1, index };
+}
 //# sourceMappingURL=lines.js.map

package/dist/util/lines.js.map

@@ -1 +1 @@
-{"version":3,"file":"lines.js","sourceRoot":"","sources":["../../src/util/lines.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,uBAAuB,CAAC,MAAc;IACpD,MAAM,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC;IACvB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACtD,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,IAAI;YAAE,UAAU,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;IACzD,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC"}
+{"version":3,"file":"lines.js","sourceRoot":"","sources":["../../src/util/lines.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,uBAAuB,CAAC,MAAc;IACpD,MAAM,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC;IACvB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACtD,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,IAAI;YAAE,UAAU,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;IACzD,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,UAA6B,EAAE,KAAa;IAC3E,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,IAAI,IAAI,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;IACjC,OAAO,GAAG,GAAG,IAAI,EAAE,CAAC;QAClB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC3C,IAAI,UAAU,CAAC,MAAM,CAAE,IAAI,KAAK,EAAE,CAAC;YACjC,GAAG,GAAG,MAAM,CAAC;QACf,CAAC;aAAM,CAAC;YACN,IAAI,GAAG,MAAM,GAAG,CAAC,CAAC;QACpB,CAAC;IACH,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,EAAE,MAAM,EAAE,KAAK,GAAG,UAAU,CAAC,GAAG,CAAE,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC;AACxE,CAAC"}

package/dist/util/resolution/cargo-targets.d.ts

@@ -0,0 +1,8 @@
+export type RustCrateRoots = {
+    /** Existing, resolved, project-confined crate root files. */
+    roots: string[];
+    /** Every candidate path considered, existing or not, for cache revalidation. */
+    probed: string[];
+};
+export declare function rustCrateRootFiles(cargoRoot: string, projectRoot: string): Promise<RustCrateRoots>;
+//# sourceMappingURL=cargo-targets.d.ts.map

package/dist/util/resolution/cargo-targets.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cargo-targets.d.ts","sourceRoot":"","sources":["../../../src/util/resolution/cargo-targets.ts"],"names":[],"mappings":"AAsKA,MAAM,MAAM,cAAc,GAAG;IAC3B,6DAA6D;IAC7D,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,gFAAgF;IAChF,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC;AAEF,wBAAsB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAsCxG"}

package/dist/util/resolution/cargo-targets.js

@@ -0,0 +1,186 @@
+import fsp from "node:fs/promises";
+import path from "node:path";
+import { parse as parseToml } from "smol-toml";
+import { isFilePathWithinRoot } from "../paths.js";
+const AUTO_DISCOVERY_GROUPS = [
+    { flag: "autobins", directory: path.join("src", "bin") },
+    { flag: "autotests", directory: "tests" },
+    { flag: "autoexamples", directory: "examples" },
+    { flag: "autobenches", directory: "benches" },
+];
+function isTomlTable(value) {
+    return value !== null && typeof value === "object" && !Array.isArray(value);
+}
+function tomlTables(value) {
+    if (Array.isArray(value))
+        return value.filter(isTomlTable);
+    return isTomlTable(value) ? [value] : [];
+}
+function tomlString(table, key) {
+    const value = table[key];
+    return typeof value === "string" && value.length > 0 ? value : undefined;
+}
+function packageAutoFlag(parsed, key) {
+    const pkg = isTomlTable(parsed.package) ? parsed.package : undefined;
+    const fromPackage = pkg?.[key];
+    if (typeof fromPackage === "boolean")
+        return fromPackage;
+    const fromRoot = parsed[key];
+    if (typeof fromRoot === "boolean")
+        return fromRoot;
+    return true;
+}
+function packageBuildScriptPath(parsed) {
+    const pkg = isTomlTable(parsed.package) ? parsed.package : undefined;
+    const build = pkg?.build;
+    if (typeof build === "boolean") {
+        if (!build)
+            return null;
+        return "build.rs";
+    }
+    if (typeof build === "string" && build.length)
+        return build;
+    return "build.rs";
+}
+function packageName(parsed) {
+    const pkg = isTomlTable(parsed.package) ? parsed.package : undefined;
+    return pkg ? tomlString(pkg, "name") : undefined;
+}
+function inferredNamedTargetDirectory(kind) {
+    if (kind === "bin")
+        return path.join("src", "bin");
+    if (kind === "example")
+        return "examples";
+    if (kind === "test")
+        return "tests";
+    return "benches";
+}
+function inferredNamedTargetPaths(kind, name, pkgName) {
+    const directory = inferredNamedTargetDirectory(kind);
+    const candidates = [path.join(directory, `${name}.rs`), path.join(directory, name, "main.rs")];
+    if (kind === "bin" && pkgName && name === pkgName) {
+        candidates.push(path.join("src", "main.rs"));
+    }
+    return candidates;
+}
+function explicitTargetPaths(parsed) {
+    const paths = [];
+    const lib = isTomlTable(parsed.lib) ? parsed.lib : undefined;
+    const libPath = lib ? tomlString(lib, "path") : undefined;
+    if (libPath)
+        paths.push(libPath);
+    const pkgName = packageName(parsed);
+    for (const key of ["bin", "example", "test", "bench"]) {
+        for (const target of tomlTables(parsed[key])) {
+            const targetPath = tomlString(target, "path");
+            if (targetPath) {
+                paths.push(targetPath);
+                continue;
+            }
+            const name = tomlString(target, "name");
+            if (!name)
+                continue;
+            paths.push(...inferredNamedTargetPaths(key, name, pkgName));
+        }
+    }
+    return paths;
+}
+async function parseCargoToml(cargoRoot) {
+    try {
+        const raw = await fsp.readFile(path.join(cargoRoot, "Cargo.toml"), "utf8");
+        const parsed = parseToml(raw);
+        return isTomlTable(parsed) ? parsed : null;
+    }
+    catch {
+        return null;
+    }
+}
+async function acceptCrateRoot(candidate, projectRoot, requireRustExtension = false) {
+    const resolved = path.resolve(candidate);
+    if (requireRustExtension && !resolved.endsWith(".rs"))
+        return null;
+    try {
+        const stat = await fsp.stat(resolved);
+        if (!stat.isFile())
+            return null;
+    }
+    catch {
+        return null;
+    }
+    if (!isFilePathWithinRoot(projectRoot, resolved))
+        return null;
+    try {
+        const realRoot = await fsp.realpath(projectRoot);
+        const realCandidate = await fsp.realpath(resolved);
+        if (!isFilePathWithinRoot(realRoot, realCandidate))
+            return null;
+    }
+    catch {
+        return null;
+    }
+    return resolved;
+}
+async function addCrateRoot(roots, probed, candidate, projectRoot, requireRustExtension = false) {
+    const resolved = path.resolve(candidate);
+    probed.add(resolved);
+    const accepted = await acceptCrateRoot(resolved, projectRoot, requireRustExtension);
+    if (accepted)
+        roots.add(accepted);
+}
+async function addAutodiscoveredDirectory(roots, probed, directory, projectRoot) {
+    probed.add(path.resolve(directory));
+    let entries = [];
+    try {
+        entries = await fsp.readdir(directory, { withFileTypes: true });
+    }
+    catch {
+        return;
+    }
+    for (const entry of entries) {
+        if (entry.isDirectory()) {
+            await addCrateRoot(roots, probed, path.join(directory, entry.name, "main.rs"), projectRoot, true);
+            continue;
+        }
+        if (entry.name.endsWith(".rs")) {
+            await addCrateRoot(roots, probed, path.join(directory, entry.name), projectRoot, true);
+        }
+    }
+}
+export async function rustCrateRootFiles(cargoRoot, projectRoot) {
+    const root = path.resolve(cargoRoot);
+    const roots = new Set();
+    const probed = new Set();
+    const parsed = await parseCargoToml(root);
+    if (parsed && !isTomlTable(parsed.package)) {
+        return { roots: [], probed: [] };
+    }
+    if (parsed) {
+        for (const relativePath of explicitTargetPaths(parsed)) {
+            await addCrateRoot(roots, probed, path.resolve(root, relativePath), projectRoot);
+        }
+        const buildScript = packageBuildScriptPath(parsed);
+        if (buildScript) {
+            await addCrateRoot(roots, probed, path.resolve(root, buildScript), projectRoot);
+        }
+        const lib = isTomlTable(parsed.lib) ? parsed.lib : undefined;
+        const libPath = lib ? tomlString(lib, "path") : undefined;
+        if (!libPath && (lib || packageAutoFlag(parsed, "autolib"))) {
+            await addCrateRoot(roots, probed, path.join(root, "src", "lib.rs"), projectRoot);
+        }
+        if (packageAutoFlag(parsed, "autobins")) {
+            await addCrateRoot(roots, probed, path.join(root, "src", "main.rs"), projectRoot);
+        }
+    }
+    else {
+        await addCrateRoot(roots, probed, path.join(root, "build.rs"), projectRoot);
+        await addCrateRoot(roots, probed, path.join(root, "src", "lib.rs"), projectRoot);
+        await addCrateRoot(roots, probed, path.join(root, "src", "main.rs"), projectRoot);
+    }
+    for (const group of AUTO_DISCOVERY_GROUPS) {
+        if (parsed && !packageAutoFlag(parsed, group.flag))
+            continue;
+        await addAutodiscoveredDirectory(roots, probed, path.join(root, group.directory), projectRoot);
+    }
+    return { roots: [...roots], probed: [...probed] };
+}
+//# sourceMappingURL=cargo-targets.js.map

package/dist/util/resolution/cargo-targets.js.map

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

package/dist/util/resolution/rust.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rust.d.ts","sourceRoot":"","sources":["../../../src/util/resolution/rust.ts"],"names":[],"mappings":"AAiHA,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAWzF;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAoB1E;AAED,wBAAgB,mCAAmC,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAGnG;AAWD,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,GAAG,MAAM,EAAE,CAEnG;AAeD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,mBAAmB,CAAC,EAAE,MAAM,GAAG,MAAM,CASjH;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,mBAAmB,CAAC,EAAE,MAAM,EAC5B,UAAU,SAAI,GACb,MAAM,GAAG,SAAS,CAMpB;AA2HD,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,MAAM,EACnB,mBAAmB,CAAC,EAAE,MAAM,GAC3B,MAAM,GAAG,SAAS,CAWpB;AAmRD,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,aAAa,CAAC,EAAE,MAAM,EACtB,mBAAmB,CAAC,EAAE,MAAM,GAC3B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAgDxB"}
+{"version":3,"file":"rust.d.ts","sourceRoot":"","sources":["../../../src/util/resolution/rust.ts"],"names":[],"mappings":"AAmKA,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAWzF;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAoB1E;AAED,wBAAgB,mCAAmC,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAGnG;AAWD,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,MAAM,EAAE,mBAAmB,EAAE,MAAM,GAAG,MAAM,EAAE,CAEnG;AAeD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,mBAAmB,CAAC,EAAE,MAAM,GAAG,MAAM,CASjH;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,MAAM,EACrB,mBAAmB,CAAC,EAAE,MAAM,EAC5B,UAAU,SAAI,GACb,MAAM,GAAG,SAAS,CAMpB;AA8HD,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,MAAM,EACd,UAAU,CAAC,EAAE,MAAM,EACnB,mBAAmB,CAAC,EAAE,MAAM,GAC3B,MAAM,GAAG,SAAS,CAWpB;AAyfD,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,aAAa,CAAC,EAAE,MAAM,EACtB,mBAAmB,CAAC,EAAE,MAAM,GAC3B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAiDxB"}

package/dist/util/resolution/rust.js

@@ -3,12 +3,16 @@ import path from "node:path";
 import { isRustItemStartBoundary, skipRustAttribute, skipRustBalancedDelimiters, skipRustCommentOrLiteral, skipRustCommentsAndWhitespaceBackward, skipRustMacroTokenTree, skipRustOuterAttribute, } from "../../languages/import-statement-parsers.js";
 import { XID_IDENTIFIER_SOURCE } from "../identifiers.js";
 import { lruMapGet, lruMapSet } from "../lru-map.js";
-import { isFilePathWithinRoot } from "../paths.js";
+import { fileIdentityKey, isFilePathWithinRoot } from "../paths.js";
 import { fileExists } from "../workspace.js";
+import { rustCrateRootFiles } from "./cargo-targets.js";
 function isWithinOrEqual(candidate, root) {
     const relative = path.relative(root, candidate);
     return !relative || (!relative.startsWith("..") && !path.isAbsolute(relative));
 }
+function rustPathIdentity(filePath) {
+    return fileIdentityKey(path.resolve(filePath));
+}
 async function findNearestCargoRoot(fromFile, projectRoot) {
     const root = path.resolve(projectRoot);
     let dir = path.dirname(path.resolve(fromFile));
@@ -60,16 +64,31 @@ async function resolveRustModuleParts(baseDir, parts) {
 const RUST_PATH_ATTRIBUTE_PATTERN = /#\s*\[\s*path\s*=\s*(?:r(#*)"([\s\S]*?)"\1|"([^"]*)")\s*\]/gu;
 const RUST_CFG_TEST_ATTRIBUTE_PATTERN = /#\s*\[\s*cfg\s*\(\s*test\s*\)\s*\]/;
 const RUST_VISIBILITY_PATTERN = /^(?:pub(?:\s*\([^)]*\))?\s+)/;
-const RUST_MOD_NAME_PATTERN = new RegExp(String.raw `^mod\s+(${XID_IDENTIFIER_SOURCE})`, "u");
+const RUST_MOD_NAME_PATTERN = new RegExp(String.raw `^mod\s+(?:r#)?(${XID_IDENTIFIER_SOURCE})`, "u");
 const MAX_RUST_PATH_ATTRIBUTE_CACHE_ENTRIES = 256;
+const MAX_RUST_MODULE_TREE_CACHE_ENTRIES = 256;
+const MAX_RUST_MODULE_TREE_FILES = 4096;
+const MAX_RUST_MODULE_TREE_DEPTH = 32;
+const MISSING_PATH_SIGNATURE = "missing";
+/**
+ * A cached module tree is re-checked against its recorded stat signatures at most once per
+ * interval. Every reachable file and every probed path contributes a signature, so validating on
+ * each lookup would cost one stat per crate file per resolved `super` specifier. The window bounds
+ * that to one sweep per interval; a source edit is therefore observed within the interval rather
+ * than on the next lookup.
+ */
+const RUST_MODULE_TREE_REVALIDATE_INTERVAL_MS = 100;
 const EMPTY_RUST_MODULE_SCOPE = {
     pathAttributes: new Map(),
     inlineModules: new Map(),
+    declaredModules: [],
 };
 const rustPathAttributeCache = new Map();
 const rustPathAttributeInflight = new Map();
+const rustModuleTreeCache = new Map();
+const rustModuleTreeInflight = new Map();
 function createRustModuleScope() {
-    return { pathAttributes: new Map(), inlineModules: new Map() };
+    return { pathAttributes: new Map(), inlineModules: new Map(), declaredModules: [] };
 }
 function pathAttributeFromAttributeBlock(attributes) {
     let last;
@@ -246,6 +265,9 @@ function scanRustModuleScope(source, start, end, scope) {
                 if (!testOnly && pathValue && !scope.pathAttributes.has(moduleName)) {
                     scope.pathAttributes.set(moduleName, pathValue);
                 }
+                if (!testOnly) {
+                    scope.declaredModules.push({ name: moduleName, pathValue });
+                }
                 index = cursor + 1;
                 continue;
             }
@@ -289,9 +311,21 @@ export function extractRustModPathAttribute(source, moduleName, statementStartIn
         return undefined;
     return extractRustModPathAttributeScopes(source).pathAttributes.get(moduleName);
 }
-async function isExistingAttributedPathInsideProject(projectRoot, attributedPath) {
-    if (!(await fileExists(attributedPath)))
-        return false;
+async function isExistingAttributedPathInsideProject(projectRoot, attributedPath, knownStat) {
+    if (knownStat !== undefined) {
+        if (knownStat === null || !knownStat.isFile())
+            return false;
+    }
+    else {
+        try {
+            const stat = await fsp.stat(attributedPath);
+            if (!stat.isFile())
+                return false;
+        }
+        catch {
+            return false;
+        }
+    }
     if (!isFilePathWithinRoot(projectRoot, attributedPath))
         return false;
     try {
@@ -306,6 +340,27 @@ async function isExistingAttributedPathInsideProject(projectRoot, attributedPath
 function rustPathAttributeSignature(stat) {
     return `${stat.size}:${stat.mtimeMs}`;
 }
+async function currentPathSignature(target) {
+    try {
+        const stat = await fsp.stat(target);
+        return rustPathAttributeSignature(stat);
+    }
+    catch {
+        return MISSING_PATH_SIGNATURE;
+    }
+}
+async function recordPathStat(target, signatures) {
+    const resolved = path.resolve(target);
+    try {
+        const stat = await fsp.stat(resolved);
+        signatures.set(resolved, rustPathAttributeSignature(stat));
+        return stat;
+    }
+    catch {
+        signatures.set(resolved, MISSING_PATH_SIGNATURE);
+        return null;
+    }
+}
 async function loadRustPathAttributeScope(file) {
     const resolved = path.resolve(file);
     let signature;
@@ -349,6 +404,153 @@ function rustChildModuleDir(parentFile) {
         return dir;
     return path.join(dir, stem);
 }
+async function resolveDeclaredConventionalModule(projectRoot, currentModuleDir, name, signatures) {
+    for (const candidate of rustModuleCandidates(currentModuleDir, [name])) {
+        const resolved = path.resolve(candidate);
+        const stat = await recordPathStat(resolved, signatures);
+        if (!stat?.isFile())
+            continue;
+        if (await isExistingAttributedPathInsideProject(projectRoot, resolved, stat))
+            return resolved;
+        return null;
+    }
+    return null;
+}
+function addAttributedOwner(ownerSets, target, owner) {
+    const targetKey = rustPathIdentity(target);
+    let set = ownerSets.get(targetKey);
+    if (!set) {
+        set = new Map();
+        ownerSets.set(targetKey, set);
+    }
+    const parentFile = path.resolve(owner.parentFile);
+    const parentModuleDir = path.resolve(owner.parentModuleDir);
+    set.set(`${rustPathIdentity(parentFile)}\0${rustPathIdentity(parentModuleDir)}`, {
+        parentFile,
+        parentModuleDir,
+    });
+}
+async function rustModuleTreeSignaturesMatch(tree) {
+    const entries = [...tree.signatures];
+    const actual = await Promise.all(entries.map(([filePath]) => currentPathSignature(filePath)));
+    for (let i = 0; i < entries.length; i += 1) {
+        if (actual[i] !== entries[i]?.[1])
+            return false;
+    }
+    return true;
+}
+async function buildRustModuleTree(cargoRoot, projectRoot) {
+    const signatures = new Map();
+    const reachable = new Set();
+    const ownerSets = new Map();
+    let truncated = false;
+    await recordPathStat(path.join(cargoRoot, "Cargo.toml"), signatures);
+    for (const relative of ["src", path.join("src", "bin"), "tests", "examples", "benches"]) {
+        await recordPathStat(path.join(cargoRoot, relative), signatures);
+    }
+    const crateRoots = await rustCrateRootFiles(cargoRoot, projectRoot);
+    const crateRootSet = new Set(crateRoots.roots.map((file) => rustPathIdentity(file)));
+    for (const candidate of crateRoots.probed) {
+        await recordPathStat(candidate, signatures);
+    }
+    const walkFile = async (file, depth) => {
+        if (truncated)
+            return;
+        if (depth > MAX_RUST_MODULE_TREE_DEPTH) {
+            truncated = true;
+            return;
+        }
+        const resolved = path.resolve(file);
+        const identity = rustPathIdentity(resolved);
+        if (reachable.has(identity))
+            return;
+        const stat = await recordPathStat(resolved, signatures);
+        if (!(await isExistingAttributedPathInsideProject(projectRoot, resolved, stat)))
+            return;
+        if (reachable.size >= MAX_RUST_MODULE_TREE_FILES) {
+            truncated = true;
+            return;
+        }
+        reachable.add(identity);
+        const scope = await loadRustPathAttributeScope(resolved);
+        const moduleDir = crateRootSet.has(identity) ? path.dirname(resolved) : rustChildModuleDir(resolved);
+        await walkScope(scope, resolved, moduleDir, path.dirname(resolved), depth);
+    };
+    const walkScope = async (scope, currentFile, currentModuleDir, attributeDirectory, depth) => {
+        if (truncated)
+            return;
+        if (depth > MAX_RUST_MODULE_TREE_DEPTH) {
+            truncated = true;
+            return;
+        }
+        for (const { name, pathValue } of scope.declaredModules) {
+            if (truncated)
+                return;
+            let target = null;
+            if (pathValue !== undefined) {
+                const attributedPath = path.resolve(attributeDirectory, pathValue);
+                const attributedStat = await recordPathStat(attributedPath, signatures);
+                if (await isExistingAttributedPathInsideProject(projectRoot, attributedPath, attributedStat)) {
+                    target = path.resolve(attributedPath);
+                    addAttributedOwner(ownerSets, target, { parentFile: currentFile, parentModuleDir: currentModuleDir });
+                }
+            }
+            else {
+                target = await resolveDeclaredConventionalModule(projectRoot, currentModuleDir, name, signatures);
+            }
+            if (target)
+                await walkFile(target, depth + 1);
+        }
+        for (const [name, child] of scope.inlineModules) {
+            if (truncated)
+                return;
+            const nextDir = path.resolve(currentModuleDir, child.inlineLocation?.directory ?? name);
+            await walkScope(child, currentFile, nextDir, nextDir, depth + 1);
+        }
+    };
+    for (const crateRoot of crateRoots.roots) {
+        await walkFile(crateRoot, 0);
+    }
+    const owners = new Map();
+    for (const [target, set] of ownerSets) {
+        owners.set(target, [...set.values()]);
+    }
+    return { signatures, truncated, reachable, owners, validatedAt: Date.now() };
+}
+async function getRustModuleTree(cargoRoot, projectRoot) {
+    const resolvedCargoRoot = path.resolve(cargoRoot);
+    const resolvedProjectRoot = path.resolve(projectRoot);
+    const key = `${rustPathIdentity(resolvedCargoRoot)}\0${rustPathIdentity(resolvedProjectRoot)}`;
+    const cached = lruMapGet(rustModuleTreeCache, key);
+    if (cached && Date.now() - cached.validatedAt < RUST_MODULE_TREE_REVALIDATE_INTERVAL_MS) {
+        return cached;
+    }
+    const inflight = rustModuleTreeInflight.get(key);
+    if (inflight)
+        return await inflight;
+    const pending = (async () => {
+        try {
+            const existing = lruMapGet(rustModuleTreeCache, key);
+            if (existing) {
+                if (Date.now() - existing.validatedAt < RUST_MODULE_TREE_REVALIDATE_INTERVAL_MS) {
+                    return existing;
+                }
+                if (await rustModuleTreeSignaturesMatch(existing)) {
+                    existing.validatedAt = Date.now();
+                    return existing;
+                }
+            }
+            const tree = await buildRustModuleTree(resolvedCargoRoot, resolvedProjectRoot);
+            lruMapSet(rustModuleTreeCache, key, tree, MAX_RUST_MODULE_TREE_CACHE_ENTRIES);
+            return tree;
+        }
+        finally {
+            rustModuleTreeInflight.delete(key);
+        }
+    })();
+    rustModuleTreeInflight.set(key, pending);
+    return await pending;
+}
 async function rustDeclaringFileCandidates(fromFile, sourceRoot) {
     const files = [];
     const seen = new Set();
@@ -424,37 +626,66 @@ async function findAttributedDeclarationParent(projectRoot, declaringFile, targe
     const scope = await loadRustPathAttributeScope(declaringFile);
     return walk(scope, path.resolve(declaringFile), rustChildModuleDir(declaringFile), path.dirname(declaringFile));
 }
-async function findPathAttributeParent(projectRoot, fromFile, sourceRoot) {
+async function findPathAttributeParent(projectRoot, fromFile, sourceRoot, cargoRoot) {
+    if (cargoRoot) {
+        const tree = await getRustModuleTree(cargoRoot, projectRoot);
+        if (!tree.truncated) {
+            const fromKey = rustPathIdentity(fromFile);
+            const owners = tree.owners.get(fromKey) ?? [];
+            if (owners.length === 1) {
+                const owner = owners[0];
+                if (owner)
+                    return { status: "resolved", parent: owner };
+            }
+            if (owners.length > 1)
+                return { status: "ambiguous" };
+            if (tree.reachable.has(fromKey))
+                return { status: "unresolved" };
+        }
+    }
     const candidates = await rustDeclaringFileCandidates(fromFile, sourceRoot);
     for (const candidate of candidates) {
         const found = await findAttributedDeclarationParent(projectRoot, candidate, fromFile);
         if (found)
-            return found;
+            return { status: "resolved", parent: found };
     }
-    return null;
+    return { status: "unresolved" };
 }
-async function rustSuperModuleContext(projectRoot, fromFile, sourceRoot) {
-    const attributed = await findPathAttributeParent(projectRoot, fromFile, sourceRoot);
-    if (attributed)
-        return attributed;
+async function rustSuperModuleContext(projectRoot, fromFile, sourceRoot, cargoRoot) {
+    const attributed = await findPathAttributeParent(projectRoot, fromFile, sourceRoot, cargoRoot);
+    if (attributed.status === "ambiguous")
+        return { status: "ambiguous" };
+    if (attributed.status === "resolved") {
+        return {
+            status: "resolved",
+            parentFile: attributed.parent.parentFile,
+            parentModuleDir: attributed.parent.parentModuleDir,
+        };
+    }
     const currentDir = path.dirname(fromFile);
     const parentModuleDir = parentRustModuleDir(fromFile, currentDir);
-    return { parentFile: await resolveRustModuleParts(parentModuleDir, []), parentModuleDir };
+    return {
+        status: "resolved",
+        parentFile: await resolveRustModuleParts(parentModuleDir, []),
+        parentModuleDir,
+    };
 }
-async function declaringFileForSpecifierHead(projectRoot, fromFile, sourceRoot, head) {
+async function declaringFileForSpecifierHead(projectRoot, fromFile, sourceRoot, cargoRoot, head) {
     if (head === "*")
-        return null;
+        return { status: "resolved", file: null };
     if (head === "crate") {
-        return resolveRustModuleParts(sourceRoot, []);
+        return { status: "resolved", file: await resolveRustModuleParts(sourceRoot, []) };
     }
     if (head === "self") {
-        return path.resolve(fromFile);
+        return { status: "resolved", file: path.resolve(fromFile) };
     }
     if (head === "super") {
-        const context = await rustSuperModuleContext(projectRoot, fromFile, sourceRoot);
-        return context.parentFile;
+        const context = await rustSuperModuleContext(projectRoot, fromFile, sourceRoot, cargoRoot);
+        if (context.status === "ambiguous")
+            return { status: "ambiguous" };
+        return { status: "resolved", file: context.parentFile };
     }
-    return path.resolve(fromFile);
+    return { status: "resolved", file: path.resolve(fromFile) };
 }
 function rustScopeAtDirectory(scope, fromDir, toDir) {
     const relative = path.relative(fromDir, toDir);
@@ -469,19 +700,24 @@ function rustScopeAtDirectory(scope, fromDir, toDir) {
     }
     return current;
 }
-async function resolveAttributedRustModulePath(projectRoot, fromFile, parts, sourceRoot) {
+async function resolveAttributedRustModulePath(projectRoot, fromFile, parts, sourceRoot, cargoRoot) {
     const head = parts[0];
     if (!head)
         return undefined;
     let startFile;
     let startModuleDir;
     if (head === "super") {
-        const context = await rustSuperModuleContext(projectRoot, fromFile, sourceRoot);
+        const context = await rustSuperModuleContext(projectRoot, fromFile, sourceRoot, cargoRoot);
+        if (context.status === "ambiguous")
+            return null;
         startFile = context.parentFile;
         startModuleDir = context.parentModuleDir;
     }
     else {
-        startFile = await declaringFileForSpecifierHead(projectRoot, fromFile, sourceRoot, head);
+        const declaring = await declaringFileForSpecifierHead(projectRoot, fromFile, sourceRoot, cargoRoot, head);
+        if (declaring.status === "ambiguous")
+            return null;
+        startFile = declaring.file;
     }
     if (!startFile)
         return undefined;
@@ -572,7 +808,7 @@ export async function resolveRustImportPath(projectRoot, fromFile, spec, pathAtt
     }
     const cargoRoot = await findNearestCargoRoot(fromFile, projectRoot);
     const sourceRoot = crateSourceRoot(cargoRoot, projectRoot);
-    const walked = await resolveAttributedRustModulePath(projectRoot, fromFile, parts, sourceRoot);
+    const walked = await resolveAttributedRustModulePath(projectRoot, fromFile, parts, sourceRoot, cargoRoot);
     if (walked !== undefined)
         return walked;
     const currentDir = path.dirname(fromFile);
@@ -587,7 +823,9 @@ export async function resolveRustImportPath(projectRoot, fromFile, spec, pathAtt
         return resolveRustModuleParts(currentDir, tail);
     }
     if (head === "super") {
-        const context = await rustSuperModuleContext(projectRoot, fromFile, sourceRoot);
+        const context = await rustSuperModuleContext(projectRoot, fromFile, sourceRoot, cargoRoot);
+        if (context.status === "ambiguous")
+            return null;
         if (!tail.length)
             return context.parentFile;
         return resolveRustModuleParts(context.parentModuleDir, tail);