@zzzen/pyright-internal 1.2.0-dev.20221016 → 1.2.0-dev.20221204

package/dist/tests/typePrinter.test.js

@@ -0,0 +1,148 @@
+"use strict";
+/*
+ * typePrinter.test.ts
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT license.
+ * Author: Eric Traut
+ *
+ * Unit tests for typePrinter module.
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const assert = __importStar(require("assert"));
+const typePrinter_1 = require("../analyzer/typePrinter");
+const types_1 = require("../analyzer/types");
+function returnTypeCallback(type) {
+    var _a;
+    return (_a = type.details.declaredReturnType) !== null && _a !== void 0 ? _a : types_1.UnknownType.create(/* isEllipsis */ true);
+}
+test('SimpleTypes', () => {
+    const anyType = types_1.AnyType.create(/* isEllipsis */ false);
+    assert.strictEqual((0, typePrinter_1.printType)(anyType, 0 /* None */, returnTypeCallback), 'Any');
+    const ellipsisType = types_1.AnyType.create(/* isEllipsis */ true);
+    assert.strictEqual((0, typePrinter_1.printType)(ellipsisType, 0 /* None */, returnTypeCallback), '...');
+    const unknownType = types_1.UnknownType.create();
+    assert.strictEqual((0, typePrinter_1.printType)(unknownType, 0 /* None */, returnTypeCallback), 'Unknown');
+    assert.strictEqual((0, typePrinter_1.printType)(unknownType, 1 /* PrintUnknownWithAny */, returnTypeCallback), 'Any');
+    assert.strictEqual((0, typePrinter_1.printType)(unknownType, 256 /* PythonSyntax */, returnTypeCallback), 'Any');
+    const unboundType = types_1.UnboundType.create();
+    assert.strictEqual((0, typePrinter_1.printType)(unboundType, 0 /* None */, returnTypeCallback), 'Unbound');
+    assert.strictEqual((0, typePrinter_1.printType)(unboundType, 256 /* PythonSyntax */, returnTypeCallback), 'Any');
+    const noneInstanceType = types_1.NoneType.createInstance();
+    assert.strictEqual((0, typePrinter_1.printType)(noneInstanceType, 0 /* None */, returnTypeCallback), 'None');
+    const noneInstantiableType = types_1.NoneType.createType();
+    assert.strictEqual((0, typePrinter_1.printType)(noneInstantiableType, 0 /* None */, returnTypeCallback), 'Type[None]');
+    const moduleType = types_1.ModuleType.create('Test', '');
+    assert.strictEqual((0, typePrinter_1.printType)(moduleType, 0 /* None */, returnTypeCallback), 'Module("Test")');
+    assert.strictEqual((0, typePrinter_1.printType)(moduleType, 256 /* PythonSyntax */, returnTypeCallback), 'Any');
+});
+test('TypeVarTypes', () => {
+    const typeVarType = types_1.TypeVarType.createInstance('T');
+    assert.strictEqual((0, typePrinter_1.printType)(typeVarType, 0 /* None */, returnTypeCallback), 'T');
+    const paramSpecType = types_1.TypeVarType.createInstance('P');
+    paramSpecType.details.isParamSpec = true;
+    assert.strictEqual((0, typePrinter_1.printType)(paramSpecType, 0 /* None */, returnTypeCallback), 'P');
+    const typeVarTupleType = types_1.TypeVarType.createInstance('Ts');
+    paramSpecType.details.isVariadic = true;
+    assert.strictEqual((0, typePrinter_1.printType)(typeVarTupleType, 0 /* None */, returnTypeCallback), 'Ts');
+});
+test('ClassTypes', () => {
+    const classTypeA = types_1.ClassType.createInstantiable('A', '', '', '', 0 /* None */, 0, 
+    /* declaredMetaclass*/ undefined, 
+    /* effectiveMetaclass */ undefined);
+    const typeVarS = types_1.TypeVarType.createInstance('S');
+    const typeVarT = types_1.TypeVarType.createInstance('T');
+    classTypeA.details.typeParameters.push(typeVarS, typeVarT);
+    assert.strictEqual((0, typePrinter_1.printType)(classTypeA, 0 /* None */, returnTypeCallback), 'Type[A[S, T]]');
+    const instanceA = types_1.ClassType.cloneAsInstance(classTypeA);
+    assert.strictEqual((0, typePrinter_1.printType)(instanceA, 0 /* None */, returnTypeCallback), 'A[S, T]');
+    const classTypeInt = types_1.ClassType.createInstantiable('int', '', '', '', 0 /* None */, 0, 
+    /* declaredMetaclass*/ undefined, 
+    /* effectiveMetaclass */ undefined);
+    const instanceInt = types_1.ClassType.cloneAsInstance(classTypeInt);
+    const specializedA = types_1.ClassType.cloneForSpecialization(instanceA, [instanceInt, instanceInt], 
+    /* isTypeArgumentExplicit */ true);
+    assert.strictEqual((0, typePrinter_1.printType)(specializedA, 0 /* None */, returnTypeCallback), 'A[int, int]');
+    const unionType = (0, types_1.combineTypes)([instanceInt, specializedA, typeVarS]);
+    assert.strictEqual((0, typePrinter_1.printType)(unionType, 0 /* None */, returnTypeCallback), 'Union[int, A[int, int], S]');
+    assert.strictEqual((0, typePrinter_1.printType)(unionType, 8 /* PEP604 */, returnTypeCallback), 'int | A[int, int] | S');
+});
+test('FunctionTypes', () => {
+    const funcTypeA = types_1.FunctionType.createInstance('A', '', '', 0 /* None */);
+    types_1.FunctionType.addParameter(funcTypeA, {
+        category: 0 /* Simple */,
+        hasDeclaredType: true,
+        type: types_1.NoneType.createInstance(),
+        name: 'a',
+    });
+    types_1.FunctionType.addParameter(funcTypeA, {
+        category: 0 /* Simple */,
+        hasDeclaredType: true,
+        type: types_1.AnyType.create(),
+    });
+    types_1.FunctionType.addParameter(funcTypeA, {
+        category: 1 /* VarArgList */,
+        hasDeclaredType: true,
+        type: types_1.AnyType.create(),
+        name: 'args',
+    });
+    types_1.FunctionType.addParameter(funcTypeA, {
+        category: 2 /* VarArgDictionary */,
+        hasDeclaredType: true,
+        type: types_1.AnyType.create(),
+        name: 'kwargs',
+    });
+    funcTypeA.details.declaredReturnType = types_1.NoneType.createInstance();
+    assert.strictEqual((0, typePrinter_1.printType)(funcTypeA, 0 /* None */, returnTypeCallback), '(a: None, /, *args: Any, **kwargs: Any) -> None');
+    assert.strictEqual((0, typePrinter_1.printType)(funcTypeA, 256 /* PythonSyntax */, returnTypeCallback), 'Callable[..., None]');
+    const funcTypeB = types_1.FunctionType.createInstance('B', '', '', 0 /* None */);
+    types_1.FunctionType.addParameter(funcTypeB, {
+        category: 0 /* Simple */,
+        hasDeclaredType: true,
+        type: types_1.NoneType.createInstance(),
+        name: 'a',
+    });
+    types_1.FunctionType.addParameter(funcTypeB, {
+        category: 0 /* Simple */,
+        hasDeclaredType: true,
+        type: types_1.NoneType.createInstance(),
+    });
+    const paramSpecP = types_1.TypeVarType.createInstance('P');
+    paramSpecP.details.isParamSpec = true;
+    funcTypeB.details.paramSpec = paramSpecP;
+    funcTypeB.details.declaredReturnType = types_1.NoneType.createInstance();
+    assert.strictEqual((0, typePrinter_1.printType)(funcTypeB, 0 /* None */, returnTypeCallback), '(a: None, /, **P) -> None');
+    assert.strictEqual((0, typePrinter_1.printType)(funcTypeB, 256 /* PythonSyntax */, returnTypeCallback), 'Callable[Concatenate[None, P], None]');
+    const funcTypeC = types_1.FunctionType.createInstance('C', '', '', 0 /* None */);
+    const typeVarTupleTs = types_1.TypeVarType.createInstance('Ts');
+    typeVarTupleTs.details.isVariadic = true;
+    const unpackedTs = types_1.TypeVarType.cloneForUnpacked(typeVarTupleTs);
+    types_1.FunctionType.addParameter(funcTypeC, {
+        category: 1 /* VarArgList */,
+        hasDeclaredType: true,
+        type: unpackedTs,
+        name: 'args',
+    });
+    assert.strictEqual((0, typePrinter_1.printType)(funcTypeC, 0 /* None */, returnTypeCallback), '(*args: *Ts) -> Unknown');
+    assert.strictEqual((0, typePrinter_1.printType)(funcTypeC, 512 /* UseTypingUnpack */, returnTypeCallback), '(*args: Unpack[Ts]) -> Unknown');
+    assert.strictEqual((0, typePrinter_1.printType)(funcTypeC, 256 /* PythonSyntax */, returnTypeCallback), 'Callable[..., Any]');
+});
+//# sourceMappingURL=typePrinter.test.js.map

