@zzzen/pyright-internal 1.2.0-dev.20230312 → 1.2.0-dev.20230319

package/dist/workspaceFactory.js

@@ -0,0 +1,421 @@
+"use strict";
+/*
+ * workspaceFactory.ts
+ *
+ * Workspace management related functionality.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WorkspaceFactory = exports.createInitStatus = exports.WorkspacePythonPathKind = exports.WellKnownWorkspaceKinds = void 0;
+const deferred_1 = require("./common/deferred");
+let WorkspaceFactoryIdCounter = 0;
+var WellKnownWorkspaceKinds;
+(function (WellKnownWorkspaceKinds) {
+    WellKnownWorkspaceKinds["Default"] = "default";
+    WellKnownWorkspaceKinds["Regular"] = "regular";
+    WellKnownWorkspaceKinds["Limited"] = "limited";
+    WellKnownWorkspaceKinds["Cloned"] = "cloned";
+    WellKnownWorkspaceKinds["Test"] = "test";
+})(WellKnownWorkspaceKinds = exports.WellKnownWorkspaceKinds || (exports.WellKnownWorkspaceKinds = {}));
+var WorkspacePythonPathKind;
+(function (WorkspacePythonPathKind) {
+    WorkspacePythonPathKind["Immutable"] = "immutable";
+    WorkspacePythonPathKind["Mutable"] = "mutable";
+})(WorkspacePythonPathKind = exports.WorkspacePythonPathKind || (exports.WorkspacePythonPathKind = {}));
+function createInitStatus() {
+    // Due to the way we get `python path`, `include/exclude` from settings to initialize workspace,
+    // we need to wait for getSettings to finish before letting IDE features to use workspace (`isInitialized` field).
+    // So most of cases, whenever we create new workspace, we send request to workspace/configuration right way
+    // except one place which is `initialize` LSP call.
+    // In `initialize` method where we create `initial workspace`, we can't do that since LSP spec doesn't allow
+    // LSP server from sending any request to client until `initialized` method is called.
+    // This flag indicates whether we had our initial updateSetting call or not after `initialized` call.
+    let called = false;
+    const deferred = (0, deferred_1.createDeferred)();
+    const self = {
+        promise: deferred.promise,
+        resolve: () => {
+            called = true;
+            deferred.resolve();
+        },
+        markCalled: () => {
+            called = true;
+        },
+        reset: () => {
+            if (!called) {
+                return self;
+            }
+            return createInitStatus();
+        },
+        resolved: () => {
+            return deferred.resolved;
+        },
+    };
+    return self;
+}
+exports.createInitStatus = createInitStatus;
+class WorkspaceFactory {
+    constructor(_console, _uriParser, _createService, _isPythonPathImmutable, _onWorkspaceCreated) {
+        this._console = _console;
+        this._uriParser = _uriParser;
+        this._createService = _createService;
+        this._isPythonPathImmutable = _isPythonPathImmutable;
+        this._onWorkspaceCreated = _onWorkspaceCreated;
+        this._defaultWorkspacePath = '<default>';
+        this._map = new Map();
+        this._id = WorkspaceFactoryIdCounter++;
+        this._console.log(`WorkspaceFactory ${this._id} created`);
+    }
+    handleInitialize(params) {
+        // Create a service instance for each of the workspace folders.
+        if (params.workspaceFolders) {
+            params.workspaceFolders.forEach((folder) => {
+                const path = this._uriParser.decodeTextDocumentUri(folder.uri);
+                this._add(folder.uri, path, folder.name, undefined, WorkspacePythonPathKind.Mutable, [
+                    WellKnownWorkspaceKinds.Regular,
+                ]);
+            });
+        }
+        else if (params.rootPath) {
+            this._add(params.rootPath, params.rootPath, params.rootPath, undefined, WorkspacePythonPathKind.Mutable, [
+                WellKnownWorkspaceKinds.Regular,
+            ]);
+        }
+    }
+    handleWorkspaceFoldersChanged(params) {
+        params.removed.forEach((workspaceInfo) => {
+            const rootPath = this._uriParser.decodeTextDocumentUri(workspaceInfo.uri);
+            // Delete all workspaces for this folder. Even the ones generated for notebook kernels.
+            const workspaces = this.getNonDefaultWorkspaces().filter((w) => w.rootPath === rootPath);
+            workspaces.forEach((w) => {
+                this._remove(w);
+            });
+        });
+        params.added.forEach((workspaceInfo) => {
+            const rootPath = this._uriParser.decodeTextDocumentUri(workspaceInfo.uri);
+            this._add(workspaceInfo.uri, rootPath, workspaceInfo.name, undefined, WorkspacePythonPathKind.Mutable, [
+                WellKnownWorkspaceKinds.Regular,
+            ]);
+        });
+    }
+    items() {
+        return [...this._map.values()];
+    }
+    applyPythonPath(workspace, newPythonPath) {
+        // See if were allowed to apply the new python path
+        if (workspace.pythonPathKind === WorkspacePythonPathKind.Mutable && newPythonPath) {
+            const originalPythonPath = workspace.pythonPath;
+            workspace.pythonPath = newPythonPath;
+            // This may not be the workspace in our map. Update the workspace in the map too.
+            // This can happen during startup were the Initialize creates a workspace and then
+            // onDidChangeConfiguration is called right away.
+            const key = this._getWorkspaceKey(workspace);
+            const workspaceInMap = this._map.get(key);
+            if (workspaceInMap) {
+                workspaceInMap.pythonPath = newPythonPath;
+            }
+            // If the python path has changed, we may need to move the immutable files to the correct workspace.
+            if (originalPythonPath && originalPythonPath !== newPythonPath && workspaceInMap) {
+                // Potentially move immutable files from one workspace to another.
+                this._moveImmutableFilesToCorrectWorkspace(originalPythonPath, workspaceInMap);
+            }
+        }
+        // Return the python path that should be used (whether hardcoded or configured)
+        return workspace.pythonPath;
+    }
+    clear() {
+        this._map.forEach((workspace) => {
+            workspace.isInitialized.resolve();
+            workspace.service.dispose();
+        });
+        this._map.clear();
+        this._console.log(`WorkspaceFactory ${this._id} clear`);
+    }
+    hasMultipleWorkspaces(kind) {
+        if (this._map.size === 0 || this._map.size === 1) {
+            return false;
+        }
+        let count = 0;
+        for (const kv of this._map) {
+            if (!kind || kv[1].kinds.some((k) => k === kind)) {
+                count++;
+            }
+            if (count > 1) {
+                return true;
+            }
+        }
+        return false;
+    }
+    getContainingWorkspace(filePath, pythonPath) {
+        return this._getBestRegularWorkspace(this.getNonDefaultWorkspaces(WellKnownWorkspaceKinds.Regular).filter((w) => filePath.startsWith(w.rootPath)), pythonPath);
+    }
+    moveFiles(filePaths, fromWorkspace, toWorkspace) {
+        if (fromWorkspace === toWorkspace) {
+            return;
+        }
+        try {
+            filePaths.forEach((f) => {
+                var _a;
+                const fileInfo = fromWorkspace.service.backgroundAnalysisProgram.program.getSourceFileInfo(f);
+                if (fileInfo) {
+                    // Copy the source file data (closing can destroy the sourceFile)
+                    const version = fileInfo.sourceFile.getClientVersion() || null;
+                    const content = fileInfo.sourceFile.getFileContent() || '';
+                    const ipythonMode = fileInfo.sourceFile.getIPythonMode();
+                    const chainedSourceFile = (_a = fileInfo.chainedSourceFile) === null || _a === void 0 ? void 0 : _a.sourceFile.getFilePath();
+                    const realFilePath = fileInfo.sourceFile.getRealFilePath();
+                    // Remove the file from the old workspace first (closing will propagate to the toWorkspace automatically).
+                    fromWorkspace.service.setFileClosed(f, /*isTracked*/ false);
+                    // Then open it in the toWorkspace so that it is marked tracked there.
+                    toWorkspace.service.setFileOpened(f, version, content, ipythonMode, chainedSourceFile, realFilePath);
+                }
+            });
+            // If the fromWorkspace has no more files in it (and it's an immutable pythonPath), then remove it.
+            this.removeUnused(fromWorkspace);
+        }
+        catch (e) {
+            this._console.error(e.toString());
+        }
+    }
+    getNonDefaultWorkspaces(kind) {
+        const workspaces = [];
+        this._map.forEach((workspace) => {
+            if (!workspace.rootPath) {
+                return;
+            }
+            if (kind && !workspace.kinds.some((k) => k === kind)) {
+                return;
+            }
+            workspaces.push(workspace);
+        });
+        return workspaces;
+    }
+    // Returns the best workspace for a file. Waits for the workspace to be finished handling other events before
+    // returning the appropriate workspace.
+    async getWorkspaceForFile(filePath, pythonPath) {
+        // Wait for all workspaces to be initialized before attempting to find the best workspace. Otherwise
+        // the list of files won't be complete and the `contains` check might fail.
+        await Promise.all(this.items().map((w) => w.isInitialized.promise));
+        // Find or create best match.
+        const workspace = await this._getOrCreateBestWorkspaceForFile(filePath, pythonPath);
+        // The workspace may have just been created. Wait for it to be initialized before returning it.
+        await workspace.isInitialized.promise;
+        return workspace;
+    }
+    async getContainingWorkspacesForFile(filePath) {
+        // Wait for all workspaces to be initialized before attempting to find the best workspace. Otherwise
+        // the list of files won't be complete and the `contains` check might fail.
+        await Promise.all(this.items().map((w) => w.isInitialized.promise));
+        // All workspaces that track the file should be considered.
+        let workspaces = this.items().filter((w) => w.service.isTracked(filePath));
+        // If that list is empty, get the best workspace
+        if (workspaces.length === 0) {
+            workspaces.push(this._getOrCreateBestWorkspaceFileSync(filePath, undefined));
+        }
+        // If the file is immutable, then only return that workspace.
+        if (this._isPythonPathImmutable(filePath)) {
+            workspaces = workspaces.filter((w) => w.pythonPathKind === WorkspacePythonPathKind.Immutable);
+        }
+        // The workspaces may have just been created, wait for them all to be initialized
+        await Promise.all(workspaces.map((w) => w.isInitialized.promise));
+        return workspaces;
+    }
+    removeUnused(workspace) {
+        // Only remove this workspace is it's not being used for immutable files and it's an immutable path kind.
+        if (workspace.service.getOpenFiles().filter((f) => this._isPythonPathImmutable(f)).length === 0 &&
+            workspace.pythonPathKind === WorkspacePythonPathKind.Immutable) {
+            // Destroy the workspace since it only had immutable files in it.
+            this._remove(workspace);
+        }
+    }
+    async _moveImmutableFilesToCorrectWorkspace(oldPythonPath, mutableWorkspace) {
+        // If the python path changes we may need to move some immutable files around.
+        // For example, if a notebook had the old python path, we need to create a new workspace
+        // for the notebook.
+        // If a notebook has the new python path but is currently in a workspace with the path hardcoded, we need to move it to
+        // this workspace.
+        const oldPathFiles = [
+            ...new Set(mutableWorkspace.service.getOpenFiles().filter((f) => this._isPythonPathImmutable(f))),
+        ];
+        const exitingWorkspaceWithSamePath = this.items().find((w) => w.pythonPath === mutableWorkspace.pythonPath && w !== mutableWorkspace);
+        const newPathFiles = new Set(exitingWorkspaceWithSamePath === null || exitingWorkspaceWithSamePath === void 0 ? void 0 : exitingWorkspaceWithSamePath.service.getOpenFiles().filter((f) => this._isPythonPathImmutable(f)));
+        // Immutable files that were in this mutableWorkspace have to be moved
+        // to a (potentially) new workspace (with the old path).
+        if (oldPathFiles.length > 0) {
+            // Given that all of these files were in the same workspace, there should be only
+            // one immutable workspace for all of them. So we can just use the first file.
+            const workspace = this._getOrCreateBestWorkspaceFileSync(oldPathFiles[0], oldPythonPath);
+            if (workspace !== mutableWorkspace) {
+                this.moveFiles(oldPathFiles, mutableWorkspace, workspace);
+            }
+        }
+        // Immutable files from a different workspace (with the same path as the new path)
+        // have to be moved to the mutable workspace (which now has the new path)
+        if (exitingWorkspaceWithSamePath) {
+            this.moveFiles([...newPathFiles], exitingWorkspaceWithSamePath, mutableWorkspace);
+            this.removeUnused(exitingWorkspaceWithSamePath);
+        }
+    }
+    _add(rootUri, rootPath, name, pythonPath, pythonPathKind, kinds) {
+        // Update the kind based of the uri is local or not
+        if (!this._uriParser.isLocal(rootUri)) {
+            // Web based workspace should be limited.
+            kinds = [...kinds, WellKnownWorkspaceKinds.Limited];
+        }
+        const result = {
+            workspaceName: name,
+            rootPath,
+            uri: rootUri,
+            kinds,
+            pythonPath,
+            pythonPathKind,
+            service: this._createService(name, rootPath, rootUri, kinds),
+            disableLanguageServices: false,
+            disableOrganizeImports: false,
+            disableWorkspaceSymbol: false,
+            isInitialized: createInitStatus(),
+            searchPathsToWatch: [],
+        };
+        // Tell our owner we added something
+        this._onWorkspaceCreated(result);
+        // Stick in our map
+        const key = this._getWorkspaceKey(result);
+        // Make sure to delete existing workspaces if there are any.
+        this._remove(result);
+        this._console.log(`WorkspaceFactory ${this._id} add ${key}`);
+        this._map.set(key, result);
+        return result;
+    }
+    _remove(value) {
+        const key = this._getWorkspaceKey(value);
+        const workspace = this._map.get(key);
+        if (workspace) {
+            workspace.isInitialized.resolve();
+            workspace.service.dispose();
+            this._console.log(`WorkspaceFactory ${this._id} remove ${key}`);
+            this._map.delete(key);
+        }
+    }
+    _getDefaultWorskpaceKey(pythonPath) {
+        return `${this._defaultWorkspacePath}:${pythonPath ? pythonPath : WorkspacePythonPathKind.Mutable}`;
+    }
+    _getWorkspaceKey(value) {
+        // Special the root path for the default workspace. It will be created
+        // without a root path
+        const rootPath = value.kinds.includes(WellKnownWorkspaceKinds.Default)
+            ? this._defaultWorkspacePath
+            : value.rootPath;
+        // Key is defined by the rootPath and the pythonPath. We might include platform in this, but for now
+        // platform is only used by the import resolver.
+        return `${rootPath}:${value.pythonPathKind === WorkspacePythonPathKind.Mutable ? value.pythonPathKind : value.pythonPath}`;
+    }
+    async _getOrCreateBestWorkspaceForFile(filePath, pythonPath) {
+        // Find the current best workspace (without creating a new one)
+        let bestInstance = this._getBestWorkspaceForFile(filePath, pythonPath);
+        // Make sure the best instance is initialized so that it has its pythonPath.
+        await bestInstance.isInitialized.promise;
+        // If this best instance doesn't match the pythonPath, then we need to create a new one.
+        if (pythonPath && bestInstance.pythonPath !== pythonPath) {
+            bestInstance = this._createImmutableCopy(bestInstance, pythonPath);
+        }
+        return bestInstance;
+    }
+    _getOrCreateBestWorkspaceFileSync(filePath, pythonPath) {
+        // Find the current best workspace (without creating a new one)
+        let bestInstance = this._getBestWorkspaceForFile(filePath, pythonPath);
+        // If this best instance doesn't match the pythonPath, then we need to create a new one.
+        if (pythonPath && bestInstance.pythonPath !== pythonPath) {
+            bestInstance = this._createImmutableCopy(bestInstance, pythonPath);
+        }
+        return bestInstance;
+    }
+    _createImmutableCopy(workspace, pythonPath) {
+        var _a;
+        const result = this._add(workspace.uri, workspace.rootPath, workspace.workspaceName, pythonPath, WorkspacePythonPathKind.Immutable, workspace.kinds);
+        // All mutable open files in the first workspace should be opened in the new workspace.
+        // Immutable files should stay where they are since they're tied to a specific workspace.
+        const files = workspace.service.getOpenFiles().filter((f) => !this._isPythonPathImmutable(f));
+        for (const file of files) {
+            const sourceFileInfo = workspace.service.backgroundAnalysisProgram.program.getSourceFileInfo(file);
+            if (sourceFileInfo) {
+                const sourceFile = sourceFileInfo.sourceFile;
+                const fileContents = sourceFile.getFileContent();
+                result.service.setFileOpened(file, sourceFile.getClientVersion() || null, fileContents || '', sourceFile.getIPythonMode(), (_a = sourceFileInfo.chainedSourceFile) === null || _a === void 0 ? void 0 : _a.sourceFile.getFilePath(), sourceFile.getRealFilePath());
+            }
+        }
+        return result;
+    }
+    _getBestWorkspaceForFile(filePath, pythonPath) {
+        let bestInstance;
+        // The order of how we find the best matching workspace for the given file is
+        // 1. The given file is the workspace itself (ex, a file being a virtual workspace itself).
+        // 2. The given file matches the fileSpec of the service under the workspace
+        //    (the file is a user file the workspace provides LSP service for).
+        // 3. The given file doesn't match anything but we have only 1 regular workspace
+        //    (ex, open a library file from the workspace).
+        // 4. The given file doesn't match anything and there are multiple workspaces but one of workspaces
+        //    contains the file (ex, open a library file already imported by a workspace).
+        // 5. If none of the above works, then it matches the default workspace.
+        // First find the workspaces that are tracking the file
+        const regularWorkspaces = this.getNonDefaultWorkspaces(WellKnownWorkspaceKinds.Regular);
+        const trackingWorkspaces = this.items().filter((w) => w.service.isTracked(filePath));
+        // Then find the best in all of those that actually matches the pythonPath.
+        bestInstance = this._getBestRegularWorkspace(trackingWorkspaces, pythonPath);
+        // If it's not in a tracked workspace, see if we only have regular workspaces with the same
+        // length root path
+        if (bestInstance === undefined &&
+            regularWorkspaces.every((w) => w.rootPath.length === regularWorkspaces[0].rootPath.length)) {
+            bestInstance = this._getBestRegularWorkspace(regularWorkspaces, pythonPath);
+        }
+        // If the regular workspaces don't all have the same length, then try the workspaces that already have the file open or scanned.
+        if (bestInstance === undefined) {
+            bestInstance = this._getBestRegularWorkspace(regularWorkspaces.filter((w) => w.service.hasSourceFile(filePath)), pythonPath);
+        }
+        // If that still didn't work, that must mean we don't have a workspace. Create a default one.
+        if (bestInstance === undefined) {
+            bestInstance = this._getOrCreateDefaultWorkspace(pythonPath);
+        }
+        return bestInstance;
+    }
+    _getOrCreateDefaultWorkspace(pythonPath) {
+        // Default key depends upon the pythonPath
+        let defaultWorkspace = this._map.get(this._getDefaultWorskpaceKey(pythonPath));
+        if (!defaultWorkspace) {
+            // Create a default workspace for files that are outside
+            // of all workspaces.
+            defaultWorkspace = this._add('', '', this._defaultWorkspacePath, pythonPath, pythonPath ? WorkspacePythonPathKind.Immutable : WorkspacePythonPathKind.Mutable, [WellKnownWorkspaceKinds.Default]);
+        }
+        return defaultWorkspace;
+    }
+    _getLongestPathWorkspace(workspaces) {
+        const longestPath = workspaces.reduce((previousPath, currentWorkspace) => {
+            if (!previousPath) {
+                return currentWorkspace.rootPath;
+            }
+            if (currentWorkspace.rootPath.length > previousPath.length) {
+                return currentWorkspace.rootPath;
+            }
+            return previousPath;
+        }, '');
+        return workspaces.find((w) => w.rootPath === longestPath);
+    }
+    _getBestRegularWorkspace(workspaces, pythonPath) {
+        if (workspaces.length === 0) {
+            return undefined;
+        }
+        // If there's only one, then it's the best.
+        if (workspaces.length === 1) {
+            return workspaces[0];
+        }
+        // If there's any that match the python path, take the one with the longest path from those.
+        if (pythonPath) {
+            const matchingWorkspaces = workspaces.filter((w) => w.pythonPath === pythonPath);
+            if (matchingWorkspaces.length > 0) {
+                return this._getLongestPathWorkspace(matchingWorkspaces);
+            }
+        }
+        // Otherwise, just take the longest path.
+        return this._getLongestPathWorkspace(workspaces);
+    }
+}
+exports.WorkspaceFactory = WorkspaceFactory;
+//# sourceMappingURL=workspaceFactory.js.map

