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

package/dist/languageServerBase.js

@@ -10,7 +10,7 @@
  * from the same core functionality.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LanguageServerBase = exports.createInitStatus = exports.WellKnownWorkspaceKinds = void 0;
+exports.LanguageServerBase = void 0;
 require("./common/extensions");
 const vscode_languageserver_1 = require("vscode-languageserver");
 const progress_1 = require("vscode-languageserver/lib/common/progress");
@@ -24,12 +24,12 @@ const collectionUtils_1 = require("./common/collectionUtils");
 const commandLineOptions_1 = require("./common/commandLineOptions");
 const configOptions_1 = require("./common/configOptions");
 const console_1 = require("./common/console");
-const deferred_1 = require("./common/deferred");
 const diagnostic_1 = require("./common/diagnostic");
 const extensibility_1 = require("./common/extensibility");
 const lspUtils_1 = require("./common/lspUtils");
 const pathUtils_1 = require("./common/pathUtils");
 const progressReporter_1 = require("./common/progressReporter");
+const stringUtils_1 = require("./common/stringUtils");
 const uriParser_1 = require("./common/uriParser");
 const workspaceEditUtils_1 = require("./common/workspaceEditUtils");
 const analyzerServiceExecutor_1 = require("./languageService/analyzerServiceExecutor");