package/dist/tests/typePrinter.test.js.map

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

package/dist/tests/workspaceEditUtils.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/tests/workspaceEditUtils.test.js

@@ -0,0 +1,167 @@
+"use strict";
+/*
+ * workspaceEditUtils.test.ts
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT license.
+ *
+ * test workspaceEditUtils
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const assert = __importStar(require("assert"));
+const vscode_languageserver_types_1 = require("vscode-languageserver-types");
+const pathUtils_1 = require("../common/pathUtils");
+const workspaceEditUtils_1 = require("../common/workspaceEditUtils");
+const analyzerServiceExecutor_1 = require("../languageService/analyzerServiceExecutor");
+const testLanguageService_1 = require("./harness/fourslash/testLanguageService");
+const testState_1 = require("./harness/fourslash/testState");
+const workspaceEditTestUtils_1 = require("./harness/fourslash/workspaceEditTestUtils");
+test('test applyWorkspaceEdits changes', async () => {
+    var _a;
+    const code = `
+// @filename: test.py
+//// [|/*marker*/|]
+        `;
+    const state = (0, testState_1.parseAndGetTestState)(code).state;
+    const cloned = await getClonedService(state);
+    const range = state.getRangeByMarkerName('marker');
+    const fileChanged = new Set();
+    (0, workspaceEditUtils_1.applyWorkspaceEdits)(cloned, {
+        changes: {
+            [(0, pathUtils_1.convertPathToUri)(cloned.fs, range.fileName)]: [
+                {
+                    range: state.convertPositionRange(range),
+                    newText: 'Text Changed',
+                },
+            ],
+        },
+    }, fileChanged);
+    assert.strictEqual(fileChanged.size, 1);
+    assert.strictEqual((_a = cloned.test_program.getSourceFile(range.fileName)) === null || _a === void 0 ? void 0 : _a.getFileContent(), 'Text Changed');
+});
+test('test applyWorkspaceEdits documentChanges', async () => {
+    var _a;
+    const code = `
+// @filename: test.py
+//// [|/*marker*/|]
+        `;
+    const state = (0, testState_1.parseAndGetTestState)(code).state;
+    const cloned = await getClonedService(state);
+    const range = state.getRangeByMarkerName('marker');
+    const fileChanged = new Set();
+    (0, workspaceEditUtils_1.applyWorkspaceEdits)(cloned, {
+        documentChanges: [
+            vscode_languageserver_types_1.TextDocumentEdit.create({
+                uri: (0, pathUtils_1.convertPathToUri)(cloned.fs, range.fileName),
+                version: null,
+            }, [
+                {
+                    range: state.convertPositionRange(range),
+                    newText: 'Text Changed',
+                },
+            ]),
+        ],
+    }, fileChanged);
+    assert.strictEqual(fileChanged.size, 1);
+    assert.strictEqual((_a = cloned.test_program.getSourceFile(range.fileName)) === null || _a === void 0 ? void 0 : _a.getFileContent(), 'Text Changed');
+});
+test('test generateWorkspaceEdits', async () => {
+    const code = `
+// @filename: test1.py
+//// [|/*marker1*/|]
+
+// @filename: test2.py
+//// [|/*marker2*/|]
+        `;
+    const state = (0, testState_1.parseAndGetTestState)(code).state;
+    const cloned = await getClonedService(state);
+    const range1 = state.getRangeByMarkerName('marker1');
+    const fileChanged = new Set();
+    (0, workspaceEditUtils_1.applyWorkspaceEdits)(cloned, {
+        changes: {
+            [(0, pathUtils_1.convertPathToUri)(cloned.fs, range1.fileName)]: [
+                {
+                    range: state.convertPositionRange(range1),
+                    newText: 'Test1 Changed',
+                },
+            ],
+        },
+    }, fileChanged);
+    (0, workspaceEditUtils_1.applyWorkspaceEdits)(cloned, {
+        documentChanges: [
+            vscode_languageserver_types_1.TextDocumentEdit.create({
+                uri: (0, pathUtils_1.convertPathToUri)(cloned.fs, range1.fileName),
+                version: null,
+            }, [
+                {
+                    range: { start: { line: 0, character: 0 }, end: { line: 0, character: 5 } },
+                    newText: 'NewTest1',
+                },
+            ]),
+        ],
+    }, fileChanged);
+    const range2 = state.getRangeByMarkerName('marker2');
+    (0, workspaceEditUtils_1.applyWorkspaceEdits)(cloned, {
+        documentChanges: [
+            vscode_languageserver_types_1.TextDocumentEdit.create({
+                uri: (0, pathUtils_1.convertPathToUri)(cloned.fs, range2.fileName),
+                version: null,
+            }, [
+                {
+                    range: state.convertPositionRange(range2),
+                    newText: 'Test2 Changed',
+                },
+            ]),
+        ],
+    }, fileChanged);
+    (0, workspaceEditUtils_1.applyWorkspaceEdits)(cloned, {
+        changes: {
+            [(0, pathUtils_1.convertPathToUri)(cloned.fs, range2.fileName)]: [
+                {
+                    range: { start: { line: 0, character: 0 }, end: { line: 0, character: 5 } },
+                    newText: 'NewTest2',
+                },
+            ],
+        },
+    }, fileChanged);
+    assert.strictEqual(fileChanged.size, 2);
+    const actualEdits = (0, workspaceEditUtils_1.generateWorkspaceEdits)(state.workspace.serviceInstance, cloned, fileChanged);
+    (0, workspaceEditTestUtils_1.verifyWorkspaceEdit)({
+        changes: {
+            [(0, pathUtils_1.convertPathToUri)(cloned.fs, range1.fileName)]: [
+                {
+                    range: state.convertPositionRange(range1),
+                    newText: 'NewTest1 Changed',
+                },
+            ],
+            [(0, pathUtils_1.convertPathToUri)(cloned.fs, range2.fileName)]: [
+                {
+                    range: state.convertPositionRange(range1),
+                    newText: 'NewTest2 Changed',
+                },
+            ],
+        },
+    }, actualEdits);
+});
+async function getClonedService(state) {
+    return await analyzerServiceExecutor_1.AnalyzerServiceExecutor.cloneService(new testLanguageService_1.TestLanguageService(state.workspace, state.console, state.workspace.serviceInstance.fs), state.workspace, { useBackgroundAnalysis: false });
+}
+//# sourceMappingURL=workspaceEditUtils.test.js.map

package/dist/tests/workspaceEditUtils.test.js.map

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

package/dist/workspaceMap.d.ts

@@ -1,8 +1,11 @@
 import { LanguageServerBase, WorkspaceServiceInstance } from './languageServerBase';
 export declare class WorkspaceMap extends Map<string, WorkspaceServiceInstance> {
     private _defaultWorkspacePath;
+    set(key: string, value: WorkspaceServiceInstance): this;
     delete(key: string): boolean;
     hasMultipleWorkspaces(kind?: string): boolean;
     getNonDefaultWorkspaces(kind?: string): WorkspaceServiceInstance[];
-    getWorkspaceForFile(ls: LanguageServerBase, filePath: string): WorkspaceServiceInstance;
+    getWorkspaceForFile(ls: LanguageServerBase, filePath: string): Promise<WorkspaceServiceInstance>;
+    getContainingWorkspace(filePath: string): WorkspaceServiceInstance | undefined;
+    private _getBestWorkspace;
 }

package/dist/workspaceMap.js

@@ -6,18 +6,24 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkspaceMap = void 0;
-const deferred_1 = require("./common/deferred");
 const languageServerBase_1 = require("./languageServerBase");
 class WorkspaceMap extends Map {
     constructor() {
         super(...arguments);
         this._defaultWorkspacePath = '<default>';
     }
+    set(key, value) {
+        // Make sure to delete existing workspace if there is one.
+        this.delete(key);
+        return super.set(key, value);
+    }
     delete(key) {
         const workspace = this.get(key);
         if (!workspace) {
             return false;
         }
+        // Make sure to unblock if there is someone waiting this workspace.
+        workspace.isInitialized.resolve();
         // Properly dispose of the service instance.
         workspace.serviceInstance.dispose();
         return super.delete(key);
@@ -50,19 +56,30 @@ class WorkspaceMap extends Map {
         });
         return workspaces;
     }
-    getWorkspaceForFile(ls, filePath) {
+    async getWorkspaceForFile(ls, filePath) {
         let bestRootPath;
         let bestInstance;
+        // Wait for all workspaces to be initialized before attempting to find the best workspace. Otherwise
+        // the list of files won't be complete and the `contains` check might fail.
+        for (const workspace of this.values()) {
+            await workspace.isInitialized.promise;
+        }
+        // The order of how we find the best matching workspace for the given file is
+        // 1. The given file is the workspace itself (ex, a file being a virtual workspace itself).
+        // 2. The given file matches the fileSpec of the service under the workspace
+        //    (the file is a user file the workspace provides LSP service for).
+        // 3. The given file doesn't match anything but we have only 1 regular workspace
+        //    (ex, open a library file from the workspace).
+        // 4. The given file doesn't match anything and there are multiple workspaces but one of workspaces
+        //    contains the file (ex, open a library file already imported by a workspace).
+        // 5. If none of the above works, then it matches the default workspace.
         this.forEach((workspace) => {
             if (workspace.path) {
-                // Is the file is under this workspace folder?
-                if (!workspace.owns(filePath)) {
+                if (workspace.path !== filePath && !workspace.serviceInstance.isTracked(filePath)) {
                     return;
                 }
-                // Is this the fist candidate? If not, is this workspace folder
-                // contained within the previous candidate folder? We always want
-                // to select the innermost folder, since that overrides the
-                // outer folders.
+                // Among workspaces that own the file, make sure we return the inner most one which
+                // we consider as the best workspace.
                 if (bestRootPath === undefined || workspace.path.startsWith(bestRootPath)) {
                     bestRootPath = workspace.path;
                     bestInstance = workspace;
@@ -72,13 +89,20 @@ class WorkspaceMap extends Map {
         // If there were multiple workspaces or we couldn't find any,
         // create a default one to use for this file.
         if (bestInstance === undefined) {
+            const regularWorkspaces = this.getNonDefaultWorkspaces(languageServerBase_1.WellKnownWorkspaceKinds.Regular);
+            // If we have only 1 regular workspace, then use that.
+            if (regularWorkspaces.length === 1) {
+                return regularWorkspaces[0];
+            }
+            // If we have multiple workspaces, see whether we can at least find one that contains the file.
+            // the file might not be tracked (user file), but still belongs to a workspace as a library file or as an orphan file to the workspace.
+            const containingWorkspace = this._getBestWorkspace(regularWorkspaces.filter((w) => w.serviceInstance.contains(filePath)));
+            if (containingWorkspace) {
+                return containingWorkspace;
+            }
+            // If no workspace contains it, then it belongs to the default workspace.
             let defaultWorkspace = this.get(this._defaultWorkspacePath);
             if (!defaultWorkspace) {
-                // If there is only one workspace, use that one.
-                const workspaceNames = [...this.keys()];
-                if (workspaceNames.length === 1) {
-                    return this.get(workspaceNames[0]);
-                }
                 // Create a default workspace for files that are outside
                 // of all workspaces.
                 defaultWorkspace = {
@@ -91,17 +115,41 @@ class WorkspaceMap extends Map {
                     disableLanguageServices: false,
                     disableOrganizeImports: false,
                     disableWorkspaceSymbol: false,
-                    isInitialized: (0, deferred_1.createDeferred)(),
+                    isInitialized: (0, languageServerBase_1.createInitStatus)(),
                     searchPathsToWatch: [],
-                    owns: (f) => true,
                 };
                 this.set(this._defaultWorkspacePath, defaultWorkspace);
-                ls.updateSettingsForWorkspace(defaultWorkspace).ignoreErrors();
+                // Do not await this. let isInitialized.promise to await. Otherwise, ordering
+                // will get messed up. The very first call will run last.
+                ls.updateSettingsForWorkspace(defaultWorkspace, defaultWorkspace.isInitialized).ignoreErrors();
             }
+            // Make sure the default workspace is initialized before using it.
+            await defaultWorkspace.isInitialized.promise;
             return defaultWorkspace;
         }
         return bestInstance;
     }
+    getContainingWorkspace(filePath) {
+        return this._getBestWorkspace(this.getNonDefaultWorkspaces(languageServerBase_1.WellKnownWorkspaceKinds.Regular).filter((w) => filePath.startsWith(w.path)));
+    }
+    _getBestWorkspace(workspaces) {
+        if (workspaces.length === 0) {
+            return undefined;
+        }
+        if (workspaces.length === 1) {
+            return workspaces[0];
+        }
+        // Best workspace is the inner most workspace.
+        return workspaces.reduce((previousWorkspace, currentWorkspace) => {
+            if (!previousWorkspace) {
+                return currentWorkspace;
+            }
+            if (currentWorkspace.path.startsWith(previousWorkspace.path)) {
+                return currentWorkspace;
+            }
+            return previousWorkspace;
+        }, workspaces[0]);
+    }
 }
 exports.WorkspaceMap = WorkspaceMap;
 //# sourceMappingURL=workspaceMap.js.map

package/dist/workspaceMap.js.map

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

package/package.json

@@ -2,7 +2,7 @@
   "name": "@zzzen/pyright-internal",
   "displayName": "pyright",
   "description": "Type checker for the Python language",
-  "version": "1.2.0-dev.20221016",
+  "version": "1.2.0-dev.20221204",
   "license": "MIT",
   "private": false,
   "files": [
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@iarna/toml": "2.2.5",
-    "@yarnpkg/fslib": "2.7.1",
+    "@yarnpkg/fslib": "2.9.0",
     "@yarnpkg/libzip": "2.2.4",
     "chalk": "^4.1.2",
     "chokidar": "^3.5.3",
@@ -30,7 +30,7 @@
     "vscode-languageserver": "8.1.0-next.1",
     "vscode-languageserver-textdocument": "^1.0.7",
     "vscode-languageserver-types": "3.17.2",
-    "vscode-uri": "^3.0.3"
+    "vscode-uri": "^3.0.6"
   },
   "devDependencies": {
     "@types/command-line-args": "^5.2.0",

package/dist/tests/fourslash/signature.paramspec.fourslash.js

@@ -1,30 +0,0 @@
-"use strict";
-/// <reference path="fourslash.ts" />
-// @filename: sig_paramspec.py
-//// from typing import Callable, Concatenate, ParamSpec
-////
-////
-//// P = ParamSpec("P")
-//// def tester(c: Callable[Concatenate[int, str, P], None]) -> Callable[Concatenate[int, P], None]:
-////     pass
-////
-//// @tester
-//// def foo(a: int, b: str, c: str, d: str):
-////     pass
-////
-//// foo(1,[|/*s1*/|])
-{
-    const simpleSignatures = [
-        {
-            label: '(int, c: str, d: str) -> None',
-            parameters: ['int', 'c: str', 'd: str'],
-        },
-    ];
-    helper.verifySignature('plaintext', {
-        s1: {
-            signatures: simpleSignatures,
-            activeParameters: [1],
-        },
-    });
-}
-//# sourceMappingURL=signature.paramspec.fourslash.js.map

package/dist/tests/fourslash/signature.paramspec.fourslash.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"signature.paramspec.fourslash.js","sourceRoot":"","sources":["../../../../src/tests/fourslash/signature.paramspec.fourslash.ts"],"names":[],"mappings":";AAAA,qCAAqC;AAErC,8BAA8B;AAC9B,wDAAwD;AACxD,IAAI;AACJ,IAAI;AACJ,uBAAuB;AACvB,oGAAoG;AACpG,aAAa;AACb,IAAI;AACJ,YAAY;AACZ,6CAA6C;AAC7C,aAAa;AACb,IAAI;AACJ,sBAAsB;AAEtB;IACI,MAAM,gBAAgB,GAAG;QACrB;YACI,KAAK,EAAE,+BAA+B;YACtC,UAAU,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC;SAC1C;KACJ,CAAC;IAEF,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE;QAChC,EAAE,EAAE;YACA,UAAU,EAAE,gBAAgB;YAC5B,gBAAgB,EAAE,CAAC,CAAC,CAAC;SACxB;KACJ,CAAC,CAAC;CACN"}