package/dist/workspaceFactory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspaceFactory.js","sourceRoot":"","sources":["../../src/workspaceFactory.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.20230312",
+  "version": "1.2.0-dev.20230319",
   "license": "MIT",
   "private": false,
   "files": [
@@ -26,10 +26,10 @@
     "source-map-support": "^0.5.21",
     "tmp": "^0.2.1",
     "typescript-char": "^0.0.0",
-    "vscode-jsonrpc": "8.1.0-next.6",
-    "vscode-languageserver": "8.1.0-next.5",
+    "vscode-jsonrpc": "8.1.0",
+    "vscode-languageserver": "8.1.0",
     "vscode-languageserver-textdocument": "^1.0.9",
-    "vscode-languageserver-types": "3.17.2",
+    "vscode-languageserver-types": "3.17.3",
     "vscode-uri": "^3.0.7"
   },
   "devDependencies": {

package/dist/workspaceMap.d.ts

@@ -1,14 +0,0 @@
-import { LanguageServerBase, WorkspaceServiceInstance } from './languageServerBase';
-export declare class WorkspaceMap extends Map<string, WorkspaceServiceInstance> {
-    private _defaultWorkspacePath;
-    set(key: string, value: WorkspaceServiceInstance): this;
-    delete(key: string): boolean;
-    hasMultipleWorkspaces(kind?: string): boolean;
-    getNonDefaultWorkspaces(kind?: string): WorkspaceServiceInstance[];
-    getWorkspaceForFile(ls: LanguageServerBase, filePath: string): Promise<WorkspaceServiceInstance>;
-    getContainingWorkspace(filePath: string): WorkspaceServiceInstance | undefined;
-    getDefaultWorkspace(): WorkspaceServiceInstance | undefined;
-    private _getBestWorkspaceForFile;
-    private _createDefaultWorkspace;
-    private _getBestWorkspace;
-}

package/dist/workspaceMap.js

@@ -1,172 +0,0 @@
-"use strict";
-/*
- * workspaceMap.ts
- *
- * Workspace management related functionality.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WorkspaceMap = void 0;
-const languageServerBase_1 = require("./languageServerBase");
-class WorkspaceMap extends Map {
-    constructor() {
-        super(...arguments);
-        this._defaultWorkspacePath = '<default>';
-    }
-    set(key, value) {
-        // Make sure to delete existing workspace if there is one.
-        this.delete(key);
-        return super.set(key, value);
-    }
-    delete(key) {
-        const workspace = this.get(key);
-        if (!workspace) {
-            return false;
-        }
-        // Make sure to unblock if there is someone waiting this workspace.
-        workspace.isInitialized.resolve();
-        // Properly dispose of the service instance.
-        workspace.serviceInstance.dispose();
-        return super.delete(key);
-    }
-    hasMultipleWorkspaces(kind) {
-        if (this.size === 0 || this.size === 1) {
-            return false;
-        }
-        let count = 0;
-        for (const kv of this) {
-            if (!kind || kv[1].kinds.some((k) => k === kind)) {
-                count++;
-            }
-            if (count > 1) {
-                return true;
-            }
-        }
-        return false;
-    }
-    getNonDefaultWorkspaces(kind) {
-        const workspaces = [];
-        this.forEach((workspace) => {
-            if (!workspace.path) {
-                return;
-            }
-            if (kind && !workspace.kinds.some((k) => k === kind)) {
-                return;
-            }
-            workspaces.push(workspace);
-        });
-        return workspaces;
-    }
-    // Returns the best workspace for a file. Waits for the workspace to be finished handling other events before
-    // returning the appropriate workspace.
-    async getWorkspaceForFile(ls, filePath) {
-        // Make sure we always have a default workspace.
-        const defaultWorkspace = this._createDefaultWorkspace(ls);
-        // Wait for all workspaces to be initialized before attempting to find the best workspace. Otherwise
-        // the list of files won't be complete and the `contains` check might fail.
-        await Promise.all([...this.values()].map((w) => w.isInitialized.promise));
-        // Find best match.
-        const workspace = this._getBestWorkspaceForFile(ls, filePath, defaultWorkspace);
-        // During the previous await we might have reset to being uninitialized again, wait before returning
-        await workspace.isInitialized.promise;
-        return workspace;
-    }
-    getContainingWorkspace(filePath) {
-        return this._getBestWorkspace(this.getNonDefaultWorkspaces(languageServerBase_1.WellKnownWorkspaceKinds.Regular).filter((w) => filePath.startsWith(w.path)));
-    }
-    getDefaultWorkspace() {
-        return this.get(this._defaultWorkspacePath);
-    }
-    _getBestWorkspaceForFile(ls, filePath, defaultWorkspace) {
-        let bestRootPath;
-        let bestInstance;
-        // The order of how we find the best matching workspace for the given file is
-        // 1. The given file is the workspace itself (ex, a file being a virtual workspace itself).
-        // 2. The given file matches the fileSpec of the service under the workspace
-        //    (the file is a user file the workspace provides LSP service for).
-        // 3. The given file doesn't match anything but we have only 1 regular workspace
-        //    (ex, open a library file from the workspace).
-        // 4. The given file doesn't match anything and there are multiple workspaces but one of workspaces
-        //    contains the file (ex, open a library file already imported by a workspace).
-        // 5. If none of the above works, then it matches the default workspace.
-        this.forEach((workspace) => {
-            if (workspace.path) {
-                if (workspace.path !== filePath && !workspace.serviceInstance.isTracked(filePath)) {
-                    return;
-                }
-                // Among workspaces that own the file, make sure we return the inner most one which
-                // we consider as the best workspace.
-                if (bestRootPath === undefined || workspace.path.startsWith(bestRootPath)) {
-                    bestRootPath = workspace.path;
-                    bestInstance = workspace;
-                }
-            }
-        });
-        // If there were multiple workspaces or we couldn't find any,
-        // use the default one.
-        if (bestInstance === undefined) {
-            const regularWorkspaces = this.getNonDefaultWorkspaces(languageServerBase_1.WellKnownWorkspaceKinds.Regular);
-            // If we have only 1 regular workspace, then use that.
-            if (regularWorkspaces.length === 1) {
-                bestInstance = regularWorkspaces[0];
-            }
-            else {
-                // If we have multiple workspaces, see whether we can at least find one that contains the file.
-                // the file might not be tracked (user file), but still belongs to a workspace as a library file or as an orphan file to the workspace.
-                const containingWorkspace = this._getBestWorkspace(regularWorkspaces.filter((w) => w.serviceInstance.contains(filePath)));
-                if (containingWorkspace) {
-                    bestInstance = containingWorkspace;
-                }
-                else {
-                    // If no workspace contains it, then it belongs to the default workspace.
-                    bestInstance = defaultWorkspace;
-                }
-            }
-        }
-        return bestInstance;
-    }
-    _createDefaultWorkspace(ls) {
-        let defaultWorkspace = this.get(this._defaultWorkspacePath);
-        if (!defaultWorkspace) {
-            // Create a default workspace for files that are outside
-            // of all workspaces.
-            defaultWorkspace = {
-                workspaceName: '',
-                rootPath: '',
-                path: '',
-                uri: '',
-                serviceInstance: ls.createAnalyzerService(this._defaultWorkspacePath),
-                kinds: [languageServerBase_1.WellKnownWorkspaceKinds.Default],
-                disableLanguageServices: false,
-                disableOrganizeImports: false,
-                disableWorkspaceSymbol: false,
-                isInitialized: (0, languageServerBase_1.createInitStatus)(),
-                searchPathsToWatch: [],
-            };
-            this.set(this._defaultWorkspacePath, defaultWorkspace);
-            // Do not await this. let isInitialized.promise to await. Otherwise, ordering
-            // will get messed up. The very first call will run last.
-            ls.updateSettingsForWorkspace(defaultWorkspace, defaultWorkspace.isInitialized).ignoreErrors();
-        }
-        return defaultWorkspace;
-    }
-    _getBestWorkspace(workspaces) {
-        if (workspaces.length === 0) {
-            return undefined;
-        }
-        if (workspaces.length === 1) {
-            return workspaces[0];
-        }
-        // Best workspace is the inner most workspace.
-        return workspaces.reduce((previousWorkspace, currentWorkspace) => {
-            if (!previousWorkspace) {
-                return currentWorkspace;
-            }
-            if (currentWorkspace.path.startsWith(previousWorkspace.path)) {
-                return currentWorkspace;
-            }
-            return previousWorkspace;
-        }, workspaces[0]);
-    }
-}
-exports.WorkspaceMap = WorkspaceMap;
-//# sourceMappingURL=workspaceMap.js.map