@zzzen/pyright-internal 1.2.0-dev.20231022 → 1.2.0-dev.20231105
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/analyzerFileInfo.d.ts +1 -0
- package/dist/analyzer/analyzerFileInfo.js.map +1 -1
- package/dist/analyzer/backgroundAnalysisProgram.d.ts +3 -4
- package/dist/analyzer/backgroundAnalysisProgram.js +6 -3
- package/dist/analyzer/backgroundAnalysisProgram.js.map +1 -1
- package/dist/analyzer/binder.js +1 -6
- package/dist/analyzer/binder.js.map +1 -1
- package/dist/analyzer/cacheManager.d.ts +3 -0
- package/dist/analyzer/cacheManager.js +11 -0
- package/dist/analyzer/cacheManager.js.map +1 -1
- package/dist/analyzer/checker.js +57 -50
- package/dist/analyzer/checker.js.map +1 -1
- package/dist/analyzer/codeFlowEngine.d.ts +0 -1
- package/dist/analyzer/codeFlowEngine.js +5 -5
- package/dist/analyzer/codeFlowEngine.js.map +1 -1
- package/dist/analyzer/codeFlowUtils.js +4 -2
- package/dist/analyzer/codeFlowUtils.js.map +1 -1
- package/dist/analyzer/constraintSolver.js +11 -9
- package/dist/analyzer/constraintSolver.js.map +1 -1
- package/dist/analyzer/constructorTransform.js +1 -1
- package/dist/analyzer/constructorTransform.js.map +1 -1
- package/dist/analyzer/constructors.js +41 -36
- package/dist/analyzer/constructors.js.map +1 -1
- package/dist/analyzer/dataClasses.js +3 -3
- package/dist/analyzer/dataClasses.js.map +1 -1
- package/dist/analyzer/enums.d.ts +2 -5
- package/dist/analyzer/enums.js +4 -2
- package/dist/analyzer/enums.js.map +1 -1
- package/dist/analyzer/functionTransform.js +1 -1
- package/dist/analyzer/functionTransform.js.map +1 -1
- package/dist/analyzer/importResolver.d.ts +6 -2
- package/dist/analyzer/importResolver.js +51 -8
- package/dist/analyzer/importResolver.js.map +1 -1
- package/dist/analyzer/namedTuples.js +3 -2
- package/dist/analyzer/namedTuples.js.map +1 -1
- package/dist/analyzer/operations.js +22 -25
- package/dist/analyzer/operations.js.map +1 -1
- package/dist/analyzer/packageTypeVerifier.js +19 -21
- package/dist/analyzer/packageTypeVerifier.js.map +1 -1
- package/dist/analyzer/parseTreeUtils.d.ts +1 -0
- package/dist/analyzer/parseTreeUtils.js +11 -2
- package/dist/analyzer/parseTreeUtils.js.map +1 -1
- package/dist/analyzer/patternMatching.js +5 -5
- package/dist/analyzer/patternMatching.js.map +1 -1
- package/dist/analyzer/program.d.ts +3 -4
- package/dist/analyzer/program.js +22 -27
- package/dist/analyzer/program.js.map +1 -1
- package/dist/analyzer/properties.js +5 -5
- package/dist/analyzer/properties.js.map +1 -1
- package/dist/analyzer/protocols.js +24 -6
- package/dist/analyzer/protocols.js.map +1 -1
- package/dist/analyzer/service.d.ts +1 -2
- package/dist/analyzer/service.js +16 -6
- package/dist/analyzer/service.js.map +1 -1
- package/dist/analyzer/sourceFile.d.ts +1 -1
- package/dist/analyzer/sourceFile.js +3 -9
- package/dist/analyzer/sourceFile.js.map +1 -1
- package/dist/analyzer/sourceFileInfo.d.ts +0 -4
- package/dist/analyzer/sourceFileInfo.js +0 -9
- package/dist/analyzer/sourceFileInfo.js.map +1 -1
- package/dist/analyzer/tracePrinter.js +11 -13
- package/dist/analyzer/tracePrinter.js.map +1 -1
- package/dist/analyzer/typeDocStringUtils.js +3 -3
- package/dist/analyzer/typeDocStringUtils.js.map +1 -1
- package/dist/analyzer/typeEvaluator.js +867 -889
- package/dist/analyzer/typeEvaluator.js.map +1 -1
- package/dist/analyzer/typeEvaluatorTypes.d.ts +13 -25
- package/dist/analyzer/typeEvaluatorTypes.js +4 -36
- package/dist/analyzer/typeEvaluatorTypes.js.map +1 -1
- package/dist/analyzer/typeGuards.js +27 -23
- package/dist/analyzer/typeGuards.js.map +1 -1
- package/dist/analyzer/typePrinter.js +19 -18
- package/dist/analyzer/typePrinter.js.map +1 -1
- package/dist/analyzer/typeUtils.d.ts +17 -8
- package/dist/analyzer/typeUtils.js +146 -93
- package/dist/analyzer/typeUtils.js.map +1 -1
- package/dist/analyzer/typeVarContext.js +6 -7
- package/dist/analyzer/typeVarContext.js.map +1 -1
- package/dist/analyzer/typeWalker.d.ts +1 -2
- package/dist/analyzer/typeWalker.js +7 -13
- package/dist/analyzer/typeWalker.js.map +1 -1
- package/dist/analyzer/typedDicts.js +17 -17
- package/dist/analyzer/typedDicts.js.map +1 -1
- package/dist/analyzer/types.d.ts +10 -22
- package/dist/analyzer/types.js +48 -86
- package/dist/analyzer/types.js.map +1 -1
- package/dist/backgroundAnalysisBase.d.ts +3 -1
- package/dist/backgroundAnalysisBase.js +27 -0
- package/dist/backgroundAnalysisBase.js.map +1 -1
- package/dist/commands/dumpFileDebugInfoCommand.js +7 -9
- package/dist/commands/dumpFileDebugInfoCommand.js.map +1 -1
- package/dist/common/commandLineOptions.d.ts +2 -1
- package/dist/common/commandLineOptions.js +1 -1
- package/dist/common/commandLineOptions.js.map +1 -1
- package/dist/common/configOptions.d.ts +1 -1
- package/dist/common/configOptions.js +22 -24
- package/dist/common/configOptions.js.map +1 -1
- package/dist/common/fullAccessHost.js +16 -1
- package/dist/common/fullAccessHost.js.map +1 -1
- package/dist/common/pathUtils.d.ts +2 -2
- package/dist/common/pathUtils.js +18 -11
- package/dist/common/pathUtils.js.map +1 -1
- package/dist/common/realFileSystem.js +15 -14
- package/dist/common/realFileSystem.js.map +1 -1
- package/dist/common/serviceProviderExtensions.d.ts +2 -0
- package/dist/common/serviceProviderExtensions.js +5 -0
- package/dist/common/serviceProviderExtensions.js.map +1 -1
- package/dist/languageServerBase.d.ts +4 -6
- package/dist/languageServerBase.js +16 -19
- package/dist/languageServerBase.js.map +1 -1
- package/dist/languageService/analyzerServiceExecutor.js +1 -1
- package/dist/languageService/analyzerServiceExecutor.js.map +1 -1
- package/dist/languageService/callHierarchyProvider.js +3 -3
- package/dist/languageService/callHierarchyProvider.js.map +1 -1
- package/dist/languageService/completionProvider.js +8 -8
- package/dist/languageService/completionProvider.js.map +1 -1
- package/dist/languageService/completionProviderUtils.js +1 -1
- package/dist/languageService/definitionProvider.js +1 -1
- package/dist/languageService/documentSymbolCollector.d.ts +7 -0
- package/dist/languageService/documentSymbolCollector.js +29 -4
- package/dist/languageService/documentSymbolCollector.js.map +1 -1
- package/dist/languageService/hoverProvider.js +1 -1
- package/dist/languageService/signatureHelpProvider.js +0 -14
- package/dist/languageService/signatureHelpProvider.js.map +1 -1
- package/dist/languageService/tooltipUtils.js +4 -4
- package/dist/languageService/tooltipUtils.js.map +1 -1
- package/dist/localization/localize.d.ts +12 -0
- package/dist/localization/localize.js +6 -0
- package/dist/localization/localize.js.map +1 -1
- package/dist/localization/package.nls.cs.json +1 -0
- package/dist/localization/package.nls.de.json +1 -0
- package/dist/localization/package.nls.en-us.json +4 -0
- package/dist/localization/package.nls.es.json +1 -0
- package/dist/localization/package.nls.fr.json +1 -0
- package/dist/localization/package.nls.it.json +1 -0
- package/dist/localization/package.nls.ja.json +1 -0
- package/dist/localization/package.nls.ko.json +1 -0
- package/dist/localization/package.nls.pl.json +1 -0
- package/dist/localization/package.nls.pt-br.json +1 -0
- package/dist/localization/package.nls.qps-ploc.json +1 -0
- package/dist/localization/package.nls.ru.json +1 -0
- package/dist/localization/package.nls.tr.json +1 -0
- package/dist/localization/package.nls.zh-cn.json +1 -0
- package/dist/localization/package.nls.zh-tw.json +1 -0
- package/dist/pyright.js +3 -6
- package/dist/pyright.js.map +1 -1
- package/dist/server.d.ts +1 -0
- package/dist/server.js +12 -1
- package/dist/server.js.map +1 -1
- package/dist/tests/fourslash/completions.importInterimFile.fourslash.disabled.js +46 -0
- package/dist/tests/fourslash/completions.importInterimFile.fourslash.disabled.js.map +1 -0
- package/dist/tests/fourslash/completions.wildcardimports.fourslash.js +4 -0
- package/dist/tests/fourslash/completions.wildcardimports.fourslash.js.map +1 -1
- package/dist/tests/fourslash/findDefinitions.classes.fourslash.js +4 -0
- package/dist/tests/fourslash/findDefinitions.classes.fourslash.js.map +1 -1
- package/dist/tests/fourslash/findDefinitions.fields.fourslash.js +4 -0
- package/dist/tests/fourslash/findDefinitions.fields.fourslash.js.map +1 -1
- package/dist/tests/fourslash/findDefinitions.functions.fourslash.js +4 -0
- package/dist/tests/fourslash/findDefinitions.functions.fourslash.js.map +1 -1
- package/dist/tests/fourslash/findDefinitions.methods.fourslash.js +4 -0
- package/dist/tests/fourslash/findDefinitions.methods.fourslash.js.map +1 -1
- package/dist/tests/fourslash/findDefinitions.parameters.fourslash.js +4 -0
- package/dist/tests/fourslash/findDefinitions.parameters.fourslash.js.map +1 -1
- package/dist/tests/fourslash/findDefinitions.variables.fourslash.js +4 -0
- package/dist/tests/fourslash/findDefinitions.variables.fourslash.js.map +1 -1
- package/dist/tests/fourslash/findDefinitions.wildcardimports.fourslash.js +4 -0
- package/dist/tests/fourslash/findDefinitions.wildcardimports.fourslash.js.map +1 -1
- package/dist/tests/fourslash/findTypeDefinitions.classes.fourslash.js +4 -0
- package/dist/tests/fourslash/findTypeDefinitions.classes.fourslash.js.map +1 -1
- package/dist/tests/fourslash/fourslash.d.ts +3 -0
- package/dist/tests/fourslash/hover.class.docString.fourslash.js +4 -0
- package/dist/tests/fourslash/hover.class.docString.fourslash.js.map +1 -1
- package/dist/tests/fourslash/hover.docFromSrc.fourslash.js +4 -0
- package/dist/tests/fourslash/hover.docFromSrc.fourslash.js.map +1 -1
- package/dist/tests/fourslash/hover.docFromSrc.stringFormat.fourslash.d.ts +1 -0
- package/dist/tests/fourslash/{hover.docFromScr.stringFormat.fourslash.js → hover.docFromSrc.stringFormat.fourslash.js} +1 -1
- package/dist/tests/fourslash/{hover.docFromScr.stringFormat.fourslash.js.map → hover.docFromSrc.stringFormat.fourslash.js.map} +1 -1
- package/dist/tests/fourslash/hover.unpackedTypedDict.key.fourslash.d.ts +1 -0
- package/dist/tests/fourslash/hover.unpackedTypedDict.key.fourslash.js +24 -0
- package/dist/tests/fourslash/hover.unpackedTypedDict.key.fourslash.js.map +1 -0
- package/dist/tests/fourslash/hover.wildcardimports.fourslash.js +4 -0
- package/dist/tests/fourslash/hover.wildcardimports.fourslash.js.map +1 -1
- package/dist/tests/fourslash/signature.complicated.fourslash.js +6 -6
- package/dist/tests/fourslash/signature.complicated.fourslash.js.map +1 -1
- package/dist/tests/fourslash/signature.docstrings.wildcardimports.fourslash.js +4 -0
- package/dist/tests/fourslash/signature.docstrings.wildcardimports.fourslash.js.map +1 -1
- package/dist/tests/harness/fourslash/testLanguageService.js +2 -2
- package/dist/tests/harness/fourslash/testLanguageService.js.map +1 -1
- package/dist/tests/harness/fourslash/testState.d.ts +6 -4
- package/dist/tests/harness/fourslash/testState.js +24 -9
- package/dist/tests/harness/fourslash/testState.js.map +1 -1
- package/dist/tests/harness/vfs/filesystem.js +1 -1
- package/dist/tests/harness/vfs/filesystem.js.map +1 -1
- package/dist/tests/ipythonMode.test.js +0 -31
- package/dist/tests/ipythonMode.test.js.map +1 -1
- package/dist/tests/logger.test.js +0 -1
- package/dist/tests/logger.test.js.map +1 -1
- package/dist/tests/pathUtils.test.js +47 -0
- package/dist/tests/pathUtils.test.js.map +1 -1
- package/dist/tests/testUtils.js +2 -1
- package/dist/tests/testUtils.js.map +1 -1
- package/dist/tests/typeEvaluator1.test.js +3 -3
- package/dist/tests/typeEvaluator2.test.js +2 -2
- package/dist/tests/typeEvaluator3.test.js +7 -1
- package/dist/tests/typeEvaluator3.test.js.map +1 -1
- package/dist/tests/typeEvaluator4.test.js +5 -1
- package/dist/tests/typeEvaluator4.test.js.map +1 -1
- package/dist/tests/typeEvaluator5.test.js +1 -1
- package/dist/tests/typePrinter.test.js +12 -16
- package/dist/tests/typePrinter.test.js.map +1 -1
- package/dist/tests/zipfs.test.js +2 -0
- package/dist/tests/zipfs.test.js.map +1 -1
- package/package.json +1 -1
- /package/dist/tests/fourslash/{hover.docFromScr.stringFormat.fourslash.d.ts → completions.importInterimFile.fourslash.disabled.d.ts} +0 -0
@@ -28,7 +28,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
28
28
|
return result;
|
29
29
|
};
|
30
30
|
Object.defineProperty(exports, "__esModule", { value: true });
|
31
|
-
exports.addDeclarationIfUnique = exports.getDeclarationsForNameNode = exports.DocumentSymbolCollector = void 0;
|
31
|
+
exports.addDeclarationIfUnique = exports.getDeclarationsForNameNode = exports.DocumentSymbolCollector = exports.AliasResolver = void 0;
|
32
32
|
const AnalyzerNodeInfo = __importStar(require("../analyzer/analyzerNodeInfo"));
|
33
33
|
const declaration_1 = require("../analyzer/declaration");
|
34
34
|
const declarationUtils_1 = require("../analyzer/declarationUtils");
|
@@ -44,6 +44,30 @@ const debug_1 = require("../common/debug");
|
|
44
44
|
const extensibility_1 = require("../common/extensibility");
|
45
45
|
const serviceProviderExtensions_1 = require("../common/serviceProviderExtensions");
|
46
46
|
const core_1 = require("../common/core");
|
47
|
+
// 99% of time, `find all references` is looking for a symbol imported from the other file to this file.
|
48
|
+
// By caching the result of `resolveAlias` we only need to resolve it once per a file.
|
49
|
+
const withLocalNamesCacheIndex = 0;
|
50
|
+
const withoutLocalNamesCacheIndex = 1;
|
51
|
+
class AliasResolver {
|
52
|
+
constructor(_evaluator) {
|
53
|
+
this._evaluator = _evaluator;
|
54
|
+
this._caches = [undefined, undefined];
|
55
|
+
// Empty
|
56
|
+
}
|
57
|
+
resolve(declaration, resolveLocalNames) {
|
58
|
+
const index = resolveLocalNames ? withLocalNamesCacheIndex : withoutLocalNamesCacheIndex;
|
59
|
+
if (this._caches[index] && this._caches[index].original === declaration) {
|
60
|
+
return this._caches[index].resolved;
|
61
|
+
}
|
62
|
+
const resolved = this._evaluator.resolveAliasDeclaration(declaration, resolveLocalNames, {
|
63
|
+
allowExternallyHiddenAccess: true,
|
64
|
+
skipFileNeededCheck: true,
|
65
|
+
});
|
66
|
+
this._caches[index] = { original: declaration, resolved };
|
67
|
+
return resolved;
|
68
|
+
}
|
69
|
+
}
|
70
|
+
exports.AliasResolver = AliasResolver;
|
47
71
|
// This walker looks for symbols that are semantically equivalent
|
48
72
|
// to the requested symbol.
|
49
73
|
class DocumentSymbolCollector extends parseTreeWalker_1.ParseTreeWalker {
|
@@ -57,6 +81,7 @@ class DocumentSymbolCollector extends parseTreeWalker_1.ParseTreeWalker {
|
|
57
81
|
this._dunderAllNameNodes = new Set();
|
58
82
|
this._symbolNames = new Set();
|
59
83
|
this._declarations = [];
|
84
|
+
this._aliasResolver = new AliasResolver(this._program.evaluator);
|
60
85
|
// Start with the symbols passed in
|
61
86
|
symbolNames.forEach((s) => this._symbolNames.add(s));
|
62
87
|
this._declarations.push(...declarations);
|
@@ -206,7 +231,7 @@ class DocumentSymbolCollector extends parseTreeWalker_1.ParseTreeWalker {
|
|
206
231
|
this._usageProviders.forEach((p) => p.appendDeclarationsAt(usage, declarations, results));
|
207
232
|
return results.some((declaration) => {
|
208
233
|
// Resolve the declaration.
|
209
|
-
const resolvedDecl = this.
|
234
|
+
const resolvedDecl = this._aliasResolver.resolve(declaration, /* resolveLocalNames */ false);
|
210
235
|
if (!resolvedDecl) {
|
211
236
|
return false;
|
212
237
|
}
|
@@ -231,7 +256,7 @@ class DocumentSymbolCollector extends parseTreeWalker_1.ParseTreeWalker {
|
|
231
256
|
if (isAliasDeclFromImportAsWithAlias(declaration)) {
|
232
257
|
return (0, declarationUtils_1.getDeclarationsWithUsesLocalNameRemoved)([declaration])[0];
|
233
258
|
}
|
234
|
-
const resolvedDecl = this.
|
259
|
+
const resolvedDecl = this._aliasResolver.resolve(declaration, /* resolveLocalNames */ true);
|
235
260
|
return isAliasDeclFromImportAsWithAlias(resolvedDecl)
|
236
261
|
? (0, declarationUtils_1.getDeclarationsWithUsesLocalNameRemoved)([resolvedDecl])[0]
|
237
262
|
: resolvedDecl;
|
@@ -304,7 +329,7 @@ function _getDeclarationsForNonModuleNameNode(evaluator, node, skipUnreachableCo
|
|
304
329
|
// Some might have synthesized type for the node such as subModule in import X.Y statement.
|
305
330
|
if (decls.length === 0) {
|
306
331
|
const type = evaluator.getType(node);
|
307
|
-
if ((type === null || type === void 0 ? void 0 : type.category) ===
|
332
|
+
if ((type === null || type === void 0 ? void 0 : type.category) === 7 /* Module */) {
|
308
333
|
// Synthesize decl for the module.
|
309
334
|
return [(0, declarationUtils_1.createSynthesizedAliasDeclaration)(type.filePath)];
|
310
335
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"documentSymbolCollector.js","sourceRoot":"","sources":["../../../src/languageService/documentSymbolCollector.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"documentSymbolCollector.js","sourceRoot":"","sources":["../../../src/languageService/documentSymbolCollector.ts"],"names":[],"mappings":"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"}
|
@@ -107,7 +107,7 @@ function getVariableTypeText(evaluator, declaration, name, type, typeNode, funct
|
|
107
107
|
}
|
108
108
|
}
|
109
109
|
// Handle the case where type is a function and was assigned to a variable.
|
110
|
-
if (type.category ===
|
110
|
+
if (type.category === 4 /* Function */ || type.category === 5 /* OverloadedFunction */) {
|
111
111
|
return (0, tooltipUtils_1.getToolTipForType)(type, label, name, evaluator, /* isProperty */ false, functionSignatureDisplay);
|
112
112
|
}
|
113
113
|
const typeText = typeVarName || name + ': ' + evaluator.printType((0, tooltipUtils_1.getTypeForToolTip)(evaluator, typeNode), { expandTypeAlias });
|
@@ -33,10 +33,8 @@ exports.SignatureHelpProvider = void 0;
|
|
33
33
|
const vscode_languageserver_1 = require("vscode-languageserver");
|
34
34
|
const docStringConversion_1 = require("../analyzer/docStringConversion");
|
35
35
|
const docStringUtils_1 = require("../analyzer/docStringUtils");
|
36
|
-
const parameterUtils_1 = require("../analyzer/parameterUtils");
|
37
36
|
const ParseTreeUtils = __importStar(require("../analyzer/parseTreeUtils"));
|
38
37
|
const parseTreeUtils_1 = require("../analyzer/parseTreeUtils");
|
39
|
-
const types_1 = require("../analyzer/types");
|
40
38
|
const cancellationUtils_1 = require("../common/cancellationUtils");
|
41
39
|
const positionUtils_1 = require("../common/positionUtils");
|
42
40
|
const tooltipUtils_1 = require("./tooltipUtils");
|
@@ -201,18 +199,6 @@ class SignatureHelpProvider {
|
|
201
199
|
else if (params.length > 0) {
|
202
200
|
paramName = params[params.length - 1].name || '';
|
203
201
|
}
|
204
|
-
// If we have a typedKwargs, the param name will be wrong.
|
205
|
-
const kwargsIndex = paramIndex >= params.length ? params.length - 1 : paramIndex;
|
206
|
-
if (kwargsIndex >= 0) {
|
207
|
-
const kwargsParam = params[kwargsIndex];
|
208
|
-
if ((0, parameterUtils_1.isTypedKwargs)(kwargsParam) &&
|
209
|
-
(0, types_1.isClassInstance)(kwargsParam.type) &&
|
210
|
-
kwargsParam.type.details.typedDictEntries) {
|
211
|
-
// Use the relative position in typed dict entries.
|
212
|
-
const dictIndex = paramIndex - kwargsIndex;
|
213
|
-
paramName = Array.from(kwargsParam.type.details.typedDictEntries.keys())[dictIndex];
|
214
|
-
}
|
215
|
-
}
|
216
202
|
parameters.push({
|
217
203
|
startOffset: label.length,
|
218
204
|
endOffset: label.length + paramString.length,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"signatureHelpProvider.js","sourceRoot":"","sources":["../../../src/languageService/signatureHelpProvider.ts"],"names":[],"mappings":";AAAA;;;;;;;;;GASG;;;;;;;;;;;;;;;;;;;;;;AAEH,iEAS+B;AAE/B,yEAA0G;AAC1G,+DAA2E;AAC3E
|
1
|
+
{"version":3,"file":"signatureHelpProvider.js","sourceRoot":"","sources":["../../../src/languageService/signatureHelpProvider.ts"],"names":[],"mappings":"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"}
|
@@ -249,13 +249,13 @@ function combineExpressionTypes(typeNodes, evaluator) {
|
|
249
249
|
// We're expecting a set of types, if there is only one and the outermost type is a list, take its inner type. This
|
250
250
|
// is probably an expression that at runtime would turn into a list.
|
251
251
|
if (typeList.length === 1 &&
|
252
|
-
result.category ===
|
252
|
+
result.category === 6 /* Class */ &&
|
253
253
|
types_1.ClassType.isBuiltIn(result, 'list') &&
|
254
254
|
result.typeArguments) {
|
255
255
|
result = result.typeArguments[0];
|
256
256
|
}
|
257
257
|
else if (typeList.length === 1 &&
|
258
|
-
result.category ===
|
258
|
+
result.category === 6 /* Class */ &&
|
259
259
|
types_1.ClassType.isBuiltIn(result, 'range')) {
|
260
260
|
result = evaluator.getBuiltInObject(typeNodes[0], 'int');
|
261
261
|
}
|
@@ -295,7 +295,7 @@ function getClassAndConstructorTypes(node, evaluator) {
|
|
295
295
|
let methodType;
|
296
296
|
// Try to get the `__init__` method first because it typically has more type information than `__new__`.
|
297
297
|
// Don't exclude `object.__init__` since in the plain case we want to show Foo().
|
298
|
-
const initMember = (0, typeUtils_1.lookUpClassMember)(classType, '__init__',
|
298
|
+
const initMember = (0, typeUtils_1.lookUpClassMember)(classType, '__init__', 16 /* SkipInstanceMembers */);
|
299
299
|
if (initMember) {
|
300
300
|
const functionType = evaluator.getTypeOfMember(initMember);
|
301
301
|
if ((0, types_1.isFunction)(functionType) || (0, types_1.isOverloadedFunction)(functionType)) {
|
@@ -308,7 +308,7 @@ function getClassAndConstructorTypes(node, evaluator) {
|
|
308
308
|
(methodType &&
|
309
309
|
(0, types_1.isFunction)(methodType) &&
|
310
310
|
(types_1.FunctionType.hasDefaultParameters(methodType) || methodType.details.parameters.length === 0))) {
|
311
|
-
const newMember = (0, typeUtils_1.lookUpClassMember)(classType, '__new__', 4 /* SkipObjectBaseClass */ |
|
311
|
+
const newMember = (0, typeUtils_1.lookUpClassMember)(classType, '__new__', 4 /* SkipObjectBaseClass */ | 16 /* SkipInstanceMembers */);
|
312
312
|
if (newMember) {
|
313
313
|
const newMemberType = evaluator.getTypeOfMember(newMember);
|
314
314
|
// Prefer `__new__` if it doesn't have default params (*args: Any, **kwargs: Any) or no params ().
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"tooltipUtils.js","sourceRoot":"","sources":["../../../src/languageService/tooltipUtils.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"tooltipUtils.js","sourceRoot":"","sources":["../../../src/languageService/tooltipUtils.ts"],"names":[],"mappings":"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"}
|
@@ -597,6 +597,9 @@ export declare namespace Localizer {
|
|
597
597
|
const optionalExtraArgs: () => string;
|
598
598
|
const orPatternIrrefutable: () => string;
|
599
599
|
const orPatternMissingName: () => string;
|
600
|
+
const overlappingKeywordArgs: () => ParameterizedString<{
|
601
|
+
names: string;
|
602
|
+
}>;
|
600
603
|
const overlappingOverload: () => ParameterizedString<{
|
601
604
|
name: string;
|
602
605
|
obscured: number;
|
@@ -800,6 +803,7 @@ export declare namespace Localizer {
|
|
800
803
|
type: string;
|
801
804
|
}>;
|
802
805
|
const superCallZeroArgForm: () => string;
|
806
|
+
const superCallZeroArgFormStaticMethod: () => string;
|
803
807
|
const symbolIsUnbound: () => ParameterizedString<{
|
804
808
|
name: string;
|
805
809
|
}>;
|
@@ -1175,6 +1179,14 @@ export declare namespace Localizer {
|
|
1175
1179
|
name: string;
|
1176
1180
|
}>;
|
1177
1181
|
const dataClassFieldLocation: () => string;
|
1182
|
+
const descriptorAccessBindingFailed: () => ParameterizedString<{
|
1183
|
+
name: string;
|
1184
|
+
className: string;
|
1185
|
+
}>;
|
1186
|
+
const descriptorAccessCallFailed: () => ParameterizedString<{
|
1187
|
+
name: string;
|
1188
|
+
className: string;
|
1189
|
+
}>;
|
1178
1190
|
const finalMethod: () => string;
|
1179
1191
|
const functionParamDefaultMissing: () => ParameterizedString<{
|
1180
1192
|
name: string;
|
@@ -100,6 +100,8 @@ function initialize() {
|
|
100
100
|
}
|
101
101
|
let localeOverride;
|
102
102
|
function setLocaleOverride(locale) {
|
103
|
+
// Force a reload of the localized strings.
|
104
|
+
localizedStrings = undefined;
|
103
105
|
localeOverride = locale.toLowerCase();
|
104
106
|
}
|
105
107
|
exports.setLocaleOverride = setLocaleOverride;
|
@@ -488,6 +490,7 @@ var Localizer;
|
|
488
490
|
Diagnostic.optionalExtraArgs = () => getRawString('Diagnostic.optionalExtraArgs');
|
489
491
|
Diagnostic.orPatternIrrefutable = () => getRawString('Diagnostic.orPatternIrrefutable');
|
490
492
|
Diagnostic.orPatternMissingName = () => getRawString('Diagnostic.orPatternMissingName');
|
493
|
+
Diagnostic.overlappingKeywordArgs = () => new ParameterizedString(getRawString('Diagnostic.overlappingKeywordArgs'));
|
491
494
|
Diagnostic.overlappingOverload = () => new ParameterizedString(getRawString('Diagnostic.overlappingOverload'));
|
492
495
|
Diagnostic.overloadAbstractMismatch = () => new ParameterizedString(getRawString('Diagnostic.overloadAbstractMismatch'));
|
493
496
|
Diagnostic.overloadImplementationMismatch = () => new ParameterizedString(getRawString('Diagnostic.overloadImplementationMismatch'));
|
@@ -584,6 +587,7 @@ var Localizer;
|
|
584
587
|
Diagnostic.superCallFirstArg = () => new ParameterizedString(getRawString('Diagnostic.superCallFirstArg'));
|
585
588
|
Diagnostic.superCallSecondArg = () => new ParameterizedString(getRawString('Diagnostic.superCallSecondArg'));
|
586
589
|
Diagnostic.superCallZeroArgForm = () => getRawString('Diagnostic.superCallZeroArgForm');
|
590
|
+
Diagnostic.superCallZeroArgFormStaticMethod = () => getRawString('Diagnostic.superCallZeroArgFormStaticMethod');
|
587
591
|
Diagnostic.symbolIsUnbound = () => new ParameterizedString(getRawString('Diagnostic.symbolIsUnbound'));
|
588
592
|
Diagnostic.symbolIsUndefined = () => new ParameterizedString(getRawString('Diagnostic.symbolIsUndefined'));
|
589
593
|
Diagnostic.symbolIsPossiblyUnbound = () => new ParameterizedString(getRawString('Diagnostic.symbolIsPossiblyUnbound'));
|
@@ -766,6 +770,8 @@ var Localizer;
|
|
766
770
|
DiagnosticAddendum.conditionalRequiresBool = () => new ParameterizedString(getRawString('DiagnosticAddendum.conditionalRequiresBool'));
|
767
771
|
DiagnosticAddendum.dataClassFrozen = () => new ParameterizedString(getRawString('DiagnosticAddendum.dataClassFrozen'));
|
768
772
|
DiagnosticAddendum.dataClassFieldLocation = () => getRawString('DiagnosticAddendum.dataClassFieldLocation');
|
773
|
+
DiagnosticAddendum.descriptorAccessBindingFailed = () => new ParameterizedString(getRawString('DiagnosticAddendum.descriptorAccessBindingFailed'));
|
774
|
+
DiagnosticAddendum.descriptorAccessCallFailed = () => new ParameterizedString(getRawString('DiagnosticAddendum.descriptorAccessCallFailed'));
|
769
775
|
DiagnosticAddendum.finalMethod = () => getRawString('DiagnosticAddendum.finalMethod');
|
770
776
|
DiagnosticAddendum.functionParamDefaultMissing = () => new ParameterizedString(getRawString('DiagnosticAddendum.functionParamDefaultMissing'));
|
771
777
|
DiagnosticAddendum.functionParamName = () => new ParameterizedString(getRawString('DiagnosticAddendum.functionParamName'));
|