@zzzen/pyright-internal 1.2.0-dev.20240107 → 1.2.0-dev.20240121

package/dist/backgroundThreadBase.js

@@ -30,7 +30,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBackgroundWaiter = exports.run = exports.createConfigOptionsFrom = exports.createJsonObjectFrom = exports.BackgroundThreadBase = exports.BackgroundConsole = void 0;
+exports.getBackgroundWaiter = exports.run = exports.deserialize = exports.deserializeReviver = exports.serialize = exports.serializeReplacer = exports.BackgroundThreadBase = exports.BackgroundConsole = void 0;
 const worker_threads_1 = require("worker_threads");
 const cancellationUtils_1 = require("./common/cancellationUtils");
 const configOptions_1 = require("./common/configOptions");
@@ -60,7 +60,7 @@ class BackgroundConsole {
         this.post(console_1.LogLevel.Error, msg);
     }
     post(level, msg) {
-        worker_threads_1.parentPort === null || worker_threads_1.parentPort === void 0 ? void 0 : worker_threads_1.parentPort.postMessage({ requestType: 'log', data: { level: level, message: msg } });
+        worker_threads_1.parentPort === null || worker_threads_1.parentPort === void 0 ? void 0 : worker_threads_1.parentPort.postMessage({ requestType: 'log', data: serialize({ level: level, message: msg }) });
     }
 }
 exports.BackgroundConsole = BackgroundConsole;
@@ -85,7 +85,7 @@ class BackgroundThreadBase {
         return this._serviceProvider.fs();
     }
     log(level, msg) {
-        //parentPort?.postMessage({ requestType: 'log', data: { level: level, message: msg } });
+        worker_threads_1.parentPort === null || worker_threads_1.parentPort === void 0 ? void 0 : worker_threads_1.parentPort.postMessage({ requestType: 'log', data: serialize({ level: level, message: msg }) });
     }
     getConsole() {
         return this._serviceProvider.console();
@@ -100,65 +100,68 @@ class BackgroundThreadBase {
     }
 }
 exports.BackgroundThreadBase = BackgroundThreadBase;
