@zzzen/pyright-internal 1.2.0-dev.20220710 → 1.2.0-dev.20220731

package/dist/common/textEditUtils.js

@@ -6,8 +6,35 @@
  *
  * Language server command execution functionality.
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertTextEdits = void 0;
+exports.TextEditTracker = exports.convertTextEdits = void 0;
+const analyzerNodeInfo_1 = require("../analyzer/analyzerNodeInfo");
+const importStatementUtils_1 = require("../analyzer/importStatementUtils");
+const ParseTreeUtils = __importStar(require("../analyzer/parseTreeUtils"));
+const debug = __importStar(require("../common/debug"));
+const collectionUtils_1 = require("./collectionUtils");
+const core_1 = require("./core");
+const positionUtils_1 = require("./positionUtils");
+const textRange_1 = require("./textRange");
 function convertTextEdits(uri, editActions) {
     if (!editActions) {
         return {};
@@ -26,4 +53,114 @@ function convertTextEdits(uri, editActions) {
     };
 }
 exports.convertTextEdits = convertTextEdits;
+class TextEditTracker {
+    constructor() {
+        this._nodesRemoved = [];
+        this._results = new Map();
+    }
+    addEdits(...edits) {
+        edits.forEach((e) => this.addEdit(e.filePath, e.range, e.replacementText));
+    }
+    addEdit(filePath, range, replacementText) {
+        const edits = (0, collectionUtils_1.getOrAdd)(this._results, filePath, () => []);
+        if (replacementText === '') {
+            // If it is a deletion, merge with overlapping deletion edit if there is any.
+            const deletions = this.getDeletionsForSpan(edits, range);
+            if (deletions.length > 0) {
+                // Delete the existing ones.
+                this.removeEdits(edits, deletions);
+                // Extend range with deleted ones.
+                (0, textRange_1.extendRange)(range, deletions.map((d) => d.range));
+            }
+        }
+        // Don't put duplicated edit. It can happen if code has duplicated module import.
+        // ex) from a import b, b, c
+        // If we need to introduce new "from import" statement for "b", we will add new statement twice.
+        if (edits.some((e) => (0, textRange_1.rangesAreEqual)(e.range, range) && e.replacementText === replacementText)) {
+            return;
+        }
+        edits.push({ filePath, range, replacementText });
+    }
+    getDeletionsForSpan(filePathOrEdit, range) {
+        var _a;
+        if ((0, core_1.isString)(filePathOrEdit)) {
+            filePathOrEdit = (_a = this._results.get(filePathOrEdit)) !== null && _a !== void 0 ? _a : [];
+        }
+        return filePathOrEdit.filter((e) => e.replacementText === '' && (0, textRange_1.doRangesIntersect)(e.range, range));
+    }
+    removeEdits(filePathOrEdit, edits) {
+        var _a;
+        if ((0, core_1.isString)(filePathOrEdit)) {
+            filePathOrEdit = (_a = this._results.get(filePathOrEdit)) !== null && _a !== void 0 ? _a : [];
+        }
+        (0, collectionUtils_1.removeArrayElements)(filePathOrEdit, (f) => edits.findIndex((e) => e === f) >= 0);
+    }
+    removeNodes(...nodes) {
+        this._nodesRemoved.push(...nodes);
+    }
+    getEdits(token) {
+        this._processNodeRemoved(token);
+        const edits = [];
+        this._results.forEach((v) => (0, collectionUtils_1.appendArray)(edits, v));
+        return edits;
+    }
+    _processNodeRemoved(token) {
+        while (this._nodesRemoved.length > 0) {
+            const numberOfNodesBeforeProcessing = this._nodesRemoved.length;
+            const peekNodeToRemove = this._nodesRemoved[this._nodesRemoved.length - 1];
+            this._handleImportNameNode(peekNodeToRemove, token);
+            if (this._nodesRemoved.length === numberOfNodesBeforeProcessing) {
+                // It looks like we don't know how to handle the node,
+                // Please add code to handle the case.
+                debug.assert(`please add handler for ${peekNodeToRemove.node.nodeType}`);
+                // As a default behavior, we will just remove the node
+                this._nodesRemoved.pop();
+                const info = (0, analyzerNodeInfo_1.getFileInfo)(peekNodeToRemove.parseResults.parseTree);
+                this.addEdit(info.filePath, (0, positionUtils_1.convertTextRangeToRange)(peekNodeToRemove.node, info.lines), '');
+            }
+        }
+    }
+    _handleImportNameNode(peekNodeToRemove, token) {
+        const peekNode = peekNodeToRemove.node;
+        if (peekNode.nodeType !== 38 /* Name */) {
+            return false;
+        }
+        const module = peekNodeToRemove.parseResults.parseTree;
+        const info = (0, analyzerNodeInfo_1.getFileInfo)(module);
+        const importNode = (0, importStatementUtils_1.getContainingImportStatement)(ParseTreeUtils.findNodeByOffset(module, peekNode.start), token);
+        if (!importNode) {
+            return false;
+        }
+        const nameNodes = (0, importStatementUtils_1.getAllImportNames)(importNode);
+        // check various different cases
+        // 1. check whether all imported names in the import statement is not used.
+        const nodesRemoved = this._nodesRemoved.filter((nodeToRemove) => nameNodes.some((n) => textRange_1.TextRange.overlapsRange(nodeToRemove.node, n)));
+        if (nameNodes.length === nodesRemoved.length) {
+            this.addEdit(info.filePath, ParseTreeUtils.getFullStatementRange(importNode, peekNodeToRemove.parseResults.tokenizerOutput), '');
+            // Remove nodes that are handled from queue.
+            this._removeNodesHandled(nodesRemoved);
+            return true;
+        }
+        // 2. some of modules in the import statement is used.
+        const indices = [];
+        for (let i = 0; i < nameNodes.length; i++) {
+            const nameNode = nameNodes[i];
+            if (nodesRemoved.some((r) => textRange_1.TextRange.overlapsRange(r.node, nameNode))) {
+                indices.push(i);
+            }
+        }
+        if (indices.length === 0) {
+            // can't find module user wants to remove
+            return false;
+        }
+        const editSpans = (0, importStatementUtils_1.getTextRangeForImportNameDeletion)(nameNodes, ...indices);
+        editSpans.forEach((e) => this.addEdit(info.filePath, (0, positionUtils_1.convertTextRangeToRange)(e, info.lines), ''));
+        this._removeNodesHandled(nodesRemoved);
+        return true;
+    }
+    _removeNodesHandled(nodesRemoved) {
+        (0, collectionUtils_1.removeArrayElements)(this._nodesRemoved, (n) => nodesRemoved.some((r) => r === n));
+    }
+}
+exports.TextEditTracker = TextEditTracker;
 //# sourceMappingURL=textEditUtils.js.map

package/dist/common/textEditUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"textEditUtils.js","sourceRoot":"","sources":["../../../src/common/textEditUtils.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAMH,SAAgB,gBAAgB,CAAC,GAAW,EAAE,WAAyC;IACnF,IAAI,CAAC,WAAW,EAAE;QACd,OAAO,EAAE,CAAC;KACb;IAED,MAAM,KAAK,GAAe,EAAE,CAAC;IAC7B,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QAC/B,KAAK,CAAC,IAAI,CAAC;YACP,KAAK,EAAE,UAAU,CAAC,KAAK;YACvB,OAAO,EAAE,UAAU,CAAC,eAAe;SACtC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,OAAO;QACH,OAAO,EAAE;YACL,CAAC,GAAG,CAAC,EAAE,KAAK;SACf;KACJ,CAAC;AACN,CAAC;AAlBD,4CAkBC"}
+{"version":3,"file":"textEditUtils.js","sourceRoot":"","sources":["../../../src/common/textEditUtils.ts"],"names":[],"mappings":"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"}

package/dist/common/uriParser.d.ts

@@ -1,5 +1,6 @@
 import { Position } from 'vscode-languageserver';
 import { TextDocumentIdentifier } from 'vscode-languageserver-protocol';
+import { URI } from 'vscode-uri';
 import { FileSystem } from './fileSystem';
 export declare class UriParser {
     protected readonly _fs: FileSystem;
@@ -9,4 +10,5 @@ export declare class UriParser {
         position: Position;
     };
     decodeTextDocumentUri(uriString: string): string;
+    isLocal(uri: URI | string | undefined): boolean;
 }

package/dist/common/uriParser.js

@@ -8,6 +8,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UriParser = void 0;
+const vscode_uri_1 = require("vscode-uri");
+const core_1 = require("./core");
 const pathUtils_1 = require("./pathUtils");
 class UriParser {
     constructor(_fs) {
@@ -20,6 +22,15 @@ class UriParser {
     decodeTextDocumentUri(uriString) {
         return (0, pathUtils_1.convertUriToPath)(this._fs, uriString);
     }
+    isLocal(uri) {
+        if (!uri) {
+            return false;
+        }
+        if ((0, core_1.isString)(uri)) {
+            uri = vscode_uri_1.URI.parse(uri);
+        }
+        return uri.scheme === 'file';
+    }
 }
 exports.UriParser = UriParser;
 //# sourceMappingURL=uriParser.js.map

package/dist/common/uriParser.js.map

@@ -1 +1 @@
-{"version":3,"file":"uriParser.js","sourceRoot":"","sources":["../../../src/common/uriParser.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAMH,2CAA+C;AAE/C,MAAa,SAAS;IAClB,YAA+B,GAAe;QAAf,QAAG,GAAH,GAAG,CAAY;IAAG,CAAC;IAE3C,0BAA0B,CAAC,YAAoC,EAAE,QAAkB;QACtF,MAAM,QAAQ,GAAG,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAC9D,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;IAClC,CAAC;IAEM,qBAAqB,CAAC,SAAiB;QAC1C,OAAO,IAAA,4BAAgB,EAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IACjD,CAAC;CACJ;AAXD,8BAWC"}
+{"version":3,"file":"uriParser.js","sourceRoot":"","sources":["../../../src/common/uriParser.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAIH,2CAAiC;AAEjC,iCAAkC;AAElC,2CAA+C;AAE/C,MAAa,SAAS;IAClB,YAA+B,GAAe;QAAf,QAAG,GAAH,GAAG,CAAY;IAAG,CAAC;IAE3C,0BAA0B,CAAC,YAAoC,EAAE,QAAkB;QACtF,MAAM,QAAQ,GAAG,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAC9D,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;IAClC,CAAC;IAEM,qBAAqB,CAAC,SAAiB;QAC1C,OAAO,IAAA,4BAAgB,EAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IACjD,CAAC;IAEM,OAAO,CAAC,GAA6B;QACxC,IAAI,CAAC,GAAG,EAAE;YACN,OAAO,KAAK,CAAC;SAChB;QAED,IAAI,IAAA,eAAQ,EAAC,GAAG,CAAC,EAAE;YACf,GAAG,GAAG,gBAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACxB;QAED,OAAO,GAAG,CAAC,MAAM,KAAK,MAAM,CAAC;IACjC,CAAC;CACJ;AAvBD,8BAuBC"}

package/dist/common/workspaceEditUtils.d.ts

@@ -2,6 +2,7 @@ import { ChangeAnnotation, WorkspaceEdit } from 'vscode-languageserver';
 import { FileEditAction, FileEditActions } from '../common/editAction';
 import { FileSystem } from './fileSystem';
 export declare function convertWorkspaceEdits(fs: FileSystem, edits: FileEditAction[]): WorkspaceEdit;
+export declare function AddToWorkspaceEdit(fs: FileSystem, workspaceEdit: WorkspaceEdit, edits: FileEditAction[]): void;
 export declare function convertWorkspaceDocumentEdits(fs: FileSystem, editActions: FileEditActions, changeAnnotations?: {
     [id: string]: ChangeAnnotation;
 }, defaultAnnotationId?: string): WorkspaceEdit;

package/dist/common/workspaceEditUtils.js

@@ -7,23 +7,27 @@
  * Convert Pyright's FileEditActions to LanguageServer's WorkspaceEdits.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertWorkspaceDocumentEdits = exports.convertWorkspaceEdits = void 0;
+exports.convertWorkspaceDocumentEdits = exports.AddToWorkspaceEdit = exports.convertWorkspaceEdits = void 0;
 const vscode_languageserver_1 = require("vscode-languageserver");
 const pathUtils_1 = require("../common/pathUtils");
 const collectionUtils_1 = require("./collectionUtils");
 const debug_1 = require("./debug");
 function convertWorkspaceEdits(fs, edits) {
-    const workspaceEdits = {
+    const workspaceEdit = {
         changes: {},
     };
+    AddToWorkspaceEdit(fs, workspaceEdit, edits);
+    return workspaceEdit;
+}
+exports.convertWorkspaceEdits = convertWorkspaceEdits;
+function AddToWorkspaceEdit(fs, workspaceEdit, edits) {
     edits.forEach((edit) => {
         const uri = (0, pathUtils_1.convertPathToUri)(fs, edit.filePath);
-        workspaceEdits.changes[uri] = workspaceEdits.changes[uri] || [];
-        workspaceEdits.changes[uri].push({ range: edit.range, newText: edit.replacementText });
+        workspaceEdit.changes[uri] = workspaceEdit.changes[uri] || [];
+        workspaceEdit.changes[uri].push({ range: edit.range, newText: edit.replacementText });
     });
-    return workspaceEdits;
 }
-exports.convertWorkspaceEdits = convertWorkspaceEdits;
+exports.AddToWorkspaceEdit = AddToWorkspaceEdit;
 function convertWorkspaceDocumentEdits(fs, editActions, changeAnnotations, defaultAnnotationId = 'default') {
     const workspaceEdit = {
         documentChanges: [],

package/dist/common/workspaceEditUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspaceEditUtils.js","sourceRoot":"","sources":["../../../src/common/workspaceEditUtils.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,iEAO+B;AAG/B,mDAAuD;AACvD,uDAAuD;AACvD,mCAAsC;AAGtC,SAAgB,qBAAqB,CAAC,EAAc,EAAE,KAAuB;IACzE,MAAM,cAAc,GAAkB;QAClC,OAAO,EAAE,EAAE;KACd,CAAC;IAEF,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACnB,MAAM,GAAG,GAAG,IAAA,4BAAgB,EAAC,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAChD,cAAc,CAAC,OAAQ,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC,OAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QAClE,cAAc,CAAC,OAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;IAC5F,CAAC,CAAC,CAAC;IAEH,OAAO,cAAc,CAAC;AAC1B,CAAC;AAZD,sDAYC;AAED,SAAgB,6BAA6B,CACzC,EAAc,EACd,WAA4B,EAC5B,iBAEC,EACD,mBAAmB,GAAG,SAAS;IAE/B,MAAM,aAAa,GAAkB;QACjC,eAAe,EAAE,EAAE;QACnB,iBAAiB,EAAE,iBAAiB;KACvC,CAAC;IAEF,MAAM,UAAU,GAAG,IAAA,oCAAkB,EAAC,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC5E,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,UAAU,EAAE;QACnC,aAAa,CAAC,eAAgB,CAAC,IAAI,CAC/B,wCAAgB,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,IAAA,4BAAgB,EAAC,EAAE,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;YACvE,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACjB,KAAK,EAAE,CAAC,CAAC,KAAK;gBACd,OAAO,EAAE,CAAC,CAAC,eAAe;gBAC1B,YAAY,EAAE,mBAAmB;aACpC,CAAC,CAAC;SACN,CAAC,CACL,CAAC;KACL;IAED,KAAK,MAAM,SAAS,IAAI,WAAW,CAAC,cAAc,EAAE;QAChD,QAAQ,SAAS,CAAC,IAAI,EAAE;YACpB,KAAK,QAAQ;gBACT,aAAa,CAAC,eAAgB,CAAC,IAAI,CAC/B,kCAAU,CAAC,MAAM,CACb,IAAA,4BAAgB,EAAC,EAAE,EAAE,SAAS,CAAC,QAAQ,CAAC;gBACxC,aAAa,CAAC,SAAS,EACvB,mBAAmB,CACtB,CACJ,CAAC;gBACF,MAAM;YACV,KAAK,QAAQ;gBACT,aAAa,CAAC,eAAgB,CAAC,IAAI,CAC/B,kCAAU,CAAC,MAAM,CACb,IAAA,4BAAgB,EAAC,EAAE,EAAE,SAAS,CAAC,WAAW,CAAC,EAC3C,IAAA,4BAAgB,EAAC,EAAE,EAAE,SAAS,CAAC,WAAW,CAAC;gBAC3C,aAAa,CAAC,SAAS,EACvB,mBAAmB,CACtB,CACJ,CAAC;gBACF,MAAM;YACV,KAAK,QAAQ;gBACT,aAAa,CAAC,eAAgB,CAAC,IAAI,CAC/B,kCAAU,CAAC,MAAM,CACb,IAAA,4BAAgB,EAAC,EAAE,EAAE,SAAS,CAAC,QAAQ,CAAC;gBACxC,aAAa,CAAC,SAAS,EACvB,mBAAmB,CACtB,CACJ,CAAC;gBACF,MAAM;YACV;gBACI,IAAA,mBAAW,EAAC,SAAS,CAAC,CAAC;SAC9B;KACJ;IAED,OAAO,aAAa,CAAC;AACzB,CAAC;AA9DD,sEA8DC"}
+{"version":3,"file":"workspaceEditUtils.js","sourceRoot":"","sources":["../../../src/common/workspaceEditUtils.ts"],"names":[],"mappings":"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"}

package/dist/languageServerBase.d.ts

@@ -16,13 +16,14 @@ import { Deferred } from './common/deferred';
 import { DiagnosticRule } from './common/diagnosticRules';
 import { FileDiagnostics } from './common/diagnosticSink';
 import { LanguageServiceExtension } from './common/extensibility';
-import { FileSystem, FileWatcherProvider } from './common/fileSystem';
+import { FileSystem, FileWatcherHandler } from './common/fileSystem';
 import { Host } from './common/host';
 import { ProgressReporter } from './common/progressReporter';
 import { DocumentRange, Position, Range } from './common/textRange';
 import { UriParser } from './common/uriParser';
 import { CompletionOptions, CompletionResultsList } from './languageService/completionProvider';
 import { DefinitionFilter } from './languageService/definitionProvider';
+import { PyrightFileSystem } from './pyrightFileSystem';
 import { WorkspaceMap } from './workspaceMap';
 export interface ServerSettings {
     venvPath?: string | undefined;
@@ -49,6 +50,7 @@ export interface ServerSettings {
 export declare enum WellKnownWorkspaceKinds {
     Default = "default",
     Regular = "regular",
+    Limited = "limited",
     Cloned = "cloned",
     Test = "test"
 }
@@ -63,6 +65,7 @@ export interface WorkspaceServiceInstance {
     disableWorkspaceSymbol: boolean;
     isInitialized: Deferred<boolean>;
     searchPathsToWatch: string[];
+    owns?(filePath: string): boolean;
 }
 export interface MessageAction {
     title: string;
@@ -86,7 +89,6 @@ export interface LanguageServerInterface {
     readonly rootPath: string;
     readonly console: ConsoleInterface;
     readonly window: WindowInterface;
-    readonly fs: FileSystem;
     readonly supportAdvancedEdits: boolean;
 }
 export interface ServerOptions {
@@ -94,15 +96,19 @@ export interface ServerOptions {
     rootDirectory: string;
     version: string;
     workspaceMap: WorkspaceMap;
-    fileSystem: FileSystem;
-    fileWatcherProvider: FileWatcherProvider;
     cancellationProvider: CancellationProvider;
+    fileSystem: FileSystem;
+    fileWatcherHandler: FileWatcherHandler;
     extension?: LanguageServiceExtension;
     maxAnalysisTimeInForeground?: MaxAnalysisTime;
     disableChecker?: boolean;
     supportedCommands?: string[];
     supportedCodeActions?: string[];
 }
+export interface WorkspaceServices {
+    fs: FileSystem;
+    backgroundAnalysis: BackgroundAnalysisBase | undefined;
+}
 interface ClientCapabilities {
     hasConfigurationCapability: boolean;
     hasVisualStudioExtensionsCapability: boolean;
@@ -116,6 +122,7 @@ interface ClientCapabilities {
     hasGoToDeclarationCapability: boolean;
     hasDocumentChangeCapability: boolean;
     hasDocumentAnnotationCapability: boolean;
+    hasCompletionCommitCharCapability: boolean;
     hoverContentFormat: MarkupKind;
     completionDocFormat: MarkupKind;
     completionSupportsSnippet: boolean;
@@ -130,7 +137,6 @@ export declare abstract class LanguageServerBase implements LanguageServerInterf
     readonly console: ConsoleInterface;
     protected _defaultClientConfig: any;
     protected _workspaceMap: WorkspaceMap;
-    protected _fileWatcherProvider: FileWatcherProvider;
     private _pendingFindAllRefsCancellationSource;
     private _pendingCommandCancellationSource;
     private _progressReporter;
@@ -138,7 +144,7 @@ export declare abstract class LanguageServerBase implements LanguageServerInterf
     private _lastFileWatcherRegistration;
     rootPath: string;
     protected client: ClientCapabilities;
-    fs: FileSystem;
+    protected _serviceFS: PyrightFileSystem;
     protected _uriParser: UriParser;
     constructor(_serverOptions: ServerOptions, _connection: Connection, console: ConsoleInterface, uriParserFactory?: (fs: FileSystem) => UriParser);
     decodeTextDocumentUri(uriString: string): string;
@@ -158,7 +164,7 @@ export declare abstract class LanguageServerBase implements LanguageServerInterf
     protected setExtension(extension: any): void;
     get window(): RemoteWindow;
     get supportAdvancedEdits(): boolean;
-    createAnalyzerService(name: string, libraryReanalysisTimeProvider?: () => number): AnalyzerService;
+    createAnalyzerService(name: string, services?: WorkspaceServices, libraryReanalysisTimeProvider?: () => number): AnalyzerService;
     getWorkspaceForFile(filePath: string): Promise<WorkspaceServiceInstance>;
     reanalyze(): void;
     restart(): void;
@@ -195,15 +201,10 @@ export declare abstract class LanguageServerBase implements LanguageServerInterf
     protected resolveWorkspaceCompletionItem(workspace: WorkspaceServiceInstance, filePath: string, item: CompletionItem, token: CancellationToken): void;
     protected getWorkspaceCompletionsForPosition(workspace: WorkspaceServiceInstance, filePath: string, position: Position, workspacePath: string, options: CompletionOptions, token: CancellationToken): Promise<CompletionResultsList | undefined>;
     updateSettingsForAllWorkspaces(): void;
-    protected getCompletionOptions(params?: CompletionParams): {
-        format: MarkupKind;
-        snippet: boolean;
-        lazyEdit: boolean;
-        autoImport: boolean;
-    };
-    protected createWorkspaceServiceInstance(workspace: WorkspaceFolder | undefined, rootPath: string, kind?: string): WorkspaceServiceInstance;
-    protected convertDiagnostics(fileDiagnostics: FileDiagnostics): PublishDiagnosticsParams[];
-    protected onAnalysisCompletedHandler(results: AnalysisResults): void;
+    protected getCompletionOptions(workspace: WorkspaceServiceInstance, params?: CompletionParams): CompletionOptions;
+    protected createWorkspaceServiceInstance(workspace: WorkspaceFolder | undefined, rootPath: string, kind?: string, owns?: (filePath: string) => boolean, services?: WorkspaceServices): WorkspaceServiceInstance;
+    protected convertDiagnostics(fs: FileSystem, fileDiagnostics: FileDiagnostics): PublishDiagnosticsParams[];
+    protected onAnalysisCompletedHandler(fs: FileSystem, results: AnalysisResults): void;
     updateSettingsForWorkspace(workspace: WorkspaceServiceInstance, serverSettings?: ServerSettings): Promise<void>;
     updateOptionsAndRestartService(workspace: WorkspaceServiceInstance, serverSettings: ServerSettings, typeStubTargetImportName?: string): void;
     protected convertLogLevel(logLevelValue?: string): LogLevel;