@zzzen/pyright-internal 1.2.0-dev.20230430 → 1.2.0-dev.20230514

package/dist/tests/workspaceEditUtils.test.js

@@ -28,6 +28,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const assert = __importStar(require("assert"));
 const vscode_languageserver_types_1 = require("vscode-languageserver-types");
+const vscode_languageserver_1 = require("vscode-languageserver");
+const sourceFile_1 = require("../analyzer/sourceFile");
 const pathUtils_1 = require("../common/pathUtils");
 const workspaceEditUtils_1 = require("../common/workspaceEditUtils");
 const analyzerServiceExecutor_1 = require("../languageService/analyzerServiceExecutor");
@@ -44,7 +46,7 @@ test('test applyWorkspaceEdits changes', async () => {
     const cloned = await getClonedService(state);
     const range = state.getRangeByMarkerName('marker');
     const fileChanged = new Set();
-    (0, workspaceEditUtils_1.applyWorkspaceEdit)(cloned, {
+    applyWorkspaceEditToService(cloned, {
         changes: {
             [(0, pathUtils_1.convertPathToUri)(cloned.fs, range.fileName)]: [
                 {
@@ -57,6 +59,88 @@ test('test applyWorkspaceEdits changes', async () => {
     assert.strictEqual(fileChanged.size, 1);
     assert.strictEqual((_a = cloned.test_program.getSourceFile(range.fileName)) === null || _a === void 0 ? void 0 : _a.getFileContent(), 'Text Changed');
 });
+test('test edit mode for workspace', async () => {
+    const code = `
+// @filename: test.py
+//// [|/*marker*/|]
+            `;
+    const state = (0, testState_1.parseAndGetTestState)(code).state;
+    const range = state.getRangeByMarkerName('marker');
+    const addedFilePath = (0, pathUtils_1.combinePaths)((0, pathUtils_1.getDirectoryPath)(range.fileName), 'test2.py');
+    const edits = await state.workspace.service.runEditMode(async () => {
+        const fileChanged = new Set();
+        applyWorkspaceEditToService(state.workspace.service, {
+            documentChanges: [
+                vscode_languageserver_types_1.TextDocumentEdit.create({
+                    uri: (0, pathUtils_1.convertPathToUri)(state.workspace.service.fs, range.fileName),
+                    version: null,
+                }, [
+                    {
+                        range: state.convertPositionRange(range),
+                        newText: 'import sys',
+                    },
+                ]),
+            ],
+        }, fileChanged);
+        assert.strictEqual(fileChanged.size, 1);
+        const newSourceFile = state.workspace.service.test_program.getSourceFile(range.fileName);
+        state.workspace.service.backgroundAnalysisProgram.analyzeFile(newSourceFile.getFilePath(), vscode_languageserver_1.CancellationToken.None);
+        assert.strictEqual(newSourceFile === null || newSourceFile === void 0 ? void 0 : newSourceFile.getFileContent(), 'import sys');
+        assert.strictEqual(newSourceFile.getImports().length, 2);
+        // Add a new file.
+        state.workspace.service.backgroundAnalysisProgram.program.setFileOpened(addedFilePath, 0, '', {
+            isTracked: true,
+            ipythonMode: sourceFile_1.IPythonMode.None,
+            chainedFilePath: undefined,
+            realFilePath: addedFilePath,
+        });
+        applyWorkspaceEditToService(state.workspace.service, {
+            documentChanges: [
+                vscode_languageserver_types_1.TextDocumentEdit.create({
+                    uri: (0, pathUtils_1.convertPathToUri)(state.workspace.service.fs, addedFilePath),
+                    version: null,
+                }, [
+                    {
+                        range: state.convertPositionRange(range),
+                        newText: 'import sys',
+                    },
+                ]),
+            ],
+        }, fileChanged);
+        applyWorkspaceEditToService(state.workspace.service, {
+            documentChanges: [
+                vscode_languageserver_types_1.TextDocumentEdit.create({
+                    uri: (0, pathUtils_1.convertPathToUri)(state.workspace.service.fs, addedFilePath),
+                    version: null,
+                }, [
+                    {
+                        range: {
+                            start: { line: 0, character: 7 },
+                            end: { line: 0, character: 10 },
+                        },
+                        newText: 'os',
+                    },
+                ]),
+            ],
+        }, fileChanged);
+        const addedSourceFile = state.workspace.service.test_program.getSourceFile(addedFilePath);
+        state.workspace.service.backgroundAnalysisProgram.analyzeFile(addedSourceFile.getFilePath(), vscode_languageserver_1.CancellationToken.None);
+        assert.strictEqual(addedSourceFile === null || addedSourceFile === void 0 ? void 0 : addedSourceFile.getFileContent(), 'import os');
+        assert.strictEqual(addedSourceFile.getImports().length, 2);
+    }, vscode_languageserver_1.CancellationToken.None);
+    // After leaving edit mode, we should be back to where we were.
+    const oldSourceFile = state.workspace.service.test_program.getSourceFile(range.fileName);
+    state.workspace.service.backgroundAnalysisProgram.analyzeFile(oldSourceFile.getFilePath(), vscode_languageserver_1.CancellationToken.None);
+    assert.strictEqual(oldSourceFile === null || oldSourceFile === void 0 ? void 0 : oldSourceFile.getFileContent(), '');
+    assert.strictEqual(oldSourceFile.getImports().length, 1);
+    assert.strictEqual(edits.length, 2);
+    assert.deepStrictEqual(edits[0].replacementText, 'import sys');
+    assert.deepStrictEqual(edits[1].replacementText, 'import os');
+    const addedSourceFile = state.workspace.service.test_program.getSourceFile(addedFilePath);
+    // The added file should be there, but be empty.
+    assert.ok(addedSourceFile);
+    assert.strictEqual(addedSourceFile === null || addedSourceFile === void 0 ? void 0 : addedSourceFile.getFileContent(), '');
+});
 test('test applyWorkspaceEdits documentChanges', async () => {
     var _a;
     const code = `
@@ -67,7 +151,7 @@ test('test applyWorkspaceEdits documentChanges', async () => {
     const cloned = await getClonedService(state);
     const range = state.getRangeByMarkerName('marker');
     const fileChanged = new Set();
-    (0, workspaceEditUtils_1.applyWorkspaceEdit)(cloned, {
+    applyWorkspaceEditToService(cloned, {
         documentChanges: [
             vscode_languageserver_types_1.TextDocumentEdit.create({
                 uri: (0, pathUtils_1.convertPathToUri)(cloned.fs, range.fileName),
@@ -95,7 +179,7 @@ test('test generateWorkspaceEdits', async () => {
     const cloned = await getClonedService(state);
     const range1 = state.getRangeByMarkerName('marker1');
     const fileChanged = new Set();
-    (0, workspaceEditUtils_1.applyWorkspaceEdit)(cloned, {
+    applyWorkspaceEditToService(cloned, {
         changes: {
             [(0, pathUtils_1.convertPathToUri)(cloned.fs, range1.fileName)]: [
                 {
@@ -105,7 +189,7 @@ test('test generateWorkspaceEdits', async () => {
             ],
         },
     }, fileChanged);
-    (0, workspaceEditUtils_1.applyWorkspaceEdit)(cloned, {
+    applyWorkspaceEditToService(cloned, {
         documentChanges: [
             vscode_languageserver_types_1.TextDocumentEdit.create({
                 uri: (0, pathUtils_1.convertPathToUri)(cloned.fs, range1.fileName),
@@ -119,7 +203,7 @@ test('test generateWorkspaceEdits', async () => {
         ],
     }, fileChanged);
     const range2 = state.getRangeByMarkerName('marker2');
-    (0, workspaceEditUtils_1.applyWorkspaceEdit)(cloned, {
+    applyWorkspaceEditToService(cloned, {
         documentChanges: [
             vscode_languageserver_types_1.TextDocumentEdit.create({
                 uri: (0, pathUtils_1.convertPathToUri)(cloned.fs, range2.fileName),
@@ -132,7 +216,7 @@ test('test generateWorkspaceEdits', async () => {
             ]),
         ],
     }, fileChanged);
-    (0, workspaceEditUtils_1.applyWorkspaceEdit)(cloned, {
+    applyWorkspaceEditToService(cloned, {
         changes: {
             [(0, pathUtils_1.convertPathToUri)(cloned.fs, range2.fileName)]: [
                 {
@@ -161,6 +245,11 @@ test('test generateWorkspaceEdits', async () => {
         },
     }, actualEdits);
 });
+function applyWorkspaceEditToService(service, edits, filesChanged) {
+    const view = service.backgroundAnalysisProgram.program;
+    const mutator = service;
+    (0, workspaceEditUtils_1.applyWorkspaceEdit)(view, mutator, edits, filesChanged);
+}
 async function getClonedService(state) {
     return await analyzerServiceExecutor_1.AnalyzerServiceExecutor.cloneService(new testLanguageService_1.TestLanguageService(state.workspace, state.console, state.workspace.service.fs), state.workspace, { useBackgroundAnalysis: false });
 }

package/dist/tests/workspaceEditUtils.test.js.map

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

package/package.json

@@ -2,7 +2,7 @@
   "name": "@zzzen/pyright-internal",
   "displayName": "pyright",
   "description": "Type checker for the Python language",
-  "version": "1.2.0-dev.20230430",
+  "version": "1.2.0-dev.20230514",
   "license": "MIT",
   "private": false,
   "files": [
@@ -16,8 +16,8 @@
   },
   "dependencies": {
     "@iarna/toml": "2.2.5",
-    "@yarnpkg/fslib": "2.10.1",
-    "@yarnpkg/libzip": "2.2.4",
+    "@yarnpkg/fslib": "2.10.3",
+    "@yarnpkg/libzip": "2.3.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
     "command-line-args": "^5.2.1",
@@ -28,7 +28,7 @@
     "typescript-char": "^0.0.0",
     "vscode-jsonrpc": "8.1.0",
     "vscode-languageserver": "8.1.0",
-    "vscode-languageserver-textdocument": "^1.0.9",
+    "vscode-languageserver-textdocument": "^1.0.10",
     "vscode-languageserver-types": "3.17.3",
     "vscode-uri": "^3.0.7"
   },

package/dist/languageService/importAdder.d.ts

@@ -1,40 +0,0 @@
-import { CancellationToken } from 'vscode-languageserver';
-import { Declaration } from '../analyzer/declaration';
-import { ImportResolver } from '../analyzer/importResolver';
-import { ImportNameInfo } from '../analyzer/importStatementUtils';
-import { TypeEvaluator } from '../analyzer/typeEvaluatorTypes';
-import { ConfigOptions } from '../common/configOptions';
-import { TextEditAction } from '../common/editAction';
-import { TextEditTracker } from '../common/textEditTracker';
-import { TextRange } from '../common/textRange';
-import { ExpressionNode, ModuleNode, NameNode } from '../parser/parseNodes';
-import { ParseResults } from '../parser/parser';
-import { ImportFormat } from './autoImporter';
-export interface ImportData {
-    containsUnreferenceableSymbols: boolean;
-    declarations: Map<Declaration, NameNode[]>;
-    importInfos?: {
-        filePath: string;
-        nameInfo: ImportNameInfo;
-    }[];
-}
-export declare class ImportAdder {
-    private _configOptions;
-    private _importResolver;
-    private _evaluator;
-    constructor(_configOptions: ConfigOptions, _importResolver: ImportResolver, _evaluator: TypeEvaluator);
-    collectImportsForSymbolsUsed(root: ParseResults | ModuleNode, ranges: TextRange | TextRange[], token: CancellationToken): ImportData;
-    addImportInfo(importInfo: {
-        filePath: string;
-        nameInfo: ImportNameInfo;
-    }, importData: ImportData): void;
-    addDeclaration(declaration: Declaration, node: ExpressionNode, importData: ImportData): boolean;
-    applyImports(result: ImportData, filePath: string, parseResults: ParseResults, insertionPosition: number, importFormat: ImportFormat, token: CancellationToken): TextEditAction[];
-    applyImportsTo(result: ImportData, parseResults: ParseResults, importFormat: ImportFormat, textEditTracker: TextEditTracker, token: CancellationToken): void;
-    private _getImportNameWithModuleInfo;
-    private _appendImportNameInfo;
-    private _tryProcessExistingImports;
-    private _addOrUpdateImport;
-    private _getImportInfo;
-    private _areSame;
-}

package/dist/languageService/importAdder.js

@@ -1,388 +0,0 @@
-"use strict";
-/*
- * importAdder.ts
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT license.
- *
- * Provides code that figures out imports needed for symbols
- * used in the given range and apply them later.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImportAdder = void 0;
-const analyzerNodeInfo_1 = require("../analyzer/analyzerNodeInfo");
-const declaration_1 = require("../analyzer/declaration");
-const declarationUtils_1 = require("../analyzer/declarationUtils");
-const importStatementUtils_1 = require("../analyzer/importStatementUtils");
-const parseTreeUtils_1 = require("../analyzer/parseTreeUtils");
-const parseTreeWalker_1 = require("../analyzer/parseTreeWalker");
-const scopeUtils_1 = require("../analyzer/scopeUtils");
-const cancellationUtils_1 = require("../common/cancellationUtils");
-const collectionUtils_1 = require("../common/collectionUtils");
-const core_1 = require("../common/core");
-const pathUtils_1 = require("../common/pathUtils");
-const positionUtils_1 = require("../common/positionUtils");
-const textRange_1 = require("../common/textRange");
-class ImportAdder {
-    constructor(_configOptions, _importResolver, _evaluator) {
-        this._configOptions = _configOptions;
-        this._importResolver = _importResolver;
-        this._evaluator = _evaluator;
-    }
-    collectImportsForSymbolsUsed(root, ranges, token) {
-        root = isParseResults(root) ? root.parseTree : root;
-        ranges = (0, core_1.isArray)(ranges) ? ranges : [ranges];
-        const collector = new NameCollector(this._evaluator, root, ranges, token);
-        collector.walk(root);
-        return {
-            containsUnreferenceableSymbols: collector.containsUnreferenceableSymbols,
-            declarations: collector.declsForSymbols,
-        };
-    }
-    addImportInfo(importInfo, importData) {
-        var _a;
-        importData.importInfos = (_a = importData.importInfos) !== null && _a !== void 0 ? _a : [];
-        importData.importInfos.push(importInfo);
-    }
-    addDeclaration(declaration, node, importData) {
-        // We don't need import statement if decl is from builtins or synthesized.
-        if (declaration.moduleName === 'builtins' || declaration.moduleName === '') {
-            return false;
-        }
-        const name = node.nodeType === 38 /* Name */
-            ? node
-            : node.nodeType === 35 /* MemberAccess */
-                ? node.memberName
-                : undefined;
-        if (!name) {
-            return false;
-        }
-        (0, collectionUtils_1.getOrAdd)(importData.declarations, declaration, () => []).push(name);
-        return true;
-    }
-    applyImports(result, filePath, parseResults, insertionPosition, importFormat, token) {
-        (0, cancellationUtils_1.throwIfCancellationRequested)(token);
-        const importStatements = (0, importStatementUtils_1.getTopLevelImports)(parseResults.parseTree);
-        const importNameInfo = this._getImportNameWithModuleInfo(filePath, result, importFormat);
-        const edits = [];
-        const newNameInfo = [];
-        for (const moduleAndInfo of (0, collectionUtils_1.createMapFromItems)(importNameInfo, (i) => i.module.moduleName)) {
-            if (!this._tryProcessExistingImports(moduleAndInfo, importStatements, parseResults, edits)) {
-                (0, collectionUtils_1.appendArray)(newNameInfo, moduleAndInfo[1]);
-                continue;
-            }
-        }
-        edits.push(...(0, importStatementUtils_1.getTextEditsForAutoImportInsertions)(newNameInfo, importStatements, parseResults, (0, positionUtils_1.convertOffsetToPosition)(insertionPosition, parseResults.tokenizerOutput.lines)));
-        return edits;
-    }
-    applyImportsTo(result, parseResults, importFormat, textEditTracker, token) {
-        (0, cancellationUtils_1.throwIfCancellationRequested)(token);
-        const filePath = (0, analyzerNodeInfo_1.getFileInfo)(parseResults.parseTree).filePath;
-        const importStatements = (0, importStatementUtils_1.getTopLevelImports)(parseResults.parseTree);
-        const importNameInfo = this._getImportNameWithModuleInfo(filePath, result, importFormat);
-        const newNameInfo = [];
-        for (const moduleAndInfo of (0, collectionUtils_1.createMapFromItems)(importNameInfo, (i) => i.module.moduleName)) {
-            if (!this._tryProcessExistingImports(moduleAndInfo, importStatements, parseResults, textEditTracker)) {
-                (0, collectionUtils_1.appendArray)(newNameInfo, moduleAndInfo[1]);
-                continue;
-            }
-        }
-        for (const moduleAndInfo of (0, collectionUtils_1.createMapFromItems)(newNameInfo, (i) => i.module.moduleName)) {
-            this._addOrUpdateImport(moduleAndInfo, importStatements, parseResults, moduleAndInfo[1], textEditTracker);
-        }
-    }
-    _getImportNameWithModuleInfo(filePath, result, importFormat) {
-        var _a;
-        const importNameInfo = [];
-        const execEnv = this._configOptions.findExecEnvironment(filePath);
-        for (const decl of (_a = result.declarations.keys()) !== null && _a !== void 0 ? _a : []) {
-            const importInfo = this._getImportInfo(decl, filePath);
-            if (!importInfo || (0, declaration_1.isUnresolvedAliasDeclaration)(decl)) {
-                continue;
-            }
-            this._appendImportNameInfo(filePath, execEnv, importFormat, importInfo, importNameInfo);
-        }
-        if (result.importInfos) {
-            for (const importInfo of result.importInfos) {
-                this._appendImportNameInfo(filePath, execEnv, importFormat, importInfo, importNameInfo);
-            }
-        }
-        return importNameInfo;
-    }
-    _appendImportNameInfo(filePath, execEnv, importFormat, importInfo, importNameInfo) {
-        const relativePath = (0, importStatementUtils_1.getRelativeModuleName)(this._importResolver.fileSystem, filePath, importInfo.filePath);
-        const moduleAndType = this._importResolver.getModuleNameForImport(importInfo.filePath, execEnv);
-        if (!moduleAndType.moduleName) {
-            if (!importInfo.nameInfo.name) {
-                return;
-            }
-            // module can't be addressed by absolute path in "from import" statement.
-            // ex) namespace package at [workspace root] or [workspace root]\__init__.py(i)
-            // use relative path
-            importFormat = "relative" /* Relative */;
-        }
-        (0, collectionUtils_1.addIfUnique)(importNameInfo, {
-            name: importInfo.nameInfo.name,
-            alias: importInfo.nameInfo.alias,
-            module: moduleAndType,
-            nameForImportFrom: importFormat === "relative" /* Relative */ ? relativePath : undefined,
-        }, (a, b) => this._areSame(a, b));
-    }
-    _tryProcessExistingImports(moduleAndInfo, importStatements, parseResults, edits) {
-        for (const kindAndImports of (0, collectionUtils_1.createMapFromItems)(importStatements.orderedImports.filter((i) => i.moduleName === moduleAndInfo[0]), (i) => (i.node.nodeType === 20 /* Import */ ? 'import' : 'importFrom'))) {
-            if (kindAndImports[0] === 'importFrom') {
-                // We can't merge to "from module import *" statement.
-                const imported = kindAndImports[1].filter((i) => i.node.nodeType === 22 /* ImportFrom */ && !i.node.isWildcardImport);
-                if (imported.length === 0) {
-                    // No regular from import statement.
-                    continue;
-                }
-                // get name info that don't exist in any of existing import statements.
-                const info = moduleAndInfo[1].filter((m) => !imported.some((n) => n.node.nodeType === 22 /* ImportFrom */ &&
-                    n.node.imports.some((i) => { var _a; return i.name.value === m.name && ((_a = i.alias) === null || _a === void 0 ? void 0 : _a.value) === m.alias; })));
-                if ((0, core_1.isArray)(edits)) {
-                    (0, collectionUtils_1.appendArray)(edits, (0, importStatementUtils_1.getTextEditsForAutoImportSymbolAddition)(info, imported[0], parseResults));
-                }
-                else {
-                    this._addOrUpdateImport(moduleAndInfo, importStatements, parseResults, info, edits);
-                }
-                return true;
-            }
-            if (kindAndImports[0] === 'import') {
-                // import statement already exists. skip those module info.
-                (0, collectionUtils_1.removeArrayElements)(moduleAndInfo[1], (i) => !i.name && kindAndImports[1].some((n) => { var _a, _b; return i.alias === ((_b = (_a = n.subnode) === null || _a === void 0 ? void 0 : _a.alias) === null || _b === void 0 ? void 0 : _b.value); }));
-                continue;
-            }
-        }
-        return false;
-    }
-    _addOrUpdateImport(moduleAndInfo, importStatements, parseResults, info, editTracker) {
-        if (info.length === 0) {
-            return;
-        }
-        const name = moduleAndInfo[0];
-        const nameForImportFrom = moduleAndInfo[1].length === 0 ? undefined : moduleAndInfo[1][0].nameForImportFrom;
-        const importGroup = moduleAndInfo[1].length === 0
-            ? 2 /* Local */
-            : (0, importStatementUtils_1.getImportGroupFromModuleNameAndType)(moduleAndInfo[1][0].module);
-        editTracker.addOrUpdateImport(parseResults, importStatements, { name, nameForImportFrom }, importGroup, info);
-    }
-    _getImportInfo(decl, destFilePath) {
-        var _a, _b;
-        if ((0, declaration_1.isAliasDeclaration)(decl)) {
-            if (!decl.node) {
-                // This is synthesized decl for implicit module case such as "import a.b"
-                return { filePath: decl.path, nameInfo: {} };
-            }
-            if (decl.node.nodeType === 21 /* ImportAs */) {
-                const importDecl = this._evaluator.getDeclarationsForNameNode(decl.node.module.nameParts[decl.node.module.nameParts.length - 1]);
-                if (!importDecl || importDecl.length === 0) {
-                    // We have no idea where it came from.
-                    // ex) from unknown import unknown
-                    return undefined;
-                }
-                return {
-                    filePath: importDecl[0].path,
-                    nameInfo: { alias: decl.usesLocalName ? (_a = decl.node.alias) === null || _a === void 0 ? void 0 : _a.value : undefined },
-                };
-            }
-            if (decl.node.nodeType === 23 /* ImportFromAs */) {
-                let path = decl.path;
-                if (!path) {
-                    // Check submodule case with no __init__
-                    if (decl.submoduleFallback) {
-                        path = (0, pathUtils_1.getDirectoryPath)(decl.submoduleFallback.path);
-                    }
-                }
-                if (!path) {
-                    // We have no idea where it came from.
-                    // ex) from unknown import unknown
-                    return undefined;
-                }
-                if (path === destFilePath && !decl.usesLocalName && !decl.submoduleFallback) {
-                    // Don't create import for the symbol (not module) defined in the current file
-                    // unless alias is used.
-                    //
-                    // We don't check insertion point since we don't create type alias for decl defined later
-                    // anyway. but in future, we could consider either rewrite or creating type alias for symbols
-                    // defined after insertion point.
-                    return undefined;
-                }
-                return {
-                    filePath: path,
-                    nameInfo: {
-                        name: decl.symbolName,
-                        alias: decl.usesLocalName ? (_b = decl.node.alias) === null || _b === void 0 ? void 0 : _b.value : undefined,
-                    },
-                };
-            }
-            if (decl.node.nodeType === 22 /* ImportFrom */) {
-                return {
-                    filePath: decl.path,
-                    nameInfo: { name: decl.symbolName },
-                };
-            }
-        }
-        if ((0, declaration_1.isVariableDeclaration)(decl) || (0, declaration_1.isFunctionDeclaration)(decl) || (0, declaration_1.isClassDeclaration)(decl)) {
-            const name = (0, declarationUtils_1.getNameFromDeclaration)(decl);
-            if (!name) {
-                return undefined;
-            }
-            return {
-                filePath: decl.path,
-                nameInfo: { name },
-            };
-        }
-        return undefined;
-    }
-    _areSame(a, b) {
-        return (a.alias === b.alias &&
-            a.name === b.name &&
-            a.module.importType === b.module.importType &&
-            a.module.isLocalTypingsFile === b.module.isLocalTypingsFile &&
-            a.module.moduleName === b.module.moduleName);
-    }
-}
-exports.ImportAdder = ImportAdder;
-class NameCollector extends parseTreeWalker_1.ParseTreeWalker {
-    constructor(_evaluator, _root, _ranges, _token) {
-        super();
-        this._evaluator = _evaluator;
-        this._root = _root;
-        this._ranges = _ranges;
-        this._token = _token;
-        // Hold onto names that we need to move imports.
-        this.declsForSymbols = new Map();
-        this.containsUnreferenceableSymbols = false;
-        this._filePath = (0, analyzerNodeInfo_1.getFileInfo)(this._root).filePath;
-        // For now, we assume the given range is at right boundary such as statement, statements, expression or expressions.
-        // In future, we might consider validating the range and adjusting it to the right boundary if needed.
-    }
-    walk(node) {
-        if (!this._ranges.some((r) => textRange_1.TextRange.overlapsRange(r, node))) {
-            return;
-        }
-        super.walk(node);
-    }
-    visitModuleName(node) {
-        // We only care about references to module symbols. not decls.
-        return false;
-    }
-    visitName(name) {
-        if (!this._ranges.some((r) => textRange_1.TextRange.containsRange(r, name))) {
-            return false;
-        }
-        (0, cancellationUtils_1.throwIfCancellationRequested)(this._token);
-        // We process dotted name as a whole rather than
-        // process each part of dotted name.
-        if (!(0, parseTreeUtils_1.isLastNameOfDottedName)(name)) {
-            return false;
-        }
-        const type = this._evaluator.getType(name);
-        if ((type === null || type === void 0 ? void 0 : type.category) === 10 /* TypeVar */) {
-            // Currently, we don't add import statement for type variables
-            // such as TypeVar, TypeVarTuple, ParamSpec, etc.
-            return false;
-        }
-        const dottedName = (0, parseTreeUtils_1.getDottedName)((0, parseTreeUtils_1.getDottedNameWithGivenNodeAsLastName)(name));
-        if (!dottedName) {
-            // Not dotted name
-            // ex) foo().[var]
-            return false;
-        }
-        // See whether the first dotted name bound to symbols defined in current file.
-        const firstName = dottedName[0];
-        const firstNameDecls = this._getDeclarationsInModule(firstName);
-        if (!firstNameDecls || firstNameDecls.length === 0) {
-            return false;
-        }
-        // Simple case.
-        // ex) import os
-        //     [os]
-        if (dottedName.length === 1) {
-            this._handleName(firstName, firstNameDecls);
-            return false;
-        }
-        for (const firstNameDecl of firstNameDecls) {
-            if (!(0, declaration_1.isAliasDeclaration)(firstNameDecl) || firstNameDecl.node.nodeType !== 21 /* ImportAs */) {
-                // decls we have is for symbols defined in current module.
-                // ex) [foo]()
-                this._handleName(firstName, [firstNameDecl]);
-                continue;
-            }
-            // Import with alias
-            // ex) import json.encoder as j
-            if (firstNameDecl.usesLocalName) {
-                this._handleName(firstName, [firstNameDecl]);
-                continue;
-            }
-            // Special casing import statement with sub module ex) import a.[b]
-            // It is complex for import a.[b] case since decl for [b] doesn't exist. so
-            // when binding a.[b].foo(), we don't get decl for "import a.[b]", we need to
-            // do some tree walk to find import a.[b] and synthesize decl for it.
-            this._handleImplicitImports(firstNameDecl, dottedName, 1);
-        }
-        return false;
-    }
-    _getDeclarationsInModule(name) {
-        var _a;
-        return (_a = this._evaluator.getDeclarationsForNameNode(name)) === null || _a === void 0 ? void 0 : _a.filter((d) => (0, declarationUtils_1.isDefinedInFile)(d, this._filePath));
-    }
-    _handleImplicitImports(aliasDecl, dottedName, nameIndex) {
-        if (dottedName.length === nameIndex) {
-            return;
-        }
-        if (!aliasDecl.implicitImports) {
-            this._handleName(dottedName[nameIndex - 1], [(0, declarationUtils_1.createSynthesizedAliasDeclaration)(aliasDecl.path)]);
-            return;
-        }
-        const implicitImportDecl = aliasDecl.implicitImports.get(dottedName[nameIndex].value);
-        if (!implicitImportDecl) {
-            this._handleName(dottedName[nameIndex - 1], [(0, declarationUtils_1.createSynthesizedAliasDeclaration)(aliasDecl.path)]);
-            return;
-        }
-        this._handleImplicitImports(implicitImportDecl, dottedName, nameIndex + 1);
-    }
-    _handleName(name, decls) {
-        for (const decl of decls) {
-            if (decl.node && this._ranges.some((r) => textRange_1.TextRange.containsRange(r, decl.node))) {
-                // Make sure our range doesn't already contain them.
-                continue;
-            }
-            if ((0, declaration_1.isParameterDeclaration)(decl)) {
-                // Parameter is not referenceable from import statement.
-                this.containsUnreferenceableSymbols = true;
-                continue;
-            }
-            if ((0, declaration_1.isVariableDeclaration)(decl) || (0, declaration_1.isFunctionDeclaration)(decl) || (0, declaration_1.isClassDeclaration)(decl)) {
-                // For now, we will allow private variable to be referenced by import
-                // so that user can fix it up once import is added.
-                // We only support top level variables.
-                const scope = (0, scopeUtils_1.getScopeForNode)(name);
-                if (!scope) {
-                    this.containsUnreferenceableSymbols = true;
-                    continue;
-                }
-                const result = scope.lookUpSymbolRecursive(name.value);
-                if (!result || result.scope.type !== 3 /* Module */) {
-                    this.containsUnreferenceableSymbols = true;
-                    continue;
-                }
-            }
-            this._addName(decl, name);
-        }
-    }
-    _addName(decl, name) {
-        (0, collectionUtils_1.getOrAdd)(this.declsForSymbols, decl, () => []).push(name);
-    }
-}
-function isParseResults(obj) {
-    return (obj &&
-        obj.text !== undefined &&
-        obj.parseTree &&
-        obj.importedModules &&
-        obj.futureImports &&
-        obj.tokenizerOutput &&
-        obj.containsWildcardImport !== undefined &&
-        obj.typingSymbolAliases);
-}
-//# sourceMappingURL=importAdder.js.map