-function createJsonObjectFrom(configOptions) {
-    return {
-        ...JSON.parse(JSON.stringify(configOptions)),
-        defineConstant: configOptions.defineConstant, // This is the only field that can't be stringified.
-    };
+// Function used to serialize specific types that can't automatically be serialized.
+// Exposed here so it can be reused by a caller that wants to add more cases.
+function serializeReplacer(key, value) {
+    if (uri_1.Uri.isUri(value) && value.toJsonObj !== undefined) {
+        return { __serialized_uri_val: value.toJsonObj() };
+    }
+    if (value instanceof Map) {
+        return { __serialized_map_val: [...value] };
+    }
+    if (value instanceof Set) {
+        return { __serialized_set_val: [...value] };
+    }
+    if (value instanceof RegExp) {
+        return { __serialized_regexp_val: { source: value.source, flags: value.flags } };
+    }
+    if (value instanceof configOptions_1.ConfigOptions) {
+        const entries = Object.entries(value);
+        return { __serialized_config_options: entries.reduce((obj, e, i) => ({ ...obj, [e[0]]: e[1] }), {}) };
+    }
+    return value;
 }
-exports.createJsonObjectFrom = createJsonObjectFrom;
-function createConfigOptionsFrom(jsonObject) {
-    var _a, _b;
-    const configOptions = new configOptions_1.ConfigOptions(uri_1.Uri.fromJsonObj(jsonObject.projectRoot));
-    const getFileSpec = (fileSpec) => {
-        return {
-            wildcardRoot: uri_1.Uri.fromJsonObj(fileSpec.wildcardRoot),
-            regExp: new RegExp(fileSpec.regExp.source, fileSpec.regExp.flags),
-            hasDirectoryWildcard: fileSpec.hasDirectoryWildcard,
-        };
-    };
-    configOptions.pythonEnvironmentName = jsonObject.pythonEnvironmentName;
-    configOptions.pythonPath = uri_1.Uri.fromJsonObj(jsonObject.pythonPath);
-    configOptions.typeshedPath = uri_1.Uri.fromJsonObj(jsonObject.typeshedPath);
-    configOptions.stubPath = uri_1.Uri.fromJsonObj(jsonObject.stubPath);
-    configOptions.autoExcludeVenv = jsonObject.autoExcludeVenv;
-    configOptions.verboseOutput = jsonObject.verboseOutput;
-    configOptions.defineConstant = new Map(jsonObject.defineConstant);
-    configOptions.checkOnlyOpenFiles = jsonObject.checkOnlyOpenFiles;
-    configOptions.useLibraryCodeForTypes = jsonObject.useLibraryCodeForTypes;
-    configOptions.internalTestMode = jsonObject.internalTestMode;
-    configOptions.indexGenerationMode = jsonObject.indexGenerationMode;
-    configOptions.venvPath = uri_1.Uri.fromJsonObj(jsonObject.venvPath);
-    configOptions.venv = jsonObject.venv;
-    configOptions.defaultPythonVersion = jsonObject.defaultPythonVersion;
-    configOptions.defaultPythonPlatform = jsonObject.defaultPythonPlatform;
-    configOptions.defaultExtraPaths = (_a = jsonObject.defaultExtraPaths) === null || _a === void 0 ? void 0 : _a.map((p) => uri_1.Uri.fromJsonObj(p));
-    configOptions.diagnosticRuleSet = jsonObject.diagnosticRuleSet;
-    configOptions.executionEnvironments = (_b = jsonObject.executionEnvironments) === null || _b === void 0 ? void 0 : _b.map((e) => {
-        var _a;
-        return {
-            ...e,
-            root: uri_1.Uri.fromJsonObj(e.root),
-            extraPaths: (_a = e.extraPaths) === null || _a === void 0 ? void 0 : _a.map((p) => uri_1.Uri.fromJsonObj(p)),
-        };
-    });
-    configOptions.autoImportCompletions = jsonObject.autoImportCompletions;
-    configOptions.indexing = jsonObject.indexing;
-    configOptions.taskListTokens = jsonObject.taskListTokens;
-    configOptions.logTypeEvaluationTime = jsonObject.logTypeEvaluationTime;
-    configOptions.typeEvaluationTimeThreshold = jsonObject.typeEvaluationTimeThreshold;
-    configOptions.include = jsonObject.include.map((f) => getFileSpec(f));
-    configOptions.exclude = jsonObject.exclude.map((f) => getFileSpec(f));
-    configOptions.ignore = jsonObject.ignore.map((f) => getFileSpec(f));
-    configOptions.strict = jsonObject.strict.map((f) => getFileSpec(f));
-    configOptions.functionSignatureDisplay = jsonObject.functionSignatureDisplay;
-    return configOptions;
+exports.serializeReplacer = serializeReplacer;
+function serialize(obj) {
+    // Convert the object to a string so it can be sent across a message port.
+    return JSON.stringify(obj, serializeReplacer);
+}
+exports.serialize = serialize;
+function deserializeReviver(key, value) {
+    if (value && typeof value === 'object') {
+        if (value.__serialized_uri_val !== undefined) {
+            return uri_1.Uri.fromJsonObj(value.__serialized_uri_val);
+        }
+        if (value.__serialized_map_val) {
+            return new Map(value.__serialized_map_val);
+        }
+        if (value.__serialized_set_val) {
+            return new Set(value.__serialized_set_val);
+        }
+        if (value.__serialized_regexp_val) {
+            return new RegExp(value.__serialized_regexp_val.source, value.__serialized_regexp_val.flags);
+        }
+        if (value.__serialized_config_options) {
+            const configOptions = new configOptions_1.ConfigOptions(value.__serialized_config_options.projectRoot);
+            Object.assign(configOptions, value.__serialized_config_options);
+            return configOptions;
+        }
+    }
+    return value;
+}
+exports.deserializeReviver = deserializeReviver;
+function deserialize(json) {
+    if (!json) {
+        return undefined;
+    }
+    // Convert the string back to an object.
+    return JSON.parse(json, deserializeReviver);
 }
-exports.createConfigOptionsFrom = createConfigOptionsFrom;
-function run(code, port) {
+exports.deserialize = deserialize;
+function run(code, port, serializer = serialize) {
     try {
         const result = code();
-        port.postMessage({ kind: 'ok', data: result });
+        port.postMessage({ kind: 'ok', data: serializer(result) });
     }
     catch (e) {
         if (cancellationUtils_1.OperationCanceledException.is(e)) {
@@ -169,12 +172,12 @@ function run(code, port) {
     }
 }
 exports.run = run;
-function getBackgroundWaiter(port) {
+function getBackgroundWaiter(port, deserializer = deserialize) {
     return new Promise((resolve, reject) => {
         port.on('message', (m) => {
             switch (m.kind) {
                 case 'ok':
-                    resolve(m.data);
+                    resolve(deserializer(m.data));
                     break;
                 case 'cancelled':
                     reject(new cancellationUtils_1.OperationCanceledException());

package/dist/backgroundThreadBase.js.map

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

package/dist/commands/quickActionCommand.js

@@ -26,7 +26,7 @@ class QuickActionCommand {
             const editActions = workspace.service.run((p) => {
                 return (0, quickActions_1.performQuickAction)(p, docUri, params.command, otherArgs, token);
             }, token);
-            return (0, workspaceEditUtils_1.convertToWorkspaceEdit)((0, workspaceEditUtils_1.convertToFileTextEdits)(docUri, editActions !== null && editActions !== void 0 ? editActions : []));
+            return (0, workspaceEditUtils_1.convertToWorkspaceEdit)(workspace.service.fs, (0, workspaceEditUtils_1.convertToFileTextEdits)(docUri, editActions !== null && editActions !== void 0 ? editActions : []));
         }
     }
 }

package/dist/commands/quickActionCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"quickActionCommand.js","sourceRoot":"","sources":["../../../src/commands/quickActionCommand.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAIH,2CAAwC;AACxC,qEAA8F;AAE9F,kEAAqE;AAIrE,MAAa,kBAAkB;IAC3B,YAAoB,GAA4B;QAA5B,QAAG,GAAH,GAAG,CAAyB;IAAG,CAAC;IAEpD,KAAK,CAAC,OAAO,CAAC,MAA4B,EAAE,KAAwB;QAChE,IAAI,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,IAAI,CAAC,EAAE;YAClD,MAAM,MAAM,GAAG,SAAG,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAW,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YAC1F,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC5C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;YAE7D,IAAI,MAAM,CAAC,OAAO,0DAA0B,IAAI,SAAS,CAAC,sBAAsB,EAAE;gBAC9E,OAAO,EAAE,CAAC;aACb;YAED,MAAM,WAAW,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC5C,OAAO,IAAA,iCAAkB,EAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;YAC3E,CAAC,EAAE,KAAK,CAAC,CAAC;YAEV,OAAO,IAAA,2CAAsB,EAAC,IAAA,2CAAsB,EAAC,MAAM,EAAE,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,EAAE,CAAC,CAAC,CAAC;SACpF;IACL,CAAC;CACJ;AApBD,gDAoBC"}
+{"version":3,"file":"quickActionCommand.js","sourceRoot":"","sources":["../../../src/commands/quickActionCommand.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAIH,2CAAwC;AACxC,qEAA8F;AAE9F,kEAAqE;AAIrE,MAAa,kBAAkB;IAC3B,YAAoB,GAA4B;QAA5B,QAAG,GAAH,GAAG,CAAyB;IAAG,CAAC;IAEpD,KAAK,CAAC,OAAO,CAAC,MAA4B,EAAE,KAAwB;QAChE,IAAI,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,IAAI,CAAC,EAAE;YAClD,MAAM,MAAM,GAAG,SAAG,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAW,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YAC1F,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC5C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;YAE7D,IAAI,MAAM,CAAC,OAAO,0DAA0B,IAAI,SAAS,CAAC,sBAAsB,EAAE;gBAC9E,OAAO,EAAE,CAAC;aACb;YAED,MAAM,WAAW,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC5C,OAAO,IAAA,iCAAkB,EAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;YAC3E,CAAC,EAAE,KAAK,CAAC,CAAC;YAEV,OAAO,IAAA,2CAAsB,EAAC,SAAS,CAAC,OAAO,CAAC,EAAE,EAAE,IAAA,2CAAsB,EAAC,MAAM,EAAE,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,EAAE,CAAC,CAAC,CAAC;SAC1G;IACL,CAAC;CACJ;AApBD,gDAoBC"}

package/dist/common/cancellationUtils.d.ts

@@ -1,5 +1,6 @@
 import { AbstractCancellationTokenSource, Event } from 'vscode-jsonrpc';
 import { CancellationToken, ResponseError } from 'vscode-languageserver';
+import { Uri } from './uri/uri';
 export interface CancellationProvider {
     createCancellationTokenSource(): AbstractCancellationTokenSource;
 }
@@ -17,13 +18,14 @@ export declare class DefaultCancellationProvider implements CancellationProvider
 }
 export declare function getCancellationTokenId(token: CancellationToken): string | undefined;
 export declare class FileBasedToken implements CancellationToken {
-    readonly cancellationFilePath: string;
     private _fs;
+    cancellationFilePath: Uri;
     protected isCancelled: boolean;
     private _emitter;
-    constructor(cancellationFilePath: string, _fs: {
-        statSync(filePath: string): void;
+    constructor(cancellationId: string, _fs: {
+        statSync(fileUri: Uri): void;
     });
+    get id(): string;
     get isCancellationRequested(): boolean;
     get onCancellationRequested(): Event<any>;
     cancel(): void;
@@ -31,3 +33,4 @@ export declare class FileBasedToken implements CancellationToken {
     private _disposeEmitter;
     private _pipeExists;
 }
+export declare function raceCancellation<T>(token?: CancellationToken, ...promises: Promise<T>[]): Promise<T>;

package/dist/common/cancellationUtils.js

@@ -7,10 +7,11 @@
  * Helper methods relating to cancellation.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FileBasedToken = exports.getCancellationTokenId = exports.DefaultCancellationProvider = exports.CancelAfter = exports.throwIfCancellationRequested = exports.OperationCanceledException = exports.setCancellationFolderName = exports.getCancellationFolderName = void 0;
+exports.raceCancellation = exports.FileBasedToken = exports.getCancellationTokenId = exports.DefaultCancellationProvider = exports.CancelAfter = exports.throwIfCancellationRequested = exports.OperationCanceledException = exports.setCancellationFolderName = exports.getCancellationFolderName = void 0;
 const vscode_jsonrpc_1 = require("vscode-jsonrpc");
 const vscode_languageserver_1 = require("vscode-languageserver");
 const core_1 = require("./core");
+const uri_1 = require("./uri/uri");
 let cancellationFolderName;
 function getCancellationFolderName() {
     return cancellationFolderName;
@@ -61,15 +62,17 @@ class DefaultCancellationProvider {
 }
 exports.DefaultCancellationProvider = DefaultCancellationProvider;
 function getCancellationTokenId(token) {
-    return token instanceof FileBasedToken ? token.cancellationFilePath : undefined;
+    return token instanceof FileBasedToken ? token.id : undefined;
 }
 exports.getCancellationTokenId = getCancellationTokenId;
 class FileBasedToken {
-    constructor(cancellationFilePath, _fs) {
-        this.cancellationFilePath = cancellationFilePath;
+    constructor(cancellationId, _fs) {
         this._fs = _fs;
         this.isCancelled = false;
-        // empty
+        this.cancellationFilePath = uri_1.Uri.file(cancellationId);
+    }
+    get id() {
+        return this.cancellationFilePath.toString();
     }
     get isCancellationRequested() {
         if (this.isCancelled) {
@@ -137,4 +140,25 @@ class CancellationThrottle {
     }
 }
 CancellationThrottle._lastCheckTimestamp = 0;
+async function raceCancellation(token, ...promises) {
+    if (!token) {
+        return Promise.race(promises);
+    }
+    if (token.isCancellationRequested) {
+        throw new OperationCanceledException();
+    }
+    return new Promise((resolve, reject) => {
+        if (token.isCancellationRequested) {
+            return reject(new OperationCanceledException());
+        }
+        const disposable = token.onCancellationRequested(() => {
+            disposable.dispose();
+            reject(new OperationCanceledException());
+        });
+        Promise.race(promises)
+            .then(resolve, reject)
+            .finally(() => disposable.dispose());
+    });
+}
+exports.raceCancellation = raceCancellation;
 //# sourceMappingURL=cancellationUtils.js.map

package/dist/common/cancellationUtils.js.map

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

package/dist/common/commandLineOptions.d.ts

@@ -43,5 +43,6 @@ export declare class CommandLineOptions {
     typeEvaluationTimeThreshold: number;
     enableAmbientAnalysis: boolean;
     analyzeUnannotatedFunctions?: boolean;
+    disableTaggedHints?: boolean;
     constructor(executionRoot: string, fromVsCodeExtension: boolean);
 }

package/dist/common/commandLineOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"commandLineOptions.js","sourceRoot":"","sources":["../../../src/common/commandLineOptions.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;;;AAKH,IAAkB,2BAKjB;AALD,WAAkB,2BAA2B;IACzC,8CAAe,CAAA;IACf,kDAAmB,CAAA;IACnB,0DAA2B,CAAA;IAC3B,4CAAa,CAAA;AACjB,CAAC,EALiB,2BAA2B,2CAA3B,2BAA2B,QAK5C;AAED,SAAgB,8BAA8B;IAC1C,OAAO;;;;;KAKN,CAAC;AACN,CAAC;AAPD,wEAOC;AAID,kFAAkF;AAClF,kFAAkF;AAClF,iFAAiF;AACjF,yFAAyF;AACzF,MAAa,kBAAkB;IAiH3B,YAAY,aAAqB,EAAE,mBAA4B;QAhH/D,+DAA+D;QAC/D,uEAAuE;QACvE,gBAAgB;QAChB,qBAAgB,GAAa,EAAE,CAAC;QAQhC,+DAA+D;QAC/D,uEAAuE;QACvE,gBAAgB;QAChB,qBAAgB,GAAa,EAAE,CAAC;QAEhC,wEAAwE;QACxE,oEAAoE;QACpE,oBAAe,GAAa,EAAE,CAAC;QAkF/B,oCAAoC;QACpC,0BAAqB,GAAG,KAAK,CAAC;QAE9B,2CAA2C;QAC3C,gCAA2B,GAAG,EAAE,CAAC;QAEjC,wBAAwB;QACxB,0BAAqB,GAAG,IAAI,CAAC;QAMzB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;IACnD,CAAC;CACJ;AArHD,gDAqHC"}
+{"version":3,"file":"commandLineOptions.js","sourceRoot":"","sources":["../../../src/common/commandLineOptions.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;;;AAKH,IAAkB,2BAKjB;AALD,WAAkB,2BAA2B;IACzC,8CAAe,CAAA;IACf,kDAAmB,CAAA;IACnB,0DAA2B,CAAA;IAC3B,4CAAa,CAAA;AACjB,CAAC,EALiB,2BAA2B,2CAA3B,2BAA2B,QAK5C;AAED,SAAgB,8BAA8B;IAC1C,OAAO;;;;;KAKN,CAAC;AACN,CAAC;AAPD,wEAOC;AAID,kFAAkF;AAClF,kFAAkF;AAClF,iFAAiF;AACjF,yFAAyF;AACzF,MAAa,kBAAkB;IAoH3B,YAAY,aAAqB,EAAE,mBAA4B;QAnH/D,+DAA+D;QAC/D,uEAAuE;QACvE,gBAAgB;QAChB,qBAAgB,GAAa,EAAE,CAAC;QAQhC,+DAA+D;QAC/D,uEAAuE;QACvE,gBAAgB;QAChB,qBAAgB,GAAa,EAAE,CAAC;QAEhC,wEAAwE;QACxE,oEAAoE;QACpE,oBAAe,GAAa,EAAE,CAAC;QAkF/B,oCAAoC;QACpC,0BAAqB,GAAG,KAAK,CAAC;QAE9B,2CAA2C;QAC3C,gCAA2B,GAAG,EAAE,CAAC;QAEjC,wBAAwB;QACxB,0BAAqB,GAAG,IAAI,CAAC;QASzB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;IACnD,CAAC;CACJ;AAxHD,gDAwHC"}

package/dist/common/commandUtils.d.ts

@@ -0,0 +1,2 @@
+import { Command } from 'vscode-languageserver-types';
+export declare function createCommand(title: string, command: string, ...args: any[]): Command;

package/dist/common/commandUtils.js

@@ -0,0 +1,24 @@
+"use strict";
+/*
+ * commandUtils.ts
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT license.
+ *
+ * Utilities for working with LSP commands.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createCommand = void 0;
+const vscode_languageserver_types_1 = require("vscode-languageserver-types");
+const uri_1 = require("./uri/uri");
+function createCommand(title, command, ...args) {
+    // Make sure if any of the args are URIs, we convert them to strings.
+    const convertedArgs = args.map((arg) => {
+        if (uri_1.Uri.isUri(arg)) {
+            return arg.toString();
+        }
+        return arg;
+    });
+    return vscode_languageserver_types_1.Command.create(title, command, ...convertedArgs);
+}
+exports.createCommand = createCommand;
+//# sourceMappingURL=commandUtils.js.map

package/dist/common/commandUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"commandUtils.js","sourceRoot":"","sources":["../../../src/common/commandUtils.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,6EAAsD;AACtD,mCAAgC;AAEhC,SAAgB,aAAa,CAAC,KAAa,EAAE,OAAe,EAAE,GAAG,IAAW;IACxE,qEAAqE;IACrE,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACnC,IAAI,SAAG,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YAChB,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;SACzB;QACD,OAAO,GAAG,CAAC;IACf,CAAC,CAAC,CAAC;IACH,OAAO,qCAAO,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC,CAAC;AAC5D,CAAC;AATD,sCASC"}

package/dist/common/configOptions.d.ts

@@ -136,6 +136,7 @@ export declare class ConfigOptions {
     typeEvaluationTimeThreshold: number;
     typeCheckingMode?: string;
     initializedFromJson: boolean;
+    disableTaggedHints: boolean;
     diagnosticRuleSet: DiagnosticRuleSet;
     taskListTokens?: TaskListToken[] | undefined;
     executionEnvironments: ExecutionEnvironment[];

package/dist/common/configOptions.js

@@ -545,6 +545,8 @@ class ConfigOptions {
         this.typeEvaluationTimeThreshold = 50;
         // Was this config initialized from JSON (pyrightconfig/pyproject)?
         this.initializedFromJson = false;
+        // Filter out any hint diagnostics with tags?
+        this.disableTaggedHints = false;
         //---------------------------------------------------------------
         // Parsing and Import Resolution Settings
         // Parameters that specify the execution environment for
@@ -577,7 +579,7 @@ class ConfigOptions {
     findExecEnvironment(file) {
         var _a;
         return ((_a = this.executionEnvironments.find((env) => {
-            const envRoot = uri_1.Uri.isUri(env.root) ? env.root : this.projectRoot.combinePaths(env.root || '');
+            const envRoot = uri_1.Uri.isUri(env.root) ? env.root : this.projectRoot.resolvePaths(env.root || '');
             return file.startsWith(envRoot);
         })) !== null && _a !== void 0 ? _a : this.getDefaultExecEnvironment());
     }
@@ -718,7 +720,7 @@ class ConfigOptions {
                 console.error(`Config "venvPath" field must contain a string.`);
             }
             else {
-                this.venvPath = this.projectRoot.combinePaths(configObj.venvPath);
+                this.venvPath = this.projectRoot.resolvePaths(configObj.venvPath);
             }
         }
         // Read the "venv" name.
@@ -744,7 +746,7 @@ class ConfigOptions {
                         console.error(`Config "extraPaths" field ${pathIndex} must be a string.`);
                     }
                     else {
-                        this.defaultExtraPaths.push(this.projectRoot.combinePaths(path));
+                        this.defaultExtraPaths.push(this.projectRoot.resolvePaths(path));
                     }
                 });
             }
@@ -783,7 +785,7 @@ class ConfigOptions {
             }
             else {
                 this.typeshedPath = configObj.typeshedPath
-                    ? this.projectRoot.combinePaths(configObj.typeshedPath)
+                    ? this.projectRoot.resolvePaths(configObj.typeshedPath)
                     : undefined;
             }
         }
@@ -796,7 +798,7 @@ class ConfigOptions {
             }
             else {
                 console.error(`Config "typingsPath" is now deprecated. Please, use stubPath instead.`);
-                this.stubPath = this.projectRoot.combinePaths(configObj.typingsPath);
+                this.stubPath = this.projectRoot.resolvePaths(configObj.typingsPath);
             }
         }
         if (configObj.stubPath !== undefined) {
@@ -804,7 +806,7 @@ class ConfigOptions {
                 console.error(`Config "stubPath" field must contain a string.`);
             }
             else {
-                this.stubPath = this.projectRoot.combinePaths(configObj.stubPath);
+                this.stubPath = this.projectRoot.resolvePaths(configObj.stubPath);
             }
         }
         // Read the "verboseOutput" setting.
@@ -942,14 +944,14 @@ class ConfigOptions {
         const paths = [];
         if (autoSearchPaths) {
             // Auto-detect the common scenario where the sources are under the src folder
-            const srcPath = this.projectRoot.combinePaths(pathConsts.src);
-            if (fs.existsSync(srcPath) && !fs.existsSync(srcPath.combinePaths('__init__.py'))) {
+            const srcPath = this.projectRoot.resolvePaths(pathConsts.src);
+            if (fs.existsSync(srcPath) && !fs.existsSync(srcPath.resolvePaths('__init__.py'))) {
                 paths.push(fs.realCasePath(srcPath));
             }
         }
         if (extraPaths && extraPaths.length > 0) {
             for (const p of extraPaths) {
-                const path = this.projectRoot.combinePaths(p);
+                const path = this.projectRoot.resolvePaths(p);
                 paths.push(fs.realCasePath(path));
                 if ((0, uriUtils_1.isDirectory)(fs, path)) {
                     (0, collectionUtils_1.appendArray)(paths, (0, pythonPathUtils_1.getPathsFromPthFiles)(fs, path));
@@ -1005,7 +1007,7 @@ class ConfigOptions {
             const newExecEnv = new ExecutionEnvironment(this._getEnvironmentName(), this.projectRoot, this.defaultPythonVersion, this.defaultPythonPlatform, this.defaultExtraPaths);
             // Validate the root.
             if (envObj.root && typeof envObj.root === 'string') {
-                newExecEnv.root = this.projectRoot.combinePaths(envObj.root);
+                newExecEnv.root = this.projectRoot.resolvePaths(envObj.root);
             }
             else {
                 console.error(`Config executionEnvironments index ${index}: missing root value.`);
@@ -1023,7 +1025,7 @@ class ConfigOptions {
                                 ` extraPaths field ${pathIndex} must be a string.`);
                         }
                         else {
-                            newExecEnv.extraPaths.push(this.projectRoot.combinePaths(path));
+                            newExecEnv.extraPaths.push(this.projectRoot.resolvePaths(path));
                         }
                     });
                 }