@zzzen/pyright-internal 1.2.0-dev.20260222 → 1.2.0-dev.20260422

package/dist/analyzer/cellChainIndex.d.ts

@@ -0,0 +1,34 @@
+import { Uri } from '../common/uri/uri';
+import { ModuleNode } from '../parser/parseNodes';
+import { SourceFileInfo } from './sourceFileInfo';
+/** Read-only provider surface for consumers that only need later-cell lookups. */
+export interface CellChainIndexProvider {
+    getLaterModuleNodes(fileUri: Uri): Iterable<ModuleNode> | undefined;
+}
+export declare class CellChainIndex implements CellChainIndexProvider {
+    private readonly _getSourceFileList;
+    private readonly _getSourceFileInfo;
+    private _tailMap;
+    constructor(_getSourceFileList: () => readonly SourceFileInfo[], _getSourceFileInfo: (uri: Uri) => SourceFileInfo | undefined);
+    /** Mark the cached tail map as stale. Call when cell chains are mutated. */
+    invalidate(): void;
+    /**
+     * Return an iterable of module nodes from cells *later* in the
+     * chain than `fileUri`. Returns `undefined` when there are no
+     * later cells (or when the file is not a CellDocs cell).
+     */
+    getLaterModuleNodes(fileUri: Uri): Iterable<ModuleNode> | undefined;
+    /**
+     * Return `[sourceFileInfo, ...laterFiles]` for the chain that
+     * `sourceFileInfo` belongs to. Used by Program's dependent-file
+     * checker logic.
+     */
+    getCellChainFiles(sourceFileInfo: SourceFileInfo): SourceFileInfo[];
+    private _ensureTailMap;
+    private _buildTailMap;
+    /**
+     * Walk backward from `chainTail` to `sourceFileInfo`, collecting
+     * every cell in between (in forward order, excluding `sourceFileInfo`).
+     */
+    private _getLaterCellChainFiles;
+}

package/dist/analyzer/cellChainIndex.js

