@zzzen/pyright-internal 1.2.0-dev.20240317 → 1.2.0-dev.20240331

package/dist/common/extensibility.d.ts

@@ -7,7 +7,7 @@ import { SourceMapper } from '../analyzer/sourceMapper';
 import { SymbolTable } from '../analyzer/symbol';
 import { TypeEvaluator } from '../analyzer/typeEvaluatorTypes';
 import { Diagnostic } from '../common/diagnostic';
-import { ServerSettings } from '../languageServerBase';
+import { ServerSettings } from '../common/languageServerInterface';
 import { ParseNode } from '../parser/parseNodes';
 import { ParseResults } from '../parser/parser';
 import { ConfigOptions } from './configOptions';

package/dist/common/fileBasedCancellationUtils.js

@@ -37,7 +37,7 @@ const path = __importStar(require("path"));
 const vscode_jsonrpc_1 = require("vscode-jsonrpc");
 const vscode_languageserver_1 = require("vscode-languageserver");
 const cancellationUtils_1 = require("./cancellationUtils");
-const uri_1 = require("./uri/uri");
+const uriUtils_1 = require("./uri/uriUtils");
 class StatSyncFromFs {
     statSync(uri) {
         return fs.statSync(uri.getFilePath());
@@ -125,7 +125,7 @@ function getCancellationFolderPath(folderName) {
     return path.join(os.tmpdir(), 'python-languageserver-cancellation', folderName);
 }
 function getCancellationFileUri(folderName, id) {
-    return uri_1.Uri.file(path.join(getCancellationFolderPath(folderName), `cancellation-${String(id)}.tmp`)).toString();
+    return uriUtils_1.UriEx.file(path.join(getCancellationFolderPath(folderName), `cancellation-${String(id)}.tmp`)).toString();
 }
 class FileCancellationReceiverStrategy {
     constructor(folderName) {

package/dist/common/fileBasedCancellationUtils.js.map

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

package/dist/common/fileSystem.d.ts

@@ -19,7 +19,6 @@ export interface MkDirOptions {
     recursive: boolean;
 }
 export interface ReadOnlyFileSystem {
-    readonly isCaseSensitive: boolean;
     existsSync(uri: Uri): boolean;
     chdir(uri: Uri): void;
     readdirEntriesSync(uri: Uri): fs.Dirent[];

package/dist/common/fileSystem.js.map

@@ -1 +1 @@
-{"version":3,"file":"fileSystem.js","sourceRoot":"","sources":["../../../../../src/common/fileSystem.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;AAmFH,IAAiB,UAAU,CAI1B;AAJD,WAAiB,UAAU;IACvB,SAAgB,EAAE,CAAC,KAAU;QACzB,OAAO,KAAK,CAAC,uBAAuB,IAAI,KAAK,CAAC,gBAAgB,IAAI,KAAK,CAAC,iBAAiB,IAAI,KAAK,CAAC,YAAY,CAAC;IACpH,CAAC;IAFe,aAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,UAAU,0BAAV,UAAU,QAI1B;AAED,IAAiB,QAAQ,CAIxB;AAJD,WAAiB,QAAQ;IACrB,SAAgB,EAAE,CAAC,KAAU;QACzB,OAAO,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC;IAC1D,CAAC;IAFe,WAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,QAAQ,wBAAR,QAAQ,QAIxB;AAED,MAAa,aAAa;IACtB,YAAmB,IAAY,EAAU,KAAc;QAApC,SAAI,GAAJ,IAAI,CAAQ;QAAU,UAAK,GAAL,KAAK,CAAS;IAAG,CAAC;IAE3D,MAAM;QACF,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,WAAW;QACP,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC;IACvB,CAAC;IAED,aAAa;QACT,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,iBAAiB;QACb,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,cAAc;QACV,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,MAAM;QACF,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,QAAQ;QACJ,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ;AA9BD,sCA8BC"}
+{"version":3,"file":"fileSystem.js","sourceRoot":"","sources":["../../../../../src/common/fileSystem.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;AAkFH,IAAiB,UAAU,CAI1B;AAJD,WAAiB,UAAU;IACvB,SAAgB,EAAE,CAAC,KAAU;QACzB,OAAO,KAAK,CAAC,uBAAuB,IAAI,KAAK,CAAC,gBAAgB,IAAI,KAAK,CAAC,iBAAiB,IAAI,KAAK,CAAC,YAAY,CAAC;IACpH,CAAC;IAFe,aAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,UAAU,0BAAV,UAAU,QAI1B;AAED,IAAiB,QAAQ,CAIxB;AAJD,WAAiB,QAAQ;IACrB,SAAgB,EAAE,CAAC,KAAU;QACzB,OAAO,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC;IAC1D,CAAC;IAFe,WAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,QAAQ,wBAAR,QAAQ,QAIxB;AAED,MAAa,aAAa;IACtB,YAAmB,IAAY,EAAU,KAAc;QAApC,SAAI,GAAJ,IAAI,CAAQ;QAAU,UAAK,GAAL,KAAK,CAAS;IAAG,CAAC;IAE3D,MAAM;QACF,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,WAAW;QACP,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC;IACvB,CAAC;IAED,aAAa;QACT,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,iBAAiB;QACb,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,cAAc;QACV,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,MAAM;QACF,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,QAAQ;QACJ,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ;AA9BD,sCA8BC"}

package/dist/common/fullAccessHost.js

@@ -40,6 +40,7 @@ const pathUtils_1 = require("./pathUtils");
 const pythonVersion_1 = require("./pythonVersion");
 const uri_1 = require("./uri/uri");
 const uriUtils_1 = require("./uri/uriUtils");
+const serviceKeys_1 = require("./serviceKeys");
 // preventLocalImports removes the working directory from sys.path.
 // The -c flag adds it automatically, which can allow some stdlib
 // modules (like json) to be overridden by other files (like json.py).
@@ -58,7 +59,7 @@ const extractSys = [
 const extractVersion = [
     ...removeCwdFromSysPath,
     'import sys, json',
-    'json.dump(dict(major=sys.version_info[0], minor=sys.version_info[1]), sys.stdout)',
+    'json.dump(tuple(sys.version_info), sys.stdout)',
 ].join('; ');
 class LimitedAccessHost extends host_1.NoAccessHost {
     get kind() {
@@ -119,9 +120,13 @@ class FullAccessHost extends LimitedAccessHost {
             const commandLineArgs = ['-c', extractVersion];
             const execOutput = this._executePythonInterpreter(pythonPath === null || pythonPath === void 0 ? void 0 : pythonPath.getFilePath(), (p) => child_process.execFileSync(p, commandLineArgs, { encoding: 'utf8' }));
             const versionJson = JSON.parse(execOutput);
-            const version = (0, pythonVersion_1.versionFromMajorMinor)(versionJson.major, versionJson.minor);
+            if (!Array.isArray(versionJson) || versionJson.length < 5) {
+                importFailureInfo.push(`Python version ${execOutput} from interpreter is unexpected format`);
+                return undefined;
+            }
+            const version = new pythonVersion_1.PythonVersion(versionJson[0], versionJson[1], versionJson[2], versionJson[3], versionJson[4]);
             if (version === undefined) {
-                importFailureInfo.push(`Python version ${versionJson.major}.${versionJson.minor} from interpreter is unsupported`);
+                importFailureInfo.push(`Python version ${execOutput} from interpreter is unsupported`);
                 return undefined;
             }
             return version;
@@ -210,7 +215,7 @@ class FullAccessHost extends LimitedAccessHost {
             const commandLineArgs = ['-c', extractSys];
             importFailureInfo.push(`Executing interpreter: '${interpreterPath}'`);
             const execOutput = child_process.execFileSync(interpreterPath, commandLineArgs, { encoding: 'utf8' });
-            const isCaseSensitive = this.serviceProvider.fs().isCaseSensitive;
+            const caseDetector = this.serviceProvider.get(serviceKeys_1.ServiceKeys.caseSensitivityDetector);
             // Parse the execOutput. It should be a JSON-encoded array of paths.
             try {
                 const execSplit = JSON.parse(execOutput);
@@ -218,7 +223,7 @@ class FullAccessHost extends LimitedAccessHost {
                     execSplitEntry = execSplitEntry.trim();
                     if (execSplitEntry) {
                         const normalizedPath = (0, pathUtils_1.normalizePath)(execSplitEntry);
-                        const normalizedUri = uri_1.Uri.file(normalizedPath, isCaseSensitive);
+                        const normalizedUri = uri_1.Uri.file(normalizedPath, caseDetector);
                         // Skip non-existent paths and broken zips/eggs.
                         if (this.serviceProvider.fs().existsSync(normalizedUri) &&
                             (0, uriUtils_1.isDirectory)(this.serviceProvider.fs(), normalizedUri)) {
@@ -229,7 +234,7 @@ class FullAccessHost extends LimitedAccessHost {
                         }
                     }
                 }
-                result.prefix = uri_1.Uri.file(execSplit.prefix, isCaseSensitive);
+                result.prefix = uri_1.Uri.file(execSplit.prefix, caseDetector);
                 if (result.paths.length === 0) {
                     importFailureInfo.push(`Found no valid directories`);
                 }

package/dist/common/fullAccessHost.js.map

@@ -1 +1 @@
-{"version":3,"file":"fullAccessHost.js","sourceRoot":"","sources":["../../../../../src/common/fullAccessHost.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fullAccessHost.js","sourceRoot":"","sources":["../../../../../src/common/fullAccessHost.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,6DAA+C;AAI/C,2DAAwH;AACxH,mDAAiD;AACjD,mCAAsC;AACtC,iCAA8D;AAC9D,2CAA4C;AAC5C,mDAAgD;AAEhD,mCAAgC;AAChC,6CAA6C;AAC7C,+CAA4C;AAE5C,mEAAmE;AACnE,iEAAiE;AACjE,sEAAsE;AACtE,MAAM,oBAAoB,GAAG;IACzB,yBAAyB;IACzB,6DAA6D;IAC7D,8BAA8B;IAC9B,kDAAkD;IAClD,wEAAwE;CAC3E,CAAC;AAEF,MAAM,UAAU,GAAG;IACf,GAAG,oBAAoB;IACvB,kBAAkB;IAClB,oEAAoE;CACvE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEb,MAAM,cAAc,GAAG;IACnB,GAAG,oBAAoB;IACvB,kBAAkB;IAClB,gDAAgD;CACnD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEb,MAAa,iBAAkB,SAAQ,mBAAY;IAC/C,IAAa,IAAI;QACb,sCAA8B;IAClC,CAAC;IAEQ,iBAAiB,CAAC,OAAkB;QACzC,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE;YAC/B,OAAO,8BAAc,CAAC,MAAM,CAAC;SAChC;aAAM,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;YACrC,OAAO,8BAAc,CAAC,KAAK,CAAC;SAC/B;aAAM,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;YACrC,OAAO,8BAAc,CAAC,OAAO,CAAC;SACjC;QAED,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ;AAhBD,8CAgBC;AAED,MAAa,cAAe,SAAQ,iBAAiB;IACjD,YAAsB,eAAgC;QAClD,KAAK,EAAE,CAAC;QADU,oBAAe,GAAf,eAAe,CAAiB;IAEtD,CAAC;IAED,IAAa,IAAI;QACb,mCAA2B;IAC/B,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,IAAc,EAAE,eAAgC;QAC9D,QAAQ,IAAI,EAAE;YACV;gBACI,OAAO,IAAI,mBAAY,EAAE,CAAC;YAC9B;gBACI,OAAO,IAAI,iBAAiB,EAAE,CAAC;YACnC;gBACI,OAAO,IAAI,cAAc,CAAC,eAAe,CAAC,CAAC;YAC/C;gBACI,IAAA,mBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACL,CAAC;IAEQ,oBAAoB,CAAC,UAAgB,EAAE,OAAkB;QAC9D,MAAM,iBAAiB,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAC;QACxC,IAAI,MAAM,GAAG,IAAI,CAAC,yBAAyB,CAAC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CACzE,IAAI,CAAC,mCAAmC,CAAC,CAAC,EAAE,iBAAiB,CAAC,CACjE,CAAC;QAEF,IAAI,CAAC,MAAM,EAAE;YACT,MAAM,GAAG;gBACL,KAAK,EAAE,EAAE;gBACT,MAAM,EAAE,SAAS;aACpB,CAAC;SACL;QAED,iBAAiB,CAAC,IAAI,CAAC,YAAY,MAAM,CAAC,KAAK,CAAC,MAAM,yBAAyB,CAAC,CAAC;QACjF,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAC1B,iBAAiB,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAClB,CAAC;IAEQ,gBAAgB,CAAC,UAAgB,EAAE,OAAkB;QAC1D,MAAM,iBAAiB,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAC;QAExC,IAAI;YACA,MAAM,eAAe,GAAa,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;YACzD,MAAM,UAAU,GAAG,IAAI,CAAC,yBAAyB,CAAC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAC/E,aAAa,CAAC,YAAY,CAAC,CAAC,EAAE,eAAe,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CACvE,CAAC;YAEF,MAAM,WAAW,GAAU,IAAI,CAAC,KAAK,CAAC,UAAW,CAAC,CAAC;YAEnD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;gBACvD,iBAAiB,CAAC,IAAI,CAAC,kBAAkB,UAAU,wCAAwC,CAAC,CAAC;gBAC7F,OAAO,SAAS,CAAC;aACpB;YAED,MAAM,OAAO,GAAG,IAAI,6BAAa,CAC7B,WAAW,CAAC,CAAC,CAAC,EACd,WAAW,CAAC,CAAC,CAAC,EACd,WAAW,CAAC,CAAC,CAAC,EACd,WAAW,CAAC,CAAC,CAAC,EACd,WAAW,CAAC,CAAC,CAAC,CACjB,CAAC;YAEF,IAAI,OAAO,KAAK,SAAS,EAAE;gBACvB,iBAAiB,CAAC,IAAI,CAAC,kBAAkB,UAAU,kCAAkC,CAAC,CAAC;gBACvF,OAAO,SAAS,CAAC;aACpB;YAED,OAAO,OAAO,CAAC;SAClB;QAAC,MAAM;YACJ,iBAAiB,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC;YACxE,OAAO,SAAS,CAAC;SACpB;IACL,CAAC;IAEQ,SAAS,CACd,UAA2B,EAC3B,MAAW,EACX,IAAc,EACd,GAAQ,EACR,KAAwB;QAExB,0DAA0D;QAC1D,IAAA,gDAA4B,EAAC,KAAK,CAAC,CAAC;QAEpC,+BAA+B;QAC/B,OAAO,IAAI,OAAO,CAAqC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACvE,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,MAAM,eAAe,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;YAExD,MAAM,KAAK,GAAG,IAAI,CAAC,yBAAyB,CAAC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAC1E,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,WAAW,EAAE,EAAE,CAAC,CACtE,CAAC;YACF,MAAM,UAAU,GAAG,IAAA,2CAAuB,EAAC,KAAK,EAAE,GAAG,EAAE;gBACnD,IAAI,KAAK,EAAE;oBACP,IAAI;wBACA,IAAI,KAAK,CAAC,GAAG,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI,EAAE;4BACtC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;gCAC9B,2EAA2E;gCAC3E,aAAa,CAAC,QAAQ,CAAC,iBAAiB,KAAK,CAAC,GAAG,mBAAmB,CAAC,CAAC;6BACzE;iCAAM;gCACH,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;6BAC3B;yBACJ;qBACJ;oBAAC,MAAM;wBACJ,UAAU;qBACb;iBACJ;gBACD,MAAM,CAAC,IAAI,8CAA0B,EAAE,CAAC,CAAC;YAC7C,CAAC,CAAC,CAAC;YACH,IAAI,KAAK,EAAE;gBACP,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5D,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5D,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;oBACpB,UAAU,CAAC,OAAO,EAAE,CAAC;oBACrB,MAAM,CAAC,CAAC,CAAC,CAAC;gBACd,CAAC,CAAC,CAAC;gBACH,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;oBAClB,UAAU,CAAC,OAAO,EAAE,CAAC;oBACrB,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;gBAChC,CAAC,CAAC,CAAC;aACN;iBAAM;gBACH,UAAU,CAAC,OAAO,EAAE,CAAC;gBACrB,MAAM,CAAC,IAAI,KAAK,CAAC,+CAA+C,MAAM,EAAE,CAAC,CAAC,CAAC;aAC9E;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,yBAAyB,CAC7B,UAA8B,EAC9B,OAAwC;QAExC,IAAI,UAAU,EAAE;YACZ,OAAO,OAAO,CAAC,UAAU,CAAC,CAAC;SAC9B;aAAM;YACH,IAAI,MAAqB,CAAC;YAC1B,IAAI;gBACA,wEAAwE;gBACxE,uEAAuE;gBACvE,4EAA4E;gBAC5E,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;oBAC9B,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;iBAC/B;aACJ;YAAC,MAAM;gBACJ,4BAA4B;aAC/B;YAED,IAAI,MAAM,KAAK,SAAS,EAAE;gBACtB,OAAO,MAAM,CAAC;aACjB;YAED,sEAAsE;YACtE,OAAO,OAAO,CAAC,QAAQ,CAAC,CAAC;SAC5B;IACL,CAAC;IAEO,mCAAmC,CACvC,eAAuB,EACvB,iBAA2B;QAE3B,MAAM,MAAM,GAAqB;YAC7B,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,SAAS;SACpB,CAAC;QAEF,IAAI;YACA,MAAM,eAAe,GAAa,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YACrD,iBAAiB,CAAC,IAAI,CAAC,2BAA2B,eAAe,GAAG,CAAC,CAAC;YACtE,MAAM,UAAU,GAAG,aAAa,CAAC,YAAY,CAAC,eAAe,EAAE,eAAe,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;YACtG,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,yBAAW,CAAC,uBAAuB,CAAC,CAAC;YAEnF,oEAAoE;YACpE,IAAI;gBACA,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;gBACzC,KAAK,IAAI,cAAc,IAAI,SAAS,CAAC,IAAI,EAAE;oBACvC,cAAc,GAAG,cAAc,CAAC,IAAI,EAAE,CAAC;oBACvC,IAAI,cAAc,EAAE;wBAChB,MAAM,cAAc,GAAG,IAAA,yBAAa,EAAC,cAAc,CAAC,CAAC;wBACrD,MAAM,aAAa,GAAG,SAAG,CAAC,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;wBAC7D,gDAAgD;wBAChD,IACI,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;4BACnD,IAAA,sBAAW,EAAC,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,EACvD;4BACE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;yBACpC;6BAAM;4BACH,iBAAiB,CAAC,IAAI,CAAC,aAAa,cAAc,uCAAuC,CAAC,CAAC;yBAC9F;qBACJ;iBACJ;gBAED,MAAM,CAAC,MAAM,GAAG,SAAG,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;gBAEzD,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;oBAC3B,iBAAiB,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;iBACxD;aACJ;YAAC,OAAO,GAAG,EAAE;gBACV,iBAAiB,CAAC,IAAI,CAAC,4BAA4B,UAAU,GAAG,CAAC,CAAC;gBAClE,MAAM,GAAG,CAAC;aACb;SACJ;QAAC,MAAM;YACJ,OAAO,SAAS,CAAC;SACpB;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAnND,wCAmNC"}

package/dist/common/languageServerInterface.d.ts

@@ -0,0 +1,62 @@
+import { BackgroundAnalysisBase } from '../backgroundAnalysisBase';
+import { Workspace } from '../workspaceFactory';
+import { DiagnosticSeverityOverridesMap } from './commandLineOptions';
+import { SignatureDisplayType } from './configOptions';
+import { ConsoleInterface, LogLevel } from './console';
+import { TaskListToken } from './diagnostic';
+import * as ext from './extensibility';
+import { Uri } from './uri/uri';
+export interface ServerSettings {
+    venvPath?: Uri | undefined;
+    pythonPath?: Uri | undefined;
+    typeshedPath?: Uri | undefined;
+    stubPath?: Uri | undefined;
+    openFilesOnly?: boolean | undefined;
+    typeCheckingMode?: string | undefined;
+    useLibraryCodeForTypes?: boolean | undefined;
+    disableLanguageServices?: boolean | undefined;
+    disableTaggedHints?: boolean | undefined;
+    disableOrganizeImports?: boolean | undefined;
+    autoSearchPaths?: boolean | undefined;
+    extraPaths?: Uri[] | undefined;
+    watchForSourceChanges?: boolean | undefined;
+    watchForLibraryChanges?: boolean | undefined;
+    watchForConfigChanges?: boolean | undefined;
+    diagnosticSeverityOverrides?: DiagnosticSeverityOverridesMap | undefined;
+    logLevel?: LogLevel | undefined;
+    autoImportCompletions?: boolean | undefined;
+    indexing?: boolean | undefined;
+    logTypeEvaluationTime?: boolean | undefined;
+    typeEvaluationTimeThreshold?: number | undefined;
+    includeFileSpecs?: string[];
+    excludeFileSpecs?: string[];
+    ignoreFileSpecs?: string[];
+    taskListTokens?: TaskListToken[];
+    functionSignatureDisplay?: SignatureDisplayType | undefined;
+}
+export interface MessageAction {
+    title: string;
+    id: string;
+}
+export interface WindowInterface {
+    showErrorMessage(message: string): void;
+    showErrorMessage(message: string, ...actions: MessageAction[]): Promise<MessageAction | undefined>;
+    showWarningMessage(message: string): void;
+    showWarningMessage(message: string, ...actions: MessageAction[]): Promise<MessageAction | undefined>;
+    showInformationMessage(message: string): void;
+    showInformationMessage(message: string, ...actions: MessageAction[]): Promise<MessageAction | undefined>;
+}
+export interface LanguageServerBaseInterface {
+    readonly console: ConsoleInterface;
+    readonly window: WindowInterface;
+    readonly supportAdvancedEdits: boolean;
+    readonly serviceProvider: ext.ServiceProvider;
+    getWorkspaces(): Promise<Workspace[]>;
+    createBackgroundAnalysis(serviceId: string): BackgroundAnalysisBase | undefined;
+    reanalyze(): void;
+    restart(): void;
+}
+export interface LanguageServerInterface extends LanguageServerBaseInterface {
+    getWorkspaceForFile(fileUri: Uri): Promise<Workspace>;
+    getSettings(workspace: Workspace): Promise<ServerSettings>;
+}

package/dist/common/languageServerInterface.js

@@ -0,0 +1,10 @@
+"use strict";
+/*
+ * languageServerInterface.ts
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT license.
+ *
+ * Interface for language server
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=languageServerInterface.js.map

package/dist/common/languageServerInterface.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"languageServerInterface.js","sourceRoot":"","sources":["../../../../../src/common/languageServerInterface.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG"}

package/dist/common/pythonVersion.d.ts

@@ -1,21 +1,37 @@
-export declare enum PythonVersion {
-    V3_0 = 768,
-    V3_1 = 769,
-    V3_2 = 770,
-    V3_3 = 771,
-    V3_4 = 772,
-    V3_5 = 773,
-    V3_6 = 774,
-    V3_7 = 775,
-    V3_8 = 776,
-    V3_9 = 777,
-    V3_10 = 778,
-    V3_11 = 779,
-    V3_12 = 780,
-    V3_13 = 781
+export type PythonReleaseLevel = 'alpha' | 'beta' | 'candidate' | 'final';
+export declare class PythonVersion {
+    private _major;
+    private _minor;
+    private _micro?;
+    private _releaseLevel?;
+    private _serial?;
+    constructor(_major: number, _minor: number, _micro?: number | undefined, _releaseLevel?: PythonReleaseLevel | undefined, _serial?: number | undefined);
+    get major(): number;
+    get minor(): number;
+    get micro(): number | undefined;
+    get releaseLevel(): PythonReleaseLevel | undefined;
+    get serial(): number | undefined;
+    isEqualTo(other: PythonVersion): boolean;
+    isGreaterThan(other: PythonVersion): boolean;
+    isGreaterOrEqualTo(other: PythonVersion): boolean;
+    isLessThan(other: PythonVersion): boolean;
+    isLessOrEqualTo(other: PythonVersion): boolean;
+    toMajorMinorString(): string;
+    toString(): string;
+    static fromString(val: string): PythonVersion | undefined;
 }
-export declare const latestStablePythonVersion = PythonVersion.V3_12;
-export declare function versionToString(version: PythonVersion): string;
-export declare function versionFromString(verString: string): PythonVersion | undefined;
-export declare function versionFromMajorMinor(major: number, minor: number): PythonVersion | undefined;
-export declare function is3x(version: PythonVersion): boolean;
+export declare const pythonVersion3_0: PythonVersion;
+export declare const pythonVersion3_1: PythonVersion;
+export declare const pythonVersion3_2: PythonVersion;
+export declare const pythonVersion3_3: PythonVersion;
+export declare const pythonVersion3_4: PythonVersion;
+export declare const pythonVersion3_5: PythonVersion;
+export declare const pythonVersion3_6: PythonVersion;
+export declare const pythonVersion3_7: PythonVersion;
+export declare const pythonVersion3_8: PythonVersion;
+export declare const pythonVersion3_9: PythonVersion;
+export declare const pythonVersion3_10: PythonVersion;
+export declare const pythonVersion3_11: PythonVersion;
+export declare const pythonVersion3_12: PythonVersion;
+export declare const pythonVersion3_13: PythonVersion;
+export declare const latestStablePythonVersion: PythonVersion;

package/dist/common/pythonVersion.js

@@ -8,64 +8,170 @@
  * Types and functions that relate to the Python language version.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.is3x = exports.versionFromMajorMinor = exports.versionFromString = exports.versionToString = exports.latestStablePythonVersion = exports.PythonVersion = void 0;
-var PythonVersion;
-(function (PythonVersion) {
-    // The order of this enumeration is significant. We assume
-    // that we can use comparison operators to check for older
-    // or newer versions.
-    PythonVersion[PythonVersion["V3_0"] = 768] = "V3_0";
-    PythonVersion[PythonVersion["V3_1"] = 769] = "V3_1";
-    PythonVersion[PythonVersion["V3_2"] = 770] = "V3_2";
-    PythonVersion[PythonVersion["V3_3"] = 771] = "V3_3";
-    PythonVersion[PythonVersion["V3_4"] = 772] = "V3_4";
-    PythonVersion[PythonVersion["V3_5"] = 773] = "V3_5";
-    PythonVersion[PythonVersion["V3_6"] = 774] = "V3_6";
-    PythonVersion[PythonVersion["V3_7"] = 775] = "V3_7";
-    PythonVersion[PythonVersion["V3_8"] = 776] = "V3_8";
-    PythonVersion[PythonVersion["V3_9"] = 777] = "V3_9";
-    PythonVersion[PythonVersion["V3_10"] = 778] = "V3_10";
-    PythonVersion[PythonVersion["V3_11"] = 779] = "V3_11";
-    PythonVersion[PythonVersion["V3_12"] = 780] = "V3_12";
-    PythonVersion[PythonVersion["V3_13"] = 781] = "V3_13";
-})(PythonVersion || (exports.PythonVersion = PythonVersion = {}));
-exports.latestStablePythonVersion = PythonVersion.V3_12;
-function versionToString(version) {
-    const majorVersion = (version >> 8) & 0xff;
-    const minorVersion = version & 0xff;
-    return `${majorVersion}.${minorVersion}`;
-}
-exports.versionToString = versionToString;
-function versionFromString(verString) {
-    const split = verString.split('.');
-    if (split.length < 2) {
-        return undefined;
+exports.latestStablePythonVersion = exports.pythonVersion3_13 = exports.pythonVersion3_12 = exports.pythonVersion3_11 = exports.pythonVersion3_10 = exports.pythonVersion3_9 = exports.pythonVersion3_8 = exports.pythonVersion3_7 = exports.pythonVersion3_6 = exports.pythonVersion3_5 = exports.pythonVersion3_4 = exports.pythonVersion3_3 = exports.pythonVersion3_2 = exports.pythonVersion3_1 = exports.pythonVersion3_0 = exports.PythonVersion = void 0;
+class PythonVersion {
+    constructor(_major, _minor, _micro, _releaseLevel, _serial) {
+        this._major = _major;
+        this._minor = _minor;
+        this._micro = _micro;
+        this._releaseLevel = _releaseLevel;
+        this._serial = _serial;
     }
-    const majorVersion = parseInt(split[0], 10);
-    const minorVersion = parseInt(split[1], 10);
-    return versionFromMajorMinor(majorVersion, minorVersion);
-}
-exports.versionFromString = versionFromString;
-function versionFromMajorMinor(major, minor) {
-    if (isNaN(major) || isNaN(minor)) {
-        return undefined;
+    get major() {
+        return this._major;
     }
-    if (major > 255 || minor > 255) {
-        return undefined;
+    get minor() {
+        return this._minor;
     }
-    const value = major * 256 + minor;
-    if (PythonVersion[value] === undefined) {
-        return undefined;
+    get micro() {
+        return this._micro;
     }
-    // Pyright currently supports only 3.x.
-    if (!is3x(value)) {
-        return undefined;
+    get releaseLevel() {
+        return this._releaseLevel;
+    }
+    get serial() {
+        return this._serial;
+    }
+    isEqualTo(other) {
+        if (this.major !== other.major || this.minor !== other.minor) {
+            return false;
+        }
+        if (this._micro === undefined || other._micro === undefined) {
+            return true;
+        }
+        else if (this._micro !== other._micro) {
+            return false;
+        }
+        if (this._releaseLevel === undefined || other._releaseLevel === undefined) {
+            return true;
+        }
+        else if (this._releaseLevel !== other._releaseLevel) {
+            return false;
+        }
+        if (this._serial === undefined || other._serial === undefined) {
+            return true;
+        }
+        else if (this._serial !== other._serial) {
+            return false;
+        }
+        return true;
+    }
+    isGreaterThan(other) {
+        if (this.major > other.major) {
+            return true;
+        }
+        else if (this.major < other.major) {
+            return false;
+        }
+        if (this.minor > other.minor) {
+            return true;
+        }
+        else if (this.minor < other.minor) {
+            return false;
+        }
+        if (this._micro === undefined || other._micro === undefined || this._micro < other._micro) {
+            return false;
+        }
+        else if (this._micro > other._micro) {
+            return true;
+        }
+        // We leverage the fact that the alphabetical ordering
+        // of the release level designators are ordered by increasing
+        // release level.
+        if (this._releaseLevel === undefined ||
+            other._releaseLevel === undefined ||
+            this._releaseLevel < other._releaseLevel) {
+            return false;
+        }
+        else if (this._releaseLevel > other._releaseLevel) {
+            return true;
+        }
+        if (this._serial === undefined || other._serial === undefined || this._serial < other._serial) {
+            return false;
+        }
+        else if (this._serial > other._serial) {
+            return true;
+        }
+        // They are exactly equal!
+        return false;
+    }
+    isGreaterOrEqualTo(other) {
+        return this.isEqualTo(other) || this.isGreaterThan(other);
+    }
+    isLessThan(other) {
+        return !this.isGreaterOrEqualTo(other);
+    }
+    isLessOrEqualTo(other) {
+        return !this.isGreaterThan(other);
+    }
+    toMajorMinorString() {
+        return `${this._major}.${this._minor}`;
+    }
+    toString() {
+        let version = this.toMajorMinorString();
+        if (this._micro === undefined) {
+            return version;
+        }
+        version += `.${this._micro}`;
+        if (this._releaseLevel === undefined) {
+            return version;
+        }
+        version += `.${this._releaseLevel}`;
+        if (this._serial === undefined) {
+            return version;
+        }
+        version += `.${this._serial}`;
+        return version;
+    }
+    static fromString(val) {
+        const split = val.split('.');
+        if (split.length < 2) {
+            return undefined;
+        }
+        const major = parseInt(split[0], 10);
+        const minor = parseInt(split[1], 10);
+        if (isNaN(major) || isNaN(minor)) {
+            return undefined;
+        }
+        let micro;
+        if (split.length >= 3) {
+            micro = parseInt(split[2], 10);
+            if (isNaN(micro)) {
+                micro = undefined;
+            }
+        }
+        let releaseLevel;
+        if (split.length >= 4) {
+            const releaseLevels = ['alpha', 'beta', 'candidate', 'final'];
+            if (releaseLevels.some((level) => level === split[3])) {
+                releaseLevel = split[3];
+            }
+        }
+        let serial;
+        if (split.length >= 5) {
+            serial = parseInt(split[4], 10);
+            if (isNaN(serial)) {
+                serial = undefined;
+            }
+        }
+        return new PythonVersion(major, minor, micro, releaseLevel, serial);
     }
-    return value;
-}
-exports.versionFromMajorMinor = versionFromMajorMinor;
-function is3x(version) {
-    return version >> 8 === 3;
 }
-exports.is3x = is3x;
+exports.PythonVersion = PythonVersion;
+// Predefine some versions.
+exports.pythonVersion3_0 = new PythonVersion(3, 0);
+exports.pythonVersion3_1 = new PythonVersion(3, 1);
+exports.pythonVersion3_2 = new PythonVersion(3, 2);
+exports.pythonVersion3_3 = new PythonVersion(3, 3);
+exports.pythonVersion3_4 = new PythonVersion(3, 4);
+exports.pythonVersion3_5 = new PythonVersion(3, 5);
+exports.pythonVersion3_6 = new PythonVersion(3, 6);
+exports.pythonVersion3_7 = new PythonVersion(3, 7);
+exports.pythonVersion3_8 = new PythonVersion(3, 8);
+exports.pythonVersion3_9 = new PythonVersion(3, 9);
+exports.pythonVersion3_10 = new PythonVersion(3, 10);
+exports.pythonVersion3_11 = new PythonVersion(3, 11);
+exports.pythonVersion3_12 = new PythonVersion(3, 12);
+exports.pythonVersion3_13 = new PythonVersion(3, 13);
+exports.latestStablePythonVersion = exports.pythonVersion3_12;
 //# sourceMappingURL=pythonVersion.js.map

package/dist/common/pythonVersion.js.map

@@ -1 +1 @@
-{"version":3,"file":"pythonVersion.js","sourceRoot":"","sources":["../../../../../src/common/pythonVersion.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;AAEH,IAAY,aAkBX;AAlBD,WAAY,aAAa;IACrB,0DAA0D;IAC1D,0DAA0D;IAC1D,qBAAqB;IACrB,mDAAa,CAAA;IACb,mDAAa,CAAA;IACb,mDAAa,CAAA;IACb,mDAAa,CAAA;IACb,mDAAa,CAAA;IACb,mDAAa,CAAA;IACb,mDAAa,CAAA;IACb,mDAAa,CAAA;IACb,mDAAa,CAAA;IACb,mDAAa,CAAA;IACb,qDAAc,CAAA;IACd,qDAAc,CAAA;IACd,qDAAc,CAAA;IACd,qDAAc,CAAA;AAClB,CAAC,EAlBW,aAAa,6BAAb,aAAa,QAkBxB;AAEY,QAAA,yBAAyB,GAAG,aAAa,CAAC,KAAK,CAAC;AAE7D,SAAgB,eAAe,CAAC,OAAsB;IAClD,MAAM,YAAY,GAAG,CAAC,OAAO,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC;IAC3C,MAAM,YAAY,GAAG,OAAO,GAAG,IAAI,CAAC;IACpC,OAAO,GAAG,YAAY,IAAI,YAAY,EAAE,CAAC;AAC7C,CAAC;AAJD,0CAIC;AAED,SAAgB,iBAAiB,CAAC,SAAiB;IAC/C,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QAClB,OAAO,SAAS,CAAC;KACpB;IAED,MAAM,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC5C,MAAM,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAE5C,OAAO,qBAAqB,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;AAC7D,CAAC;AAVD,8CAUC;AAED,SAAgB,qBAAqB,CAAC,KAAa,EAAE,KAAa;IAC9D,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,EAAE;QAC9B,OAAO,SAAS,CAAC;KACpB;IAED,IAAI,KAAK,GAAG,GAAG,IAAI,KAAK,GAAG,GAAG,EAAE;QAC5B,OAAO,SAAS,CAAC;KACpB;IAED,MAAM,KAAK,GAAG,KAAK,GAAG,GAAG,GAAG,KAAK,CAAC;IAClC,IAAI,aAAa,CAAC,KAAK,CAAC,KAAK,SAAS,EAAE;QACpC,OAAO,SAAS,CAAC;KACpB;IAED,uCAAuC;IACvC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QACd,OAAO,SAAS,CAAC;KACpB;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AApBD,sDAoBC;AAED,SAAgB,IAAI,CAAC,OAAsB;IACvC,OAAO,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC;AAC9B,CAAC;AAFD,oBAEC"}
+{"version":3,"file":"pythonVersion.js","sourceRoot":"","sources":["../../../../../src/common/pythonVersion.ts"],"names":[],"mappings":"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"}

package/dist/common/realFileSystem.d.ts

@@ -2,18 +2,22 @@ import { ConsoleInterface } from './console';
 import { FileSystem, TempFile, TmpfileOptions } from './fileSystem';
 import { FileWatcher, FileWatcherEventHandler, FileWatcherEventType, FileWatcherHandler, FileWatcherProvider } from './fileWatcher';
 import { Uri } from './uri/uri';
-export declare function createFromRealFileSystem(console?: ConsoleInterface, fileWatcherProvider?: FileWatcherProvider): FileSystem;
+import { CaseSensitivityDetector } from './caseSensitivityDetector';
+export declare function createFromRealFileSystem(caseSensitiveDetector: CaseSensitivityDetector, console?: ConsoleInterface, fileWatcherProvider?: FileWatcherProvider): FileSystem;
 export declare class WorkspaceFileWatcherProvider implements FileWatcherProvider, FileWatcherHandler {
     private _fileWatchers;
     createFileWatcher(workspacePaths: string[], listener: FileWatcherEventHandler): FileWatcher;
     onFileChange(eventType: FileWatcherEventType, fileUri: Uri): void;
 }
-export declare class RealTempFile implements TempFile {
-    private readonly _isCaseSensitive;
+export declare class RealTempFile implements TempFile, CaseSensitivityDetector {
+    private _caseSensitivity?;
     private _tmpdir?;
-    constructor(_isCaseSensitive: boolean);
+    constructor();
     tmpdir(): Uri;
     tmpfile(options?: TmpfileOptions): Uri;
     dispose(): void;
+    isCaseSensitive(uri: string): boolean;
+    private _isLocalFileSystemCaseSensitive;
     private _getTmpDir;
+    private _isFileSystemCaseSensitiveInternal;
 }