@zzzen/pyright-internal 1.2.0-dev.20240721 → 1.2.0-dev.20240728
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/analyzerNodeInfo.js +2 -2
- package/dist/analyzer/analyzerNodeInfo.js.map +1 -1
- package/dist/analyzer/binder.js +8 -8
- package/dist/analyzer/binder.js.map +1 -1
- package/dist/analyzer/cacheManager.js +3 -0
- package/dist/analyzer/cacheManager.js.map +1 -1
- package/dist/analyzer/checker.d.ts +3 -2
- package/dist/analyzer/checker.js +115 -122
- package/dist/analyzer/checker.js.map +1 -1
- package/dist/analyzer/codeFlowEngine.d.ts +2 -2
- package/dist/analyzer/codeFlowEngine.js +49 -42
- package/dist/analyzer/codeFlowEngine.js.map +1 -1
- package/dist/analyzer/codeFlowTypes.js +1 -1
- package/dist/analyzer/codeFlowTypes.js.map +1 -1
- package/dist/analyzer/constraintSolver.d.ts +2 -2
- package/dist/analyzer/constraintSolver.js +164 -204
- package/dist/analyzer/constraintSolver.js.map +1 -1
- package/dist/analyzer/constructorTransform.d.ts +2 -2
- package/dist/analyzer/constructorTransform.js +15 -15
- package/dist/analyzer/constructorTransform.js.map +1 -1
- package/dist/analyzer/constructors.d.ts +2 -2
- package/dist/analyzer/constructors.js +28 -33
- package/dist/analyzer/constructors.js.map +1 -1
- package/dist/analyzer/dataClasses.d.ts +2 -2
- package/dist/analyzer/dataClasses.js +59 -36
- package/dist/analyzer/dataClasses.js.map +1 -1
- package/dist/analyzer/declaration.d.ts +9 -9
- package/dist/analyzer/declaration.js +9 -9
- package/dist/analyzer/declaration.js.map +1 -1
- package/dist/analyzer/declarationUtils.d.ts +1 -1
- package/dist/analyzer/declarationUtils.js +6 -6
- package/dist/analyzer/declarationUtils.js.map +1 -1
- package/dist/analyzer/decorators.js +4 -4
- package/dist/analyzer/decorators.js.map +1 -1
- package/dist/analyzer/docStringConversion.js +2 -2
- package/dist/analyzer/docStringConversion.js.map +1 -1
- package/dist/analyzer/enums.d.ts +2 -2
- package/dist/analyzer/enums.js +6 -6
- package/dist/analyzer/enums.js.map +1 -1
- package/dist/analyzer/functionTransform.d.ts +2 -2
- package/dist/analyzer/functionTransform.js +4 -4
- package/dist/analyzer/functionTransform.js.map +1 -1
- package/dist/analyzer/importResolver.js +5 -3
- package/dist/analyzer/importResolver.js.map +1 -1
- package/dist/analyzer/namedTuples.d.ts +3 -3
- package/dist/analyzer/namedTuples.js +21 -22
- package/dist/analyzer/namedTuples.js.map +1 -1
- package/dist/analyzer/operations.js +10 -10
- package/dist/analyzer/operations.js.map +1 -1
- package/dist/analyzer/packageTypeVerifier.js +8 -8
- package/dist/analyzer/packageTypeVerifier.js.map +1 -1
- package/dist/analyzer/parameterUtils.d.ts +10 -10
- package/dist/analyzer/parameterUtils.js +58 -58
- package/dist/analyzer/parameterUtils.js.map +1 -1
- package/dist/analyzer/parseTreeUtils.d.ts +6 -6
- package/dist/analyzer/parseTreeUtils.js +22 -22
- package/dist/analyzer/parseTreeUtils.js.map +1 -1
- package/dist/analyzer/patternMatching.js +108 -89
- package/dist/analyzer/patternMatching.js.map +1 -1
- package/dist/analyzer/program.js +11 -4
- package/dist/analyzer/program.js.map +1 -1
- package/dist/analyzer/properties.js +19 -19
- package/dist/analyzer/properties.js.map +1 -1
- package/dist/analyzer/protocols.js +14 -15
- package/dist/analyzer/protocols.js.map +1 -1
- package/dist/analyzer/pythonPathUtils.js +1 -1
- package/dist/analyzer/pythonPathUtils.js.map +1 -1
- package/dist/analyzer/service.d.ts +3 -7
- package/dist/analyzer/service.js +28 -30
- package/dist/analyzer/service.js.map +1 -1
- package/dist/analyzer/serviceUtils.d.ts +8 -0
- package/dist/analyzer/serviceUtils.js +31 -0
- package/dist/analyzer/serviceUtils.js.map +1 -0
- package/dist/analyzer/sourceFile.js +5 -19
- package/dist/analyzer/sourceFile.js.map +1 -1
- package/dist/analyzer/sourceMapper.d.ts +1 -1
- package/dist/analyzer/sourceMapper.js +4 -4
- package/dist/analyzer/sourceMapper.js.map +1 -1
- package/dist/analyzer/staticExpressions.js +1 -1
- package/dist/analyzer/staticExpressions.js.map +1 -1
- package/dist/analyzer/tracePrinter.js +4 -4
- package/dist/analyzer/tracePrinter.js.map +1 -1
- package/dist/analyzer/tuples.d.ts +9 -0
- package/dist/analyzer/tuples.js +252 -0
- package/dist/analyzer/tuples.js.map +1 -0
- package/dist/analyzer/typeComplexity.d.ts +2 -0
- package/dist/analyzer/typeComplexity.js +86 -0
- package/dist/analyzer/typeComplexity.js.map +1 -0
- package/dist/analyzer/typeEvaluator.js +1062 -1311
- package/dist/analyzer/typeEvaluator.js.map +1 -1
- package/dist/analyzer/typeEvaluatorTypes.d.ts +44 -40
- package/dist/analyzer/typeEvaluatorTypes.js +7 -1
- package/dist/analyzer/typeEvaluatorTypes.js.map +1 -1
- package/dist/analyzer/typeGuards.js +114 -85
- package/dist/analyzer/typeGuards.js.map +1 -1
- package/dist/analyzer/typePrinter.d.ts +1 -1
- package/dist/analyzer/typePrinter.js +54 -53
- package/dist/analyzer/typePrinter.js.map +1 -1
- package/dist/analyzer/typeStubWriter.d.ts +3 -3
- package/dist/analyzer/typeStubWriter.js +15 -15
- package/dist/analyzer/typeStubWriter.js.map +1 -1
- package/dist/analyzer/typeUtils.d.ts +20 -18
- package/dist/analyzer/typeUtils.js +316 -321
- package/dist/analyzer/typeUtils.js.map +1 -1
- package/dist/analyzer/typeVarContext.d.ts +24 -36
- package/dist/analyzer/typeVarContext.js +89 -193
- package/dist/analyzer/typeVarContext.js.map +1 -1
- package/dist/analyzer/typeWalker.js +4 -4
- package/dist/analyzer/typeWalker.js.map +1 -1
- package/dist/analyzer/typedDicts.d.ts +2 -2
- package/dist/analyzer/typedDicts.js +48 -52
- package/dist/analyzer/typedDicts.js.map +1 -1
- package/dist/analyzer/types.d.ts +79 -57
- package/dist/analyzer/types.js +125 -113
- package/dist/analyzer/types.js.map +1 -1
- package/dist/commands/dumpFileDebugInfoCommand.js +11 -11
- package/dist/commands/dumpFileDebugInfoCommand.js.map +1 -1
- package/dist/common/configOptions.d.ts +1 -0
- package/dist/common/configOptions.js +5 -0
- package/dist/common/configOptions.js.map +1 -1
- package/dist/common/diagnosticRules.d.ts +1 -0
- package/dist/common/diagnosticRules.js +1 -0
- package/dist/common/diagnosticRules.js.map +1 -1
- package/dist/common/fileSystem.d.ts +0 -1
- package/dist/common/fileSystem.js.map +1 -1
- package/dist/common/languageServerInterface.d.ts +13 -0
- package/dist/common/languageServerInterface.js +15 -1
- package/dist/common/languageServerInterface.js.map +1 -1
- package/dist/common/lspUtils.js +2 -2
- package/dist/common/memUtils.d.ts +4 -0
- package/dist/common/memUtils.js +33 -2
- package/dist/common/memUtils.js.map +1 -1
- package/dist/common/serviceKeys.d.ts +3 -0
- package/dist/common/serviceKeys.js +2 -0
- package/dist/common/serviceKeys.js.map +1 -1
- package/dist/common/serviceProviderExtensions.js +7 -0
- package/dist/common/serviceProviderExtensions.js.map +1 -1
- package/dist/languageServerBase.d.ts +4 -3
- package/dist/languageServerBase.js +14 -10
- package/dist/languageServerBase.js.map +1 -1
- package/dist/languageService/autoImporter.d.ts +3 -2
- package/dist/languageService/autoImporter.js +5 -1
- package/dist/languageService/autoImporter.js.map +1 -1
- package/dist/languageService/completionProvider.d.ts +5 -3
- package/dist/languageService/completionProvider.js +38 -37
- package/dist/languageService/completionProvider.js.map +1 -1
- package/dist/languageService/completionProviderUtils.d.ts +1 -1
- package/dist/languageService/completionProviderUtils.js +3 -3
- package/dist/languageService/completionProviderUtils.js.map +1 -1
- package/dist/languageService/fileWatcherDynamicFeature.js +2 -2
- package/dist/languageService/fileWatcherDynamicFeature.js.map +1 -1
- package/dist/languageService/hoverProvider.js +3 -3
- package/dist/languageService/hoverProvider.js.map +1 -1
- package/dist/languageService/referencesProvider.js +2 -2
- package/dist/languageService/signatureHelpProvider.js +1 -1
- package/dist/languageService/signatureHelpProvider.js.map +1 -1
- package/dist/languageService/tooltipUtils.js +3 -3
- package/dist/languageService/tooltipUtils.js.map +1 -1
- package/dist/localization/localize.d.ts +5 -0
- package/dist/localization/localize.js +6 -0
- package/dist/localization/localize.js.map +1 -1
- package/dist/localization/package.nls.cs.json +5 -1
- package/dist/localization/package.nls.de.json +5 -1
- package/dist/localization/package.nls.en-us.json +5 -0
- package/dist/localization/package.nls.es.json +5 -1
- package/dist/localization/package.nls.fr.json +5 -1
- package/dist/localization/package.nls.it.json +5 -1
- package/dist/localization/package.nls.ja.json +5 -1
- package/dist/localization/package.nls.ko.json +5 -1
- package/dist/localization/package.nls.pl.json +5 -1
- package/dist/localization/package.nls.pt-br.json +5 -1
- package/dist/localization/package.nls.qps-ploc.json +5 -1
- package/dist/localization/package.nls.ru.json +5 -1
- package/dist/localization/package.nls.tr.json +5 -1
- package/dist/localization/package.nls.zh-cn.json +5 -1
- package/dist/localization/package.nls.zh-tw.json +5 -1
- package/dist/parser/parseNodes.d.ts +9 -9
- package/dist/parser/parseNodes.js +20 -20
- package/dist/parser/parseNodes.js.map +1 -1
- package/dist/parser/parser.js +30 -30
- package/dist/parser/parser.js.map +1 -1
- package/dist/tests/checker.test.js +2 -2
- package/dist/tests/fourslash/signature.builtinDocstrings.fourslash.js +4 -21
- package/dist/tests/fourslash/signature.builtinDocstrings.fourslash.js.map +1 -1
- package/dist/tests/fourslash/signature.complicated.fourslash.js +1 -1
- package/dist/tests/fourslash/signature.complicated.fourslash.js.map +1 -1
- package/dist/tests/harness/fourslash/fourSlashParser.js +1 -1
- package/dist/tests/harness/fourslash/fourSlashParser.js.map +1 -1
- package/dist/tests/harness/fourslash/testStateUtils.js +2 -2
- package/dist/tests/harness/fourslash/testStateUtils.js.map +1 -1
- package/dist/tests/harness/vfs/filesystem.d.ts +0 -1
- package/dist/tests/harness/vfs/filesystem.js +0 -4
- package/dist/tests/harness/vfs/filesystem.js.map +1 -1
- package/dist/tests/importResolver.test.js +62 -15
- package/dist/tests/importResolver.test.js.map +1 -1
- package/dist/tests/lsp/languageServerTestUtils.js +1 -1
- package/dist/tests/lsp/languageServerTestUtils.js.map +1 -1
- package/dist/tests/typeEvaluator3.test.js +1 -1
- package/dist/tests/typeEvaluator4.test.js +9 -1
- package/dist/tests/typeEvaluator4.test.js.map +1 -1
- package/dist/tests/typeEvaluator5.test.js +8 -2
- package/dist/tests/typeEvaluator5.test.js.map +1 -1
- package/dist/tests/typeEvaluator6.test.js +72 -60
- package/dist/tests/typeEvaluator6.test.js.map +1 -1
- package/dist/tests/typeEvaluator7.test.js +2 -2
- package/dist/tests/typePrinter.test.js +13 -18
- package/dist/tests/typePrinter.test.js.map +1 -1
- package/dist/workspaceFactory.d.ts +3 -2
- package/dist/workspaceFactory.js +15 -2
- package/dist/workspaceFactory.js.map +1 -1
- package/package.json +1 -1
@@ -7,38 +7,38 @@
|
|
7
7
|
* Utility functions for parameters.
|
8
8
|
*/
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
10
|
-
exports.
|
10
|
+
exports.isParamSpecKwargs = exports.isParamSpecArgs = exports.getParamListDetails = exports.firstParamsExcludingSelf = exports.ParamKind = exports.isTypedKwargs = void 0;
|
11
11
|
const symbolNameUtils_1 = require("./symbolNameUtils");
|
12
12
|
const types_1 = require("./types");
|
13
13
|
const typeUtils_1 = require("./typeUtils");
|
14
14
|
function isTypedKwargs(param) {
|
15
|
-
return (param.category === 2 /*
|
15
|
+
return (param.category === 2 /* ParamCategory.KwargsDict */ &&
|
16
16
|
(0, types_1.isClassInstance)(param.type) &&
|
17
17
|
(0, types_1.isUnpackedClass)(param.type) &&
|
18
18
|
types_1.ClassType.isTypedDictClass(param.type) &&
|
19
19
|
!!param.type.shared.typedDictEntries);
|
20
20
|
}
|
21
21
|
exports.isTypedKwargs = isTypedKwargs;
|
22
|
-
var
|
23
|
-
(function (
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
})(
|
28
|
-
function
|
22
|
+
var ParamKind;
|
23
|
+
(function (ParamKind) {
|
24
|
+
ParamKind[ParamKind["Positional"] = 0] = "Positional";
|
25
|
+
ParamKind[ParamKind["Standard"] = 1] = "Standard";
|
26
|
+
ParamKind[ParamKind["Keyword"] = 2] = "Keyword";
|
27
|
+
})(ParamKind || (exports.ParamKind = ParamKind = {}));
|
28
|
+
function firstParamsExcludingSelf(type) {
|
29
29
|
return type.shared.parameters.find((p) => !((0, types_1.isTypeVar)(p.type) && p.type.shared.isSynthesizedSelf));
|
30
30
|
}
|
31
|
-
exports.
|
31
|
+
exports.firstParamsExcludingSelf = firstParamsExcludingSelf;
|
32
32
|
// Examines the input parameters within a function signature and creates a
|
33
33
|
// "virtual list" of parameters, stripping out any markers and expanding
|
34
34
|
// any *args with unpacked tuples.
|
35
|
-
function
|
35
|
+
function getParamListDetails(type) {
|
36
36
|
const result = {
|
37
37
|
firstPositionOrKeywordIndex: 0,
|
38
38
|
positionParamCount: 0,
|
39
39
|
positionOnlyParamCount: 0,
|
40
40
|
params: [],
|
41
|
-
|
41
|
+
hasUnpackedTypeVarTuple: false,
|
42
42
|
hasUnpackedTypedDict: false,
|
43
43
|
};
|
44
44
|
let positionOnlyIndex = type.shared.parameters.findIndex((p) => (0, types_1.isPositionOnlySeparator)(p));
|
@@ -47,7 +47,7 @@ function getParameterListDetails(type) {
|
|
47
47
|
if (positionOnlyIndex < 0) {
|
48
48
|
for (let i = 0; i < type.shared.parameters.length; i++) {
|
49
49
|
const p = type.shared.parameters[i];
|
50
|
-
if (p.category !== 0 /*
|
50
|
+
if (p.category !== 0 /* ParamCategory.Simple */) {
|
51
51
|
break;
|
52
52
|
}
|
53
53
|
if (!p.name) {
|
@@ -70,28 +70,28 @@ function getParameterListDetails(type) {
|
|
70
70
|
result.positionOnlyParamCount++;
|
71
71
|
}
|
72
72
|
let sawKeywordOnlySeparator = false;
|
73
|
-
const
|
73
|
+
const addVirtualParam = (param, index, typeOverride, defaultArgTypeOverride, sourceOverride) => {
|
74
74
|
if (param.name) {
|
75
75
|
let kind;
|
76
76
|
if (sourceOverride !== undefined) {
|
77
77
|
kind = sourceOverride;
|
78
78
|
}
|
79
|
-
else if (param.category === 1 /*
|
80
|
-
kind =
|
79
|
+
else if (param.category === 1 /* ParamCategory.ArgsList */) {
|
80
|
+
kind = ParamKind.Positional;
|
81
81
|
}
|
82
82
|
else if (sawKeywordOnlySeparator) {
|
83
|
-
kind =
|
83
|
+
kind = ParamKind.Keyword;
|
84
84
|
}
|
85
85
|
else if (positionOnlyIndex >= 0 && index < positionOnlyIndex) {
|
86
|
-
kind =
|
86
|
+
kind = ParamKind.Positional;
|
87
87
|
}
|
88
88
|
else {
|
89
|
-
kind =
|
89
|
+
kind = ParamKind.Standard;
|
90
90
|
}
|
91
91
|
result.params.push({
|
92
92
|
param,
|
93
93
|
index,
|
94
|
-
type: typeOverride !== null && typeOverride !== void 0 ? typeOverride : types_1.FunctionType.
|
94
|
+
type: typeOverride !== null && typeOverride !== void 0 ? typeOverride : types_1.FunctionType.getEffectiveParamType(type, index),
|
95
95
|
defaultArgType: defaultArgTypeOverride,
|
96
96
|
kind,
|
97
97
|
});
|
@@ -99,24 +99,24 @@ function getParameterListDetails(type) {
|
|
99
99
|
};
|
100
100
|
type.shared.parameters.forEach((param, index) => {
|
101
101
|
var _a, _b;
|
102
|
-
if (param.category === 1 /*
|
102
|
+
if (param.category === 1 /* ParamCategory.ArgsList */) {
|
103
103
|
// If this is an unpacked tuple, expand the entries.
|
104
|
-
const paramType = types_1.FunctionType.
|
105
|
-
if (param.name && (0, types_1.isUnpackedClass)(paramType) && paramType.priv.
|
104
|
+
const paramType = types_1.FunctionType.getEffectiveParamType(type, index);
|
105
|
+
if (param.name && (0, types_1.isUnpackedClass)(paramType) && paramType.priv.tupleTypeArgs) {
|
106
106
|
const addToPositionalOnly = index < result.positionOnlyParamCount;
|
107
|
-
paramType.priv.
|
108
|
-
const category = (0, types_1.
|
109
|
-
? 1 /*
|
110
|
-
: 0 /*
|
111
|
-
if (category === 1 /*
|
107
|
+
paramType.priv.tupleTypeArgs.forEach((tupleArg, tupleIndex) => {
|
108
|
+
const category = (0, types_1.isTypeVarTuple)(tupleArg.type) || tupleArg.isUnbounded
|
109
|
+
? 1 /* ParamCategory.ArgsList */
|
110
|
+
: 0 /* ParamCategory.Simple */;
|
111
|
+
if (category === 1 /* ParamCategory.ArgsList */) {
|
112
112
|
result.argsIndex = result.params.length;
|
113
113
|
}
|
114
|
-
if ((0, types_1.
|
115
|
-
result.
|
114
|
+
if ((0, types_1.isTypeVarTuple)(param.type)) {
|
115
|
+
result.hasUnpackedTypeVarTuple = true;
|
116
116
|
}
|
117
|
-
|
118
|
-
/* defaultArgTypeOverride */ undefined,
|
119
|
-
if (category === 0 /*
|
117
|
+
addVirtualParam(types_1.FunctionParam.create(category, tupleArg.type, types_1.FunctionParamFlags.NameSynthesized | types_1.FunctionParamFlags.TypeDeclared, `${param.name}[${tupleIndex.toString()}]`), index, tupleArg.type,
|
118
|
+
/* defaultArgTypeOverride */ undefined, ParamKind.Positional);
|
119
|
+
if (category === 0 /* ParamCategory.Simple */) {
|
120
120
|
result.positionParamCount++;
|
121
121
|
}
|
122
122
|
if (tupleIndex > 0 && addToPositionalOnly) {
|
@@ -135,8 +135,8 @@ function getParameterListDetails(type) {
|
|
135
135
|
else {
|
136
136
|
if (param.name && result.argsIndex === undefined) {
|
137
137
|
result.argsIndex = result.params.length;
|
138
|
-
if ((0, types_1.
|
139
|
-
result.
|
138
|
+
if ((0, types_1.isTypeVarTuple)(param.type)) {
|
139
|
+
result.hasUnpackedTypeVarTuple = true;
|
140
140
|
}
|
141
141
|
}
|
142
142
|
// Normally, a VarArgList parameter (either named or as an unnamed separator)
|
@@ -150,12 +150,12 @@ function getParameterListDetails(type) {
|
|
150
150
|
}
|
151
151
|
sawKeywordOnlySeparator = true;
|
152
152
|
}
|
153
|
-
|
153
|
+
addVirtualParam(param, index);
|
154
154
|
}
|
155
155
|
}
|
156
|
-
else if (param.category === 2 /*
|
156
|
+
else if (param.category === 2 /* ParamCategory.KwargsDict */) {
|
157
157
|
sawKeywordOnlySeparator = true;
|
158
|
-
const paramType = types_1.FunctionType.
|
158
|
+
const paramType = types_1.FunctionType.getEffectiveParamType(type, index);
|
159
159
|
// Is this an unpacked TypedDict? If so, expand the entries.
|
160
160
|
if ((0, types_1.isClassInstance)(paramType) && (0, types_1.isUnpackedClass)(paramType) && paramType.shared.typedDictEntries) {
|
161
161
|
if (result.firstKeywordOnlyIndex === undefined) {
|
@@ -165,10 +165,10 @@ function getParameterListDetails(type) {
|
|
165
165
|
paramType.shared.typedDictEntries.knownItems.forEach((entry, name) => {
|
166
166
|
const specializedParamType = (0, typeUtils_1.partiallySpecializeType)(entry.valueType, typedDictType,
|
167
167
|
/* typeClassType */ undefined);
|
168
|
-
|
168
|
+
addVirtualParam(types_1.FunctionParam.create(0 /* ParamCategory.Simple */, specializedParamType, types_1.FunctionParamFlags.TypeDeclared, name, !entry.isRequired ? specializedParamType : undefined), index, specializedParamType);
|
169
169
|
});
|
170
170
|
if (paramType.shared.typedDictEntries.extraItems) {
|
171
|
-
|
171
|
+
addVirtualParam(types_1.FunctionParam.create(2 /* ParamCategory.KwargsDict */, paramType.shared.typedDictEntries.extraItems.valueType, types_1.FunctionParamFlags.TypeDeclared, 'kwargs'), index, paramType.shared.typedDictEntries.extraItems.valueType);
|
172
172
|
result.kwargsIndex = result.params.length - 1;
|
173
173
|
}
|
174
174
|
result.hasUnpackedTypedDict = true;
|
@@ -181,14 +181,14 @@ function getParameterListDetails(type) {
|
|
181
181
|
if (result.firstKeywordOnlyIndex === undefined) {
|
182
182
|
result.firstKeywordOnlyIndex = result.params.length;
|
183
183
|
}
|
184
|
-
|
184
|
+
addVirtualParam(param, index);
|
185
185
|
}
|
186
186
|
}
|
187
|
-
else if (param.category === 0 /*
|
187
|
+
else if (param.category === 0 /* ParamCategory.Simple */) {
|
188
188
|
if (param.name && !sawKeywordOnlySeparator) {
|
189
189
|
result.positionParamCount++;
|
190
190
|
}
|
191
|
-
|
191
|
+
addVirtualParam(param, index,
|
192
192
|
/* typeOverride */ undefined, ((_a = type.priv.specializedTypes) === null || _a === void 0 ? void 0 : _a.parameterDefaultArgs)
|
193
193
|
? (_b = type.priv.specializedTypes) === null || _b === void 0 ? void 0 : _b.parameterDefaultArgs[index]
|
194
194
|
: undefined);
|
@@ -197,16 +197,16 @@ function getParameterListDetails(type) {
|
|
197
197
|
// If the signature ends in `*args: P.args, **kwargs: P.kwargs`,
|
198
198
|
// extract the ParamSpec P.
|
199
199
|
result.paramSpec = types_1.FunctionType.getParamSpecFromArgsKwargs(type);
|
200
|
-
result.firstPositionOrKeywordIndex = result.params.findIndex((p) => p.kind !==
|
200
|
+
result.firstPositionOrKeywordIndex = result.params.findIndex((p) => p.kind !== ParamKind.Positional);
|
201
201
|
if (result.firstPositionOrKeywordIndex < 0) {
|
202
202
|
result.firstPositionOrKeywordIndex = result.params.length;
|
203
203
|
}
|
204
204
|
return result;
|
205
205
|
}
|
206
|
-
exports.
|
206
|
+
exports.getParamListDetails = getParamListDetails;
|
207
207
|
// Returns true if the type of the argument type is "*args: P.args" or
|
208
208
|
// "*args: Any". Both of these match a parameter of type "*args: P.args".
|
209
|
-
function
|
209
|
+
function isParamSpecArgs(paramSpec, argType) {
|
210
210
|
let isCompatible = true;
|
211
211
|
(0, typeUtils_1.doForEachSubtype)(argType, (argSubtype) => {
|
212
212
|
if ((0, types_1.isParamSpec)(argSubtype) &&
|
@@ -215,10 +215,10 @@ function isParamSpecArgsArgument(paramSpec, argType) {
|
|
215
215
|
return;
|
216
216
|
}
|
217
217
|
if ((0, types_1.isClassInstance)(argSubtype) &&
|
218
|
-
argSubtype.priv.
|
219
|
-
argSubtype.priv.
|
220
|
-
argSubtype.priv.
|
221
|
-
(0, types_1.isAnyOrUnknown)(argSubtype.priv.
|
218
|
+
argSubtype.priv.tupleTypeArgs &&
|
219
|
+
argSubtype.priv.tupleTypeArgs.length === 1 &&
|
220
|
+
argSubtype.priv.tupleTypeArgs[0].isUnbounded &&
|
221
|
+
(0, types_1.isAnyOrUnknown)(argSubtype.priv.tupleTypeArgs[0].type)) {
|
222
222
|
return;
|
223
223
|
}
|
224
224
|
if ((0, types_1.isAnyOrUnknown)(argSubtype)) {
|
@@ -228,10 +228,10 @@ function isParamSpecArgsArgument(paramSpec, argType) {
|
|
228
228
|
});
|
229
229
|
return isCompatible;
|
230
230
|
}
|
231
|
-
exports.
|
231
|
+
exports.isParamSpecArgs = isParamSpecArgs;
|
232
232
|
// Returns true if the type of the argument type is "**kwargs: P.kwargs" or
|
233
233
|
// "*kwargs: Any". Both of these match a parameter of type "*kwargs: P.kwargs".
|
234
|
-
function
|
234
|
+
function isParamSpecKwargs(paramSpec, argType) {
|
235
235
|
let isCompatible = true;
|
236
236
|
(0, typeUtils_1.doForEachSubtype)(argType, (argSubtype) => {
|
237
237
|
if ((0, types_1.isParamSpec)(argSubtype) &&
|
@@ -241,11 +241,11 @@ function isParamSpecKwargsArgument(paramSpec, argType) {
|
|
241
241
|
}
|
242
242
|
if ((0, types_1.isClassInstance)(argSubtype) &&
|
243
243
|
types_1.ClassType.isBuiltIn(argSubtype, 'dict') &&
|
244
|
-
argSubtype.priv.
|
245
|
-
argSubtype.priv.
|
246
|
-
(0, types_1.isClassInstance)(argSubtype.priv.
|
247
|
-
types_1.ClassType.isBuiltIn(argSubtype.priv.
|
248
|
-
(0, types_1.isAnyOrUnknown)(argSubtype.priv.
|
244
|
+
argSubtype.priv.typeArgs &&
|
245
|
+
argSubtype.priv.typeArgs.length === 2 &&
|
246
|
+
(0, types_1.isClassInstance)(argSubtype.priv.typeArgs[0]) &&
|
247
|
+
types_1.ClassType.isBuiltIn(argSubtype.priv.typeArgs[0], 'str') &&
|
248
|
+
(0, types_1.isAnyOrUnknown)(argSubtype.priv.typeArgs[1])) {
|
249
249
|
return;
|
250
250
|
}
|
251
251
|
if ((0, types_1.isAnyOrUnknown)(argSubtype)) {
|
@@ -255,5 +255,5 @@ function isParamSpecKwargsArgument(paramSpec, argType) {
|
|
255
255
|
});
|
256
256
|
return isCompatible;
|
257
257
|
}
|
258
|
-
exports.
|
258
|
+
exports.isParamSpecKwargs = isParamSpecKwargs;
|
259
259
|
//# sourceMappingURL=parameterUtils.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"parameterUtils.js","sourceRoot":"","sources":["../../../../../src/analyzer/parameterUtils.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAGH,uDAAiD;AACjD,mCAeiB;AACjB,2CAAwE;AAExE,SAAgB,aAAa,CAAC,KAAoB;IAC9C,OAAO,CACH,KAAK,CAAC,QAAQ,
|
1
|
+
{"version":3,"file":"parameterUtils.js","sourceRoot":"","sources":["../../../../../src/analyzer/parameterUtils.ts"],"names":[],"mappings":"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"}
|
@@ -21,7 +21,7 @@ export declare function findNodeByOffset(node: ParseNode, offset: number): Parse
|
|
21
21
|
export declare function isCompliantWithNodeRangeRules(node: ParseNode): boolean;
|
22
22
|
export declare function getClassFullName(classNode: ParseNode, moduleName: string, className: string): string;
|
23
23
|
export declare function getTypeSourceId(node: ParseNode): number;
|
24
|
-
export declare function
|
24
|
+
export declare function printArg(node: ArgumentNode, flags: PrintExpressionFlags): string;
|
25
25
|
export declare function printExpression(node: ExpressionNode, flags?: PrintExpressionFlags): string;
|
26
26
|
export declare function printOperator(operator: OperatorType): string;
|
27
27
|
export declare function getCallForName(node: NameNode): CallNode | undefined;
|
@@ -41,7 +41,7 @@ export declare function getEvaluationScopeNode(node: ParseNode): EvaluationScope
|
|
41
41
|
export declare function getTypeVarScopeNode(node: ParseNode): TypeParameterScopeNode | undefined;
|
42
42
|
export declare function getExecutionScopeNode(node: ParseNode): ExecutionScopeNode;
|
43
43
|
export declare function getTypeAnnotationNode(node: ParseNode): TypeAnnotationNode | undefined;
|
44
|
-
export declare function
|
44
|
+
export declare function getArgsByRuntimeOrder(node: CallNode): ArgumentNode[];
|
45
45
|
export declare function isFinalAllowedForAssignmentTarget(targetNode: ExpressionNode): boolean;
|
46
46
|
export declare function isClassVarAllowedForAssignmentTarget(targetNode: ExpressionNode): boolean;
|
47
47
|
export declare function isRequiredAllowedForAssignmentTarget(targetNode: ExpressionNode): boolean;
|
@@ -74,8 +74,8 @@ export declare class CallNodeWalker extends ParseTreeWalker {
|
|
74
74
|
constructor(_callback: (node: CallNode) => void);
|
75
75
|
visitCall(node: CallNode): boolean;
|
76
76
|
}
|
77
|
-
export declare function
|
78
|
-
export declare function
|
77
|
+
export declare function getEnclosingParam(node: ParseNode): ParameterNode | undefined;
|
78
|
+
export declare function getCallNodeAndActiveParamIndex(node: ParseNode, insertionOffset: number, tokens: TextRangeCollection<Token>): {
|
79
79
|
callNode: CallNode;
|
80
80
|
activeIndex: number;
|
81
81
|
activeOrFake: boolean;
|
@@ -89,12 +89,12 @@ export declare function getTokenOverlapping(tokens: TextRangeCollection<Token>,
|
|
89
89
|
export declare function getIndexOfTokenOverlapping(tokens: TextRangeCollection<Token>, position: number): number;
|
90
90
|
export declare function findTokenAfter(tokenizerOutput: TokenizerOutput, offset: number, predicate: (t: Token) => boolean): Token | undefined;
|
91
91
|
export declare function getCommentsAtTokenIndex(tokens: TextRangeCollection<Token>, index: number): import("../parser/tokenizerTypes").Comment[] | undefined;
|
92
|
-
export declare function printParseNodeType(type: ParseNodeType): "
|
92
|
+
export declare function printParseNodeType(type: ParseNodeType): "Tuple" | "TypeAlias" | "Error" | "Argument" | "Assert" | "Assignment" | "AssignmentExpression" | "AugmentedAssignment" | "Await" | "BinaryOperation" | "Break" | "Call" | "Class" | "Constant" | "Continue" | "Decorator" | "Del" | "Dictionary" | "DictionaryExpandEntry" | "DictionaryKeyEntry" | "Ellipsis" | "If" | "Import" | "ImportAs" | "ImportFrom" | "ImportFromAs" | "Index" | "Except" | "For" | "FormatString" | "Function" | "Global" | "Lambda" | "List" | "Comprehension" | "ComprehensionFor" | "ComprehensionIf" | "MemberAccess" | "Module" | "ModuleName" | "Name" | "Nonlocal" | "Number" | "Parameter" | "Pass" | "Raise" | "Return" | "Set" | "Slice" | "StatementList" | "StringList" | "String" | "Suite" | "Ternary" | "Try" | "TypeAnnotation" | "UnaryOperation" | "Unpack" | "While" | "With" | "WithItem" | "Yield" | "YieldFrom" | "FunctionAnnotation" | "Match" | "Case" | "PatternSequence" | "PatternAs" | "PatternLiteral" | "PatternClass" | "PatternCapture" | "PatternMapping" | "PatternMappingKeyEntry" | "PatternMappingExpandEntry" | "PatternValue" | "PatternClassArgument" | "TypeParameter" | "TypeParameterList";
|
93
93
|
export declare function isWriteAccess(node: NameNode): boolean;
|
94
94
|
export declare function getModuleNode(node: ParseNode): ModuleNode | undefined;
|
95
95
|
export declare function getFileInfoFromNode(node: ParseNode): import("./analyzerFileInfo").AnalyzerFileInfo | undefined;
|
96
96
|
export declare function isFunctionSuiteEmpty(node: FunctionNode): boolean;
|
97
|
-
export declare function
|
97
|
+
export declare function getTypeAnnotationForParam(node: FunctionNode, paramIndex: number): ExpressionNode | undefined;
|
98
98
|
export declare function isImportModuleName(node: ParseNode): boolean;
|
99
99
|
export declare function isImportAlias(node: ParseNode): boolean;
|
100
100
|
export declare function isFromImportModuleName(node: ParseNode): boolean;
|
@@ -31,8 +31,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
31
31
|
return result;
|
32
32
|
};
|
33
33
|
Object.defineProperty(exports, "__esModule", { value: true });
|
34
|
-
exports.
|
35
|
-
exports.isSimpleDefault = exports.checkDecorator = exports.getTypeVarScopesForNode = exports.getScopeIdForNode = exports.getVariableDocStringNode = exports.operatorSupportsChaining = exports.isValidLocationForFutureImport = exports.isUnannotatedFunction = exports.isBlankLine = exports.getFullStatementRange = exports.getStringValueRange = exports.getStringNodeValueRange = exports.isLastNameOfDottedName = exports.isFirstNameOfDottedName = exports.getFirstNameOfDottedName = exports.getDottedName = exports.getDecoratorName = exports.getDottedNameWithGivenNodeAsLastName = exports.getFirstAncestorOrSelf = exports.getFirstAncestorOrSelfOfKind = exports.getAncestorsIncludingSelf = exports.isLastNameOfModuleName = exports.isFromImportAlias = exports.isFromImportName = exports.isFromImportModuleName = exports.isImportAlias = exports.isImportModuleName = exports.
|
34
|
+
exports.getEnclosingParam = exports.CallNodeWalker = exports.NameNodeWalker = exports.isAssignmentToDefaultsFollowingNamedTuple = exports.isDocString = exports.getDocString = exports.isWithinAssertExpression = exports.isWithinLoop = exports.isWithinAnnotationComment = exports.isWithinTypeAnnotation = exports.isWithinDefaultParamInitializer = exports.isPartialMatchingExpression = exports.isMatchingExpression = exports.containsAwaitNode = exports.isSuiteEmpty = exports.isNodeContainedWithinNodeType = exports.getParentAnnotationNode = exports.getParentNodeOfType = exports.isNodeContainedWithin = exports.isRequiredAllowedForAssignmentTarget = exports.isClassVarAllowedForAssignmentTarget = exports.isFinalAllowedForAssignmentTarget = exports.getArgsByRuntimeOrder = exports.getTypeAnnotationNode = exports.getExecutionScopeNode = exports.getTypeVarScopeNode = exports.getEvaluationScopeNode = exports.getEvaluationNodeForAssignmentExpression = exports.getEnclosingSuiteOrModule = exports.getEnclosingClassOrFunctionSuite = exports.getEnclosingClassOrFunction = exports.getEnclosingLambda = exports.getEnclosingFunctionEvaluationScope = exports.getEnclosingFunction = exports.getEnclosingClassOrModule = exports.getEnclosingModule = exports.getEnclosingClass = exports.getEnclosingSuite = exports.getDecoratorForName = exports.getCallForName = exports.printOperator = exports.printExpression = exports.printArg = exports.getTypeSourceId = exports.getClassFullName = exports.isCompliantWithNodeRangeRules = exports.findNodeByOffset = exports.findNodeByPosition = exports.getNodeDepth = exports.PrintExpressionFlags = void 0;
|
35
|
+
exports.isSimpleDefault = exports.checkDecorator = exports.getTypeVarScopesForNode = exports.getScopeIdForNode = exports.getVariableDocStringNode = exports.operatorSupportsChaining = exports.isValidLocationForFutureImport = exports.isUnannotatedFunction = exports.isBlankLine = exports.getFullStatementRange = exports.getStringValueRange = exports.getStringNodeValueRange = exports.isLastNameOfDottedName = exports.isFirstNameOfDottedName = exports.getFirstNameOfDottedName = exports.getDottedName = exports.getDecoratorName = exports.getDottedNameWithGivenNodeAsLastName = exports.getFirstAncestorOrSelf = exports.getFirstAncestorOrSelfOfKind = exports.getAncestorsIncludingSelf = exports.isLastNameOfModuleName = exports.isFromImportAlias = exports.isFromImportName = exports.isFromImportModuleName = exports.isImportAlias = exports.isImportModuleName = exports.getTypeAnnotationForParam = exports.isFunctionSuiteEmpty = exports.getFileInfoFromNode = exports.getModuleNode = exports.isWriteAccess = exports.printParseNodeType = exports.getCommentsAtTokenIndex = exports.findTokenAfter = exports.getIndexOfTokenOverlapping = exports.getTokenOverlapping = exports.getTokenAt = exports.getTokenAtIndex = exports.isWhitespace = exports.getTokenAtLeft = exports.getTokenIndexAtLeft = exports.getCallNodeAndActiveParamIndex = void 0;
|
36
36
|
const AnalyzerNodeInfo = __importStar(require("../analyzer/analyzerNodeInfo"));
|
37
37
|
const core_1 = require("../common/core");
|
38
38
|
const debug_1 = require("../common/debug");
|
@@ -159,12 +159,12 @@ function getTypeSourceId(node) {
|
|
159
159
|
return node.start;
|
160
160
|
}
|
161
161
|
exports.getTypeSourceId = getTypeSourceId;
|
162
|
-
function
|
162
|
+
function printArg(node, flags) {
|
163
163
|
let argStr = '';
|
164
|
-
if (node.d.argCategory === 1 /*
|
164
|
+
if (node.d.argCategory === 1 /* ArgCategory.UnpackedList */) {
|
165
165
|
argStr = '*';
|
166
166
|
}
|
167
|
-
else if (node.d.argCategory === 2 /*
|
167
|
+
else if (node.d.argCategory === 2 /* ArgCategory.UnpackedDictionary */) {
|
168
168
|
argStr = '**';
|
169
169
|
}
|
170
170
|
if (node.d.name) {
|
@@ -175,7 +175,7 @@ function printArgument(node, flags) {
|
|
175
175
|
}
|
176
176
|
return argStr;
|
177
177
|
}
|
178
|
-
exports.
|
178
|
+
exports.printArg = printArg;
|
179
179
|
function printExpression(node, flags = 0 /* PrintExpressionFlags.None */) {
|
180
180
|
switch (node.nodeType) {
|
181
181
|
case 38 /* ParseNodeType.Name */: {
|
@@ -193,12 +193,12 @@ function printExpression(node, flags = 0 /* PrintExpressionFlags.None */) {
|
|
193
193
|
node.d.leftExpr.nodeType !== 9 /* ParseNodeType.Call */) {
|
194
194
|
lhs = `(${lhs})`;
|
195
195
|
}
|
196
|
-
return lhs + '(' + node.d.args.map((arg) =>
|
196
|
+
return lhs + '(' + node.d.args.map((arg) => printArg(arg, flags)).join(', ') + ')';
|
197
197
|
}
|
198
198
|
case 27 /* ParseNodeType.Index */: {
|
199
199
|
return (printExpression(node.d.leftExpr, flags) +
|
200
200
|
'[' +
|
201
|
-
node.d.items.map((item) =>
|
201
|
+
node.d.items.map((item) => printArg(item, flags)).join(', ') +
|
202
202
|
(node.d.trailingComma ? ',' : '') +
|
203
203
|
']');
|
204
204
|
}
|
@@ -414,16 +414,16 @@ function printExpression(node, flags = 0 /* PrintExpressionFlags.None */) {
|
|
414
414
|
node.d.params
|
415
415
|
.map((param) => {
|
416
416
|
let paramStr = '';
|
417
|
-
if (param.d.category === 1 /*
|
417
|
+
if (param.d.category === 1 /* ParamCategory.ArgsList */) {
|
418
418
|
paramStr += '*';
|
419
419
|
}
|
420
|
-
else if (param.d.category === 2 /*
|
420
|
+
else if (param.d.category === 2 /* ParamCategory.KwargsDict */) {
|
421
421
|
paramStr += '**';
|
422
422
|
}
|
423
423
|
if (param.d.name) {
|
424
424
|
paramStr += param.d.name.d.value;
|
425
425
|
}
|
426
|
-
else if (param.d.category === 0 /*
|
426
|
+
else if (param.d.category === 0 /* ParamCategory.Simple */) {
|
427
427
|
paramStr += '/';
|
428
428
|
}
|
429
429
|
if (param.d.defaultValue) {
|
@@ -953,12 +953,12 @@ exports.getTypeAnnotationNode = getTypeAnnotationNode;
|
|
953
953
|
// In general, arguments passed to a call are evaluated by the runtime in
|
954
954
|
// left-to-right order. There is one exception, however, when an unpacked
|
955
955
|
// iterable is used after a keyword argument.
|
956
|
-
function
|
957
|
-
const positionalArgs = node.d.args.filter((arg) => !arg.d.name && arg.d.argCategory !== 2 /*
|
958
|
-
const keywordArgs = node.d.args.filter((arg) => !!arg.d.name || arg.d.argCategory === 2 /*
|
956
|
+
function getArgsByRuntimeOrder(node) {
|
957
|
+
const positionalArgs = node.d.args.filter((arg) => !arg.d.name && arg.d.argCategory !== 2 /* ArgCategory.UnpackedDictionary */);
|
958
|
+
const keywordArgs = node.d.args.filter((arg) => !!arg.d.name || arg.d.argCategory === 2 /* ArgCategory.UnpackedDictionary */);
|
959
959
|
return positionalArgs.concat(keywordArgs);
|
960
960
|
}
|
961
|
-
exports.
|
961
|
+
exports.getArgsByRuntimeOrder = getArgsByRuntimeOrder;
|
962
962
|
// PEP 591 spells out certain limited cases where an assignment target
|
963
963
|
// can be annotated with a "Final" annotation. This function determines
|
964
964
|
// whether Final is allowed for the specified node.
|
@@ -1133,7 +1133,7 @@ function isMatchingExpression(reference, expression) {
|
|
1133
1133
|
if (expression.d.items.length !== 1 ||
|
1134
1134
|
expression.d.trailingComma ||
|
1135
1135
|
expression.d.items[0].d.name ||
|
1136
|
-
expression.d.items[0].d.argCategory !== 0 /*
|
1136
|
+
expression.d.items[0].d.argCategory !== 0 /* ArgCategory.Simple */) {
|
1137
1137
|
return false;
|
1138
1138
|
}
|
1139
1139
|
const expr = reference.d.items[0].d.valueExpr;
|
@@ -1437,7 +1437,7 @@ class CallNodeWalker extends parseTreeWalker_1.ParseTreeWalker {
|
|
1437
1437
|
}
|
1438
1438
|
}
|
1439
1439
|
exports.CallNodeWalker = CallNodeWalker;
|
1440
|
-
function
|
1440
|
+
function getEnclosingParam(node) {
|
1441
1441
|
let curNode = node;
|
1442
1442
|
while (curNode) {
|
1443
1443
|
if (curNode.nodeType === 41 /* ParseNodeType.Parameter */) {
|
@@ -1450,8 +1450,8 @@ function getEnclosingParameter(node) {
|
|
1450
1450
|
}
|
1451
1451
|
return undefined;
|
1452
1452
|
}
|
1453
|
-
exports.
|
1454
|
-
function
|
1453
|
+
exports.getEnclosingParam = getEnclosingParam;
|
1454
|
+
function getCallNodeAndActiveParamIndex(node, insertionOffset, tokens) {
|
1455
1455
|
// Find the call node that contains the specified node.
|
1456
1456
|
let curNode = node;
|
1457
1457
|
let callNode;
|
@@ -1547,7 +1547,7 @@ function getCallNodeAndActiveParameterIndex(node, insertionOffset, tokens) {
|
|
1547
1547
|
return true;
|
1548
1548
|
}
|
1549
1549
|
}
|
1550
|
-
exports.
|
1550
|
+
exports.getCallNodeAndActiveParamIndex = getCallNodeAndActiveParamIndex;
|
1551
1551
|
function getTokenIndexAtLeft(tokens, position, includeWhitespace = false, includeZeroLengthToken = false) {
|
1552
1552
|
const index = tokens.getItemAtPosition(position);
|
1553
1553
|
if (index < 0) {
|
@@ -1899,7 +1899,7 @@ function isFunctionSuiteEmpty(node) {
|
|
1899
1899
|
return isEmpty;
|
1900
1900
|
}
|
1901
1901
|
exports.isFunctionSuiteEmpty = isFunctionSuiteEmpty;
|
1902
|
-
function
|
1902
|
+
function getTypeAnnotationForParam(node, paramIndex) {
|
1903
1903
|
if (paramIndex >= node.d.params.length) {
|
1904
1904
|
return undefined;
|
1905
1905
|
}
|
@@ -1924,7 +1924,7 @@ function getTypeAnnotationForParameter(node, paramIndex) {
|
|
1924
1924
|
}
|
1925
1925
|
return paramAnnotations[adjIndex];
|
1926
1926
|
}
|
1927
|
-
exports.
|
1927
|
+
exports.getTypeAnnotationForParam = getTypeAnnotationForParam;
|
1928
1928
|
function isImportModuleName(node) {
|
1929
1929
|
var _a, _b;
|
1930
1930
|
return ((_b = (_a = getFirstAncestorOrSelfOfKind(node, 37 /* ParseNodeType.ModuleName */)) === null || _a === void 0 ? void 0 : _a.parent) === null || _b === void 0 ? void 0 : _b.nodeType) === 24 /* ParseNodeType.ImportAs */;
|