@@ -0,0 +1,126 @@
+"use strict";
+/*
+ * cellChainIndex.ts
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT license.
+ *
+ * Maintains a lazily-built index that maps each CellDocs cell
+ * to the tail of its chain, enabling efficient forward-cell
+ * lookups for notebook inter-cell symbol resolution.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CellChainIndex = void 0;
+const sourceFile_1 = require("./sourceFile");
+class CellChainIndex {
+    constructor(_getSourceFileList, _getSourceFileInfo) {
+        this._getSourceFileList = _getSourceFileList;
+        this._getSourceFileInfo = _getSourceFileInfo;
+    }
+    /** Mark the cached tail map as stale. Call when cell chains are mutated. */
+    invalidate() {
+        this._tailMap = undefined;
+    }
+    /**
+     * Return an iterable of module nodes from cells *later* in the
+     * chain than `fileUri`. Returns `undefined` when there are no
+     * later cells (or when the file is not a CellDocs cell).
+     */
+    getLaterModuleNodes(fileUri) {
+        const sourceFileInfo = this._getSourceFileInfo(fileUri);
+        if (!sourceFileInfo || sourceFileInfo.ipythonMode !== sourceFile_1.IPythonMode.CellDocs) {
+            return undefined;
+        }
+        const tailMap = this._ensureTailMap();
+        const chainTail = tailMap.get(fileUri.key);
+        if (!chainTail || chainTail === sourceFileInfo) {
+            return undefined;
+        }
+        const laterFiles = this._getLaterCellChainFiles(sourceFileInfo, chainTail);
+        if (laterFiles.length === 0) {
+            return undefined;
+        }
+        // The later-files list is captured eagerly above; parse trees are
+        // resolved lazily per-yield. Callers consume the iterable synchronously
+        // during a single scope-lookup pass.
+        return (function* () {
+            for (const laterCellFileInfo of laterFiles) {
+                const parseTree = laterCellFileInfo.sourceFile.getParserOutput()?.parseTree;
+                if (parseTree) {
+                    yield parseTree;
+                }
+            }
+        })();
+    }
+    /**
+     * Return `[sourceFileInfo, ...laterFiles]` for the chain that
+     * `sourceFileInfo` belongs to. Used by Program's dependent-file
+     * checker logic.
+     */
+    getCellChainFiles(sourceFileInfo) {
+        const tailMap = this._ensureTailMap();
+        const chainTail = tailMap.get(sourceFileInfo.uri.key);
+        if (!chainTail || chainTail === sourceFileInfo) {
+            return [sourceFileInfo];
+        }
+        return [sourceFileInfo, ...this._getLaterCellChainFiles(sourceFileInfo, chainTail)];
+    }
+    _ensureTailMap() {
+        if (!this._tailMap) {
+            this._tailMap = this._buildTailMap();
+        }
+        return this._tailMap;
+    }
+    // The tail map is rebuilt in O(n) over the source file list on first
+    // access after invalidation. This is acceptable because cell-chain
+    // mutations (open/close/reorder) are infrequent relative to lookups.
+    _buildTailMap() {
+        const tailMap = new Map();
+        const sourceFileList = this._getSourceFileList();
+        // Build a "next-cell-in-chain" reverse map: for each cell that is
+        // chained *to* another cell, record `chainedTo -> chainingCell`.
+        const nextCellInChainMap = new Map();
+        for (const sourceFileInfo of sourceFileList) {
+            if (sourceFileInfo.ipythonMode !== sourceFile_1.IPythonMode.CellDocs ||
+                sourceFileInfo.chainedSourceFile?.ipythonMode !== sourceFile_1.IPythonMode.CellDocs) {
+                continue;
+            }
+            nextCellInChainMap.set(sourceFileInfo.chainedSourceFile.uri.key, sourceFileInfo);
+        }
+        // Walk from each tail (a cell with no next-cell) backwards through
+        // the chain, recording the tail for every cell in that chain.
+        for (const sourceFileInfo of sourceFileList) {
+            if (sourceFileInfo.ipythonMode !== sourceFile_1.IPythonMode.CellDocs || nextCellInChainMap.has(sourceFileInfo.uri.key)) {
+                continue;
+            }
+            let current = sourceFileInfo;
+            while (current && current.ipythonMode === sourceFile_1.IPythonMode.CellDocs) {
+                tailMap.set(current.uri.key, sourceFileInfo);
+                current = current.chainedSourceFile;
+            }
+        }
+        return tailMap;
+    }
+    /**
+     * Walk backward from `chainTail` to `sourceFileInfo`, collecting
+     * every cell in between (in forward order, excluding `sourceFileInfo`).
+     */
+    _getLaterCellChainFiles(sourceFileInfo, chainTail) {
+        // Walk backward from tail to sourceFileInfo, then reverse for forward order.
+        const reversedLaterCellChainFiles = [];
+        let current = chainTail;
+        while (current && current !== sourceFileInfo) {
+            reversedLaterCellChainFiles.push(current);
+            current = current.chainedSourceFile;
+        }
+        if (current !== sourceFileInfo) {
+            return [];
+        }
+        const laterCellChainFiles = [];
+        for (let i = reversedLaterCellChainFiles.length - 1; i >= 0; i--) {
+            laterCellChainFiles.push(reversedLaterCellChainFiles[i]);
+        }
+        return laterCellChainFiles;
+    }
+}
+exports.CellChainIndex = CellChainIndex;
+//# sourceMappingURL=cellChainIndex.js.map

package/dist/analyzer/cellChainIndex.js.map

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

package/dist/analyzer/checker.js

@@ -1550,7 +1550,6 @@ class Checker extends parseTreeWalker_1.ParseTreeWalker {
         }
         const nameWalker = new ParseTreeUtils.NameNodeWalker((nameNode, subscriptIndex, baseExpression) => {
             const nameType = this._evaluator.getType(nameNode);
-            ``;
             if (nameType && (0, types_1.isTypeVar)(nameType) && !types_1.TypeVarType.isSelf(nameType)) {
                 // Does this name refer to a TypeVar that is scoped to this function?
                 if (nameType.priv.scopeId === ParseTreeUtils.getScopeIdForNode(node)) {