@zzzen/pyright-internal 1.2.0-dev.20260920 → 1.2.0-dev.20260927
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/analyzer/checker.d.ts +2 -1
- package/dist/analyzer/checker.js +15 -1
- package/dist/analyzer/checker.js.map +1 -1
- package/dist/analyzer/codeFlowEngine.js +9 -3
- package/dist/analyzer/codeFlowEngine.js.map +1 -1
- package/dist/analyzer/operations.js +1 -1
- package/dist/analyzer/operations.js.map +1 -1
- package/dist/analyzer/overloadResult.d.ts +15 -0
- package/dist/analyzer/overloadResult.js +233 -0
- package/dist/analyzer/overloadResult.js.map +1 -0
- package/dist/analyzer/overloadResultAdmission.d.ts +20 -0
- package/dist/analyzer/overloadResultAdmission.js +448 -0
- package/dist/analyzer/overloadResultAdmission.js.map +1 -0
- package/dist/analyzer/overloadResultController.d.ts +227 -0
- package/dist/analyzer/overloadResultController.js +904 -0
- package/dist/analyzer/overloadResultController.js.map +1 -0
- package/dist/analyzer/overloadResultSelector.d.ts +24 -0
- package/dist/analyzer/overloadResultSelector.js +131 -0
- package/dist/analyzer/overloadResultSelector.js.map +1 -0
- package/dist/analyzer/parseTreeUtils.d.ts +1 -0
- package/dist/analyzer/parseTreeUtils.js +4 -0
- package/dist/analyzer/parseTreeUtils.js.map +1 -1
- package/dist/analyzer/program.d.ts +13 -2
- package/dist/analyzer/program.js +98 -46
- package/dist/analyzer/program.js.map +1 -1
- package/dist/analyzer/protocols.d.ts +1 -0
- package/dist/analyzer/protocols.js +286 -6
- package/dist/analyzer/protocols.js.map +1 -1
- package/dist/analyzer/sourceFile.d.ts +6 -2
- package/dist/analyzer/sourceFile.js +9 -3
- package/dist/analyzer/sourceFile.js.map +1 -1
- package/dist/analyzer/tracePrinter.js +4 -0
- package/dist/analyzer/tracePrinter.js.map +1 -1
- package/dist/analyzer/typeCacheUtils.d.ts +4 -0
- package/dist/analyzer/typeCacheUtils.js +36 -0
- package/dist/analyzer/typeCacheUtils.js.map +1 -1
- package/dist/analyzer/typeComplexity.js +2 -0
- package/dist/analyzer/typeComplexity.js.map +1 -1
- package/dist/analyzer/typeEvaluator.d.ts +10 -1
- package/dist/analyzer/typeEvaluator.js +351 -11
- package/dist/analyzer/typeEvaluator.js.map +1 -1
- package/dist/analyzer/typeEvaluatorTypes.d.ts +30 -1
- package/dist/analyzer/typeEvaluatorTypes.js.map +1 -1
- package/dist/analyzer/typeGuards.d.ts +1 -1
- package/dist/analyzer/typePrinter.js +8 -0
- package/dist/analyzer/typePrinter.js.map +1 -1
- package/dist/analyzer/typeUtils.d.ts +1 -1
- package/dist/analyzer/typeUtils.js +29 -26
- package/dist/analyzer/typeUtils.js.map +1 -1
- package/dist/analyzer/typeWalker.d.ts +2 -1
- package/dist/analyzer/typeWalker.js +12 -0
- package/dist/analyzer/typeWalker.js.map +1 -1
- package/dist/analyzer/typedDicts.js +1 -0
- package/dist/analyzer/typedDicts.js.map +1 -1
- package/dist/analyzer/types.d.ts +16 -2
- package/dist/analyzer/types.js +94 -2
- package/dist/analyzer/types.js.map +1 -1
- package/dist/common/configOptions.d.ts +1 -0
- package/dist/common/configOptions.js +2 -0
- package/dist/common/configOptions.js.map +1 -1
- package/dist/languageServerBase.js +2 -2
- package/dist/languageServerBase.js.map +1 -1
- package/dist/languageService/callHierarchyProvider.js +3 -2
- package/dist/languageService/callHierarchyProvider.js.map +1 -1
- package/dist/languageService/completionProvider.js +4 -1
- package/dist/languageService/completionProvider.js.map +1 -1
- package/dist/tests/config.test.js +48 -0
- package/dist/tests/config.test.js.map +1 -1
- package/dist/tests/fourslash/showcallhierarchy.incomingCalls.aliasedFunction.fourslash.js +10 -6
- package/dist/tests/fourslash/showcallhierarchy.incomingCalls.aliasedFunction.fourslash.js.map +1 -1
- package/dist/tests/fourslash/showcallhierarchy.incomingCalls.function.fourslash.js +16 -10
- package/dist/tests/fourslash/showcallhierarchy.incomingCalls.function.fourslash.js.map +1 -1
- package/dist/tests/harness/fourslash/testState.js +10 -9
- package/dist/tests/harness/fourslash/testState.js.map +1 -1
- package/dist/tests/languageServer.test.js +129 -0
- package/dist/tests/languageServer.test.js.map +1 -1
- package/dist/tests/overloadResult.test.d.ts +1 -0
- package/dist/tests/overloadResult.test.js +182 -0
- package/dist/tests/overloadResult.test.js.map +1 -0
- package/dist/tests/overloadResultController.test.d.ts +1 -0
- package/dist/tests/overloadResultController.test.js +2146 -0
- package/dist/tests/overloadResultController.test.js.map +1 -0
- package/dist/tests/protocolRequirement.test.d.ts +1 -0
- package/dist/tests/protocolRequirement.test.js +122 -0
- package/dist/tests/protocolRequirement.test.js.map +1 -0
- package/dist/tests/protocolRequirementAdversarial.test.d.ts +1 -0
- package/dist/tests/protocolRequirementAdversarial.test.js +92 -0
- package/dist/tests/protocolRequirementAdversarial.test.js.map +1 -0
- package/dist/tests/protocolRequirementBoundary.test.d.ts +1 -0
- package/dist/tests/protocolRequirementBoundary.test.js +119 -0
- package/dist/tests/protocolRequirementBoundary.test.js.map +1 -0
- package/dist/tests/protocolRequirementComplexity.test.d.ts +1 -0
- package/dist/tests/protocolRequirementComplexity.test.js +159 -0
- package/dist/tests/protocolRequirementComplexity.test.js.map +1 -0
- package/dist/tests/protocolRequirementCycles.test.d.ts +1 -0
- package/dist/tests/protocolRequirementCycles.test.js +160 -0
- package/dist/tests/protocolRequirementCycles.test.js.map +1 -0
- package/dist/tests/protocolRequirementGeneral.test.d.ts +1 -0
- package/dist/tests/protocolRequirementGeneral.test.js +120 -0
- package/dist/tests/protocolRequirementGeneral.test.js.map +1 -0
- package/dist/tests/protocolRequirementInstances.test.d.ts +1 -0
- package/dist/tests/protocolRequirementInstances.test.js +164 -0
- package/dist/tests/protocolRequirementInstances.test.js.map +1 -0
- package/dist/tests/protocolRequirementListStub.test.d.ts +1 -0
- package/dist/tests/protocolRequirementListStub.test.js +244 -0
- package/dist/tests/protocolRequirementListStub.test.js.map +1 -0
- package/dist/tests/protocolRequirementPopulated.test.d.ts +1 -0
- package/dist/tests/protocolRequirementPopulated.test.js +172 -0
- package/dist/tests/protocolRequirementPopulated.test.js.map +1 -0
- package/dist/tests/protocolRequirementRecursive.test.d.ts +1 -0
- package/dist/tests/protocolRequirementRecursive.test.js +118 -0
- package/dist/tests/protocolRequirementRecursive.test.js.map +1 -0
- package/dist/tests/protocolRequirementSpeculative.test.d.ts +1 -0
- package/dist/tests/protocolRequirementSpeculative.test.js +200 -0
- package/dist/tests/protocolRequirementSpeculative.test.js.map +1 -0
- package/dist/tests/protocolRequirementState.test.d.ts +1 -0
- package/dist/tests/protocolRequirementState.test.js +161 -0
- package/dist/tests/protocolRequirementState.test.js.map +1 -0
- package/dist/tests/testState.test.js +64 -0
- package/dist/tests/testState.test.js.map +1 -1
- package/dist/tests/testUtils.d.ts +6 -1
- package/dist/tests/testUtils.js +11 -6
- package/dist/tests/testUtils.js.map +1 -1
- package/dist/tests/typeCacheIsolation.test.d.ts +1 -0
- package/dist/tests/typeCacheIsolation.test.js +109 -0
- package/dist/tests/typeCacheIsolation.test.js.map +1 -0
- package/dist/tests/typeCacheUtils.test.js +59 -0
- package/dist/tests/typeCacheUtils.test.js.map +1 -1
- package/dist/tests/typeEvaluator1.test.js +5 -1
- package/dist/tests/typeEvaluator1.test.js.map +1 -1
- package/dist/tests/typeEvaluator4.test.js +6 -2
- package/dist/tests/typeEvaluator4.test.js.map +1 -1
- package/dist/tests/typeEvaluator5.test.js +25 -0
- package/dist/tests/typeEvaluator5.test.js.map +1 -1
- package/dist/tests/typeEvaluator6.test.js +7 -23
- package/dist/tests/typeEvaluator6.test.js.map +1 -1
- package/dist/tests/typeEvaluator7.test.js +237 -2
- package/dist/tests/typeEvaluator7.test.js.map +1 -1
- package/dist/tests/typeServer/typeServer.inProc.test.js +86 -0
- package/dist/tests/typeServer/typeServer.inProc.test.js.map +1 -1
- package/dist/tests/typeUtils.test.js +36 -0
- package/dist/tests/typeUtils.test.js.map +1 -1
- package/dist/trace/nativeAdapter.js +1 -5
- package/dist/trace/nativeAdapter.js.map +1 -1
- package/dist/typeServer/protocol/typeServerProtocol.d.ts +8 -2
- package/dist/typeServer/protocol/typeServerProtocol.js +1 -0
- package/dist/typeServer/protocol/typeServerProtocol.js.map +1 -1
- package/dist/typeServer/typeServerConversionUtils.js +9 -0
- package/dist/typeServer/typeServerConversionUtils.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,118 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
const assert = __importStar(require("assert"));
|
|
37
|
+
const constraintTracker_1 = require("../analyzer/constraintTracker");
|
|
38
|
+
const protocols_1 = require("../analyzer/protocols");
|
|
39
|
+
const types_1 = require("../analyzer/types");
|
|
40
|
+
const diagnostic_1 = require("../common/diagnostic");
|
|
41
|
+
const testState_1 = require("./harness/fourslash/testState");
|
|
42
|
+
describe.each([
|
|
43
|
+
{ element: 'RecursiveLeaf', accepted: true },
|
|
44
|
+
{ element: 'RecursiveMixed', accepted: true },
|
|
45
|
+
{ element: 'RecursiveSequence', accepted: true },
|
|
46
|
+
{ element: 'MutualLeft', accepted: true },
|
|
47
|
+
{ element: 'RecursiveGeneric[Good]', accepted: true },
|
|
48
|
+
{ element: 'RecursiveGeneric[Bad]', accepted: false },
|
|
49
|
+
{ element: 'BadRecursiveSequence', accepted: false },
|
|
50
|
+
])('ProtocolRequirementRecursive $element', ({ element, accepted }) => {
|
|
51
|
+
test.each(accepted ? ['shortcut', 'cold', 'diagnostic'] : ['cold', 'diagnostic'])('%s', (mode) => {
|
|
52
|
+
const state = (0, testState_1.parseAndGetTestState)(`
|
|
53
|
+
// @filename: test.py
|
|
54
|
+
//// from collections.abc import Iterator
|
|
55
|
+
//// from typing import Protocol, TypeAlias, TypeVar
|
|
56
|
+
//// T_co = TypeVar("T_co", covariant=True)
|
|
57
|
+
//// class SupportsArray(Protocol[T_co]):
|
|
58
|
+
//// def __array__(self) -> T_co: ...
|
|
59
|
+
//// class NestedSequence(Protocol[T_co]):
|
|
60
|
+
//// def __len__(self, /) -> int: ...
|
|
61
|
+
//// def __getitem__(self, index: int, /) -> T_co | "NestedSequence[T_co]": ...
|
|
62
|
+
//// def __iter__(self, /) -> Iterator[T_co | "NestedSequence[T_co]"]: ...
|
|
63
|
+
//// class Good:
|
|
64
|
+
//// def __array__(self) -> int: ...
|
|
65
|
+
//// class Bad:
|
|
66
|
+
//// def __array__(self) -> str: ...
|
|
67
|
+
//// class BadRecursiveSequence:
|
|
68
|
+
//// def __len__(self, /) -> int: ...
|
|
69
|
+
//// def __getitem__(self, index: int, /) -> Bad | "BadRecursiveSequence": ...
|
|
70
|
+
//// def __iter__(self, /) -> Iterator[Bad | "BadRecursiveSequence"]: ...
|
|
71
|
+
//// RecursiveLeaf: TypeAlias = Good | list["RecursiveLeaf"]
|
|
72
|
+
//// RecursiveMixed: TypeAlias = Good | list["RecursiveMixed"] | tuple["RecursiveMixed", ...]
|
|
73
|
+
//// class RecursiveSequence:
|
|
74
|
+
//// def __len__(self, /) -> int: ...
|
|
75
|
+
//// def __getitem__(self, index: int, /) -> Good | "RecursiveSequence": ...
|
|
76
|
+
//// def __iter__(self, /) -> Iterator[Good | "RecursiveSequence"]: ...
|
|
77
|
+
//// class MutualLeft:
|
|
78
|
+
//// def __len__(self, /) -> int: ...
|
|
79
|
+
//// def __getitem__(self, index: int, /) -> Good | "MutualRight": ...
|
|
80
|
+
//// def __iter__(self, /) -> Iterator[Good | "MutualRight"]: ...
|
|
81
|
+
//// class MutualRight:
|
|
82
|
+
//// def __len__(self, /) -> int: ...
|
|
83
|
+
//// def __getitem__(self, index: int, /) -> Good | MutualLeft: ...
|
|
84
|
+
//// def __iter__(self, /) -> Iterator[Good | MutualLeft]: ...
|
|
85
|
+
//// type RecursiveGeneric[Value] = Value | list[RecursiveGeneric[Value]]
|
|
86
|
+
//// def check(source: list[${element}], destination: NestedSequence[SupportsArray[int]]):
|
|
87
|
+
//// /*source*/source
|
|
88
|
+
//// /*destination*/destination
|
|
89
|
+
`).state;
|
|
90
|
+
const evaluator = state.program.evaluator;
|
|
91
|
+
const typeAt = (marker) => {
|
|
92
|
+
const node = (0, testState_1.getNodeAtMarker)(state, marker);
|
|
93
|
+
assert.strictEqual(node.nodeType, 38 /* ParseNodeType.Name */);
|
|
94
|
+
return evaluator.getTypeOfExpression(node).type;
|
|
95
|
+
};
|
|
96
|
+
const source = typeAt('source');
|
|
97
|
+
const destination = typeAt('destination');
|
|
98
|
+
assert.ok((0, types_1.isClassInstance)(source) && (0, types_1.isClassInstance)(destination));
|
|
99
|
+
const target = types_1.ClassType.cloneAsInstantiable(destination);
|
|
100
|
+
const constraints = new constraintTracker_1.ConstraintTracker();
|
|
101
|
+
constraints.getMainConstraintSet().addScopeId('caller');
|
|
102
|
+
const sourceBefore = evaluator.printType(source);
|
|
103
|
+
for (let repetition = 0; repetition < 2; repetition++) {
|
|
104
|
+
if (mode === 'shortcut') {
|
|
105
|
+
assert.strictEqual((0, protocols_1.tryFastRejectSequenceProtocol)(evaluator, target, source, constraints, 0 /* AssignTypeFlags.Default */, 0), undefined);
|
|
106
|
+
}
|
|
107
|
+
else {
|
|
108
|
+
assert.strictEqual((0, protocols_1.assignClassToProtocol)(evaluator, target, source, mode === 'diagnostic' ? new diagnostic_1.DiagnosticAddendum() : undefined, constraints, 0 /* AssignTypeFlags.Default */, 0), accepted);
|
|
109
|
+
}
|
|
110
|
+
assert.strictEqual(evaluator.printType(source), sourceBefore);
|
|
111
|
+
assert.deepStrictEqual(constraints.getConstraintSets().map((set) => ({
|
|
112
|
+
scopes: [...set.getScopeIds()],
|
|
113
|
+
bounds: set.getTypeVars(),
|
|
114
|
+
})), [{ scopes: ['caller'], bounds: [] }]);
|
|
115
|
+
}
|
|
116
|
+
});
|
|
117
|
+
});
|
|
118
|
+
//# sourceMappingURL=protocolRequirementRecursive.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"protocolRequirementRecursive.test.js","sourceRoot":"","sources":["../../../../../src/tests/protocolRequirementRecursive.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,200 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
const assert = __importStar(require("assert"));
|
|
37
|
+
const constraintTracker_1 = require("../analyzer/constraintTracker");
|
|
38
|
+
const protocols_1 = require("../analyzer/protocols");
|
|
39
|
+
const types_1 = require("../analyzer/types");
|
|
40
|
+
const diagnostic_1 = require("../common/diagnostic");
|
|
41
|
+
const testState_1 = require("./harness/fourslash/testState");
|
|
42
|
+
describe.each(['Plain', 'Callable[[], int]', 'int'])('ProtocolRequirementSpeculative %s', (element) => {
|
|
43
|
+
test.each([0 /* AssignTypeFlags.Default */, 256 /* AssignTypeFlags.RetainLiteralsForTypeVar */].flatMap((flags) => [false, true].flatMap((multipleSets) => [false, true].flatMap((positiveFirst) => [false, true].map((populated) => ({ flags, multipleSets, positiveFirst, populated }))))))('flags=$flags multipleSets=$multipleSets positiveFirst=$positiveFirst populated=$populated', ({ flags, multipleSets, positiveFirst, populated }) => {
|
|
44
|
+
const run = (speculative) => {
|
|
45
|
+
const state = (0, testState_1.parseAndGetTestState)(`
|
|
46
|
+
// @filename: test.py
|
|
47
|
+
//// from collections.abc import Callable, Iterator
|
|
48
|
+
//// from typing import Literal, Protocol, TypeVar
|
|
49
|
+
//// T_co = TypeVar("T_co", covariant=True)
|
|
50
|
+
//// class Leaf(Protocol):
|
|
51
|
+
//// def serialize(self) -> int: ...
|
|
52
|
+
//// class Plain: pass
|
|
53
|
+
//// class Good:
|
|
54
|
+
//// def serialize(self) -> int: ...
|
|
55
|
+
//// class NestedSequence(Protocol[T_co]):
|
|
56
|
+
//// def __len__(self, /) -> int: ...
|
|
57
|
+
//// def __getitem__(self, index: int, /) -> T_co | "NestedSequence[T_co]": ...
|
|
58
|
+
//// def __iter__(self, /) -> Iterator[T_co | "NestedSequence[T_co]"]: ...
|
|
59
|
+
//// def check[T](variable: T, literal: Literal[7], other: Literal[8], integer: int, source: list[${element}], destination: NestedSequence[${element === 'int' ? 'str' : 'Leaf'}], valid: list[${element === 'int' ? 'str' : 'Good'}]):
|
|
60
|
+
//// /*source*/source
|
|
61
|
+
//// /*destination*/destination
|
|
62
|
+
//// /*valid*/valid
|
|
63
|
+
//// /*variable*/variable
|
|
64
|
+
//// /*literal*/literal
|
|
65
|
+
//// /*other*/other
|
|
66
|
+
//// /*integer*/integer
|
|
67
|
+
`).state;
|
|
68
|
+
const evaluator = state.program.evaluator;
|
|
69
|
+
const typeAt = (marker) => {
|
|
70
|
+
const node = (0, testState_1.getNodeAtMarker)(state, marker);
|
|
71
|
+
assert.strictEqual(node.nodeType, 38 /* ParseNodeType.Name */);
|
|
72
|
+
const type = evaluator.getTypeOfExpression(node).type;
|
|
73
|
+
assert.ok((0, types_1.isClassInstance)(type));
|
|
74
|
+
return type;
|
|
75
|
+
};
|
|
76
|
+
const source = typeAt('source');
|
|
77
|
+
const target = types_1.ClassType.cloneAsInstantiable(typeAt('destination'));
|
|
78
|
+
const valid = typeAt('valid');
|
|
79
|
+
const accepted = types_1.ClassType.specialize(target, [source.priv.typeArgs[0]]);
|
|
80
|
+
const constraints = new constraintTracker_1.ConstraintTracker();
|
|
81
|
+
const variableNode = (0, testState_1.getNodeAtMarker)(state, 'variable');
|
|
82
|
+
assert.strictEqual(variableNode.nodeType, 38 /* ParseNodeType.Name */);
|
|
83
|
+
const variable = evaluator.getTypeOfExpression(variableNode).type;
|
|
84
|
+
assert.ok((0, types_1.isTypeVar)(variable) && variable.priv.freeTypeVar);
|
|
85
|
+
const freeVariable = variable.priv.freeTypeVar;
|
|
86
|
+
if (populated) {
|
|
87
|
+
constraints.setBounds(freeVariable, typeAt('literal'), typeAt('integer'), false);
|
|
88
|
+
}
|
|
89
|
+
constraints.getMainConstraintSet().addScopeId('caller');
|
|
90
|
+
if (multipleSets) {
|
|
91
|
+
const other = constraints.getMainConstraintSet().clone();
|
|
92
|
+
other.addScopeId('alternative');
|
|
93
|
+
if (populated) {
|
|
94
|
+
other.setBounds(freeVariable, typeAt('other'), typeAt('integer'), true);
|
|
95
|
+
}
|
|
96
|
+
constraints.addConstraintSets([constraints.getMainConstraintSet(), other]);
|
|
97
|
+
}
|
|
98
|
+
const observe = () => ({
|
|
99
|
+
source: evaluator.printType(source),
|
|
100
|
+
sets: constraints.getConstraintSets().map((set) => ({
|
|
101
|
+
scopes: [...set.getScopeIds()],
|
|
102
|
+
bounds: set.getTypeVars().map((entry) => ({
|
|
103
|
+
variable: evaluator.printType(entry.typeVar),
|
|
104
|
+
lower: entry.lowerBound && evaluator.printType(entry.lowerBound),
|
|
105
|
+
upper: entry.upperBound && evaluator.printType(entry.upperBound),
|
|
106
|
+
retain: entry.retainLiterals,
|
|
107
|
+
})),
|
|
108
|
+
})),
|
|
109
|
+
});
|
|
110
|
+
const before = observe();
|
|
111
|
+
const assign = (destination, input = source, details = new diagnostic_1.DiagnosticAddendum()) => (0, protocols_1.assignClassToProtocol)(evaluator, destination, input, details, constraints, flags, 0);
|
|
112
|
+
if (positiveFirst) {
|
|
113
|
+
assert.strictEqual(assign(accepted), true);
|
|
114
|
+
assert.deepStrictEqual(observe(), before);
|
|
115
|
+
}
|
|
116
|
+
const observations = [];
|
|
117
|
+
const reject = () => {
|
|
118
|
+
assert.strictEqual(evaluator.isSpeculativeModeInUse(undefined), speculative);
|
|
119
|
+
assert.strictEqual(assign(target), false);
|
|
120
|
+
assert.deepStrictEqual(observe(), before);
|
|
121
|
+
observations.push(observe());
|
|
122
|
+
};
|
|
123
|
+
if (speculative) {
|
|
124
|
+
evaluator.useSpeculativeMode((0, testState_1.getNodeAtMarker)(state, 'source'), () => {
|
|
125
|
+
reject();
|
|
126
|
+
evaluator.useSpeculativeMode((0, testState_1.getNodeAtMarker)(state, 'destination'), reject);
|
|
127
|
+
reject();
|
|
128
|
+
});
|
|
129
|
+
}
|
|
130
|
+
else {
|
|
131
|
+
reject();
|
|
132
|
+
reject();
|
|
133
|
+
reject();
|
|
134
|
+
}
|
|
135
|
+
assert.strictEqual(evaluator.isSpeculativeModeInUse(undefined), false);
|
|
136
|
+
const details = new diagnostic_1.DiagnosticAddendum();
|
|
137
|
+
assert.strictEqual(assign(target, source, details), false);
|
|
138
|
+
assert.ok(details.getString().length > 0);
|
|
139
|
+
assert.strictEqual(assign(accepted), true);
|
|
140
|
+
assert.strictEqual(assign(target, valid), true);
|
|
141
|
+
assert.deepStrictEqual(observe(), before);
|
|
142
|
+
observations.push(observe());
|
|
143
|
+
return { observations, diagnostic: details.getString() };
|
|
144
|
+
};
|
|
145
|
+
assert.deepStrictEqual(run(true), run(false));
|
|
146
|
+
});
|
|
147
|
+
});
|
|
148
|
+
test.each([false, true])('ProtocolRequirementExceptionUnwind speculative=%s', (speculative) => {
|
|
149
|
+
const state = (0, testState_1.parseAndGetTestState)(`
|
|
150
|
+
// @filename: test.py
|
|
151
|
+
//// from collections.abc import Iterator
|
|
152
|
+
//// from typing import Protocol, TypeVar
|
|
153
|
+
//// T_co = TypeVar("T_co", covariant=True)
|
|
154
|
+
//// class NestedSequence(Protocol[T_co]):
|
|
155
|
+
//// def __len__(self, /) -> int: ...
|
|
156
|
+
//// def __getitem__(self, index: int, /) -> T_co | "NestedSequence[T_co]": ...
|
|
157
|
+
//// def __iter__(self, /) -> Iterator[T_co | "NestedSequence[T_co]"]: ...
|
|
158
|
+
//// def check(source: list[int], destination: NestedSequence[str]):
|
|
159
|
+
//// /*source*/source
|
|
160
|
+
//// /*destination*/destination
|
|
161
|
+
`).state;
|
|
162
|
+
const evaluator = state.program.evaluator;
|
|
163
|
+
const typeAt = (marker) => {
|
|
164
|
+
const node = (0, testState_1.getNodeAtMarker)(state, marker);
|
|
165
|
+
assert.strictEqual(node.nodeType, 38 /* ParseNodeType.Name */);
|
|
166
|
+
const type = evaluator.getTypeOfExpression(node).type;
|
|
167
|
+
assert.ok((0, types_1.isClassInstance)(type));
|
|
168
|
+
return type;
|
|
169
|
+
};
|
|
170
|
+
const source = typeAt('source');
|
|
171
|
+
const target = types_1.ClassType.cloneAsInstantiable(typeAt('destination'));
|
|
172
|
+
evaluator.inferVarianceForClass(target);
|
|
173
|
+
const constraints = new constraintTracker_1.ConstraintTracker();
|
|
174
|
+
constraints.getMainConstraintSet().addScopeId('caller');
|
|
175
|
+
const assign = (destination = target) => (0, protocols_1.assignClassToProtocol)(evaluator, destination, source, undefined, constraints, 0 /* AssignTypeFlags.Default */, 0);
|
|
176
|
+
const failure = new Error('Injected protocol member lookup failure');
|
|
177
|
+
const spy = jest.spyOn(evaluator, 'getDeclaredTypeOfSymbol').mockImplementationOnce(() => {
|
|
178
|
+
throw failure;
|
|
179
|
+
});
|
|
180
|
+
try {
|
|
181
|
+
assert.throws(() => {
|
|
182
|
+
if (speculative) {
|
|
183
|
+
evaluator.useSpeculativeMode((0, testState_1.getNodeAtMarker)(state, 'source'), () => evaluator.useSpeculativeMode((0, testState_1.getNodeAtMarker)(state, 'destination'), () => assign()));
|
|
184
|
+
}
|
|
185
|
+
else {
|
|
186
|
+
assign();
|
|
187
|
+
}
|
|
188
|
+
}, (error) => error === failure);
|
|
189
|
+
assert.strictEqual(spy.mock.calls.length, 1);
|
|
190
|
+
}
|
|
191
|
+
finally {
|
|
192
|
+
spy.mockRestore();
|
|
193
|
+
}
|
|
194
|
+
assert.strictEqual(evaluator.isSpeculativeModeInUse(undefined), false);
|
|
195
|
+
assert.strictEqual(assign(), false);
|
|
196
|
+
assert.strictEqual(assign(types_1.ClassType.specialize(target, [source.priv.typeArgs[0]])), true);
|
|
197
|
+
assert.strictEqual(assign(), false);
|
|
198
|
+
assert.deepStrictEqual(constraints.getConstraintSets().map((set) => ({ scopes: [...set.getScopeIds()], bounds: set.getTypeVars() })), [{ scopes: ['caller'], bounds: [] }]);
|
|
199
|
+
});
|
|
200
|
+
//# sourceMappingURL=protocolRequirementSpeculative.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"protocolRequirementSpeculative.test.js","sourceRoot":"","sources":["../../../../../src/tests/protocolRequirementSpeculative.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,161 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
const assert = __importStar(require("assert"));
|
|
37
|
+
const constraintTracker_1 = require("../analyzer/constraintTracker");
|
|
38
|
+
const protocols_1 = require("../analyzer/protocols");
|
|
39
|
+
const types_1 = require("../analyzer/types");
|
|
40
|
+
const typeUtils_1 = require("../analyzer/typeUtils");
|
|
41
|
+
const diagnostic_1 = require("../common/diagnostic");
|
|
42
|
+
const testState_1 = require("./harness/fourslash/testState");
|
|
43
|
+
const cases = ['Plain', 'Plain | Callable[[], int]'].flatMap((element) => ['serialize', 'read'].flatMap((member) => [false, true].flatMap((concrete) => ['empty', 'literal', 'integer', 'none'].map((seed) => ({ element, member, concrete, seed })))));
|
|
44
|
+
test.each(cases)('ProtocolRequirementState $element $member concrete=$concrete seed=$seed', ({ element, member, concrete, seed }) => {
|
|
45
|
+
const run = (diagnostics) => {
|
|
46
|
+
const state = (0, testState_1.parseAndGetTestState)(`
|
|
47
|
+
// @filename: test.py
|
|
48
|
+
//// from collections.abc import Callable, Iterator
|
|
49
|
+
//// from typing import Literal, Protocol, TypeVar
|
|
50
|
+
//// T_co = TypeVar("T_co", covariant=True)
|
|
51
|
+
//// class Leaf(Protocol[T_co]):
|
|
52
|
+
//// def ${member}(self) -> T_co: ...
|
|
53
|
+
//// class NestedSequence(Protocol[T_co]):
|
|
54
|
+
//// def __len__(self, /) -> int: ...
|
|
55
|
+
${member === 'read' ? '//// def __iter__(self, /) -> Iterator[T_co | "NestedSequence[T_co]"]: ...' : ''}
|
|
56
|
+
//// def __getitem__(self, index: int, /) -> T_co | "NestedSequence[T_co]": ...
|
|
57
|
+
${member === 'serialize' ? '//// def __iter__(self, /) -> Iterator[T_co | "NestedSequence[T_co]"]: ...' : ''}
|
|
58
|
+
//// class Plain: pass
|
|
59
|
+
//// def check[T](source: list[${element}], rejected: NestedSequence[Leaf[${concrete ? 'int' : 'T'}]], accepted: NestedSequence[${element}], variable: T, literal: Literal[7], other: Literal[8], integer: int, text: str, container: list[T]):
|
|
60
|
+
//// /*source*/source
|
|
61
|
+
//// /*rejected*/rejected
|
|
62
|
+
//// /*accepted*/accepted
|
|
63
|
+
//// /*variable*/variable
|
|
64
|
+
//// /*literal*/literal
|
|
65
|
+
//// /*other*/other
|
|
66
|
+
//// /*integer*/integer
|
|
67
|
+
//// /*text*/text
|
|
68
|
+
//// /*container*/container
|
|
69
|
+
`).state;
|
|
70
|
+
const evaluator = state.program.evaluator;
|
|
71
|
+
const typeAt = (marker) => {
|
|
72
|
+
const node = (0, testState_1.getNodeAtMarker)(state, marker);
|
|
73
|
+
assert.strictEqual(node.nodeType, 38 /* ParseNodeType.Name */);
|
|
74
|
+
return evaluator.getTypeOfExpression(node).type;
|
|
75
|
+
};
|
|
76
|
+
const source = typeAt('source');
|
|
77
|
+
const rejected = typeAt('rejected');
|
|
78
|
+
const accepted = typeAt('accepted');
|
|
79
|
+
const variable = typeAt('variable');
|
|
80
|
+
assert.ok((0, types_1.isClassInstance)(source) && (0, types_1.isClassInstance)(rejected) && (0, types_1.isClassInstance)(accepted));
|
|
81
|
+
assert.ok((0, types_1.isTypeVar)(variable));
|
|
82
|
+
const freeVariable = variable.priv.freeTypeVar;
|
|
83
|
+
assert.ok(freeVariable?.priv.scopeId);
|
|
84
|
+
const scopes = [freeVariable.priv.scopeId];
|
|
85
|
+
const target = (0, typeUtils_1.makeTypeVarsFree)(types_1.ClassType.cloneAsInstantiable(rejected), scopes);
|
|
86
|
+
const container = (0, typeUtils_1.makeTypeVarsFree)(typeAt('container'), scopes);
|
|
87
|
+
const initial = new constraintTracker_1.ConstraintTracker();
|
|
88
|
+
if (seed !== 'empty') {
|
|
89
|
+
initial.setBounds(freeVariable, typeAt('literal'), seed === 'none' ? undefined : typeAt(seed), false);
|
|
90
|
+
}
|
|
91
|
+
initial.getMainConstraintSet().addScopeId('caller');
|
|
92
|
+
const observe = (tracker) => ({
|
|
93
|
+
solved: evaluator.printType(evaluator.solveAndApplyConstraints(freeVariable, tracker)),
|
|
94
|
+
nested: evaluator.printType(evaluator.solveAndApplyConstraints(container, tracker)),
|
|
95
|
+
score: tracker.getScore(),
|
|
96
|
+
sets: tracker.getConstraintSets().map((set) => ({
|
|
97
|
+
scopes: [...set.getScopeIds()],
|
|
98
|
+
bounds: set.getTypeVars().map((entry) => ({
|
|
99
|
+
variable: evaluator.printType(entry.typeVar),
|
|
100
|
+
lower: entry.lowerBound && evaluator.printType(entry.lowerBound),
|
|
101
|
+
upper: entry.upperBound && evaluator.printType(entry.upperBound),
|
|
102
|
+
retain: entry.retainLiterals,
|
|
103
|
+
})),
|
|
104
|
+
})),
|
|
105
|
+
});
|
|
106
|
+
const before = observe(initial);
|
|
107
|
+
const sourceBefore = evaluator.printType(source);
|
|
108
|
+
const eligible = concrete || seed === 'empty';
|
|
109
|
+
assert.strictEqual((0, protocols_1.tryFastRejectSequenceProtocol)(evaluator, target, source, initial, 0 /* AssignTypeFlags.Default */, 0), eligible ? '__getitem__' : undefined);
|
|
110
|
+
assert.deepStrictEqual(observe(initial), before);
|
|
111
|
+
const results = [];
|
|
112
|
+
for (const matchFlags of [0 /* AssignTypeFlags.Default */, 256 /* AssignTypeFlags.RetainLiteralsForTypeVar */]) {
|
|
113
|
+
const constraints = initial.clone();
|
|
114
|
+
for (let repetition = 0; repetition < 2; repetition++) {
|
|
115
|
+
assert.strictEqual((0, protocols_1.assignClassToProtocol)(evaluator, target, source, diagnostics ? new diagnostic_1.DiagnosticAddendum() : undefined, constraints, matchFlags, 0), false);
|
|
116
|
+
if (eligible) {
|
|
117
|
+
assert.deepStrictEqual(observe(constraints), before);
|
|
118
|
+
}
|
|
119
|
+
else {
|
|
120
|
+
assert.strictEqual(observe(constraints).solved, seed === 'literal' ? 'Literal[7]' : 'int');
|
|
121
|
+
}
|
|
122
|
+
results.push(observe(constraints));
|
|
123
|
+
}
|
|
124
|
+
for (const flags of [
|
|
125
|
+
0 /* AssignTypeFlags.Default */,
|
|
126
|
+
1 /* AssignTypeFlags.Invariant */,
|
|
127
|
+
2 /* AssignTypeFlags.Contravariant */,
|
|
128
|
+
]) {
|
|
129
|
+
for (const transfer of ['clone', 'signature', 'copy']) {
|
|
130
|
+
const parentBefore = observe(constraints);
|
|
131
|
+
const continued = transfer === 'signature' ? constraints.cloneWithSignature('caller') : constraints.clone();
|
|
132
|
+
if (transfer === 'copy') {
|
|
133
|
+
continued.copyFromClone(constraints);
|
|
134
|
+
}
|
|
135
|
+
for (const marker of ['literal', 'other', 'integer', 'text']) {
|
|
136
|
+
results.push({
|
|
137
|
+
assigned: evaluator.assignType(freeVariable, typeAt(marker), undefined, continued, flags),
|
|
138
|
+
observation: observe(continued),
|
|
139
|
+
parent: observe(constraints),
|
|
140
|
+
});
|
|
141
|
+
}
|
|
142
|
+
assert.deepStrictEqual(observe(initial), before);
|
|
143
|
+
if (transfer === 'signature') {
|
|
144
|
+
assert.strictEqual(continued.getMainConstraintSet(), constraints.getMainConstraintSet());
|
|
145
|
+
assert.deepStrictEqual(observe(constraints), observe(continued));
|
|
146
|
+
}
|
|
147
|
+
else {
|
|
148
|
+
assert.notStrictEqual(continued.getMainConstraintSet(), constraints.getMainConstraintSet());
|
|
149
|
+
assert.deepStrictEqual(observe(constraints), parentBefore);
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
assert.strictEqual((0, protocols_1.assignClassToProtocol)(evaluator, types_1.ClassType.cloneAsInstantiable(accepted), source, undefined, constraints, 0 /* AssignTypeFlags.Default */, 0), true);
|
|
154
|
+
results.push(observe(constraints));
|
|
155
|
+
assert.strictEqual(evaluator.printType(source), sourceBefore);
|
|
156
|
+
}
|
|
157
|
+
return results;
|
|
158
|
+
};
|
|
159
|
+
assert.deepStrictEqual(run(false), run(true));
|
|
160
|
+
});
|
|
161
|
+
//# sourceMappingURL=protocolRequirementState.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"protocolRequirementState.test.js","sourceRoot":"","sources":["../../../../../src/tests/protocolRequirementState.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,6 +47,7 @@ const assert_1 = __importDefault(require("assert"));
|
|
|
47
47
|
const pathUtils_1 = require("../common/pathUtils");
|
|
48
48
|
const stringUtils_1 = require("../common/stringUtils");
|
|
49
49
|
const uri_1 = require("../common/uri/uri");
|
|
50
|
+
const callHierarchyProvider_1 = require("../languageService/callHierarchyProvider");
|
|
50
51
|
const runner_1 = require("./harness/fourslash/runner");
|
|
51
52
|
const testState_1 = require("./harness/fourslash/testState");
|
|
52
53
|
const factory = __importStar(require("./harness/vfs/factory"));
|
|
@@ -451,6 +452,69 @@ helper.getMarkerByName("position");
|
|
|
451
452
|
`;
|
|
452
453
|
(0, runner_1.runFourSlashTestContent)((0, pathUtils_1.normalizeSlashes)('/'), 'unused.py', code);
|
|
453
454
|
});
|
|
455
|
+
describe('Incoming call hierarchy assertions', () => {
|
|
456
|
+
function createTestState() {
|
|
457
|
+
const code = `
|
|
458
|
+
// @filename: declare.py
|
|
459
|
+
//// def /*target*/target():
|
|
460
|
+
//// pass
|
|
461
|
+
|
|
462
|
+
// @filename: first.py
|
|
463
|
+
//// from declare import target
|
|
464
|
+
////
|
|
465
|
+
//// [|/*firstRange*/def [|/*firstSelection*/first|]():
|
|
466
|
+
//// target()|]
|
|
467
|
+
|
|
468
|
+
// @filename: second.py
|
|
469
|
+
//// from declare import target
|
|
470
|
+
////
|
|
471
|
+
////
|
|
472
|
+
//// [|/*secondRange*/def [|/*secondSelection*/second|]():
|
|
473
|
+
//// target()|]
|
|
474
|
+
`;
|
|
475
|
+
const { state } = (0, testState_1.parseAndGetTestState)(code);
|
|
476
|
+
const items = ['first', 'second'].map((name) => ({
|
|
477
|
+
filePath: state.getMappedFilePath(`${name}.py`),
|
|
478
|
+
name,
|
|
479
|
+
range: state.getPositionRange(`${name}Range`),
|
|
480
|
+
selectionRange: state.getPositionRange(`${name}Selection`),
|
|
481
|
+
}));
|
|
482
|
+
return { state, items };
|
|
483
|
+
}
|
|
484
|
+
test.each([0, 1])('accepts an omitted selectionRange for caller %i', (index) => {
|
|
485
|
+
const { state, items } = createTestState();
|
|
486
|
+
const expectations = items.map((item, i) => i === index ? { filePath: item.filePath, name: item.name, range: item.range } : item);
|
|
487
|
+
state.verifyShowCallHierarchyGetIncomingCalls({ target: { items: expectations } });
|
|
488
|
+
});
|
|
489
|
+
test.each(['filePath', 'name', 'range', 'selectionRange'])('rejects %s swapped between callers', (field) => {
|
|
490
|
+
const { state, items } = createTestState();
|
|
491
|
+
const expectations = [
|
|
492
|
+
{ ...items[0], [field]: items[1][field] },
|
|
493
|
+
{ ...items[1], [field]: items[0][field] },
|
|
494
|
+
];
|
|
495
|
+
assert_1.default.throws(() => state.verifyShowCallHierarchyGetIncomingCalls({ target: { items: expectations } }), assert_1.default.AssertionError);
|
|
496
|
+
});
|
|
497
|
+
test('matches each caller exactly once', () => {
|
|
498
|
+
const { state, items } = createTestState();
|
|
499
|
+
state.verifyShowCallHierarchyGetIncomingCalls({ target: { items: [...items].reverse() } });
|
|
500
|
+
assert_1.default.throws(() => state.verifyShowCallHierarchyGetIncomingCalls({ target: { items: [items[0], items[0]] } }), assert_1.default.AssertionError);
|
|
501
|
+
assert_1.default.throws(() => state.verifyShowCallHierarchyGetIncomingCalls({ target: { items: [items[0]] } }), assert_1.default.AssertionError);
|
|
502
|
+
const getIncomingCalls = callHierarchyProvider_1.CallHierarchyProvider.prototype.getIncomingCalls;
|
|
503
|
+
const spy = jest
|
|
504
|
+
.spyOn(callHierarchyProvider_1.CallHierarchyProvider.prototype, 'getIncomingCalls')
|
|
505
|
+
.mockImplementation(function () {
|
|
506
|
+
const calls = getIncomingCalls.call(this);
|
|
507
|
+
(0, assert_1.default)(calls && calls.length === 2);
|
|
508
|
+
return [calls[0], calls[0]];
|
|
509
|
+
});
|
|
510
|
+
try {
|
|
511
|
+
assert_1.default.throws(() => state.verifyShowCallHierarchyGetIncomingCalls({ target: { items } }), assert_1.default.AssertionError);
|
|
512
|
+
}
|
|
513
|
+
finally {
|
|
514
|
+
spy.mockRestore();
|
|
515
|
+
}
|
|
516
|
+
});
|
|
517
|
+
});
|
|
454
518
|
test('VerifyDiagnosticsTest1', () => {
|
|
455
519
|
const code = `
|
|
456
520
|
/// <reference path="typings/fourslash.d.ts" />
|