@zzzen/pyright-internal 1.2.0-dev.20220703 → 1.2.0-dev.20220724

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/languageServerBase.d.ts

@@ -6,6 +6,7 @@ import { BackgroundAnalysisProgram } from './analyzer/backgroundAnalysisProgram'
 import { ImportResolver } from './analyzer/importResolver';
 import { MaxAnalysisTime } from './analyzer/program';
 import { AnalyzerService } from './analyzer/service';
+import { IPythonMode } from './analyzer/sourceFile';
 import type { BackgroundAnalysisBase } from './backgroundAnalysisBase';
 import { CancellationProvider } from './common/cancellationUtils';
 import { DiagnosticSeverityOverrides, DiagnosticSeverityOverridesMap } from './common/commandLineOptions';
@@ -15,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;
@@ -48,6 +50,7 @@ export interface ServerSettings {
 export declare enum WellKnownWorkspaceKinds {
     Default = "default",
     Regular = "regular",
+    Limited = "limited",
     Cloned = "cloned",
     Test = "test"
 }
@@ -85,7 +88,6 @@ export interface LanguageServerInterface {
     readonly rootPath: string;
     readonly console: ConsoleInterface;
     readonly window: WindowInterface;
-    readonly fs: FileSystem;
     readonly supportAdvancedEdits: boolean;
 }
 export interface ServerOptions {
@@ -93,15 +95,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;
@@ -115,6 +121,7 @@ interface ClientCapabilities {
     hasGoToDeclarationCapability: boolean;
     hasDocumentChangeCapability: boolean;
     hasDocumentAnnotationCapability: boolean;
+    hasCompletionCommitCharCapability: boolean;
     hoverContentFormat: MarkupKind;
     completionDocFormat: MarkupKind;
     completionSupportsSnippet: boolean;
@@ -129,7 +136,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;
@@ -137,7 +143,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;
@@ -157,7 +163,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;
@@ -186,23 +192,18 @@ export declare abstract class LanguageServerBase implements LanguageServerInterf
     protected onPrepare(params: CallHierarchyPrepareParams, token: CancellationToken): Promise<CallHierarchyItem[] | null>;
     protected onIncomingCalls(params: CallHierarchyIncomingCallsParams, token: CancellationToken): Promise<import("vscode-languageserver-types").CallHierarchyIncomingCall[] | null>;
     protected onOutgoingCalls(params: CallHierarchyOutgoingCallsParams, token: CancellationToken): Promise<CallHierarchyOutgoingCall[] | null>;
-    protected onDidOpenTextDocument(params: DidOpenTextDocumentParams, ipythonMode?: boolean): Promise<void>;
-    protected onDidChangeTextDocument(params: DidChangeTextDocumentParams, ipythonMode?: boolean): Promise<void>;
+    protected onDidOpenTextDocument(params: DidOpenTextDocumentParams, ipythonMode?: IPythonMode): Promise<void>;
+    protected onDidChangeTextDocument(params: DidChangeTextDocumentParams, ipythonMode?: IPythonMode): Promise<void>;
     protected onDidCloseTextDocument(params: DidCloseTextDocumentParams): Promise<void>;
     protected onDidChangeWatchedFiles(params: DidChangeWatchedFilesParams): void;
     protected onExecuteCommand(params: ExecuteCommandParams, token: CancellationToken, reporter: WorkDoneProgressReporter): Promise<any>;
     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, 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;

package/dist/languageServerBase.js

@@ -16,6 +16,7 @@ const vscode_languageserver_1 = require("vscode-languageserver");
 const progress_1 = require("vscode-languageserver/lib/common/progress");
 const backgroundAnalysisProgram_1 = require("./analyzer/backgroundAnalysisProgram");
 const service_1 = require("./analyzer/service");
+const sourceFile_1 = require("./analyzer/sourceFile");
 const commandResult_1 = require("./commands/commandResult");
 const cancellationUtils_1 = require("./common/cancellationUtils");
 const collectionUtils_1 = require("./common/collectionUtils");
@@ -38,6 +39,7 @@ var WellKnownWorkspaceKinds;
 (function (WellKnownWorkspaceKinds) {
     WellKnownWorkspaceKinds["Default"] = "default";
     WellKnownWorkspaceKinds["Regular"] = "regular";
+    WellKnownWorkspaceKinds["Limited"] = "limited";
     WellKnownWorkspaceKinds["Cloned"] = "cloned";
     WellKnownWorkspaceKinds["Test"] = "test";
 })(WellKnownWorkspaceKinds = exports.WellKnownWorkspaceKinds || (exports.WellKnownWorkspaceKinds = {}));
@@ -64,6 +66,7 @@ class LanguageServerBase {
             hasGoToDeclarationCapability: false,
             hasDocumentChangeCapability: false,
             hasDocumentAnnotationCapability: false,
+            hasCompletionCommitCharCapability: false,
             hoverContentFormat: vscode_languageserver_1.MarkupKind.PlainText,
             completionDocFormat: vscode_languageserver_1.MarkupKind.PlainText,
             completionSupportsSnippet: false,
@@ -78,15 +81,14 @@ class LanguageServerBase {
         this.console.info(`${_serverOptions.productName} language server ${_serverOptions.version && _serverOptions.version + ' '}starting`);
         this.console.info(`Server root directory: ${_serverOptions.rootDirectory}`);
         this._workspaceMap = this._serverOptions.workspaceMap;
-        this._fileWatcherProvider = this._serverOptions.fileWatcherProvider;
-        this.fs = new pyrightFileSystem_1.PyrightFileSystem(this._serverOptions.fileSystem);
-        this._uriParser = uriParserFactory(this.fs);
+        this._serviceFS = new pyrightFileSystem_1.PyrightFileSystem(this._serverOptions.fileSystem);
+        this._uriParser = uriParserFactory(this._serviceFS);
         // Set the working directory to a known location within
         // the extension directory. Otherwise the execution of
         // python can have unintended and surprising results.
-        const moduleDirectory = this.fs.getModulePath();
+        const moduleDirectory = this._serviceFS.getModulePath();
         if (moduleDirectory) {
-            this.fs.chdir(moduleDirectory);
+            this._serviceFS.chdir(moduleDirectory);
         }
         // Set up callbacks.
         this.setupConnection((_a = _serverOptions.supportedCommands) !== null && _a !== void 0 ? _a : [], (_b = _serverOptions.supportedCodeActions) !== null && _b !== void 0 ? _b : []);
@@ -149,20 +151,21 @@ class LanguageServerBase {
     }
     // Creates a service instance that's used for analyzing a
     // program within a workspace.
-    createAnalyzerService(name, libraryReanalysisTimeProvider) {
-        this.console.log(`Starting service instance "${name}"`);
-        const service = new service_1.AnalyzerService(name, this.fs, {
+    createAnalyzerService(name, services, libraryReanalysisTimeProvider) {
+        var _a;
+        this.console.info(`Starting service instance "${name}"`);
+        const service = new service_1.AnalyzerService(name, (_a = services === null || services === void 0 ? void 0 : services.fs) !== null && _a !== void 0 ? _a : this._serviceFS, {
             console: this.console,
             hostFactory: this.createHost.bind(this),
             importResolverFactory: this.createImportResolver.bind(this),
             extension: this._serverOptions.extension,
-            backgroundAnalysis: this.createBackgroundAnalysis(),
+            backgroundAnalysis: services ? services.backgroundAnalysis : this.createBackgroundAnalysis(),
             maxAnalysisTime: this._serverOptions.maxAnalysisTimeInForeground,
             backgroundAnalysisProgramFactory: this.createBackgroundAnalysisProgram.bind(this),
             cancellationProvider: this._serverOptions.cancellationProvider,
             libraryReanalysisTimeProvider,
         });
-        service.setCompletionCallback((results) => this.onAnalysisCompletedHandler(results));
+        service.setCompletionCallback((results) => this.onAnalysisCompletedHandler(service.fs, results));
         return service;
     }
     async getWorkspaceForFile(filePath) {
@@ -211,7 +214,7 @@ class LanguageServerBase {
         this._connection.onExecuteCommand(async (params, token, reporter) => this.onExecuteCommand(params, token, reporter));
     }
     initialize(params, supportedCommands, supportedCodeActions) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19;
         if (params.locale) {
             (0, localize_1.setLocaleOverride)(params.locale);
         }
@@ -233,17 +236,20 @@ class LanguageServerBase {
             !!((_s = (_r = capabilities.workspace) === null || _r === void 0 ? void 0 : _r.workspaceEdit) === null || _s === void 0 ? void 0 : _s.documentChanges) &&
                 !!((_t = capabilities.workspace.workspaceEdit) === null || _t === void 0 ? void 0 : _t.resourceOperations);
         this.client.hasDocumentAnnotationCapability = !!((_v = (_u = capabilities.workspace) === null || _u === void 0 ? void 0 : _u.workspaceEdit) === null || _v === void 0 ? void 0 : _v.changeAnnotationSupport);
-        this.client.hoverContentFormat = this._getCompatibleMarkupKind((_x = (_w = capabilities.textDocument) === null || _w === void 0 ? void 0 : _w.hover) === null || _x === void 0 ? void 0 : _x.contentFormat);
-        this.client.completionDocFormat = this._getCompatibleMarkupKind((_0 = (_z = (_y = capabilities.textDocument) === null || _y === void 0 ? void 0 : _y.completion) === null || _z === void 0 ? void 0 : _z.completionItem) === null || _0 === void 0 ? void 0 : _0.documentationFormat);
-        this.client.completionSupportsSnippet = !!((_3 = (_2 = (_1 = capabilities.textDocument) === null || _1 === void 0 ? void 0 : _1.completion) === null || _2 === void 0 ? void 0 : _2.completionItem) === null || _3 === void 0 ? void 0 : _3.snippetSupport);
-        this.client.signatureDocFormat = this._getCompatibleMarkupKind((_6 = (_5 = (_4 = capabilities.textDocument) === null || _4 === void 0 ? void 0 : _4.signatureHelp) === null || _5 === void 0 ? void 0 : _5.signatureInformation) === null || _6 === void 0 ? void 0 : _6.documentationFormat);
-        const supportedDiagnosticTags = ((_9 = (_8 = (_7 = capabilities.textDocument) === null || _7 === void 0 ? void 0 : _7.publishDiagnostics) === null || _8 === void 0 ? void 0 : _8.tagSupport) === null || _9 === void 0 ? void 0 : _9.valueSet) || [];
+        this.client.hasCompletionCommitCharCapability =
+            !!((_y = (_x = (_w = capabilities.textDocument) === null || _w === void 0 ? void 0 : _w.completion) === null || _x === void 0 ? void 0 : _x.completionList) === null || _y === void 0 ? void 0 : _y.itemDefaults) &&
+                !!((_z = capabilities.textDocument.completion.completionItem) === null || _z === void 0 ? void 0 : _z.commitCharactersSupport);
+        this.client.hoverContentFormat = this._getCompatibleMarkupKind((_1 = (_0 = capabilities.textDocument) === null || _0 === void 0 ? void 0 : _0.hover) === null || _1 === void 0 ? void 0 : _1.contentFormat);
+        this.client.completionDocFormat = this._getCompatibleMarkupKind((_4 = (_3 = (_2 = capabilities.textDocument) === null || _2 === void 0 ? void 0 : _2.completion) === null || _3 === void 0 ? void 0 : _3.completionItem) === null || _4 === void 0 ? void 0 : _4.documentationFormat);
+        this.client.completionSupportsSnippet = !!((_7 = (_6 = (_5 = capabilities.textDocument) === null || _5 === void 0 ? void 0 : _5.completion) === null || _6 === void 0 ? void 0 : _6.completionItem) === null || _7 === void 0 ? void 0 : _7.snippetSupport);
+        this.client.signatureDocFormat = this._getCompatibleMarkupKind((_10 = (_9 = (_8 = capabilities.textDocument) === null || _8 === void 0 ? void 0 : _8.signatureHelp) === null || _9 === void 0 ? void 0 : _9.signatureInformation) === null || _10 === void 0 ? void 0 : _10.documentationFormat);
+        const supportedDiagnosticTags = ((_13 = (_12 = (_11 = capabilities.textDocument) === null || _11 === void 0 ? void 0 : _11.publishDiagnostics) === null || _12 === void 0 ? void 0 : _12.tagSupport) === null || _13 === void 0 ? void 0 : _13.valueSet) || [];
         this.client.supportsUnnecessaryDiagnosticTag = supportedDiagnosticTags.some((tag) => tag === vscode_languageserver_1.DiagnosticTag.Unnecessary);
         this.client.supportsDeprecatedDiagnosticTag = supportedDiagnosticTags.some((tag) => tag === vscode_languageserver_1.DiagnosticTag.Deprecated);
-        this.client.hasWindowProgressCapability = !!((_10 = capabilities.window) === null || _10 === void 0 ? void 0 : _10.workDoneProgress);
-        this.client.hasGoToDeclarationCapability = !!((_11 = capabilities.textDocument) === null || _11 === void 0 ? void 0 : _11.declaration);
+        this.client.hasWindowProgressCapability = !!((_14 = capabilities.window) === null || _14 === void 0 ? void 0 : _14.workDoneProgress);
+        this.client.hasGoToDeclarationCapability = !!((_15 = capabilities.textDocument) === null || _15 === void 0 ? void 0 : _15.declaration);
         this.client.completionItemResolveSupportsAdditionalTextEdits =
-            !!((_15 = (_14 = (_13 = (_12 = capabilities.textDocument) === null || _12 === void 0 ? void 0 : _12.completion) === null || _13 === void 0 ? void 0 : _13.completionItem) === null || _14 === void 0 ? void 0 : _14.resolveSupport) === null || _15 === void 0 ? void 0 : _15.properties.some((p) => p === 'additionalTextEdits'));
+            !!((_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) => {
@@ -322,11 +328,15 @@ class LanguageServerBase {
         // Add all python search paths to watch list
         if (this.client.hasWatchFileRelativePathCapability) {
             // Dedup search paths from all workspaces.
-            const foldersToWatch = (0, pathUtils_1.deduplicateFolders)(this._workspaceMap.getNonDefaultWorkspaces().map((w) => w.searchPathsToWatch));
+            // Get rid of any search path under workspace root since it is already watched by
+            // "**" above.
+            const foldersToWatch = (0, pathUtils_1.deduplicateFolders)(this._workspaceMap
+                .getNonDefaultWorkspaces()
+                .map((w) => w.searchPathsToWatch.filter((p) => !p.startsWith(w.rootPath))));
             foldersToWatch.forEach((p) => {
-                const globPattern = (0, pathUtils_1.isFile)(this.fs, p, /* treatZipDirectoryAsFile */ true)
-                    ? { baseUri: (0, pathUtils_1.convertPathToUri)(this.fs, (0, pathUtils_1.getDirectoryPath)(p)), pattern: (0, pathUtils_1.getFileName)(p) }
-                    : { baseUri: (0, pathUtils_1.convertPathToUri)(this.fs, p), pattern: '**' };
+                const globPattern = (0, pathUtils_1.isFile)(this._serviceFS, p, /* treatZipDirectoryAsFile */ true)
+                    ? { baseUri: (0, pathUtils_1.convertPathToUri)(this._serviceFS, (0, pathUtils_1.getDirectoryPath)(p)), pattern: (0, pathUtils_1.getFileName)(p) }
+                    : { baseUri: (0, pathUtils_1.convertPathToUri)(this._serviceFS, p), pattern: '**' };
                 watchers.push({ globPattern, kind: watchKind });
             });
         }
@@ -366,8 +376,8 @@ class LanguageServerBase {
             return undefined;
         }
         return locations
-            .filter((loc) => !this.fs.isInZipOrEgg(loc.path))
-            .map((loc) => vscode_languageserver_1.Location.create((0, pathUtils_1.convertPathToUri)(this.fs, loc.path), loc.range));
+            .filter((loc) => !workspace.serviceInstance.fs.isInZipOrEgg(loc.path))
+            .map((loc) => vscode_languageserver_1.Location.create((0, pathUtils_1.convertPathToUri)(workspace.serviceInstance.fs, loc.path), loc.range));
     }
     async onReferences(params, token, workDoneReporter, resultReporter) {
         if (this._pendingFindAllRefsCancellationSource) {
@@ -388,8 +398,8 @@ class LanguageServerBase {
             }
             const convert = (locs) => {
                 return locs
-                    .filter((loc) => !this.fs.isInZipOrEgg(loc.path))
-                    .map((loc) => vscode_languageserver_1.Location.create((0, pathUtils_1.convertPathToUri)(this.fs, loc.path), loc.range));
+                    .filter((loc) => !workspace.serviceInstance.fs.isInZipOrEgg(loc.path))
+                    .map((loc) => vscode_languageserver_1.Location.create((0, pathUtils_1.convertPathToUri)(workspace.serviceInstance.fs, loc.path), loc.range));
             };
             const locations = [];
             const reporter = resultReporter
@@ -539,7 +549,7 @@ class LanguageServerBase {
         if (workspace.disableLanguageServices) {
             return;
         }
-        const completions = await this.getWorkspaceCompletionsForPosition(workspace, filePath, position, workspace.rootPath, this.getCompletionOptions(params), token);
+        const completions = await this.getWorkspaceCompletionsForPosition(workspace, filePath, position, workspace.rootPath, this.getCompletionOptions(workspace, params), token);
         if (completions) {
             completions.completionList.isIncomplete = completionIncomplete;
         }
@@ -578,7 +588,7 @@ class LanguageServerBase {
         if (!editActions) {
             return undefined;
         }
-        return (0, workspaceEditUtils_1.convertWorkspaceDocumentEdits)(this.fs, editActions);
+        return (0, workspaceEditUtils_1.convertWorkspaceDocumentEdits)(workspace.serviceInstance.fs, editActions);
     }
     async onPrepare(params, token) {
         const { filePath, position } = this._uriParser.decodeTextDocumentPosition(params.textDocument, params.position);
@@ -590,11 +600,11 @@ class LanguageServerBase {
         if (!callItem) {
             return null;
         }
-        if (this.fs.isInZipOrEgg(callItem.uri)) {
+        if (workspace.serviceInstance.fs.isInZipOrEgg(callItem.uri)) {
             return null;
         }
         // Convert the file path in the item to proper URI.
-        callItem.uri = (0, pathUtils_1.convertPathToUri)(this.fs, callItem.uri);
+        callItem.uri = (0, pathUtils_1.convertPathToUri)(workspace.serviceInstance.fs, callItem.uri);
         return [callItem];
     }
     async onIncomingCalls(params, token) {
@@ -607,10 +617,10 @@ class LanguageServerBase {
         if (!callItems || callItems.length === 0) {
             return null;
         }
-        callItems = callItems.filter((item) => !this.fs.isInZipOrEgg(item.from.uri));
+        callItems = callItems.filter((item) => !workspace.serviceInstance.fs.isInZipOrEgg(item.from.uri));
         // Convert the file paths in the items to proper URIs.
         callItems.forEach((item) => {
-            item.from.uri = (0, pathUtils_1.convertPathToUri)(this.fs, item.from.uri);
+            item.from.uri = (0, pathUtils_1.convertPathToUri)(workspace.serviceInstance.fs, item.from.uri);
         });
         return callItems;
     }
@@ -624,26 +634,26 @@ class LanguageServerBase {
         if (!callItems || callItems.length === 0) {
             return null;
         }
-        callItems = callItems.filter((item) => !this.fs.isInZipOrEgg(item.to.uri));
+        callItems = callItems.filter((item) => !workspace.serviceInstance.fs.isInZipOrEgg(item.to.uri));
         // Convert the file paths in the items to proper URIs.
         callItems.forEach((item) => {
-            item.to.uri = (0, pathUtils_1.convertPathToUri)(this.fs, item.to.uri);
+            item.to.uri = (0, pathUtils_1.convertPathToUri)(workspace.serviceInstance.fs, item.to.uri);
         });
         return callItems;
     }
-    async onDidOpenTextDocument(params, ipythonMode = false) {
+    async onDidOpenTextDocument(params, ipythonMode = sourceFile_1.IPythonMode.None) {
         const filePath = this._uriParser.decodeTextDocumentUri(params.textDocument.uri);
-        if (!this.fs.addUriMap(params.textDocument.uri, filePath)) {
+        if (!this._serviceFS.addUriMap(params.textDocument.uri, filePath)) {
             // 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);
     }
-    async onDidChangeTextDocument(params, ipythonMode = false) {
+    async onDidChangeTextDocument(params, ipythonMode = sourceFile_1.IPythonMode.None) {
         this.recordUserInteractionTime();
         const filePath = this._uriParser.decodeTextDocumentUri(params.textDocument.uri);
-        if (!this.fs.hasUriMapEntry(params.textDocument.uri, filePath)) {
+        if (!this._serviceFS.hasUriMapEntry(params.textDocument.uri, filePath)) {
             // We do not support opening 1 file with 2 different uri.
             return;
         }
@@ -652,7 +662,7 @@ class LanguageServerBase {
     }
     async onDidCloseTextDocument(params) {
         const filePath = this._uriParser.decodeTextDocumentUri(params.textDocument.uri);
-        if (!this.fs.removeUriMap(params.textDocument.uri, filePath)) {
+        if (!this._serviceFS.removeUriMap(params.textDocument.uri, filePath)) {
             // We do not support opening 1 file with 2 different uri.
             return;
         }
@@ -661,9 +671,9 @@ class LanguageServerBase {
     }
     onDidChangeWatchedFiles(params) {
         params.changes.forEach((change) => {
-            const filePath = this.fs.realCasePath(this._uriParser.decodeTextDocumentUri(change.uri));
+            const filePath = this._serviceFS.realCasePath(this._uriParser.decodeTextDocumentUri(change.uri));
             const eventType = change.type === 1 ? 'add' : 'change';
-            this._fileWatcherProvider.onFileChange(eventType, filePath);
+            this._serverOptions.fileWatcherHandler.onFileChange(eventType, filePath);
         });
     }
     async onExecuteCommand(params, token, reporter) {
@@ -706,7 +716,7 @@ class LanguageServerBase {
         }
     }
     resolveWorkspaceCompletionItem(workspace, filePath, item, token) {
-        workspace.serviceInstance.resolveCompletionItem(filePath, item, this.getCompletionOptions(), 
+        workspace.serviceInstance.resolveCompletionItem(filePath, item, this.getCompletionOptions(workspace), 
         /* nameMap */ undefined, token);
     }
     getWorkspaceCompletionsForPosition(workspace, filePath, position, workspacePath, options, token) {
@@ -721,15 +731,16 @@ class LanguageServerBase {
             this._setupFileWatcher();
         });
     }
-    getCompletionOptions(params) {
+    getCompletionOptions(workspace, params) {
         return {
             format: this.client.completionDocFormat,
             snippet: this.client.completionSupportsSnippet,
             lazyEdit: this.client.completionItemResolveSupportsAdditionalTextEdits,
             autoImport: true,
+            extraCommitChars: false,
         };
     }
-    createWorkspaceServiceInstance(workspace, rootPath, kind = WellKnownWorkspaceKinds.Regular) {
+    createWorkspaceServiceInstance(workspace, rootPath, kind = WellKnownWorkspaceKinds.Regular, services) {
         var _a, _b, _c;
         // 5 seconds default
         const defaultBackOffTime = 5 * 1000;
@@ -738,12 +749,13 @@ class LanguageServerBase {
         const libraryReanalysisTimeProvider = kind === WellKnownWorkspaceKinds.Regular
             ? () => this._workspaceMap.hasMultipleWorkspaces(kind) ? multiWorkspaceBackOffTime : defaultBackOffTime
             : () => defaultBackOffTime;
+        const rootUri = (_a = workspace === null || workspace === void 0 ? void 0 : workspace.uri) !== null && _a !== void 0 ? _a : '';
         return {
-            workspaceName: (_a = workspace === null || workspace === void 0 ? void 0 : workspace.name) !== null && _a !== void 0 ? _a : '',
+            workspaceName: (_b = workspace === null || workspace === void 0 ? void 0 : workspace.name) !== null && _b !== void 0 ? _b : '',
             rootPath,
-            rootUri: (_b = workspace === null || workspace === void 0 ? void 0 : workspace.uri) !== null && _b !== void 0 ? _b : '',
+            rootUri,
             kind,
-            serviceInstance: this.createAnalyzerService((_c = workspace === null || workspace === void 0 ? void 0 : workspace.name) !== null && _c !== void 0 ? _c : rootPath, libraryReanalysisTimeProvider),
+            serviceInstance: this.createAnalyzerService((_c = workspace === null || workspace === void 0 ? void 0 : workspace.name) !== null && _c !== void 0 ? _c : rootPath, services, libraryReanalysisTimeProvider),
             disableLanguageServices: false,
             disableOrganizeImports: false,
             disableWorkspaceSymbol: false,
@@ -751,23 +763,23 @@ class LanguageServerBase {
             searchPathsToWatch: [],
         };
     }
-    convertDiagnostics(fileDiagnostics) {
+    convertDiagnostics(fs, fileDiagnostics) {
         return [
             {
-                uri: (0, pathUtils_1.convertPathToUri)(this.fs, fileDiagnostics.filePath),
+                uri: (0, pathUtils_1.convertPathToUri)(fs, fileDiagnostics.filePath),
                 version: fileDiagnostics.version,
-                diagnostics: this._convertDiagnostics(fileDiagnostics.diagnostics),
+                diagnostics: this._convertDiagnostics(fs, fileDiagnostics.diagnostics),
             },
         ];
     }
-    onAnalysisCompletedHandler(results) {
+    onAnalysisCompletedHandler(fs, results) {
         // Send the computed diagnostics to the client.
         results.diagnostics.forEach((fileDiag) => {
-            if (this.fs.isInZipOrEgg(fileDiag.filePath)) {
+            if (fs.isInZipOrEgg(fileDiag.filePath)) {
                 return;
             }
-            this._sendDiagnostics(this.convertDiagnostics(fileDiag));
-            this.fs.pendingRequest(fileDiag.filePath, fileDiag.diagnostics.length > 0);
+            this._sendDiagnostics(this.convertDiagnostics(fs, fileDiag));
+            this._serviceFS.pendingRequest(fileDiag.filePath, fileDiag.diagnostics.length > 0);
         });
         if (!this._progressReporter.isEnabled(results)) {
             // Make sure to disable progress bar if it is currently active.
@@ -856,13 +868,14 @@ class LanguageServerBase {
             source: (0, cancellationUtils_1.CancelAfter)(token, serverInitiatedReporter.token),
         };
     }
-    _convertDiagnostics(diags) {
+    _convertDiagnostics(fs, diags) {
         const convertedDiags = [];
         diags.forEach((diag) => {
             const severity = convertCategoryToSeverity(diag.category);
             const rule = diag.getRule();
             const vsDiag = vscode_languageserver_1.Diagnostic.create(diag.range, diag.message, severity, rule, this._serverOptions.productName);
-            if (diag.category === 3 /* UnusedCode */) {
+            if (diag.category === 3 /* UnusedCode */ ||
+                diag.category === 4 /* UnreachableCode */) {
                 vsDiag.tags = [vscode_languageserver_1.DiagnosticTag.Unnecessary];
                 vsDiag.severity = vscode_languageserver_1.DiagnosticSeverity.Hint;
                 // If the client doesn't support "unnecessary" tags, don't report unused code.
@@ -870,7 +883,7 @@ class LanguageServerBase {
                     return;
                 }
             }
-            else if (diag.category === 4 /* Deprecated */) {
+            else if (diag.category === 5 /* Deprecated */) {
                 vsDiag.tags = [vscode_languageserver_1.DiagnosticTag.Deprecated];
                 vsDiag.severity = vscode_languageserver_1.DiagnosticSeverity.Hint;
                 // If the client doesn't support "deprecated" tags, don't report.
@@ -889,8 +902,8 @@ class LanguageServerBase {
             const relatedInfo = diag.getRelatedInfo();
             if (relatedInfo.length > 0) {
                 vsDiag.relatedInformation = relatedInfo
-                    .filter((info) => !this.fs.isInZipOrEgg(info.filePath))
-                    .map((info) => vscode_languageserver_1.DiagnosticRelatedInformation.create(vscode_languageserver_1.Location.create((0, pathUtils_1.convertPathToUri)(this.fs, info.filePath), info.range), info.message));
+                    .filter((info) => !fs.isInZipOrEgg(info.filePath))
+                    .map((info) => vscode_languageserver_1.DiagnosticRelatedInformation.create(vscode_languageserver_1.Location.create((0, pathUtils_1.convertPathToUri)(fs, info.filePath), info.range), info.message));
             }
             convertedDiags.push(vsDiag);
         });
@@ -903,7 +916,8 @@ class LanguageServerBase {
                 case 2 /* Information */:
                     return vscode_languageserver_1.DiagnosticSeverity.Information;
                 case 3 /* UnusedCode */:
-                case 4 /* Deprecated */:
+                case 4 /* UnreachableCode */:
+                case 5 /* Deprecated */:
                     return vscode_languageserver_1.DiagnosticSeverity.Hint;
             }
         }