@zzzen/pyright-internal 1.2.0-dev.20240707 → 1.2.0-dev.20240714
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 +74 -46
- package/dist/analyzer/analyzerNodeInfo.js.map +1 -1
- package/dist/analyzer/binder.js +506 -512
- package/dist/analyzer/binder.js.map +1 -1
- package/dist/analyzer/checker.js +649 -634
- package/dist/analyzer/checker.js.map +1 -1
- package/dist/analyzer/codeFlowEngine.d.ts +5 -3
- package/dist/analyzer/codeFlowEngine.js +87 -101
- package/dist/analyzer/codeFlowEngine.js.map +1 -1
- package/dist/analyzer/codeFlowTypes.js +30 -28
- package/dist/analyzer/codeFlowTypes.js.map +1 -1
- package/dist/analyzer/constraintSolver.js +68 -64
- package/dist/analyzer/constraintSolver.js.map +1 -1
- package/dist/analyzer/constructorTransform.js +22 -22
- package/dist/analyzer/constructorTransform.js.map +1 -1
- package/dist/analyzer/constructors.js +51 -48
- package/dist/analyzer/constructors.js.map +1 -1
- package/dist/analyzer/dataClasses.js +109 -175
- package/dist/analyzer/dataClasses.js.map +1 -1
- package/dist/analyzer/declarationUtils.js +14 -15
- package/dist/analyzer/declarationUtils.js.map +1 -1
- package/dist/analyzer/decorators.js +77 -77
- package/dist/analyzer/decorators.js.map +1 -1
- package/dist/analyzer/enums.js +70 -56
- package/dist/analyzer/enums.js.map +1 -1
- package/dist/analyzer/functionTransform.js +8 -18
- package/dist/analyzer/functionTransform.js.map +1 -1
- package/dist/analyzer/importResolver.d.ts +2 -1
- package/dist/analyzer/importResolver.js +40 -29
- package/dist/analyzer/importResolver.js.map +1 -1
- package/dist/analyzer/importStatementUtils.js +27 -27
- package/dist/analyzer/importStatementUtils.js.map +1 -1
- package/dist/analyzer/namedTuples.js +33 -59
- package/dist/analyzer/namedTuples.js.map +1 -1
- package/dist/analyzer/operations.js +66 -66
- package/dist/analyzer/operations.js.map +1 -1
- package/dist/analyzer/packageTypeVerifier.js +66 -62
- package/dist/analyzer/packageTypeVerifier.js.map +1 -1
- package/dist/analyzer/parameterUtils.d.ts +4 -4
- package/dist/analyzer/parameterUtils.js +28 -46
- package/dist/analyzer/parameterUtils.js.map +1 -1
- package/dist/analyzer/parseTreeUtils.js +268 -269
- package/dist/analyzer/parseTreeUtils.js.map +1 -1
- package/dist/analyzer/parseTreeWalker.js +76 -76
- package/dist/analyzer/parseTreeWalker.js.map +1 -1
- package/dist/analyzer/patternMatching.js +176 -143
- package/dist/analyzer/patternMatching.js.map +1 -1
- package/dist/analyzer/program.js +1 -1
- package/dist/analyzer/program.js.map +1 -1
- package/dist/analyzer/properties.js +78 -147
- package/dist/analyzer/properties.js.map +1 -1
- package/dist/analyzer/protocols.js +21 -21
- package/dist/analyzer/protocols.js.map +1 -1
- package/dist/analyzer/sourceFile.js +3 -3
- package/dist/analyzer/sourceFile.js.map +1 -1
- package/dist/analyzer/sourceMapper.js +20 -19
- package/dist/analyzer/sourceMapper.js.map +1 -1
- package/dist/analyzer/staticExpressions.js +83 -84
- package/dist/analyzer/staticExpressions.js.map +1 -1
- package/dist/analyzer/testWalker.js +2 -2
- package/dist/analyzer/testWalker.js.map +1 -1
- package/dist/analyzer/tracePrinter.js +20 -20
- package/dist/analyzer/tracePrinter.js.map +1 -1
- package/dist/analyzer/typeDocStringUtils.js +25 -25
- package/dist/analyzer/typeDocStringUtils.js.map +1 -1
- package/dist/analyzer/typeEvaluator.js +1884 -1937
- package/dist/analyzer/typeEvaluator.js.map +1 -1
- package/dist/analyzer/typeEvaluatorTypes.d.ts +6 -5
- package/dist/analyzer/typeEvaluatorTypes.js +4 -1
- package/dist/analyzer/typeEvaluatorTypes.js.map +1 -1
- package/dist/analyzer/typeGuards.js +211 -211
- package/dist/analyzer/typeGuards.js.map +1 -1
- package/dist/analyzer/typePrinter.js +118 -115
- package/dist/analyzer/typePrinter.js.map +1 -1
- package/dist/analyzer/typeStubWriter.js +104 -103
- package/dist/analyzer/typeStubWriter.js.map +1 -1
- package/dist/analyzer/typeUtils.d.ts +14 -3
- package/dist/analyzer/typeUtils.js +432 -402
- package/dist/analyzer/typeUtils.js.map +1 -1
- package/dist/analyzer/typeVarContext.js +8 -8
- package/dist/analyzer/typeVarContext.js.map +1 -1
- package/dist/analyzer/typeWalker.js +13 -10
- package/dist/analyzer/typeWalker.js.map +1 -1
- package/dist/analyzer/typedDicts.js +96 -198
- package/dist/analyzer/typedDicts.js.map +1 -1
- package/dist/analyzer/types.d.ts +144 -102
- package/dist/analyzer/types.js +662 -494
- package/dist/analyzer/types.js.map +1 -1
- package/dist/commands/dumpFileDebugInfoCommand.js +33 -33
- package/dist/commands/dumpFileDebugInfoCommand.js.map +1 -1
- package/dist/common/fileSystem.d.ts +1 -0
- package/dist/common/fileSystem.js.map +1 -1
- package/dist/common/fullAccessHost.js +6 -4
- package/dist/common/fullAccessHost.js.map +1 -1
- package/dist/common/realFileSystem.d.ts +1 -0
- package/dist/common/realFileSystem.js +4 -0
- package/dist/common/realFileSystem.js.map +1 -1
- package/dist/common/textEditTracker.js +14 -14
- package/dist/common/textEditTracker.js.map +1 -1
- package/dist/languageService/autoImporter.js +10 -10
- package/dist/languageService/autoImporter.js.map +1 -1
- package/dist/languageService/callHierarchyProvider.js +23 -23
- package/dist/languageService/callHierarchyProvider.js.map +1 -1
- package/dist/languageService/completionProvider.js +153 -151
- package/dist/languageService/completionProvider.js.map +1 -1
- package/dist/languageService/definitionProvider.d.ts +1 -1
- package/dist/languageService/definitionProvider.js +3 -1
- package/dist/languageService/definitionProvider.js.map +1 -1
- package/dist/languageService/documentSymbolCollector.js +19 -19
- package/dist/languageService/documentSymbolCollector.js.map +1 -1
- package/dist/languageService/hoverProvider.js +25 -24
- package/dist/languageService/hoverProvider.js.map +1 -1
- package/dist/languageService/importSorter.js +8 -8
- package/dist/languageService/importSorter.js.map +1 -1
- package/dist/languageService/referencesProvider.js +8 -8
- package/dist/languageService/referencesProvider.js.map +1 -1
- package/dist/languageService/signatureHelpProvider.d.ts +1 -1
- package/dist/languageService/signatureHelpProvider.js +6 -6
- package/dist/languageService/signatureHelpProvider.js.map +1 -1
- package/dist/languageService/symbolIndexer.js +3 -3
- package/dist/languageService/symbolIndexer.js.map +1 -1
- package/dist/languageService/tooltipUtils.js +13 -13
- package/dist/languageService/tooltipUtils.js.map +1 -1
- package/dist/parser/parseNodes.d.ts +468 -401
- package/dist/parser/parseNodes.js +626 -355
- package/dist/parser/parseNodes.js.map +1 -1
- package/dist/parser/parser.d.ts +1 -0
- package/dist/parser/parser.js +316 -294
- package/dist/parser/parser.js.map +1 -1
- package/dist/tests/classDeclaration.test.js +14 -14
- package/dist/tests/classDeclaration.test.js.map +1 -1
- package/dist/tests/harness/vfs/filesystem.d.ts +3 -2
- package/dist/tests/harness/vfs/filesystem.js +6 -2
- package/dist/tests/harness/vfs/filesystem.js.map +1 -1
- package/dist/tests/importResolver.test.js +4 -3
- package/dist/tests/importResolver.test.js.map +1 -1
- package/dist/tests/parseTreeUtils.test.js +5 -5
- package/dist/tests/parseTreeUtils.test.js.map +1 -1
- package/dist/tests/parser.test.js +8 -8
- package/dist/tests/parser.test.js.map +1 -1
- package/dist/tests/sourceMapperUtils.test.js +7 -7
- package/dist/tests/sourceMapperUtils.test.js.map +1 -1
- package/dist/tests/typeEvaluator3.test.js +8 -3
- package/dist/tests/typeEvaluator3.test.js.map +1 -1
- package/dist/tests/typePrinter.test.js +14 -39
- package/dist/tests/typePrinter.test.js.map +1 -1
- package/package.json +1 -1
@@ -16,11 +16,11 @@ const pythonVersion_1 = require("../common/pythonVersion");
|
|
16
16
|
// statically as a bool value or true/false if it can.
|
17
17
|
function evaluateStaticBoolExpression(node, execEnv, definedConstants, typingImportAliases, sysImportAliases) {
|
18
18
|
if (node.nodeType === 4 /* ParseNodeType.AssignmentExpression */) {
|
19
|
-
return evaluateStaticBoolExpression(node.
|
19
|
+
return evaluateStaticBoolExpression(node.d.rightExpr, execEnv, definedConstants, typingImportAliases, sysImportAliases);
|
20
20
|
}
|
21
21
|
if (node.nodeType === 55 /* ParseNodeType.UnaryOperation */) {
|
22
|
-
if (node.operator === 38 /* OperatorType.Not */) {
|
23
|
-
const value = evaluateStaticBoolLikeExpression(node.
|
22
|
+
if (node.d.operator === 38 /* OperatorType.Not */) {
|
23
|
+
const value = evaluateStaticBoolLikeExpression(node.d.expr, execEnv, definedConstants, typingImportAliases, sysImportAliases);
|
24
24
|
if (value !== undefined) {
|
25
25
|
return !value;
|
26
26
|
}
|
@@ -28,98 +28,97 @@ function evaluateStaticBoolExpression(node, execEnv, definedConstants, typingImp
|
|
28
28
|
}
|
29
29
|
else if (node.nodeType === 7 /* ParseNodeType.BinaryOperation */) {
|
30
30
|
// Is it an OR or AND expression?
|
31
|
-
if (node.operator === 37 /* OperatorType.Or */ || node.operator === 36 /* OperatorType.And */) {
|
32
|
-
const leftValue = evaluateStaticBoolExpression(node.
|
33
|
-
const rightValue = evaluateStaticBoolExpression(node.
|
31
|
+
if (node.d.operator === 37 /* OperatorType.Or */ || node.d.operator === 36 /* OperatorType.And */) {
|
32
|
+
const leftValue = evaluateStaticBoolExpression(node.d.leftExpr, execEnv, definedConstants, typingImportAliases, sysImportAliases);
|
33
|
+
const rightValue = evaluateStaticBoolExpression(node.d.rightExpr, execEnv, definedConstants, typingImportAliases, sysImportAliases);
|
34
34
|
if (leftValue === undefined || rightValue === undefined) {
|
35
35
|
return undefined;
|
36
36
|
}
|
37
|
-
if (node.operator === 37 /* OperatorType.Or */) {
|
37
|
+
if (node.d.operator === 37 /* OperatorType.Or */) {
|
38
38
|
return leftValue || rightValue;
|
39
39
|
}
|
40
40
|
else {
|
41
41
|
return leftValue && rightValue;
|
42
42
|
}
|
43
43
|
}
|
44
|
-
if (_isSysVersionInfoExpression(node.
|
45
|
-
node.
|
44
|
+
if (_isSysVersionInfoExpression(node.d.leftExpr, sysImportAliases) &&
|
45
|
+
node.d.rightExpr.nodeType === 52 /* ParseNodeType.Tuple */) {
|
46
46
|
// Handle the special case of "sys.version_info >= (3, x)"
|
47
|
-
const comparisonVersion = _convertTupleToVersion(node.
|
48
|
-
return _evaluateVersionBinaryOperation(node.operator, execEnv.pythonVersion, comparisonVersion);
|
47
|
+
const comparisonVersion = _convertTupleToVersion(node.d.rightExpr);
|
48
|
+
return _evaluateVersionBinaryOperation(node.d.operator, execEnv.pythonVersion, comparisonVersion);
|
49
49
|
}
|
50
|
-
if (node.
|
51
|
-
_isSysVersionInfoExpression(node.
|
52
|
-
node.
|
53
|
-
!node.
|
54
|
-
!node.
|
55
|
-
node.
|
56
|
-
node.
|
57
|
-
!node.
|
58
|
-
node.
|
59
|
-
node.
|
60
|
-
node.
|
61
|
-
typeof node.
|
50
|
+
if (node.d.leftExpr.nodeType === 27 /* ParseNodeType.Index */ &&
|
51
|
+
_isSysVersionInfoExpression(node.d.leftExpr.d.leftExpr, sysImportAliases) &&
|
52
|
+
node.d.leftExpr.d.items.length === 1 &&
|
53
|
+
!node.d.leftExpr.d.trailingComma &&
|
54
|
+
!node.d.leftExpr.d.items[0].d.name &&
|
55
|
+
node.d.leftExpr.d.items[0].d.argCategory === 0 /* ArgumentCategory.Simple */ &&
|
56
|
+
node.d.leftExpr.d.items[0].d.valueExpr.nodeType === 40 /* ParseNodeType.Number */ &&
|
57
|
+
!node.d.leftExpr.d.items[0].d.valueExpr.d.isImaginary &&
|
58
|
+
node.d.leftExpr.d.items[0].d.valueExpr.d.value === 0 &&
|
59
|
+
node.d.rightExpr.nodeType === 40 /* ParseNodeType.Number */ &&
|
60
|
+
node.d.rightExpr.d.isInteger &&
|
61
|
+
typeof node.d.rightExpr.d.value === 'number') {
|
62
62
|
// Handle the special case of "sys.version_info[0] >= X"
|
63
|
-
return _evaluateVersionBinaryOperation(node.operator, new pythonVersion_1.PythonVersion(execEnv.pythonVersion.major, 0), new pythonVersion_1.PythonVersion(node.
|
63
|
+
return _evaluateVersionBinaryOperation(node.d.operator, new pythonVersion_1.PythonVersion(execEnv.pythonVersion.major, 0), new pythonVersion_1.PythonVersion(node.d.rightExpr.d.value, 0));
|
64
64
|
}
|
65
|
-
if (_isSysPlatformInfoExpression(node.
|
66
|
-
node.
|
65
|
+
if (_isSysPlatformInfoExpression(node.d.leftExpr, sysImportAliases) &&
|
66
|
+
node.d.rightExpr.nodeType === 48 /* ParseNodeType.StringList */) {
|
67
67
|
// Handle the special case of "sys.platform != 'X'"
|
68
|
-
const comparisonPlatform = node.
|
68
|
+
const comparisonPlatform = node.d.rightExpr.d.strings.map((s) => s.d.value).join('');
|
69
69
|
const expectedPlatformName = _getExpectedPlatformNameFromPlatform(execEnv);
|
70
|
-
return _evaluateStringBinaryOperation(node.operator, expectedPlatformName, comparisonPlatform);
|
70
|
+
return _evaluateStringBinaryOperation(node.d.operator, expectedPlatformName, comparisonPlatform);
|
71
71
|
}
|
72
|
-
if (_isOsNameInfoExpression(node.
|
73
|
-
node.rightExpression.nodeType === 48 /* ParseNodeType.StringList */) {
|
72
|
+
if (_isOsNameInfoExpression(node.d.leftExpr) && node.d.rightExpr.nodeType === 48 /* ParseNodeType.StringList */) {
|
74
73
|
// Handle the special case of "os.name == 'X'"
|
75
|
-
const comparisonOsName = node.
|
74
|
+
const comparisonOsName = node.d.rightExpr.d.strings.map((s) => s.d.value).join('');
|
76
75
|
const expectedOsName = _getExpectedOsNameFromPlatform(execEnv);
|
77
76
|
if (expectedOsName !== undefined) {
|
78
|
-
return _evaluateStringBinaryOperation(node.operator, expectedOsName, comparisonOsName);
|
77
|
+
return _evaluateStringBinaryOperation(node.d.operator, expectedOsName, comparisonOsName);
|
79
78
|
}
|
80
79
|
}
|
81
80
|
else {
|
82
81
|
// Handle the special case of <definedConstant> == 'X' or <definedConstant> != 'X'.
|
83
|
-
if (node.
|
82
|
+
if (node.d.rightExpr.nodeType === 48 /* ParseNodeType.StringList */) {
|
84
83
|
let constantValue;
|
85
|
-
if (node.
|
86
|
-
constantValue = definedConstants.get(node.
|
84
|
+
if (node.d.leftExpr.nodeType === 38 /* ParseNodeType.Name */) {
|
85
|
+
constantValue = definedConstants.get(node.d.leftExpr.d.value);
|
87
86
|
}
|
88
|
-
else if (node.
|
89
|
-
constantValue = definedConstants.get(node.
|
87
|
+
else if (node.d.leftExpr.nodeType === 35 /* ParseNodeType.MemberAccess */) {
|
88
|
+
constantValue = definedConstants.get(node.d.leftExpr.d.member.d.value);
|
90
89
|
}
|
91
90
|
if (constantValue !== undefined && typeof constantValue === 'string') {
|
92
|
-
const comparisonStringName = node.
|
93
|
-
return _evaluateStringBinaryOperation(node.operator, constantValue, comparisonStringName);
|
91
|
+
const comparisonStringName = node.d.rightExpr.d.strings.map((s) => s.d.value).join('');
|
92
|
+
return _evaluateStringBinaryOperation(node.d.operator, constantValue, comparisonStringName);
|
94
93
|
}
|
95
94
|
}
|
96
95
|
}
|
97
96
|
}
|
98
97
|
else if (node.nodeType === 14 /* ParseNodeType.Constant */) {
|
99
|
-
if (node.constType === 33 /* KeywordType.True */) {
|
98
|
+
if (node.d.constType === 33 /* KeywordType.True */) {
|
100
99
|
return true;
|
101
100
|
}
|
102
|
-
else if (node.constType === 15 /* KeywordType.False */) {
|
101
|
+
else if (node.d.constType === 15 /* KeywordType.False */) {
|
103
102
|
return false;
|
104
103
|
}
|
105
104
|
}
|
106
105
|
else if (node.nodeType === 38 /* ParseNodeType.Name */) {
|
107
|
-
if (node.value === 'TYPE_CHECKING') {
|
106
|
+
if (node.d.value === 'TYPE_CHECKING') {
|
108
107
|
return true;
|
109
108
|
}
|
110
|
-
const constant = definedConstants.get(node.value);
|
109
|
+
const constant = definedConstants.get(node.d.value);
|
111
110
|
if (constant !== undefined) {
|
112
111
|
return !!constant;
|
113
112
|
}
|
114
113
|
}
|
115
114
|
else if (node.nodeType === 35 /* ParseNodeType.MemberAccess */) {
|
116
115
|
if (typingImportAliases &&
|
117
|
-
node.
|
118
|
-
node.
|
119
|
-
typingImportAliases.some((alias) => alias === node.
|
116
|
+
node.d.member.d.value === 'TYPE_CHECKING' &&
|
117
|
+
node.d.leftExpr.nodeType === 38 /* ParseNodeType.Name */ &&
|
118
|
+
typingImportAliases.some((alias) => alias === node.d.leftExpr.d.value)) {
|
120
119
|
return true;
|
121
120
|
}
|
122
|
-
const constant = definedConstants.get(node.
|
121
|
+
const constant = definedConstants.get(node.d.member.d.value);
|
123
122
|
if (constant !== undefined) {
|
124
123
|
return !!constant;
|
125
124
|
}
|
@@ -132,7 +131,7 @@ exports.evaluateStaticBoolExpression = evaluateStaticBoolExpression;
|
|
132
131
|
// (like "None").
|
133
132
|
function evaluateStaticBoolLikeExpression(node, execEnv, definedConstants, typingImportAliases, sysImportAliases) {
|
134
133
|
if (node.nodeType === 14 /* ParseNodeType.Constant */) {
|
135
|
-
if (node.constType === 26 /* KeywordType.None */) {
|
134
|
+
if (node.d.constType === 26 /* KeywordType.None */) {
|
136
135
|
return false;
|
137
136
|
}
|
138
137
|
}
|
@@ -140,46 +139,46 @@ function evaluateStaticBoolLikeExpression(node, execEnv, definedConstants, typin
|
|
140
139
|
}
|
141
140
|
exports.evaluateStaticBoolLikeExpression = evaluateStaticBoolLikeExpression;
|
142
141
|
function _convertTupleToVersion(node) {
|
143
|
-
if (node.
|
144
|
-
if (node.
|
145
|
-
!node.
|
146
|
-
node.
|
147
|
-
!node.
|
148
|
-
const majorNode = node.
|
149
|
-
const minorNode = node.
|
150
|
-
if (typeof majorNode.value !== 'number' || typeof minorNode.value !== 'number') {
|
142
|
+
if (node.d.items.length >= 2) {
|
143
|
+
if (node.d.items[0].nodeType === 40 /* ParseNodeType.Number */ &&
|
144
|
+
!node.d.items[0].d.isImaginary &&
|
145
|
+
node.d.items[1].nodeType === 40 /* ParseNodeType.Number */ &&
|
146
|
+
!node.d.items[1].d.isImaginary) {
|
147
|
+
const majorNode = node.d.items[0];
|
148
|
+
const minorNode = node.d.items[1];
|
149
|
+
if (typeof majorNode.d.value !== 'number' || typeof minorNode.d.value !== 'number') {
|
151
150
|
return undefined;
|
152
151
|
}
|
153
|
-
const major = majorNode.value;
|
154
|
-
const minor = minorNode.value;
|
152
|
+
const major = majorNode.d.value;
|
153
|
+
const minor = minorNode.d.value;
|
155
154
|
let micro;
|
156
|
-
if (node.
|
157
|
-
node.
|
158
|
-
!node.
|
159
|
-
typeof node.
|
160
|
-
micro = node.
|
155
|
+
if (node.d.items.length >= 3 &&
|
156
|
+
node.d.items[2].nodeType === 40 /* ParseNodeType.Number */ &&
|
157
|
+
!node.d.items[2].d.isImaginary &&
|
158
|
+
typeof node.d.items[2].d.value === 'number') {
|
159
|
+
micro = node.d.items[2].d.value;
|
161
160
|
}
|
162
161
|
let releaseLevel;
|
163
|
-
if (node.
|
164
|
-
node.
|
165
|
-
node.
|
166
|
-
node.
|
167
|
-
releaseLevel = node.
|
162
|
+
if (node.d.items.length >= 4 &&
|
163
|
+
node.d.items[3].nodeType === 48 /* ParseNodeType.StringList */ &&
|
164
|
+
node.d.items[3].d.strings.length === 1 &&
|
165
|
+
node.d.items[3].d.strings[0].nodeType === 49 /* ParseNodeType.String */) {
|
166
|
+
releaseLevel = node.d.items[3].d.strings[0].d.value;
|
168
167
|
}
|
169
168
|
let serial;
|
170
|
-
if (node.
|
171
|
-
node.
|
172
|
-
!node.
|
173
|
-
typeof node.
|
174
|
-
serial = node.
|
169
|
+
if (node.d.items.length >= 5 &&
|
170
|
+
node.d.items[4].nodeType === 40 /* ParseNodeType.Number */ &&
|
171
|
+
!node.d.items[4].d.isImaginary &&
|
172
|
+
typeof node.d.items[4].d.value === 'number') {
|
173
|
+
serial = node.d.items[4].d.value;
|
175
174
|
}
|
176
175
|
return new pythonVersion_1.PythonVersion(major, minor, micro, releaseLevel, serial);
|
177
176
|
}
|
178
177
|
}
|
179
|
-
else if (node.
|
180
|
-
const major = node.
|
181
|
-
if (typeof major.value === 'number') {
|
182
|
-
return new pythonVersion_1.PythonVersion(major.value, 0);
|
178
|
+
else if (node.d.items.length === 1) {
|
179
|
+
const major = node.d.items[0];
|
180
|
+
if (typeof major.d.value === 'number') {
|
181
|
+
return new pythonVersion_1.PythonVersion(major.d.value, 0);
|
183
182
|
}
|
184
183
|
}
|
185
184
|
return undefined;
|
@@ -220,8 +219,8 @@ function _evaluateStringBinaryOperation(operatorType, leftValue, rightValue) {
|
|
220
219
|
}
|
221
220
|
function _isSysVersionInfoExpression(node, sysImportAliases = ['sys']) {
|
222
221
|
if (node.nodeType === 35 /* ParseNodeType.MemberAccess */) {
|
223
|
-
if (node.
|
224
|
-
if (sysImportAliases.some((alias) => alias === node.
|
222
|
+
if (node.d.leftExpr.nodeType === 38 /* ParseNodeType.Name */ && node.d.member.d.value === 'version_info') {
|
223
|
+
if (sysImportAliases.some((alias) => alias === node.d.leftExpr.d.value)) {
|
225
224
|
return true;
|
226
225
|
}
|
227
226
|
}
|
@@ -230,8 +229,8 @@ function _isSysVersionInfoExpression(node, sysImportAliases = ['sys']) {
|
|
230
229
|
}
|
231
230
|
function _isSysPlatformInfoExpression(node, sysImportAliases = ['sys']) {
|
232
231
|
if (node.nodeType === 35 /* ParseNodeType.MemberAccess */) {
|
233
|
-
if (node.
|
234
|
-
if (sysImportAliases.some((alias) => alias === node.
|
232
|
+
if (node.d.leftExpr.nodeType === 38 /* ParseNodeType.Name */ && node.d.member.d.value === 'platform') {
|
233
|
+
if (sysImportAliases.some((alias) => alias === node.d.leftExpr.d.value)) {
|
235
234
|
return true;
|
236
235
|
}
|
237
236
|
}
|
@@ -240,9 +239,9 @@ function _isSysPlatformInfoExpression(node, sysImportAliases = ['sys']) {
|
|
240
239
|
}
|
241
240
|
function _isOsNameInfoExpression(node) {
|
242
241
|
if (node.nodeType === 35 /* ParseNodeType.MemberAccess */) {
|
243
|
-
if (node.
|
244
|
-
node.
|
245
|
-
node.
|
242
|
+
if (node.d.leftExpr.nodeType === 38 /* ParseNodeType.Name */ &&
|
243
|
+
node.d.leftExpr.d.value === 'os' &&
|
244
|
+
node.d.member.d.value === 'name') {
|
246
245
|
return true;
|
247
246
|
}
|
248
247
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"staticExpressions.js","sourceRoot":"","sources":["../../../../../src/analyzer/staticExpressions.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"staticExpressions.js","sourceRoot":"","sources":["../../../../../src/analyzer/staticExpressions.ts"],"names":[],"mappings":"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"}
|
@@ -48,7 +48,7 @@ class TestWalker extends parseTreeWalker_1.ParseTreeWalker {
|
|
48
48
|
case 3 /* ParseNodeType.Assignment */:
|
49
49
|
// There are a few exceptions we need to deal with here. Comment
|
50
50
|
// annotations can occur outside of an assignment node's range.
|
51
|
-
if (child === node.
|
51
|
+
if (child === node.d.annotationComment) {
|
52
52
|
skipCheck = true;
|
53
53
|
}
|
54
54
|
// Portions of chained assignments can occur outside of an
|
@@ -58,7 +58,7 @@ class TestWalker extends parseTreeWalker_1.ParseTreeWalker {
|
|
58
58
|
}
|
59
59
|
break;
|
60
60
|
case 48 /* ParseNodeType.StringList */:
|
61
|
-
if (child === node.
|
61
|
+
if (child === node.d.annotation) {
|
62
62
|
skipCheck = true;
|
63
63
|
}
|
64
64
|
break;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"testWalker.js","sourceRoot":"","sources":["../../../../../src/analyzer/testWalker.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;AAEH,iEAA8D;AAC9D,2CAAuC;AACvC,mDAAgD;AAEhD,qDAAiE;AAGjE,MAAa,UAAW,SAAQ,iCAAe;IAC3C;QACI,KAAK,EAAE,CAAC;IACZ,CAAC;IAEQ,SAAS,CAAC,IAAe;QAC9B,MAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC7C,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAExC,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,4DAA4D;IACpD,uBAAuB,CAAC,IAAe,EAAE,QAAwB;QACrE,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACvB,IAAI,KAAK,EAAE;gBACP,IAAI,KAAK,CAAC,MAAM,KAAK,IAAI,EAAE;oBACvB,IAAA,YAAI,EACA,cAAc,KAAK,CAAC,QAAQ,YAAY,GAAG,qCAAqC,IAAI,CAAC,QAAQ,EAAE,CAClG,CAAC;iBACL;aACJ;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,eAAe;IACf,oDAAoD;IACpD,4CAA4C;IAC5C,+CAA+C;IACvC,kBAAkB,CAAC,IAAe,EAAE,QAAwB;QAChE,IAAI,QAA+B,CAAC;QAEpC,MAAM,SAAS,GAAG,IAAA,8CAA6B,EAAC,IAAI,CAAC,CAAC;QACtD,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACvB,IAAI,KAAK,EAAE;gBACP,IAAI,SAAS,GAAG,KAAK,CAAC;gBAEtB,IAAI,CAAC,SAAS,EAAE;oBACZ,QAAQ,IAAI,CAAC,QAAQ,EAAE;wBACnB;4BACI,gEAAgE;4BAChE,+DAA+D;4BAC/D,IAAI,KAAK,KAAK,IAAI,CAAC,
|
1
|
+
{"version":3,"file":"testWalker.js","sourceRoot":"","sources":["../../../../../src/analyzer/testWalker.ts"],"names":[],"mappings":"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"}
|
@@ -68,34 +68,34 @@ function createTracePrinter(roots) {
|
|
68
68
|
return '';
|
69
69
|
}
|
70
70
|
function printType(type) {
|
71
|
-
var _a, _b, _c, _d, _e;
|
71
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
|
72
72
|
if (type) {
|
73
73
|
switch (type.category) {
|
74
74
|
case 2 /* TypeCategory.Any */:
|
75
|
-
return `Any ${wrap((_a = type.
|
75
|
+
return `Any ${wrap((_b = (_a = type.props) === null || _a === void 0 ? void 0 : _a.typeAliasInfo) === null || _b === void 0 ? void 0 : _b.fullName)}`;
|
76
76
|
case 6 /* TypeCategory.Class */:
|
77
77
|
if (types_1.TypeBase.isInstantiable(type)) {
|
78
|
-
return `Class '${type.
|
78
|
+
return `Class '${type.shared.name}' (${type.shared.moduleName})`;
|
79
79
|
}
|
80
80
|
else {
|
81
|
-
return `Object '${type.
|
81
|
+
return `Object '${type.shared.name}' (${type.shared.moduleName})`;
|
82
82
|
}
|
83
83
|
case 4 /* TypeCategory.Function */:
|
84
|
-
return `Function '${type.
|
84
|
+
return `Function '${type.shared.name}' (${type.shared.moduleName})`;
|
85
85
|
case 7 /* TypeCategory.Module */:
|
86
|
-
return `Module '${type.moduleName}' (${type.moduleName})`;
|
86
|
+
return `Module '${type.priv.moduleName}' (${type.priv.moduleName})`;
|
87
87
|
case 3 /* TypeCategory.Never */:
|
88
|
-
return `Never ${wrap((
|
88
|
+
return `Never ${wrap((_d = (_c = type.props) === null || _c === void 0 ? void 0 : _c.typeAliasInfo) === null || _d === void 0 ? void 0 : _d.fullName)}`;
|
89
89
|
case 5 /* TypeCategory.OverloadedFunction */:
|
90
|
-
return `OverloadedFunction [${type.overloads.map((o) => wrap(printType(o), '"')).join(',')}]`;
|
90
|
+
return `OverloadedFunction [${type.priv.overloads.map((o) => wrap(printType(o), '"')).join(',')}]`;
|
91
91
|
case 9 /* TypeCategory.TypeVar */:
|
92
|
-
return `TypeVar '${type.
|
92
|
+
return `TypeVar '${type.shared.name}' ${wrap((_f = (_e = type.props) === null || _e === void 0 ? void 0 : _e.typeAliasInfo) === null || _f === void 0 ? void 0 : _f.fullName)}`;
|
93
93
|
case 0 /* TypeCategory.Unbound */:
|
94
|
-
return `Unbound ${wrap((
|
94
|
+
return `Unbound ${wrap((_h = (_g = type.props) === null || _g === void 0 ? void 0 : _g.typeAliasInfo) === null || _h === void 0 ? void 0 : _h.fullName)}`;
|
95
95
|
case 8 /* TypeCategory.Union */:
|
96
|
-
return `Union [${type.subtypes.map((o) => wrap(printType(o), '"')).join(',')}]`;
|
96
|
+
return `Union [${type.priv.subtypes.map((o) => wrap(printType(o), '"')).join(',')}]`;
|
97
97
|
case 1 /* TypeCategory.Unknown */:
|
98
|
-
return `Unknown ${wrap((
|
98
|
+
return `Unknown ${wrap((_k = (_j = type.props) === null || _j === void 0 ? void 0 : _j.typeAliasInfo) === null || _k === void 0 ? void 0 : _k.fullName)}`;
|
99
99
|
default:
|
100
100
|
(0, debug_1.assertNever)(type);
|
101
101
|
}
|
@@ -166,23 +166,23 @@ function createTracePrinter(roots) {
|
|
166
166
|
}
|
167
167
|
switch (node.nodeType) {
|
168
168
|
case 24 /* ParseNodeType.ImportAs */:
|
169
|
-
return `importAs '${printNode(node.module)}' ${wrap(node.alias ? printNode(node.alias) : '')} ${path}`;
|
169
|
+
return `importAs '${printNode(node.d.module)}' ${wrap(node.d.alias ? printNode(node.d.alias) : '')} ${path}`;
|
170
170
|
case 25 /* ParseNodeType.ImportFrom */:
|
171
|
-
return `importFrom [${node.imports.map((i) => wrap(printNode(i), '"')).join(',')}]`;
|
171
|
+
return `importFrom [${node.d.imports.map((i) => wrap(printNode(i), '"')).join(',')}]`;
|
172
172
|
case 26 /* ParseNodeType.ImportFromAs */:
|
173
|
-
return `ImportFromAs '${printNode(node.name)}' ${wrap(node.alias ? printNode(node.alias) : '')} ${path}`;
|
173
|
+
return `ImportFromAs '${printNode(node.d.name)}' ${wrap(node.d.alias ? printNode(node.d.alias) : '')} ${path}`;
|
174
174
|
case 36 /* ParseNodeType.Module */:
|
175
175
|
return `module ${path}`;
|
176
176
|
case 10 /* ParseNodeType.Class */:
|
177
|
-
return `class '${printNode(node.name)}' ${path}`;
|
177
|
+
return `class '${printNode(node.d.name)}' ${path}`;
|
178
178
|
case 31 /* ParseNodeType.Function */:
|
179
|
-
return `function '${printNode(node.name)}' ${path}`;
|
179
|
+
return `function '${printNode(node.d.name)}' ${path}`;
|
180
180
|
case 37 /* ParseNodeType.ModuleName */:
|
181
|
-
return `moduleName '${node.nameParts.map((n) => printNode(n)).join('.')}' ${path}`;
|
181
|
+
return `moduleName '${node.d.nameParts.map((n) => printNode(n)).join('.')}' ${path}`;
|
182
182
|
case 1 /* ParseNodeType.Argument */:
|
183
|
-
return `argument '${node.name ? printNode(node.name) : 'N/A'}' ${path}`;
|
183
|
+
return `argument '${node.d.name ? printNode(node.d.name) : 'N/A'}' ${path}`;
|
184
184
|
case 41 /* ParseNodeType.Parameter */:
|
185
|
-
return `parameter '${node.name ? printNode(node.name) : 'N/A'}' ${path}`;
|
185
|
+
return `parameter '${node.d.name ? printNode(node.d.name) : 'N/A'}' ${path}`;
|
186
186
|
default:
|
187
187
|
return `${ParseTreeUtils.printParseNodeType(node.nodeType)} ${path}`;
|
188
188
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"tracePrinter.js","sourceRoot":"","sources":["../../../../../src/analyzer/tracePrinter.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,yCAAoD;AACpD,2CAA8C;AAC9C,mDAAyD;AACzD,2DAAkE;AAClE,2CAAwC;AACxC,qDAAkF;AAElF,qEAAuD;AAEvD,iEAAmD;AACnD,qCAAkC;AAClC,mCAAuD;AASvD,SAAgB,kBAAkB,CAAC,KAAY;IAC3C,SAAS,IAAI,CAAC,KAAyB,EAAE,EAAE,GAAG,GAAG;QAC7C,OAAO,KAAK,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7C,CAAC;IAED,gEAAgE;IAChE,8BAA8B;IAC9B,mDAAmD;IACnD,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAEnE,MAAM,eAAe,GAAG,QAAQ,CAAC;IACjC,SAAS,qBAAqB,CAAC,eAA2D;QACtF,IAAI,eAAe,EAAE;YACjB,IAAI,SAAG,CAAC,EAAE,CAAC,eAAe,CAAC,EAAE;gBACzB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;oBACtB,IAAI,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;wBAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;wBACtD,OAAO,IAAA,8BAAkB,EAAC,OAAQ,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;qBACrE;iBACJ;gBAED,OAAO,eAAe,CAAC,mBAAmB,EAAE,CAAC;aAChD;iBAAM,IAAI,eAAe,CAAC,SAAS,EAAE;gBAClC,OAAO,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC9C;SACJ;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAED,SAAS,SAAS,CAAC,IAAsB;;QACrC,IAAI,IAAI,EAAE;YACN,QAAQ,IAAI,CAAC,QAAQ,EAAE;gBACnB;oBACI,OAAO,OAAO,IAAI,CAAC,MAAA,IAAI,CAAC,aAAa,0CAAE,QAAQ,CAAC,EAAE,CAAC;
|
1
|
+
{"version":3,"file":"tracePrinter.js","sourceRoot":"","sources":["../../../../../src/analyzer/tracePrinter.ts"],"names":[],"mappings":"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"}
|
@@ -45,17 +45,17 @@ const DefaultClassIteratorFlagsForFunctions = 4 /* MemberAccessFlags.SkipObjectB
|
|
45
45
|
64 /* MemberAccessFlags.DeclaredTypesOnly */;
|
46
46
|
function isInheritedFromBuiltin(type, classType) {
|
47
47
|
if (type.category === 5 /* TypeCategory.OverloadedFunction */) {
|
48
|
-
if (type.overloads.length === 0) {
|
48
|
+
if (type.priv.overloads.length === 0) {
|
49
49
|
return false;
|
50
50
|
}
|
51
|
-
type = type.overloads[0];
|
51
|
+
type = type.priv.overloads[0];
|
52
52
|
}
|
53
53
|
// Functions that are bound to a different type than where they
|
54
54
|
// were declared are inherited.
|
55
|
-
return (!!type.
|
56
|
-
types_1.ClassType.isBuiltIn(type.
|
57
|
-
!!type.boundToType &&
|
58
|
-
!types_1.ClassType.isBuiltIn(type.boundToType));
|
55
|
+
return (!!type.shared.methodClass &&
|
56
|
+
types_1.ClassType.isBuiltIn(type.shared.methodClass) &&
|
57
|
+
!!type.priv.boundToType &&
|
58
|
+
!types_1.ClassType.isBuiltIn(type.priv.boundToType));
|
59
59
|
}
|
60
60
|
function getFunctionDocStringInherited(type, resolvedDecl, sourceMapper, classType) {
|
61
61
|
let docString;
|
@@ -67,7 +67,7 @@ function getFunctionDocStringInherited(type, resolvedDecl, sourceMapper, classTy
|
|
67
67
|
}
|
68
68
|
// Search mro
|
69
69
|
if (!docString && classType) {
|
70
|
-
const funcName = type.
|
70
|
+
const funcName = type.shared.name;
|
71
71
|
const memberIterator = (0, typeUtils_1.getClassMemberIterator)(classType, funcName, DefaultClassIteratorFlagsForFunctions);
|
72
72
|
for (const classMember of memberIterator) {
|
73
73
|
const decls = classMember.symbol.getDeclarations();
|
@@ -82,7 +82,7 @@ function getFunctionDocStringInherited(type, resolvedDecl, sourceMapper, classTy
|
|
82
82
|
}
|
83
83
|
}
|
84
84
|
}
|
85
|
-
return docString || type.
|
85
|
+
return docString || type.shared.docString;
|
86
86
|
}
|
87
87
|
exports.getFunctionDocStringInherited = getFunctionDocStringInherited;
|
88
88
|
function getOverloadedFunctionDocStringsInherited(type, resolvedDecls, sourceMapper, evaluator, classType) {
|
@@ -100,8 +100,8 @@ function getOverloadedFunctionDocStringsInherited(type, resolvedDecls, sourceMap
|
|
100
100
|
}
|
101
101
|
}
|
102
102
|
// Search mro
|
103
|
-
if (classType && type.overloads.length > 0) {
|
104
|
-
const funcName = type.overloads[0].
|
103
|
+
if (classType && type.priv.overloads.length > 0) {
|
104
|
+
const funcName = type.priv.overloads[0].shared.name;
|
105
105
|
const memberIterator = (0, typeUtils_1.getClassMemberIterator)(classType, funcName, DefaultClassIteratorFlagsForFunctions);
|
106
106
|
for (const classMember of memberIterator) {
|
107
107
|
const inheritedDecl = classMember.symbol.getDeclarations().slice(-1)[0];
|
@@ -118,7 +118,7 @@ function getOverloadedFunctionDocStringsInherited(type, resolvedDecls, sourceMap
|
|
118
118
|
}
|
119
119
|
exports.getOverloadedFunctionDocStringsInherited = getOverloadedFunctionDocStringsInherited;
|
120
120
|
function getPropertyDocStringInherited(decl, sourceMapper, evaluator) {
|
121
|
-
const enclosingClass = ParseTreeUtils.getEnclosingClass(decl.node.name, /* stopAtFunction */ false);
|
121
|
+
const enclosingClass = ParseTreeUtils.getEnclosingClass(decl.node.d.name, /* stopAtFunction */ false);
|
122
122
|
const classResults = enclosingClass ? evaluator.getTypeOfClass(enclosingClass) : undefined;
|
123
123
|
if (classResults) {
|
124
124
|
return _getPropertyDocStringInherited(decl, sourceMapper, evaluator, classResults.classType);
|
@@ -156,8 +156,8 @@ function isBuiltInModule(uri) {
|
|
156
156
|
exports.isBuiltInModule = isBuiltInModule;
|
157
157
|
function getModuleDocStringFromModuleNodes(modules) {
|
158
158
|
for (const module of modules) {
|
159
|
-
if (module.statements) {
|
160
|
-
const docString = ParseTreeUtils.getDocString(module.statements);
|
159
|
+
if (module.d.statements) {
|
160
|
+
const docString = ParseTreeUtils.getDocString(module.d.statements);
|
161
161
|
if (docString) {
|
162
162
|
return docString;
|
163
163
|
}
|
@@ -179,16 +179,16 @@ function getModuleDocStringFromUris(uris, sourceMapper) {
|
|
179
179
|
exports.getModuleDocStringFromUris = getModuleDocStringFromUris;
|
180
180
|
function getModuleDocString(type, resolvedDecl, sourceMapper) {
|
181
181
|
var _a;
|
182
|
-
let docString = type.docString;
|
182
|
+
let docString = type.priv.docString;
|
183
183
|
if (!docString) {
|
184
|
-
const uri = (_a = resolvedDecl === null || resolvedDecl === void 0 ? void 0 : resolvedDecl.uri) !== null && _a !== void 0 ? _a : type.fileUri;
|
184
|
+
const uri = (_a = resolvedDecl === null || resolvedDecl === void 0 ? void 0 : resolvedDecl.uri) !== null && _a !== void 0 ? _a : type.priv.fileUri;
|
185
185
|
docString = getModuleDocStringFromUris([uri], sourceMapper);
|
186
186
|
}
|
187
187
|
return docString;
|
188
188
|
}
|
189
189
|
exports.getModuleDocString = getModuleDocString;
|
190
190
|
function getClassDocString(classType, resolvedDecl, sourceMapper) {
|
191
|
-
let docString = classType.
|
191
|
+
let docString = classType.shared.docString;
|
192
192
|
if (!docString && resolvedDecl && _isAnyClassDeclaration(resolvedDecl)) {
|
193
193
|
docString = (0, declaration_1.isClassDeclaration)(resolvedDecl) ? _getFunctionOrClassDeclsDocString([resolvedDecl]) : undefined;
|
194
194
|
if (!docString && resolvedDecl && (0, sourceMapper_1.isStubFile)(resolvedDecl.uri)) {
|
@@ -216,7 +216,7 @@ function getClassDocString(classType, resolvedDecl, sourceMapper) {
|
|
216
216
|
exports.getClassDocString = getClassDocString;
|
217
217
|
function getFunctionOrClassDeclDocString(decl) {
|
218
218
|
var _a, _b, _c;
|
219
|
-
return ParseTreeUtils.getDocString((_c = (_b = (_a = decl.node) === null || _a === void 0 ? void 0 : _a.suite) === null || _b === void 0 ? void 0 : _b.statements) !== null && _c !== void 0 ? _c : []);
|
219
|
+
return ParseTreeUtils.getDocString((_c = (_b = (_a = decl.node) === null || _a === void 0 ? void 0 : _a.d.suite) === null || _b === void 0 ? void 0 : _b.d.statements) !== null && _c !== void 0 ? _c : []);
|
220
220
|
}
|
221
221
|
exports.getFunctionOrClassDeclDocString = getFunctionOrClassDeclDocString;
|
222
222
|
function getVariableDocString(decl, sourceMapper) {
|
@@ -236,10 +236,10 @@ function _getOverloadedFunctionDocStrings(type, resolvedDecl, sourceMapper) {
|
|
236
236
|
return undefined;
|
237
237
|
}
|
238
238
|
const docStrings = [];
|
239
|
-
if (type.overloads.some((o) => o.
|
240
|
-
type.overloads.forEach((overload) => {
|
241
|
-
if (overload.
|
242
|
-
docStrings.push(overload.
|
239
|
+
if (type.priv.overloads.some((o) => o.shared.docString)) {
|
240
|
+
type.priv.overloads.forEach((overload) => {
|
241
|
+
if (overload.shared.docString) {
|
242
|
+
docStrings.push(overload.shared.docString);
|
243
243
|
}
|
244
244
|
});
|
245
245
|
}
|
@@ -261,7 +261,7 @@ function _getPropertyDocStringInherited(decl, sourceMapper, evaluator, classType
|
|
261
261
|
if (!declaredType || !(0, typeUtils_1.isMaybeDescriptorInstance)(declaredType)) {
|
262
262
|
return;
|
263
263
|
}
|
264
|
-
const fieldName = decl.node.nodeType === 31 /* ParseNodeType.Function */ ? decl.node.name.value : undefined;
|
264
|
+
const fieldName = decl.node.nodeType === 31 /* ParseNodeType.Function */ ? decl.node.d.name.d.value : undefined;
|
265
265
|
if (!fieldName) {
|
266
266
|
return;
|
267
267
|
}
|
@@ -294,12 +294,12 @@ function _getFunctionDocString(type, resolvedDecl, sourceMapper) {
|
|
294
294
|
if (!(0, types_1.isFunction)(type)) {
|
295
295
|
return undefined;
|
296
296
|
}
|
297
|
-
let docString = type.
|
297
|
+
let docString = type.shared.docString;
|
298
298
|
if (!docString && resolvedDecl) {
|
299
299
|
docString = _getFunctionDocStringFromDeclaration(resolvedDecl, sourceMapper);
|
300
300
|
}
|
301
|
-
if (!docString && type.
|
302
|
-
docString = _getFunctionDocStringFromDeclaration(type.
|
301
|
+
if (!docString && type.shared.declaration) {
|
302
|
+
docString = _getFunctionDocStringFromDeclaration(type.shared.declaration, sourceMapper);
|
303
303
|
}
|
304
304
|
return docString;
|
305
305
|
}
|