@zzzen/pyright-internal 1.2.0-dev.20260809 → 1.2.0-dev.20260823

package/dist/typeServer/protocol/tspSupplemental.js

@@ -11,7 +11,7 @@ exports.TspSupplemental = void 0;
  * These notifications are NOT part of the base TSP (defined in typeServerProtocol.ts),
  * which is shared by all TSP implementers (e.g., ty-tsp). This file defines
  * Pyright-only extensions that require Pyright-specific knowledge (e.g., the
- * VirtualFileOverlayFileSystem in PylanceFileSystem).
+ * virtual-file overlay in PylanceFileSystem).
  *
  * All the types in this file should be JSON serializable, as they are sent over the wire.
  */
@@ -25,7 +25,7 @@ var TspSupplemental;
      *
      * This is used by the Django stub generation feature: Pylance's Rust sidecar writes
      * merged virtual `.py` files to disk, and this notification tells the type server's
-     * VirtualFileOverlayFileSystem to redirect reads so Pyright analyzes the virtual content.
+     * virtual-file overlay to redirect reads so Pyright analyzes the virtual content.
      */
     let SetVirtualFileRedirectNotification;
     (function (SetVirtualFileRedirectNotification) {

package/dist/typeServer/server.d.ts

@@ -1,10 +1,12 @@
-import { CancellationToken, Connection } from 'vscode-languageserver';
+import { CancellationToken, Connection, Diagnostic } from 'vscode-languageserver';
 import { CodeActionParams, DidOpenTextDocumentParams, DocumentDiagnosticParams, ExecuteCommandParams, InitializeParams, InitializeResult } from 'vscode-languageserver-protocol';
 import { CodeAction, Command } from 'vscode-languageserver-types';
 import { ImportResolver } from '../analyzer/importResolver';
 import { IPythonMode } from '../analyzer/sourceFile';
 import { IBackgroundAnalysis } from '../backgroundAnalysisBase';
 import { ConfigOptions } from '../common/configOptions';
+import { Diagnostic as AnalyzerDiagnostic } from '../common/diagnostic';
+import { ReadOnlyFileSystem } from '../common/fileSystem';
 import { Host } from '../common/host';
 import { ServerOptions, ServerSettings } from '../common/languageServerInterface';
 import { ProgressReporter } from '../common/progressReporter';
@@ -12,11 +14,13 @@ import { ServiceProvider } from '../common/serviceProvider';
 import { Uri } from '../common/uri/uri';
 import { LanguageServerBase } from '../languageServerBase';
 import { Workspace } from '../workspaceFactory';
+import { NotebookDocumentHandler } from './notebookDocumentHandler';
+import { NotebookUriMapper } from './notebookUriMapper';
 export declare class TypeServer extends LanguageServerBase {
     private readonly _handleToUriMap;
     private _initializedComplete;
     private _globalTypeCache;
-    private _notebookManager;
+    protected notebookManager: NotebookDocumentHandler | undefined;
     private readonly _uriMapper;
     constructor(serverOptions: ServerOptions, connection: Connection);
     dispose(): void;
@@ -33,11 +37,18 @@ export declare class TypeServer extends LanguageServerBase {
     protected executeCommand(params: ExecuteCommandParams, token: CancellationToken): Promise<any>;
     protected setupConnection(supportedCommands: string[], supportedCodeActions: string[]): void;
     protected initialize(params: InitializeParams, supportedCommands: string[], supportedCodeActions: string[]): Promise<InitializeResult>;
+    /**
+     * Factory for the notebook document handler. Split out so subclasses (e.g. Pylance) can
+     * substitute a handler that layers in product-specific behavior (such as startup commands)
+     * without duplicating the initialize()/notebook-capability wiring.
+     */
+    protected createNotebookManager(uriMapper: NotebookUriMapper): NotebookDocumentHandler;
     protected convertLspUriStringToUri(lspUri: string): Uri;
     protected onInitialized(): void;
     protected onWorkspaceCreated(workspace: Workspace): void;
     protected onDidOpenTextDocument(params: DidOpenTextDocumentParams, ipythonMode?: IPythonMode): Promise<void>;
     protected onDiagnostics(params: DocumentDiagnosticParams, token: CancellationToken): Promise<import("vscode-languageserver").RelatedFullDocumentDiagnosticReport>;
+    protected convertDiagnostic(diag: AnalyzerDiagnostic, fs: ReadOnlyFileSystem, supportsUnnecessaryDiagnosticTag: boolean, supportsTaskItemDiagnosticTag: boolean): Diagnostic | undefined;
     private _getStringValues;
     private _getParserOutput;
     private _getWorkspaceForUri;

package/dist/typeServer/server.js

@@ -18,12 +18,11 @@
  * Feature notes:
  *   - Telemetry and profiling are intentionally omitted (Pyright has no telemetry).
  *   - Notebook support and the virtual-file-redirect supplemental are layered in by later
- *     phases; the seams (`_notebookManager`, overlay file system) are left in place.
+ *     phases; the seams (`notebookManager`, overlay file system) are left in place.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypeServer = void 0;
 const vscode_languageserver_1 = require("vscode-languageserver");
-const analyzerNodeInfo_1 = require("../analyzer/analyzerNodeInfo");
 const backgroundAnalysisProgram_1 = require("../analyzer/backgroundAnalysisProgram");
 const importResolver_1 = require("../analyzer/importResolver");
 const pythonPathUtils_1 = require("../analyzer/pythonPathUtils");
@@ -66,8 +65,8 @@ class TypeServer extends languageServerBase_1.LanguageServerBase {
         // If this is a notebook cell and no python path was passed in, use the last known
         // python path for the containing notebook so cells resolve to the workspace with the
         // matching pythonPath.
-        if (notebookUriMapper_1.NotebookUriMapper.isNotebookCell(fileUri) && this._notebookManager) {
-            const notebookData = await this._notebookManager.getNotebookDataForCell(fileUri);
+        if (notebookUriMapper_1.NotebookUriMapper.isNotebookCell(fileUri) && this.notebookManager) {
+            const notebookData = await this.notebookManager.getNotebookDataForCell(fileUri);
             if (pythonPath === undefined) {
                 pythonPath = notebookData?.pythonPath;
             }
@@ -79,8 +78,8 @@ class TypeServer extends languageServerBase_1.LanguageServerBase {
     }
     async getContainingWorkspacesForFile(fileUri) {
         // If this is a notebook cell we should wait for the notebook to open first.
-        if (notebookUriMapper_1.NotebookUriMapper.isNotebookCell(fileUri) && this._notebookManager) {
-            await this._notebookManager.getNotebookDataForCell(fileUri);
+        if (notebookUriMapper_1.NotebookUriMapper.isNotebookCell(fileUri) && this.notebookManager) {
+            await this.notebookManager.getNotebookDataForCell(fileUri);
             // Map the vscode-notebook-cell: URI to its file-scheme equivalent so the workspace
             // factory can match it against workspace root URIs.
             fileUri = this._uriMapper.getMappedCellUri(fileUri);
@@ -156,9 +155,9 @@ class TypeServer extends languageServerBase_1.LanguageServerBase {
                 serverSettings.autoSearchPaths = !!pythonAnalysisSection.autoSearchPaths;
                 const extraPaths = pythonAnalysisSection.extraPaths;
                 if (extraPaths && Array.isArray(extraPaths) && extraPaths.length > 0) {
-                    serverSettings.extraPaths = extraPaths
+                    serverSettings.extraPathFileSpecs = extraPaths
                         .filter((p) => p && (0, core_1.isString)(p))
-                        .map((p) => (0, envVarUtils_1.resolvePathWithEnvVariables)(workspace, p, workspaces))
+                        .map((p) => (0, envVarUtils_1.resolvePathStringWithEnvVariables)(workspace, p, workspaces))
                         .filter(core_1.isDefined);
                 }
                 serverSettings.includeFileSpecs = this._getStringValues(pythonAnalysisSection.include);
@@ -291,36 +290,43 @@ class TypeServer extends languageServerBase_1.LanguageServerBase {
         this.connection.onNotification(tspSupplemental_1.TspSupplemental.RemoveVirtualFileRedirectNotification.type, (params) => this._onRemoveVirtualFileRedirect(params));
         // Register raw notification handlers for notebook documents. These are registered here
         // (before connection.listen()) so they're ready when the connection starts processing
-        // messages. `_notebookManager` is created in `initialize()` (not here) because SWC's
+        // messages. `notebookManager` is created in `initialize()` (not here) because SWC's
         // TC39 class-field semantics would reinitialize it to undefined after the base class
         // constructor returns; `initialize()` runs before any notifications arrive.
         this.connection.onNotification('notebookDocument/didOpen', (params) => {
-            this._notebookManager?.onDidOpenNotebookDocument(params);
+            this.notebookManager?.onDidOpenNotebookDocument(params);
         });
         this.connection.onNotification('notebookDocument/didChange', (params) => {
-            this._notebookManager?.onDidChangeNotebookDocument(params);
+            this.notebookManager?.onDidChangeNotebookDocument(params);
         });
         this.connection.onNotification('notebookDocument/didClose', (params) => {
-            this._notebookManager?.onDidCloseNotebookDocument(params);
+            this.notebookManager?.onDidCloseNotebookDocument(params);
         });
     }
     async initialize(params, supportedCommands, supportedCodeActions) {
         // Create the notebook manager here (not in setupConnection) because SWC's TC39
-        // class-field semantics reinitialize `_notebookManager` to undefined after the base
+        // class-field semantics reinitialize `notebookManager` to undefined after the base
         // class constructor returns. This method runs when the Initialize request is processed,
         // which is before any notifications arrive. The manager is only created when a notebook
         // URI mapper is registered in the service provider (notebook support is otherwise off).
         if (this._uriMapper && this._uriMapper instanceof notebookUriMapper_1.NotebookUriMapper) {
-            const uriMapper = this._uriMapper;
-            this._notebookManager = new notebookDocumentHandler_1.NotebookDocumentHandler(uriMapper, this.caseSensitiveDetector, this.console, (fileUri) => this.workspaceFactory.getWorkspaceForFile(fileUri, undefined));
+            this.notebookManager = this.createNotebookManager(this._uriMapper);
         }
         const result = await super.initialize(params, supportedCommands, supportedCodeActions);
         // Advertise notebook support so the client sends notebookDocument/* notifications.
-        if (this._notebookManager) {
+        if (this.notebookManager) {
             result.capabilities.notebookDocumentSync = notebookCellChain_1.AnyNotebookDocumentSelector;
         }
         return result;
     }
+    /**
+     * Factory for the notebook document handler. Split out so subclasses (e.g. Pylance) can
+     * substitute a handler that layers in product-specific behavior (such as startup commands)
+     * without duplicating the initialize()/notebook-capability wiring.
+     */
+    createNotebookManager(uriMapper) {
+        return new notebookDocumentHandler_1.NotebookDocumentHandler(uriMapper, this.caseSensitiveDetector, this.console, (fileUri) => this.workspaceFactory.getWorkspaceForFile(fileUri, undefined));
+    }
     convertLspUriStringToUri(lspUri) {
         // Do our own conversion of the LSP URI string to a Uri so notebook cells map to their
         // file-scheme equivalent.
@@ -397,7 +403,7 @@ class TypeServer extends languageServerBase_1.LanguageServerBase {
                 // receive the actual client capabilities, but a foreground server relays
                 // these diagnostics directly and the original client does support them.
                 const lspDiagnostics = serverDiagnostics
-                    .map((d) => (0, diagnosticUtils_1.convertFromPyrightDiagnostic)(d, workspace.service.fs, 
+                    .map((d) => this.convertDiagnostic(d, workspace.service.fs, 
                 /* supportsUnnecessaryDiagnosticTag */ true, 
                 /* supportsTaskItemDiagnosticTag */ true))
                     .filter((d) => d !== undefined);
@@ -419,6 +425,12 @@ class TypeServer extends languageServerBase_1.LanguageServerBase {
         }
         return result;
     }
+    // Converts a single analyzer diagnostic to an LSP diagnostic. Subclasses (e.g. Pylance) can
+    // override to add product-specific tagging (such as VS task-item tags/rank) without
+    // reimplementing the pull-diagnostics flow in `onDiagnostics`.
+    convertDiagnostic(diag, fs, supportsUnnecessaryDiagnosticTag, supportsTaskItemDiagnosticTag) {
+        return (0, diagnosticUtils_1.convertFromPyrightDiagnostic)(diag, fs, supportsUnnecessaryDiagnosticTag, supportsTaskItemDiagnosticTag);
+    }
     _getStringValues(values) {
         if (!values || !Array.isArray(values) || values.length === 0) {
             return [];
@@ -494,8 +506,9 @@ class TypeServer extends languageServerBase_1.LanguageServerBase {
             return undefined;
         }
         let pythonVersion = program.configOptions.getDefaultExecEnvironment().pythonVersion;
-        if (!(0, typeEvalUtils_1.isDeclaration)(input)) {
-            const fileInfo = (0, analyzerNodeInfo_1.getFileInfo)(input);
+        const node = (0, typeEvalUtils_1.isDeclaration)(input) ? input.node : input;
+        if (node) {
+            const fileInfo = program.symbolLookup.getFileInfo(node);
             pythonVersion = fileInfo.executionEnvironment.pythonVersion;
         }
         return program.run((p) => {
@@ -534,12 +547,12 @@ class TypeServer extends languageServerBase_1.LanguageServerBase {
     }
     _onSetVirtualFileRedirect(params) {
         const fs = this.fs;
-        if (!typeServerFileSystem_1.TypeServerFileSystem.is(fs)) {
+        if (!typeServerFileSystem_1.TypeServerVirtualFileRedirects.is(fs)) {
             return;
         }
         const realUri = this.convertLspUriStringToUri(params.realUri);
         const virtualUri = this.convertLspUriStringToUri(params.virtualUri);
-        fs.virtualOverlay.addFileRedirect(realUri, virtualUri);
+        fs.addVirtualFileRedirect(realUri, virtualUri);
         // If the file is currently open, read the virtual content and update Pyright's in-memory
         // buffer. For closed files, the FS overlay redirect is sufficient — Pyright reads from
         // the FS.
@@ -564,11 +577,11 @@ class TypeServer extends languageServerBase_1.LanguageServerBase {
     }
     _onRemoveVirtualFileRedirect(params) {
         const fs = this.fs;
-        if (!typeServerFileSystem_1.TypeServerFileSystem.is(fs)) {
+        if (!typeServerFileSystem_1.TypeServerVirtualFileRedirects.is(fs)) {
             return;
         }
         const realUri = this.convertLspUriStringToUri(params.realUri);
-        fs.virtualOverlay.removeFileRedirect(realUri);
+        fs.removeVirtualFileRedirect(realUri);
         // If the file is currently open, restore from the open document's original text
         // (authoritative), not from disk which may differ. For closed files, just removing the
         // redirect is enough.

package/dist/typeServer/server.js.map

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

package/dist/typeServer/typeCache.d.ts

@@ -1,14 +1,15 @@
+import { AnalyzerNodeInfoReader } from '../analyzer/analyzerNodeInfo';
 import { Type } from '../analyzer/types';
 import { FileSystem } from '../common/fileSystem';
 import { ServiceProvider } from '../common/serviceProvider';
 import { Uri } from '../common/uri/uri';
-import { ParseNode } from '../parser/parseNodes';
+import { ParseNode, ParseTreeKey } from '../parser/parseNodes';
 import { ParserOutput } from '../parser/parser';
 import { Event } from './eventEmitter';
 import { INotebookUriMapper } from './notebookUriMapper';
 export interface ITypeCache {
     snapshot: number;
-    getUri(node: ParseNode): Uri;
+    getUri(node: ParseNode, nodeInfo: AnalyzerNodeInfoReader, getActiveUri?: (key: ParseTreeKey) => Uri | undefined): Uri;
     isCaseSensitive(uri: string): boolean;
     snapshotChanged: Event<number>;
     incrementSnapshot(): number;
@@ -16,16 +17,19 @@ export interface ITypeCache {
 export declare class TypeCache implements ITypeCache {
     private readonly _serviceProvider;
     private readonly _getParserOutput;
+    private readonly _getSourceUris?;
     private _snapshot;
     private _snapshotEmitter;
-    constructor(_serviceProvider: ServiceProvider, _getParserOutput: (uri: Uri) => ParserOutput | undefined);
+    private _parseTreeUris;
+    constructor(_serviceProvider: ServiceProvider, _getParserOutput: (uri: Uri) => ParserOutput | undefined, _getSourceUris?: (() => Iterable<Uri>) | undefined);
     get snapshot(): number;
     get snapshotChanged(): Event<number>;
     get fs(): FileSystem;
     get uriMapper(): INotebookUriMapper | undefined;
     getTypeName(type: Type): string;
-    getUri(node: ParseNode): Uri;
+    getUri(node: ParseNode, nodeInfo: AnalyzerNodeInfoReader, getActiveUri?: (key: ParseTreeKey) => Uri | undefined): Uri;
     getParserOutput(uri: Uri): ParserOutput | undefined;
     isCaseSensitive(uri: string): boolean;
     incrementSnapshot(): number;
+    private _populateParseTreeUris;
 }

package/dist/typeServer/typeCache.js

@@ -9,11 +9,13 @@ const uri_1 = require("../common/uri/uri");
 const eventEmitter_1 = require("./eventEmitter");
 const typeServerServiceKeys_1 = require("./typeServerServiceKeys");
 class TypeCache {
-    constructor(_serviceProvider, _getParserOutput) {
+    constructor(_serviceProvider, _getParserOutput, _getSourceUris) {
         this._serviceProvider = _serviceProvider;
         this._getParserOutput = _getParserOutput;
+        this._getSourceUris = _getSourceUris;
         this._snapshot = 0; // Make sure to start out as a valid snapshot.
         this._snapshotEmitter = eventEmitter_1.EventEmitter.create();
+        this._parseTreeUris = new WeakMap();
     }
     get snapshot() {
         return this._snapshot;
@@ -33,12 +35,31 @@ class TypeCache {
         }
         return 'unknown';
     }
-    getUri(node) {
-        (0, debug_1.assert)((0, analyzerNodeInfo_1.getFileInfo)(node), 'Node must have file info');
-        return (0, analyzerNodeInfo_1.getFileInfo)(node)?.fileUri ?? uri_1.Uri.file('', this._serviceProvider);
+    getUri(node, nodeInfo, getActiveUri) {
+        const fileInfo = (0, analyzerNodeInfo_1.getFileInfo)(node, nodeInfo);
+        if (fileInfo) {
+            return fileInfo.fileUri;
+        }
+        // A caller can need the URI to bind the file that will provide file info.
+        let uri = getActiveUri?.(node.a);
+        if (uri) {
+            this._parseTreeUris.set(node.a, uri);
+            return uri;
+        }
+        uri = this._parseTreeUris.get(node.a);
+        if (!uri) {
+            this._populateParseTreeUris();
+            uri = this._parseTreeUris.get(node.a);
+        }
+        (0, debug_1.assert)(uri, 'Node must have file info');
+        return uri ?? uri_1.Uri.file('', this._serviceProvider);
     }
     getParserOutput(uri) {
-        return this._getParserOutput(uri);
+        const parserOutput = this._getParserOutput(uri);
+        if (parserOutput) {
+            this._parseTreeUris.set(parserOutput.parseTree.a, uri);
+        }
+        return parserOutput;
     }
     isCaseSensitive(uri) {
         return this._serviceProvider.get(serviceKeys_1.ServiceKeys.caseSensitivityDetector).isCaseSensitive(uri);
@@ -49,6 +70,13 @@ class TypeCache {
         this._snapshotEmitter.fire(this._snapshot);
         return this._snapshot;
     }
+    _populateParseTreeUris() {
+        if (this._getSourceUris) {
+            for (const uri of this._getSourceUris()) {
+                this.getParserOutput(uri);
+            }
+        }
+    }
 }
 exports.TypeCache = TypeCache;
 //# sourceMappingURL=typeCache.js.map

package/dist/typeServer/typeCache.js.map

@@ -1 +1 @@
-{"version":3,"file":"typeCache.js","sourceRoot":"","sources":["../../../../../src/typeServer/typeCache.ts"],"names":[],"mappings":";;;AAAA,mEAA2D;AAC3D,6CAAyE;AACzE,2CAAyC;AAEzC,uDAAoD;AAEpD,2CAAwC;AAIxC,iDAAqD;AAErD,mEAAgE;AAUhE,MAAa,SAAS;IAIlB,YACqB,gBAAiC,EACjC,gBAAwD;QADxD,qBAAgB,GAAhB,gBAAgB,CAAiB;QACjC,qBAAgB,GAAhB,gBAAgB,CAAwC;QALrE,cAAS,GAAW,CAAC,CAAC,CAAC,8CAA8C;QACrE,qBAAgB,GAAG,2BAAY,CAAC,MAAM,EAAU,CAAC;IAKtD,CAAC;IAEJ,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IACD,IAAI,eAAe;QACf,OAAO,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC;IACvC,CAAC;IACD,IAAI,EAAE;QACF,OAAO,IAAI,CAAC,gBAAgB,CAAC,EAAE,EAAE,CAAC;IACtC,CAAC;IACD,IAAI,SAAS;QACT,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,6CAAqB,CAAC,SAAS,CAAC,CAAC;IACzE,CAAC;IACD,WAAW,CAAC,IAAU;QAClB,IAAI,IAAA,eAAO,EAAC,IAAI,CAAC,IAAI,IAAA,kBAAU,EAAC,IAAI,CAAC,IAAI,IAAA,iBAAS,EAAC,IAAI,CAAC,EAAE,CAAC;YACvD,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;QAC5B,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,MAAM,CAAC,IAAe;QAClB,IAAA,cAAM,EAAC,IAAA,8BAAW,EAAC,IAAI,CAAC,EAAE,0BAA0B,CAAC,CAAC;QACtD,OAAO,IAAA,8BAAW,EAAC,IAAI,CAAC,EAAE,OAAO,IAAI,SAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC7E,CAAC;IAED,eAAe,CAAC,GAAQ;QACpB,OAAO,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IACtC,CAAC;IACD,eAAe,CAAC,GAAW;QACvB,OAAO,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,yBAAW,CAAC,uBAAuB,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;IAC/F,CAAC;IAED,iBAAiB;QACb,oGAAoG;QACpG,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC3C,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;CACJ;AA7CD,8BA6CC"}
+{"version":3,"file":"typeCache.js","sourceRoot":"","sources":["../../../../../src/typeServer/typeCache.ts"],"names":[],"mappings":"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"}

package/dist/typeServer/typeEvalUtils.d.ts

@@ -1,3 +1,4 @@
+import { AnalyzerNodeInfoReader } from '../analyzer/analyzerNodeInfo';
 import { Declaration } from '../analyzer/declaration';
 import { TypeEvaluator } from '../analyzer/typeEvaluatorTypes';
 import { ClassType, Type } from '../analyzer/types';
@@ -8,6 +9,6 @@ export declare function forEach<T>(array: T[] | undefined, callbackfn: (value: T
 export declare function map<T, U>(array: T[], callbackfn: (value: T, index: number, array: T[]) => U, thisArg?: any): U[];
 export declare function filter<T>(array: T[], predicate: (value: T, index: number, array: T[]) => boolean, thisArg?: any): T[];
 export declare function isDeclaration(decl: any): decl is Declaration;
-export declare function getSymbolFromScope(node: ParseNode, name: string): import("../analyzer/symbol").Symbol | undefined;
+export declare function getSymbolFromScope(node: ParseNode, name: string, nodeInfo: AnalyzerNodeInfoReader): import("../analyzer/symbol").Symbol | undefined;
 export declare function getEffectiveTypeOfDeclaration(evaluator: TypeEvaluator | undefined, decl: Declaration): Type | undefined;
 export declare function getSymbolTable(classType: ClassType): import("../analyzer/symbol").SymbolTable;

package/dist/typeServer/typeEvalUtils.js

@@ -7,6 +7,7 @@ exports.isDeclaration = isDeclaration;
 exports.getSymbolFromScope = getSymbolFromScope;
 exports.getEffectiveTypeOfDeclaration = getEffectiveTypeOfDeclaration;
 exports.getSymbolTable = getSymbolTable;
+const analyzerNodeInfo_1 = require("../analyzer/analyzerNodeInfo");
 const scopeUtils_1 = require("../analyzer/scopeUtils");
 const core_1 = require("../common/core");
 const typeServerConversionTypes_1 = require("./typeServerConversionTypes");
@@ -48,10 +49,10 @@ function filter(array, predicate, thisArg) {
 function isDeclaration(decl) {
     return decl && decl.type !== undefined && decl.uri !== undefined;
 }
-function getSymbolFromScope(node, name) {
+function getSymbolFromScope(node, name, nodeInfo) {
     // use name node for parameter to get the correct scope
     const nodeForScope = node.nodeType === 41 /* ParseNodeType.Parameter */ ? node.d.name ?? node : node;
-    const scope = (0, scopeUtils_1.getScopeForNode)(nodeForScope);
+    const scope = (0, scopeUtils_1.getScopeForNode)(nodeForScope, nodeInfo);
     if (!scope) {
         return undefined;
     }
@@ -69,7 +70,10 @@ function getEffectiveTypeOfDeclaration(evaluator, decl) {
     if (symbolName === undefined) {
         return undefined;
     }
-    const symbol = getSymbolFromScope(decl.node, symbolName);
+    if (!evaluator) {
+        return undefined;
+    }
+    const symbol = getSymbolFromScope(decl.node, symbolName, (0, analyzerNodeInfo_1.getInfoReader)(evaluator));
     if (!symbol) {
         return undefined;
     }

package/dist/typeServer/typeEvalUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"typeEvalUtils.js","sourceRoot":"","sources":["../../../../../src/typeServer/typeEvalUtils.ts"],"names":[],"mappings":";;AAwBA,0BAuBC;AAED,kBAMC;AAED,wBAQC;AAED,sCAEC;AAED,gDASC;AAED,sEAwBC;AAED,wCAKC;AAhHD,uDAAyD;AAGzD,yCAAuC;AAGvC,2EAA2E;AAiB3E,SAAgB,OAAO,CACnB,UAAgD,EAChD,UAGqD,EACrD,OAAa;IAEb,IAAI,CAAC,UAAU;QAAE,OAAO;IAExB,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACxC,UAA4D,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;QAC9G,CAAC;IACL,CAAC;SAAM,IAAI,IAAA,YAAK,EAAC,UAAU,CAAC,EAAE,CAAC;QAC3B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,UAAU,EAAE,CAAC;YACnC,UAAyD,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;QACrG,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,KAAK,MAAM,KAAK,IAAI,UAAU,EAAE,CAAC;YAC5B,UAAyD,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;QACvG,CAAC;IACL,CAAC;AACL,CAAC;AAED,SAAgB,GAAG,CAAO,KAAU,EAAE,UAAsD,EAAE,OAAa;IACvG,MAAM,MAAM,GAAQ,EAAE,CAAC;IACvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACpC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;IAC9D,CAAC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAgB,MAAM,CAAI,KAAU,EAAE,SAA2D,EAAE,OAAa;IAC5G,MAAM,MAAM,GAAQ,EAAE,CAAC;IACvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACpC,IAAI,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC;YAC9C,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1B,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAgB,aAAa,CAAC,IAAS;IACnC,OAAO,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,GAAG,KAAK,SAAS,CAAC;AACrE,CAAC;AAED,SAAgB,kBAAkB,CAAC,IAAe,EAAE,IAAY;IAC5D,uDAAuD;IACvD,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,qCAA4B,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5F,MAAM,KAAK,GAAG,IAAA,4BAAe,EAAC,YAAY,CAAC,CAAC;IAC5C,IAAI,CAAC,KAAK,EAAE,CAAC;QACT,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;AACpC,CAAC;AAED,SAAgB,6BAA6B,CACzC,SAAoC,EACpC,IAAiB;IAEjB,MAAM,IAAI,GAAG,SAAS,EAAE,qBAAqB,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC;IAC1D,IAAI,IAAI,EAAE,CAAC;QACP,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QACb,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,UAAU,GAAG,IAAA,wDAA4B,EAAC,IAAI,CAAC,CAAC;IACtD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,MAAM,GAAG,kBAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IACzD,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO,SAAS,EAAE,4BAA4B,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AACjE,CAAC;AAED,SAAgB,cAAc,CAAC,SAAoB;IAC/C,2FAA2F;IAC3F,SAAS,CAAC,MAAM,CAAC,yBAAyB,EAAE,EAAE,CAAC;IAE/C,OAAO,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC;AACnC,CAAC"}
+{"version":3,"file":"typeEvalUtils.js","sourceRoot":"","sources":["../../../../../src/typeServer/typeEvalUtils.ts"],"names":[],"mappings":"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"}

package/dist/typeServer/typeServerFileSystem.d.ts

@@ -5,19 +5,20 @@ import { FileWatcher, FileWatcherEventHandler } from '../common/fileWatcher';
 import { Uri } from '../common/uri/uri';
 import { IPyrightFileSystem } from '../pyrightFileSystem';
 import { INotebookUriMapper } from './notebookUriMapper';
-import { VirtualFileOverlayFileSystem } from './virtualFileOverlayFileSystem';
-export declare class TypeServerFileSystem implements IPyrightFileSystem {
+export interface TypeServerVirtualFileRedirects {
+    addVirtualFileRedirect(realUri: Uri, virtualUri: Uri): Disposable;
+    removeVirtualFileRedirect(realUri: Uri): void;
+}
+export declare namespace TypeServerVirtualFileRedirects {
+    function is(fileSystem: FileSystem): fileSystem is FileSystem & TypeServerVirtualFileRedirects;
+}
+export declare class TypeServerFileSystem implements IPyrightFileSystem, TypeServerVirtualFileRedirects {
     private readonly _uriMapper?;
     private readonly _fs;
     private readonly _virtualOverlay;
     constructor(realFileSystem: FileSystem, _uriMapper?: INotebookUriMapper | undefined);
-    /**
-     * Returns the virtual file overlay layer. The server's virtual-file-redirect handlers use
-     * this to add/remove per-file redirects that transparently redirect read operations to
-     * alternate on-disk locations.
-     */
-    get virtualOverlay(): VirtualFileOverlayFileSystem;
-    static is(obj: any): obj is TypeServerFileSystem;
+    addVirtualFileRedirect(realUri: Uri, virtualUri: Uri): Disposable;
+    removeVirtualFileRedirect(realUri: Uri): void;
     mkdirSync(uri: Uri, options?: MkDirOptions): void;
     writeFileSync(uri: Uri, data: string | Buffer, encoding: BufferEncoding | null): void;
     unlinkSync(uri: Uri): void;

package/dist/typeServer/typeServerFileSystem.js

@@ -7,18 +7,27 @@
  * The file system used by the Pyright type server. It wraps the real file system in a
  * VirtualFileOverlayFileSystem so that individual files can be transparently redirected to
  * alternate on-disk locations (e.g. merged Django stubs produced by an external client), and
- * exposes that overlay via the `virtualOverlay` getter so the server's virtual-file-redirect
- * handlers (TspSupplemental) can register and remove redirects.
+ * exposes redirect controls so the server's virtual-file-redirect handlers (TspSupplemental)
+ * can register and remove redirects without depending on this concrete wrapper.
  *
  * This is the Pyright-native counterpart to Pylance's `PylanceFileSystem`. Notebook cell URI
  * mapping is optional here (supplied in the notebook phase); when no mapper is provided the
  * notebook branches simply delegate to the underlying file system.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TypeServerFileSystem = void 0;
+exports.TypeServerFileSystem = exports.TypeServerVirtualFileRedirects = void 0;
 const pyrightFileSystem_1 = require("../pyrightFileSystem");
 const notebookUriMapper_1 = require("./notebookUriMapper");
 const virtualFileOverlayFileSystem_1 = require("./virtualFileOverlayFileSystem");
+var TypeServerVirtualFileRedirects;
+(function (TypeServerVirtualFileRedirects) {
+    function is(fileSystem) {
+        const candidate = fileSystem;
+        return (typeof candidate.addVirtualFileRedirect === 'function' &&
+            typeof candidate.removeVirtualFileRedirect === 'function');
+    }
+    TypeServerVirtualFileRedirects.is = is;
+})(TypeServerVirtualFileRedirects || (exports.TypeServerVirtualFileRedirects = TypeServerVirtualFileRedirects = {}));
 class TypeServerFileSystem {
     constructor(realFileSystem, _uriMapper) {
         this._uriMapper = _uriMapper;
@@ -29,16 +38,11 @@ class TypeServerFileSystem {
         this._virtualOverlay = new virtualFileOverlayFileSystem_1.VirtualFileOverlayFileSystem(realFileSystem);
         this._fs = new pyrightFileSystem_1.PyrightFileSystem(this._virtualOverlay);
     }
-    /**
-     * Returns the virtual file overlay layer. The server's virtual-file-redirect handlers use
-     * this to add/remove per-file redirects that transparently redirect read operations to
-     * alternate on-disk locations.
-     */
-    get virtualOverlay() {
-        return this._virtualOverlay;
+    addVirtualFileRedirect(realUri, virtualUri) {
+        return this._virtualOverlay.addFileRedirect(realUri, virtualUri);
     }
-    static is(obj) {
-        return obj instanceof TypeServerFileSystem;
+    removeVirtualFileRedirect(realUri) {
+        this._virtualOverlay.removeFileRedirect(realUri);
     }
     mkdirSync(uri, options) {
         return this._fs.mkdirSync(uri, options);

package/dist/typeServer/typeServerFileSystem.js.map

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