@@ -38,46 +38,7 @@ const documentSymbolProvider_1 = require("./languageService/documentSymbolProvid
 const hoverProvider_1 = require("./languageService/hoverProvider");
 const localize_1 = require("./localization/localize");
 const pyrightFileSystem_1 = require("./pyrightFileSystem");
-var WellKnownWorkspaceKinds;
-(function (WellKnownWorkspaceKinds) {
-    WellKnownWorkspaceKinds["Default"] = "default";
-    WellKnownWorkspaceKinds["Regular"] = "regular";
-    WellKnownWorkspaceKinds["Limited"] = "limited";
-    WellKnownWorkspaceKinds["Cloned"] = "cloned";
-    WellKnownWorkspaceKinds["Test"] = "test";
-})(WellKnownWorkspaceKinds = exports.WellKnownWorkspaceKinds || (exports.WellKnownWorkspaceKinds = {}));
-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;
+const workspaceFactory_1 = require("./workspaceFactory");
 const nullProgressReporter = (0, progress_1.attachWorkDone)(undefined, /* params */ undefined);
 /*
  * Additional DiagnosticTag values that are specific to Visual Studio.
@@ -144,6 +105,7 @@ class LanguageServerBase {
         this._connection = _connection;
         this.console = console;
         this._lastTriggerKind = vscode_languageserver_1.CompletionTriggerKind.Invoked;
+        this._initialized = false;
         // Global root path - the basis for all global settings.
         this.rootPath = '';
         this.client = {
@@ -175,9 +137,9 @@ class LanguageServerBase {
         this.console.info(`${_serverOptions.productName} language server ${_serverOptions.version && _serverOptions.version + ' '}starting`);
         this.console.info(`Server root directory: ${_serverOptions.rootDirectory}`);
         this._cacheManager = new cacheManager_1.CacheManager();
-        this._workspaceMap = this._serverOptions.workspaceMap;
         this._serviceFS = new pyrightFileSystem_1.PyrightFileSystem(this._serverOptions.fileSystem);
         this._uriParser = uriParserFactory(this._serviceFS);
+        this._workspaceFactory = new workspaceFactory_1.WorkspaceFactory(this.console, this._uriParser, this.createAnalyzerServiceForWorkspace.bind(this), this.isPythonPathImmutable.bind(this), this.onWorkspaceCreated.bind(this));
         // Set the working directory to a known location within
         // the extension directory. Otherwise the execution of
         // python can have unintended and surprising results.
@@ -197,6 +159,12 @@ class LanguageServerBase {
     decodeTextDocumentUri(uriString) {
         return this._uriParser.decodeTextDocumentUri(uriString);
     }
+    isPythonPathImmutable(filePath) {
+        // This function is called to determine if the file is using
+        // a special pythonPath separate from a workspace or not.
+        // The default is no.
+        return false;
+    }
     async getConfiguration(scopeUri, section) {
         if (this.client.hasConfigurationCapability) {
             const item = {};
@@ -266,23 +234,26 @@ class LanguageServerBase {
         return service;
     }
     async test_getWorkspaces() {
-        const workspaces = [...this._workspaceMap.values()];
+        const workspaces = [...this._workspaceFactory.items()];
         for (const workspace of workspaces) {
             await workspace.isInitialized.promise;
         }
         return workspaces;
     }
-    async getWorkspaceForFile(filePath) {
-        return this._workspaceMap.getWorkspaceForFile(this, filePath);
+    async getWorkspaceForFile(filePath, pythonPath) {
+        return this._workspaceFactory.getWorkspaceForFile(filePath, pythonPath);
+    }
+    async getContainingWorkspacesForFile(filePath) {
+        return this._workspaceFactory.getContainingWorkspacesForFile(filePath);
     }
     reanalyze() {
-        this._workspaceMap.forEach((workspace) => {
-            workspace.serviceInstance.invalidateAndForceReanalysis();
+        this._workspaceFactory.items().forEach((workspace) => {
+            workspace.service.invalidateAndForceReanalysis();
         });
     }
     restart() {
-        this._workspaceMap.forEach((workspace) => {
-            workspace.serviceInstance.restart();
+        this._workspaceFactory.items().forEach((workspace) => {
+            workspace.service.restart();
         });
     }
     setupConnection(supportedCommands, supportedCodeActions) {
@@ -356,15 +327,7 @@ class LanguageServerBase {
         this.client.completionItemResolveSupportsAdditionalTextEdits =
             !!((_19 = (_18 = (_17 = (_16 = capabilities.textDocument) === null || _16 === void 0 ? void 0 : _16.completion) === null || _17 === void 0 ? void 0 : _17.completionItem) === null || _18 === void 0 ? void 0 : _18.resolveSupport) === null || _19 === void 0 ? void 0 : _19.properties.some((p) => p === 'additionalTextEdits'));
         // 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._workspaceMap.set(path, this.createWorkspaceServiceInstance(folder, path, path));
-            });
-        }
-        else if (params.rootPath) {
-            this._workspaceMap.set(params.rootPath, this.createWorkspaceServiceInstance(undefined, params.rootPath, params.rootPath));
-        }
+        this._workspaceFactory.handleInitialize(params);
         const result = {
             capabilities: {
                 textDocumentSync: vscode_languageserver_1.TextDocumentSyncKind.Incremental,
@@ -378,7 +341,9 @@ class LanguageServerBase {
                 documentHighlightProvider: { workDoneProgress: true },
                 renameProvider: { prepareProvider: true, workDoneProgress: true },
                 completionProvider: {
-                    triggerCharacters: this.client.hasVisualStudioExtensionsCapability ? ['.', '[', '@'] : ['.', '['],
+                    triggerCharacters: this.client.hasVisualStudioExtensionsCapability
+                        ? ['.', '[', '@', '"', "'"]
+                        : ['.', '[', '"', "'"],
                     resolveProvider: true,
                     workDoneProgress: true,
                     completionItem: {
@@ -409,22 +374,16 @@ class LanguageServerBase {
         return result;
     }
     onInitialized() {
+        // Mark as initialized. We need this to make sure to
+        // not send config updates before this point.
+        this._initialized = true;
         if (!this.client.hasWorkspaceFoldersCapability) {
             // If folder capability is not supported, initialize ones given by onInitialize.
             this.updateSettingsForAllWorkspaces();
             return;
         }
         this._connection.workspace.onDidChangeWorkspaceFolders((event) => {
-            event.removed.forEach((workspaceInfo) => {
-                const rootPath = this._uriParser.decodeTextDocumentUri(workspaceInfo.uri);
-                this._workspaceMap.delete(rootPath);
-            });
-            event.added.forEach((workspaceInfo) => {
-                const rootPath = this._uriParser.decodeTextDocumentUri(workspaceInfo.uri);
-                const newWorkspace = this.createWorkspaceServiceInstance(workspaceInfo, rootPath, rootPath);
-                this._workspaceMap.set(rootPath, newWorkspace);
-                this.updateSettingsForWorkspace(newWorkspace, newWorkspace.isInitialized).ignoreErrors();
-            });
+            this._workspaceFactory.handleWorkspaceFoldersChanged(event);
             this._setupFileWatcher();
         });
         this._setupFileWatcher();
@@ -444,7 +403,7 @@ class LanguageServerBase {
             // Dedup search paths from all workspaces.
             // Get rid of any search path under workspace root since it is already watched by
             // "**" above.
-            const foldersToWatch = (0, pathUtils_1.deduplicateFolders)(this._workspaceMap
+            const foldersToWatch = (0, pathUtils_1.deduplicateFolders)(this._workspaceFactory
                 .getNonDefaultWorkspaces()
                 .map((w) => w.searchPathsToWatch.filter((p) => !p.startsWith(w.rootPath))));
             foldersToWatch.forEach((p) => {
@@ -470,13 +429,13 @@ class LanguageServerBase {
         this.updateSettingsForAllWorkspaces();
     }
     async onDefinition(params, token) {
-        return this.getDefinitions(params, token, this.client.hasGoToDeclarationCapability ? definitionProvider_1.DefinitionFilter.PreferSource : definitionProvider_1.DefinitionFilter.All, (workspace, filePath, position, filter, token) => workspace.serviceInstance.getDefinitionForPosition(filePath, position, filter, token));
+        return this.getDefinitions(params, token, this.client.hasGoToDeclarationCapability ? definitionProvider_1.DefinitionFilter.PreferSource : definitionProvider_1.DefinitionFilter.All, (workspace, filePath, position, filter, token) => workspace.service.getDefinitionForPosition(filePath, position, filter, token));
     }
     async onDeclaration(params, token) {
-        return this.getDefinitions(params, token, this.client.hasGoToDeclarationCapability ? definitionProvider_1.DefinitionFilter.PreferStubs : definitionProvider_1.DefinitionFilter.All, (workspace, filePath, position, filter, token) => workspace.serviceInstance.getDefinitionForPosition(filePath, position, filter, token));
+        return this.getDefinitions(params, token, this.client.hasGoToDeclarationCapability ? definitionProvider_1.DefinitionFilter.PreferStubs : definitionProvider_1.DefinitionFilter.All, (workspace, filePath, position, filter, token) => workspace.service.getDefinitionForPosition(filePath, position, filter, token));
     }
     async onTypeDefinition(params, token) {
-        return this.getDefinitions(params, token, definitionProvider_1.DefinitionFilter.All, (workspace, filePath, position, _, token) => workspace.serviceInstance.getTypeDefinitionForPosition(filePath, position, token));
+        return this.getDefinitions(params, token, definitionProvider_1.DefinitionFilter.All, (workspace, filePath, position, _, token) => workspace.service.getTypeDefinitionForPosition(filePath, position, token));
     }
     async getDefinitions(params, token, filter, getDefinitionsFunc) {
         this.recordUserInteractionTime();
@@ -490,8 +449,8 @@ class LanguageServerBase {
             return undefined;
         }
         return locations
-            .filter((loc) => this.canNavigateToFile(loc.path, workspace.serviceInstance.fs))
-            .map((loc) => vscode_languageserver_1.Location.create((0, pathUtils_1.convertPathToUri)(workspace.serviceInstance.fs, loc.path), loc.range));
+            .filter((loc) => this.canNavigateToFile(loc.path, workspace.service.fs))
+            .map((loc) => vscode_languageserver_1.Location.create((0, pathUtils_1.convertPathToUri)(workspace.service.fs, loc.path), loc.range));
     }
     async onReferences(params, token, workDoneReporter, resultReporter) {
         if (this._pendingFindAllRefsCancellationSource) {
@@ -512,14 +471,14 @@ class LanguageServerBase {
             }
             const convert = (locs) => {
                 return locs
-                    .filter((loc) => this.canNavigateToFile(loc.path, workspace.serviceInstance.fs))
-                    .map((loc) => vscode_languageserver_1.Location.create((0, pathUtils_1.convertPathToUri)(workspace.serviceInstance.fs, loc.path), loc.range));
+                    .filter((loc) => this.canNavigateToFile(loc.path, workspace.service.fs))
+                    .map((loc) => vscode_languageserver_1.Location.create((0, pathUtils_1.convertPathToUri)(workspace.service.fs, loc.path), loc.range));
             };
             const locations = [];
             const reporter = resultReporter
                 ? (locs) => resultReporter.report(convert(locs))
                 : (locs) => (0, collectionUtils_1.appendArray)(locations, convert(locs));
-            workspace.serviceInstance.reportReferencesForPosition(filePath, position, params.context.includeDeclaration, reporter, source.token);
+            workspace.service.reportReferencesForPosition(filePath, position, params.context.includeDeclaration, reporter, source.token);
             return locations;
         }
         finally {
@@ -535,7 +494,7 @@ class LanguageServerBase {
             return undefined;
         }
         const symbolList = [];
-        workspace.serviceInstance.addSymbolsForDocument(filePath, symbolList, token);
+        workspace.service.addSymbolsForDocument(filePath, symbolList, token);
         if (this.client.hasHierarchicalDocumentSymbolCapability) {
             return symbolList;
         }
@@ -546,10 +505,10 @@ class LanguageServerBase {
         const reporter = resultReporter
             ? (symbols) => resultReporter.report(symbols)
             : (symbols) => (0, collectionUtils_1.appendArray)(symbolList, symbols);
-        for (const workspace of this._workspaceMap.values()) {
+        for (const workspace of this._workspaceFactory.items()) {
             await workspace.isInitialized.promise;
             if (!workspace.disableLanguageServices && !workspace.disableWorkspaceSymbol) {
-                workspace.serviceInstance.reportSymbolsForWorkspace(params.query, reporter, token);
+                workspace.service.reportSymbolsForWorkspace(params.query, reporter, token);
             }
         }
         return symbolList;
@@ -557,13 +516,13 @@ class LanguageServerBase {
     async onHover(params, token) {
         const { filePath, position } = this._uriParser.decodeTextDocumentPosition(params.textDocument, params.position);
         const workspace = await this.getWorkspaceForFile(filePath);
-        const hoverResults = workspace.serviceInstance.getHoverForPosition(filePath, position, this.client.hoverContentFormat, token);
-        return (0, hoverProvider_1.convertHoverResults)(this.client.hoverContentFormat, hoverResults);
+        const hoverResults = workspace.service.getHoverForPosition(filePath, position, this.client.hoverContentFormat, token);
+        return (0, hoverProvider_1.convertHoverResults)(this.client.hoverContentFormat, hoverResults, !!this._serverOptions.supportsTelemetry);
     }
     async onDocumentHighlight(params, token) {
         const { filePath, position } = this._uriParser.decodeTextDocumentPosition(params.textDocument, params.position);
         const workspace = await this.getWorkspaceForFile(filePath);
-        return workspace.serviceInstance.getDocumentHighlight(filePath, position, token);
+        return workspace.service.getDocumentHighlight(filePath, position, token);
     }
     async onSignatureHelp(params, token) {
         var _a, _b;
@@ -572,7 +531,7 @@ class LanguageServerBase {
         if (workspace.disableLanguageServices) {
             return;
         }
-        const signatureHelpResults = workspace.serviceInstance.getSignatureHelpForPosition(filePath, position, this.client.signatureDocFormat, token);
+        const signatureHelpResults = workspace.service.getSignatureHelpForPosition(filePath, position, this.client.signatureDocFormat, token);
         if (!signatureHelpResults) {
             return undefined;
         }
@@ -667,6 +626,19 @@ class LanguageServerBase {
         if (completions) {
             completions.completionList.isIncomplete = completionIncomplete;
         }
+        // Add memberAccessInfo.lastKnownModule if we have it. The client side
+        // will use this to send extra telemetry
+        if ((completions === null || completions === void 0 ? void 0 : completions.memberAccessInfo) &&
+            completions.completionList &&
+            completions.completionList.items.length > 0 &&
+            completions.memberAccessInfo.lastKnownModule &&
+            this._serverOptions.supportsTelemetry) {
+            // Just stick it on the first item. It only checks the first one
+            completions.completionList.items[0].data = {
+                ...completions.completionList.items[0].data,
+                moduleHash: (0, stringUtils_1.hashString)(completions.memberAccessInfo.lastKnownModule),
+            };
+        }
         return completions === null || completions === void 0 ? void 0 : completions.completionList;
     }
     // Cancellation bugs in vscode and LSP:
@@ -690,7 +662,7 @@ class LanguageServerBase {
         if (workspace.disableLanguageServices) {
             return null;
         }
-        const result = workspace.serviceInstance.canRenameSymbolAtPosition(filePath, position, workspace.path === '', this.allowModuleRename, token);
+        const result = workspace.service.canRenameSymbolAtPosition(filePath, position, workspace.kinds.includes(workspaceFactory_1.WellKnownWorkspaceKinds.Default), this.allowModuleRename, token);
         return (_a = result === null || result === void 0 ? void 0 : result.range) !== null && _a !== void 0 ? _a : null;
     }
     async onRenameRequest(params, token) {
@@ -699,11 +671,11 @@ class LanguageServerBase {
         if (workspace.disableLanguageServices) {
             return;
         }
-        const editActions = workspace.serviceInstance.renameSymbolAtPosition(filePath, position, params.newName, workspace.path === '', this.allowModuleRename, token);
+        const editActions = workspace.service.renameSymbolAtPosition(filePath, position, params.newName, workspace.kinds.includes(workspaceFactory_1.WellKnownWorkspaceKinds.Default), this.allowModuleRename, token);
         if (!editActions) {
             return undefined;
         }
-        return (0, workspaceEditUtils_1.convertToWorkspaceEdit)(workspace.serviceInstance.fs, editActions);
+        return (0, workspaceEditUtils_1.convertToWorkspaceEdit)(workspace.service.fs, editActions);
     }
     async onPrepare(params, token) {
         const { filePath, position } = this._uriParser.decodeTextDocumentPosition(params.textDocument, params.position);
@@ -711,15 +683,15 @@ class LanguageServerBase {
         if (workspace.disableLanguageServices) {
             return null;
         }
-        const callItem = workspace.serviceInstance.getCallForPosition(filePath, position, token) || null;
+        const callItem = workspace.service.getCallForPosition(filePath, position, token) || null;
         if (!callItem) {
             return null;
         }
-        if (!this.canNavigateToFile(callItem.uri, workspace.serviceInstance.fs)) {
+        if (!this.canNavigateToFile(callItem.uri, workspace.service.fs)) {
             return null;
         }
         // Convert the file path in the item to proper URI.
-        callItem.uri = (0, pathUtils_1.convertPathToUri)(workspace.serviceInstance.fs, callItem.uri);
+        callItem.uri = (0, pathUtils_1.convertPathToUri)(workspace.service.fs, callItem.uri);
         return [callItem];
     }
     async onIncomingCalls(params, token) {
@@ -728,14 +700,14 @@ class LanguageServerBase {
         if (workspace.disableLanguageServices) {
             return null;
         }
-        let callItems = workspace.serviceInstance.getIncomingCallsForPosition(filePath, position, token) || null;
+        let callItems = workspace.service.getIncomingCallsForPosition(filePath, position, token) || null;
         if (!callItems || callItems.length === 0) {
             return null;
         }
-        callItems = callItems.filter((item) => this.canNavigateToFile(item.from.uri, workspace.serviceInstance.fs));
+        callItems = callItems.filter((item) => this.canNavigateToFile(item.from.uri, workspace.service.fs));
         // Convert the file paths in the items to proper URIs.
         callItems.forEach((item) => {
-            item.from.uri = (0, pathUtils_1.convertPathToUri)(workspace.serviceInstance.fs, item.from.uri);
+            item.from.uri = (0, pathUtils_1.convertPathToUri)(workspace.service.fs, item.from.uri);
         });
         return callItems;
     }
@@ -745,14 +717,14 @@ class LanguageServerBase {
         if (workspace.disableLanguageServices) {
             return null;
         }
-        let callItems = workspace.serviceInstance.getOutgoingCallsForPosition(filePath, position, token) || null;
+        let callItems = workspace.service.getOutgoingCallsForPosition(filePath, position, token) || null;
         if (!callItems || callItems.length === 0) {
             return null;
         }
-        callItems = callItems.filter((item) => this.canNavigateToFile(item.to.uri, workspace.serviceInstance.fs));
+        callItems = callItems.filter((item) => this.canNavigateToFile(item.to.uri, workspace.service.fs));
         // Convert the file paths in the items to proper URIs.
         callItems.forEach((item) => {
-            item.to.uri = (0, pathUtils_1.convertPathToUri)(workspace.serviceInstance.fs, item.to.uri);
+            item.to.uri = (0, pathUtils_1.convertPathToUri)(workspace.service.fs, item.to.uri);
         });
         return callItems;
     }
@@ -762,8 +734,11 @@ class LanguageServerBase {
             // We do not support opening 1 file with 2 different uri.
             return;
         }
-        const workspace = await this.getWorkspaceForFile(filePath);
-        workspace.serviceInstance.setFileOpened(filePath, params.textDocument.version, params.textDocument.text, ipythonMode);
+        // Send this open to all the workspaces that might contain this file.
+        const workspaces = await this.getContainingWorkspacesForFile(filePath);
+        workspaces.forEach((w) => {
+            w.service.setFileOpened(filePath, params.textDocument.version, params.textDocument.text, ipythonMode);
+        });
     }
     async onDidChangeTextDocument(params, ipythonMode = sourceFile_1.IPythonMode.None) {
         this.recordUserInteractionTime();
@@ -772,8 +747,11 @@ class LanguageServerBase {
             // We do not support opening 1 file with 2 different uri.
             return;
         }
-        const workspace = await this.getWorkspaceForFile(filePath);
-        workspace.serviceInstance.updateOpenFileContents(filePath, params.textDocument.version, params.contentChanges, ipythonMode);
+        // Send this change to all the workspaces that might contain this file.
+        const workspaces = await this.getContainingWorkspacesForFile(filePath);
+        workspaces.forEach((w) => {
+            w.service.updateOpenFileContents(filePath, params.textDocument.version, params.contentChanges, ipythonMode);
+        });
     }
     async onDidCloseTextDocument(params) {
         const filePath = this._uriParser.decodeTextDocumentUri(params.textDocument.uri);
@@ -781,8 +759,11 @@ class LanguageServerBase {
             // We do not support opening 1 file with 2 different uri.
             return;
         }
-        const workspace = await this.getWorkspaceForFile(filePath);
-        workspace.serviceInstance.setFileClosed(filePath);
+        // Send this close to all the workspaces that might contain this file.
+        const workspaces = await this.getContainingWorkspacesForFile(filePath);
+        workspaces.forEach((w) => {
+            w.service.setFileClosed(filePath);
+        });
     }
     onDidChangeWatchedFiles(params) {
         params.changes.forEach((change) => {
@@ -832,19 +813,19 @@ class LanguageServerBase {
     }
     onShutdown(token) {
         // Shutdown remaining workspaces.
-        this._workspaceMap.forEach((_, key) => this._workspaceMap.delete(key));
+        this._workspaceFactory.clear();
         return Promise.resolve();
     }
     resolveWorkspaceCompletionItem(workspace, filePath, item, token) {
-        workspace.serviceInstance.resolveCompletionItem(filePath, item, this.getCompletionOptions(workspace), 
+        workspace.service.resolveCompletionItem(filePath, item, this.getCompletionOptions(workspace), 
         /* nameMap */ undefined, token);
     }
     getWorkspaceCompletionsForPosition(workspace, filePath, position, options, token) {
-        return workspace.serviceInstance.getCompletionsForPosition(filePath, position, workspace.path, options, undefined, token);
+        return workspace.service.getCompletionsForPosition(filePath, position, workspace.rootPath, options, undefined, token);
     }
     updateSettingsForAllWorkspaces() {
         const tasks = [];
-        this._workspaceMap.forEach((workspace) => {
+        this._workspaceFactory.items().forEach((workspace) => {
             // Updating settings can change workspace's file ownership. Make workspace uninitialized so that
             // features can wait until workspace gets new settings.
             // the file's ownership can also changed by `pyrightconfig.json` changes, but those are synchronous
@@ -869,32 +850,6 @@ class LanguageServerBase {
             triggerCharacter: (_a = params === null || params === void 0 ? void 0 : params.context) === null || _a === void 0 ? void 0 : _a.triggerCharacter,
         };
     }
-    createWorkspaceServiceInstance(workspaceFolder, rootPath, path, kinds = [WellKnownWorkspaceKinds.Regular], services) {
-        var _a, _b, _c;
-        // 5 seconds default
-        const defaultBackOffTime = 5 * 1000;
-        // 10 seconds back off for multi workspace.
-        const multiWorkspaceBackOffTime = 10 * 1000;
-        const libraryReanalysisTimeProvider = kinds.length === 1 && kinds[0] === WellKnownWorkspaceKinds.Regular
-            ? () => this._workspaceMap.hasMultipleWorkspaces(kinds[0])
-                ? multiWorkspaceBackOffTime
-                : defaultBackOffTime
-            : () => defaultBackOffTime;
-        const rootUri = (_a = workspaceFolder === null || workspaceFolder === void 0 ? void 0 : workspaceFolder.uri) !== null && _a !== void 0 ? _a : '';
-        return {
-            workspaceName: (_b = workspaceFolder === null || workspaceFolder === void 0 ? void 0 : workspaceFolder.name) !== null && _b !== void 0 ? _b : '',
-            rootPath,
-            path,
-            uri: rootUri,
-            kinds,
-            serviceInstance: this.createAnalyzerService((_c = workspaceFolder === null || workspaceFolder === void 0 ? void 0 : workspaceFolder.name) !== null && _c !== void 0 ? _c : path, services, libraryReanalysisTimeProvider),
-            disableLanguageServices: false,
-            disableOrganizeImports: false,
-            disableWorkspaceSymbol: false,
-            isInitialized: createInitStatus(),
-            searchPathsToWatch: [],
-        };
-    }
     convertDiagnostics(fs, fileDiagnostics) {
         return [
             {
@@ -941,6 +896,9 @@ class LanguageServerBase {
         serverSettings = serverSettings !== null && serverSettings !== void 0 ? serverSettings : (await this.getSettings(workspace));
         // Set logging level first.
         this.console.level = (_a = serverSettings.logLevel) !== null && _a !== void 0 ? _a : console_1.LogLevel.Info;
+        // Apply the new path to the workspace (before restarting the service).
+        serverSettings.pythonPath = this._workspaceFactory.applyPythonPath(workspace, serverSettings.pythonPath);
+        // Then use the updated settings to restart the service.
         this.updateOptionsAndRestartService(workspace, serverSettings);
         workspace.disableLanguageServices = !!serverSettings.disableLanguageServices;
         workspace.disableOrganizeImports = !!serverSettings.disableOrganizeImports;
@@ -952,24 +910,26 @@ class LanguageServerBase {
     updateOptionsAndRestartService(workspace, serverSettings, typeStubTargetImportName) {
         var _a;
         analyzerServiceExecutor_1.AnalyzerServiceExecutor.runWithOptions(this.rootPath, workspace, serverSettings, typeStubTargetImportName);
-        workspace.searchPathsToWatch = (_a = workspace.serviceInstance.librarySearchPathsToWatch) !== null && _a !== void 0 ? _a : [];
+        workspace.searchPathsToWatch = (_a = workspace.service.librarySearchPathsToWatch) !== null && _a !== void 0 ? _a : [];
     }
-    convertLogLevel(logLevelValue) {
-        if (!logLevelValue) {
-            return console_1.LogLevel.Info;
-        }
-        switch (logLevelValue.toLowerCase()) {
-            case 'error':
-                return console_1.LogLevel.Error;
-            case 'warning':
-                return console_1.LogLevel.Warn;
-            case 'information':
-                return console_1.LogLevel.Info;
-            case 'trace':
-                return console_1.LogLevel.Log;
-            default:
-                return console_1.LogLevel.Info;
+    onWorkspaceCreated(workspace) {
+        // Update settings on this workspace (but only if initialize has happened)
+        if (this._initialized) {
+            this.updateSettingsForWorkspace(workspace, workspace.isInitialized).ignoreErrors();
         }
+        // Otherwise the intiailize completion should cause settings to be updated on all workspaces.
+    }
+    createAnalyzerServiceForWorkspace(name, _rootPath, _uri, kinds, services) {
+        // 5 seconds default
+        const defaultBackOffTime = 5 * 1000;
+        // 10 seconds back off for multi workspace.
+        const multiWorkspaceBackOffTime = 10 * 1000;
+        const libraryReanalysisTimeProvider = kinds.length === 1 && kinds[0] === workspaceFactory_1.WellKnownWorkspaceKinds.Regular
+            ? () => this._workspaceFactory.hasMultipleWorkspaces(kinds[0])
+                ? multiWorkspaceBackOffTime
+                : defaultBackOffTime
+            : () => defaultBackOffTime;
+        return this.createAnalyzerService(name, services, libraryReanalysisTimeProvider);
     }
     _sendDiagnostics(params) {
         for (const param of params) {
@@ -1086,8 +1046,8 @@ class LanguageServerBase {
         // Tell all of the services that the user is actively
         // interacting with one or more editors, so they should
         // back off from performing any work.
-        this._workspaceMap.forEach((workspace) => {
-            workspace.serviceInstance.recordUserInteractionTime();
+        this._workspaceFactory.items().forEach((workspace) => {
+            workspace.service.recordUserInteractionTime();
         });
     }
     getDocumentationUrlForDiagnosticRule(rule) {