@zzzen/pyright-internal 1.2.0-dev.20260816 → 1.2.0-dev.20260830
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.d.ts +123 -24
- package/dist/analyzer/analyzerNodeInfo.js +429 -89
- package/dist/analyzer/analyzerNodeInfo.js.map +1 -1
- package/dist/analyzer/backgroundAnalysisProgram.d.ts +2 -1
- package/dist/analyzer/backgroundAnalysisProgram.js +4 -8
- package/dist/analyzer/backgroundAnalysisProgram.js.map +1 -1
- package/dist/analyzer/binder.d.ts +6 -3
- package/dist/analyzer/binder.js +70 -69
- package/dist/analyzer/binder.js.map +1 -1
- package/dist/analyzer/checker.d.ts +4 -2
- package/dist/analyzer/checker.js +86 -59
- package/dist/analyzer/checker.js.map +1 -1
- package/dist/analyzer/codeFlowEngine.d.ts +2 -1
- package/dist/analyzer/codeFlowEngine.js +12 -10
- package/dist/analyzer/codeFlowEngine.js.map +1 -1
- package/dist/analyzer/codeFlowUtils.d.ts +2 -1
- package/dist/analyzer/codeFlowUtils.js +2 -3
- package/dist/analyzer/codeFlowUtils.js.map +1 -1
- package/dist/analyzer/constructorTransform.js +8 -0
- package/dist/analyzer/constructorTransform.js.map +1 -1
- package/dist/analyzer/dataClasses.d.ts +5 -4
- package/dist/analyzer/dataClasses.js +30 -59
- package/dist/analyzer/dataClasses.js.map +1 -1
- package/dist/analyzer/declarationUtils.d.ts +2 -1
- package/dist/analyzer/declarationUtils.js +2 -2
- package/dist/analyzer/declarationUtils.js.map +1 -1
- package/dist/analyzer/decorators.d.ts +5 -4
- package/dist/analyzer/decorators.js +20 -21
- package/dist/analyzer/decorators.js.map +1 -1
- package/dist/analyzer/enums.d.ts +5 -4
- package/dist/analyzer/enums.js +11 -10
- package/dist/analyzer/enums.js.map +1 -1
- package/dist/analyzer/importResolver.d.ts +1 -1
- package/dist/analyzer/importResolver.js +5 -3
- package/dist/analyzer/importResolver.js.map +1 -1
- package/dist/analyzer/importStatementUtils.d.ts +3 -1
- package/dist/analyzer/importStatementUtils.js +14 -7
- package/dist/analyzer/importStatementUtils.js.map +1 -1
- package/dist/analyzer/namedTuples.d.ts +2 -1
- package/dist/analyzer/namedTuples.js +3 -4
- package/dist/analyzer/namedTuples.js.map +1 -1
- package/dist/analyzer/operations.d.ts +3 -2
- package/dist/analyzer/operations.js +8 -8
- package/dist/analyzer/operations.js.map +1 -1
- package/dist/analyzer/packageTypeVerifier.js +2 -2
- package/dist/analyzer/packageTypeVerifier.js.map +1 -1
- package/dist/analyzer/parseTreeUtils.d.ts +13 -11
- package/dist/analyzer/parseTreeUtils.js +62 -36
- package/dist/analyzer/parseTreeUtils.js.map +1 -1
- package/dist/analyzer/parseTreeWalker.d.ts +7 -2
- package/dist/analyzer/parseTreeWalker.js +29 -175
- package/dist/analyzer/parseTreeWalker.js.map +1 -1
- package/dist/analyzer/patternMatching.d.ts +4 -3
- package/dist/analyzer/patternMatching.js +47 -43
- package/dist/analyzer/patternMatching.js.map +1 -1
- package/dist/analyzer/program.d.ts +12 -0
- package/dist/analyzer/program.js +238 -29
- package/dist/analyzer/program.js.map +1 -1
- package/dist/analyzer/properties.d.ts +4 -3
- package/dist/analyzer/properties.js +7 -8
- package/dist/analyzer/properties.js.map +1 -1
- package/dist/analyzer/protocols.js +14 -2
- package/dist/analyzer/protocols.js.map +1 -1
- package/dist/analyzer/scopeUtils.d.ts +4 -3
- package/dist/analyzer/scopeUtils.js +8 -8
- package/dist/analyzer/scopeUtils.js.map +1 -1
- package/dist/analyzer/sentinel.d.ts +3 -2
- package/dist/analyzer/sentinel.js +4 -5
- package/dist/analyzer/sentinel.js.map +1 -1
- package/dist/analyzer/service.d.ts +5 -10
- package/dist/analyzer/service.js +36 -96
- package/dist/analyzer/service.js.map +1 -1
- package/dist/analyzer/sourceEnumerator.d.ts +5 -0
- package/dist/analyzer/sourceEnumerator.js +57 -3
- package/dist/analyzer/sourceEnumerator.js.map +1 -1
- package/dist/analyzer/sourceFile.d.ts +12 -6
- package/dist/analyzer/sourceFile.js +74 -50
- package/dist/analyzer/sourceFile.js.map +1 -1
- package/dist/analyzer/sourceFileInfoUtils.d.ts +1 -0
- package/dist/analyzer/sourceFileInfoUtils.js +8 -0
- package/dist/analyzer/sourceFileInfoUtils.js.map +1 -1
- package/dist/analyzer/sourceMapper.d.ts +4 -1
- package/dist/analyzer/sourceMapper.js +14 -8
- package/dist/analyzer/sourceMapper.js.map +1 -1
- package/dist/analyzer/testWalker.js +2 -1
- package/dist/analyzer/testWalker.js.map +1 -1
- package/dist/analyzer/tracePrinter.d.ts +2 -1
- package/dist/analyzer/tracePrinter.js +2 -2
- package/dist/analyzer/tracePrinter.js.map +1 -1
- package/dist/analyzer/tuples.d.ts +3 -2
- package/dist/analyzer/tuples.js +5 -5
- package/dist/analyzer/tuples.js.map +1 -1
- package/dist/analyzer/typeDocStringUtils.d.ts +5 -7
- package/dist/analyzer/typeDocStringUtils.js +229 -132
- package/dist/analyzer/typeDocStringUtils.js.map +1 -1
- package/dist/analyzer/typeEvaluator.d.ts +2 -0
- package/dist/analyzer/typeEvaluator.js +418 -229
- package/dist/analyzer/typeEvaluator.js.map +1 -1
- package/dist/analyzer/typeEvaluatorTypes.d.ts +2 -0
- package/dist/analyzer/typeEvaluatorTypes.js.map +1 -1
- package/dist/analyzer/typeGuards.d.ts +3 -2
- package/dist/analyzer/typeGuards.js +159 -35
- package/dist/analyzer/typeGuards.js.map +1 -1
- package/dist/analyzer/typeStubGeneration.d.ts +64 -0
- package/dist/analyzer/typeStubGeneration.js +226 -0
- package/dist/analyzer/typeStubGeneration.js.map +1 -0
- package/dist/analyzer/typeStubMessages.d.ts +4 -0
- package/dist/analyzer/typeStubMessages.js +25 -0
- package/dist/analyzer/typeStubMessages.js.map +1 -0
- package/dist/analyzer/typeStubOutput.d.ts +9 -0
- package/dist/analyzer/typeStubOutput.js +52 -0
- package/dist/analyzer/typeStubOutput.js.map +1 -0
- package/dist/analyzer/typeStubRenderer.d.ts +5 -0
- package/dist/analyzer/{typeStubWriter.js → typeStubRenderer.js} +20 -99
- package/dist/analyzer/typeStubRenderer.js.map +1 -0
- package/dist/analyzer/typeUtils.d.ts +1 -0
- package/dist/analyzer/typeUtils.js +115 -1
- package/dist/analyzer/typeUtils.js.map +1 -1
- package/dist/analyzer/typedDicts.d.ts +4 -3
- package/dist/analyzer/typedDicts.js +15 -14
- package/dist/analyzer/typedDicts.js.map +1 -1
- package/dist/analyzer/types.d.ts +2 -0
- package/dist/analyzer/types.js +84 -58
- package/dist/analyzer/types.js.map +1 -1
- package/dist/backgroundAnalysisBase.d.ts +5 -4
- package/dist/backgroundAnalysisBase.js +11 -19
- package/dist/backgroundAnalysisBase.js.map +1 -1
- package/dist/commands/createTypeStub.d.ts +2 -6
- package/dist/commands/createTypeStub.js +14 -27
- package/dist/commands/createTypeStub.js.map +1 -1
- package/dist/commands/dumpFileDebugInfoCommand.js +1 -1
- package/dist/commands/dumpFileDebugInfoCommand.js.map +1 -1
- package/dist/common/collectionUtils.js +15 -6
- package/dist/common/collectionUtils.js.map +1 -1
- package/dist/common/commandLineOptions.d.ts +1 -1
- package/dist/common/commandLineOptions.js.map +1 -1
- package/dist/common/configOptions.d.ts +4 -1
- package/dist/common/configOptions.js +68 -12
- package/dist/common/configOptions.js.map +1 -1
- package/dist/common/envVarUtils.d.ts +1 -0
- package/dist/common/envVarUtils.js +41 -10
- package/dist/common/envVarUtils.js.map +1 -1
- package/dist/common/extensibility.d.ts +3 -1
- package/dist/common/extensibility.js.map +1 -1
- package/dist/common/extraPathGlob.d.ts +12 -0
- package/dist/common/extraPathGlob.js +315 -0
- package/dist/common/extraPathGlob.js.map +1 -0
- package/dist/common/host.d.ts +2 -0
- package/dist/common/host.js.map +1 -1
- package/dist/common/languageServerInterface.d.ts +2 -1
- package/dist/common/languageServerInterface.js.map +1 -1
- package/dist/common/pathConsts.d.ts +1 -0
- package/dist/common/pathConsts.js +11 -1
- package/dist/common/pathConsts.js.map +1 -1
- package/dist/common/processUtils.d.ts +4 -2
- package/dist/common/processUtils.js +3 -0
- package/dist/common/processUtils.js.map +1 -1
- package/dist/common/stringUtils.d.ts +6 -0
- package/dist/common/stringUtils.js +87 -5
- package/dist/common/stringUtils.js.map +1 -1
- package/dist/common/textEditTracker.d.ts +3 -1
- package/dist/common/textEditTracker.js +8 -6
- package/dist/common/textEditTracker.js.map +1 -1
- package/dist/common/textRangeCollection.d.ts +1 -0
- package/dist/common/textRangeCollection.js +32 -1
- package/dist/common/textRangeCollection.js.map +1 -1
- package/dist/common/uri/uriUtils.d.ts +3 -0
- package/dist/common/uri/uriUtils.js +65 -15
- package/dist/common/uri/uriUtils.js.map +1 -1
- package/dist/fileSystemMapping.d.ts +10 -0
- package/dist/fileSystemMapping.js +176 -0
- package/dist/fileSystemMapping.js.map +1 -0
- package/dist/languageServerBase.d.ts +1 -1
- package/dist/languageServerBase.js +2 -2
- package/dist/languageServerBase.js.map +1 -1
- package/dist/languageService/analyzerServiceExecutor.d.ts +1 -3
- package/dist/languageService/analyzerServiceExecutor.js +10 -29
- package/dist/languageService/analyzerServiceExecutor.js.map +1 -1
- package/dist/languageService/autoImporter.d.ts +1 -0
- package/dist/languageService/autoImporter.js +32 -5
- package/dist/languageService/autoImporter.js.map +1 -1
- package/dist/languageService/callHierarchyProvider.d.ts +7 -0
- package/dist/languageService/callHierarchyProvider.js +97 -11
- package/dist/languageService/callHierarchyProvider.js.map +1 -1
- package/dist/languageService/completionProvider.d.ts +30 -8
- package/dist/languageService/completionProvider.js +298 -93
- package/dist/languageService/completionProvider.js.map +1 -1
- package/dist/languageService/definitionProvider.js +7 -6
- package/dist/languageService/definitionProvider.js.map +1 -1
- package/dist/languageService/documentHighlightProvider.js +2 -1
- package/dist/languageService/documentHighlightProvider.js.map +1 -1
- package/dist/languageService/documentSymbolCollector.d.ts +3 -1
- package/dist/languageService/documentSymbolCollector.js +78 -14
- package/dist/languageService/documentSymbolCollector.js.map +1 -1
- package/dist/languageService/documentSymbolProvider.js +3 -2
- package/dist/languageService/documentSymbolProvider.js.map +1 -1
- package/dist/languageService/fileWatcherDynamicFeature.js +28 -1
- package/dist/languageService/fileWatcherDynamicFeature.js.map +1 -1
- package/dist/languageService/hoverProvider.d.ts +2 -1
- package/dist/languageService/hoverProvider.js +48 -16
- package/dist/languageService/hoverProvider.js.map +1 -1
- package/dist/languageService/importSorter.d.ts +3 -1
- package/dist/languageService/importSorter.js +4 -2
- package/dist/languageService/importSorter.js.map +1 -1
- package/dist/languageService/importStatementCandidates.js +4 -2
- package/dist/languageService/importStatementCandidates.js.map +1 -1
- package/dist/languageService/quickActions.js +2 -1
- package/dist/languageService/quickActions.js.map +1 -1
- package/dist/languageService/referencesProvider.js +12 -5
- package/dist/languageService/referencesProvider.js.map +1 -1
- package/dist/languageService/signatureHelpProvider.d.ts +3 -0
- package/dist/languageService/signatureHelpProvider.js +56 -18
- package/dist/languageService/signatureHelpProvider.js.map +1 -1
- package/dist/languageService/symbolIndexer.d.ts +2 -1
- package/dist/languageService/symbolIndexer.js +7 -7
- package/dist/languageService/symbolIndexer.js.map +1 -1
- package/dist/languageService/tooltipUtils.d.ts +1 -1
- package/dist/languageService/tooltipUtils.js +103 -35
- package/dist/languageService/tooltipUtils.js.map +1 -1
- package/dist/languageService/workspaceSymbolProvider.js +3 -2
- package/dist/languageService/workspaceSymbolProvider.js.map +1 -1
- package/dist/localization/localize.d.ts +6 -0
- package/dist/localization/localize.js +10 -0
- package/dist/localization/localize.js.map +1 -1
- package/dist/localization/package.nls.cs.json +15 -0
- package/dist/localization/package.nls.de.json +15 -0
- package/dist/localization/package.nls.en-us.json +5 -0
- package/dist/localization/package.nls.es.json +15 -0
- package/dist/localization/package.nls.fr.json +15 -0
- package/dist/localization/package.nls.it.json +15 -0
- package/dist/localization/package.nls.ja.json +15 -0
- package/dist/localization/package.nls.ko.json +15 -0
- package/dist/localization/package.nls.pl.json +15 -0
- package/dist/localization/package.nls.pt-br.json +15 -0
- package/dist/localization/package.nls.qps-ploc.json +15 -0
- package/dist/localization/package.nls.ru.json +15 -0
- package/dist/localization/package.nls.tr.json +15 -0
- package/dist/localization/package.nls.zh-cn.json +16 -1
- package/dist/localization/package.nls.zh-tw.json +17 -2
- package/dist/parser/parseNodes.d.ts +85 -80
- package/dist/parser/parseNodes.js +182 -159
- package/dist/parser/parseNodes.js.map +1 -1
- package/dist/parser/parseTreeUtils.d.ts +3 -0
- package/dist/parser/parseTreeUtils.js +209 -0
- package/dist/parser/parseTreeUtils.js.map +1 -0
- package/dist/parser/parser.d.ts +16 -6
- package/dist/parser/parser.js +210 -144
- package/dist/parser/parser.js.map +1 -1
- package/dist/parser/stringAnnotationInfo.d.ts +16 -0
- package/dist/parser/stringAnnotationInfo.js +26 -0
- package/dist/parser/stringAnnotationInfo.js.map +1 -0
- package/dist/pyright.js +30 -17
- package/dist/pyright.js.map +1 -1
- package/dist/readonlyAugmentedFileSystem.d.ts +2 -9
- package/dist/readonlyAugmentedFileSystem.js +17 -144
- package/dist/readonlyAugmentedFileSystem.js.map +1 -1
- package/dist/server.js +2 -2
- package/dist/server.js.map +1 -1
- package/dist/tests/analyzerNodeInfo.test.d.ts +1 -0
- package/dist/tests/analyzerNodeInfo.test.js +145 -0
- package/dist/tests/analyzerNodeInfo.test.js.map +1 -0
- package/dist/tests/collectionUtils.test.js +46 -0
- package/dist/tests/collectionUtils.test.js.map +1 -1
- package/dist/tests/completions.test.js +34 -0
- package/dist/tests/completions.test.js.map +1 -1
- package/dist/tests/config.test.js +131 -7
- package/dist/tests/config.test.js.map +1 -1
- package/dist/tests/extraPathGlob.test.d.ts +1 -0
- package/dist/tests/extraPathGlob.test.js +434 -0
- package/dist/tests/extraPathGlob.test.js.map +1 -0
- package/dist/tests/fileSystemMapping.test.d.ts +1 -0
- package/dist/tests/fileSystemMapping.test.js +458 -0
- package/dist/tests/fileSystemMapping.test.js.map +1 -0
- package/dist/tests/fourslash/completions.call.typedDict.fourslash.js +23 -0
- package/dist/tests/fourslash/completions.call.typedDict.fourslash.js.map +1 -1
- package/dist/tests/fourslash/completions.call.typedDict.list.fourslash.js +14 -0
- package/dist/tests/fourslash/completions.call.typedDict.list.fourslash.js.map +1 -1
- package/dist/tests/fourslash/completions.call.typedDict.states.fourslash.js +7 -0
- package/dist/tests/fourslash/completions.call.typedDict.states.fourslash.js.map +1 -1
- package/dist/tests/fourslash/completions.callSite.isinstanceNarrowing.fourslash.d.ts +1 -0
- package/dist/tests/fourslash/completions.callSite.isinstanceNarrowing.fourslash.js +41 -0
- package/dist/tests/fourslash/completions.callSite.isinstanceNarrowing.fourslash.js.map +1 -0
- package/dist/tests/fourslash/completions.dictionary.keys.literalTypes.fourslash.js +2 -0
- package/dist/tests/fourslash/completions.dictionary.keys.literalTypes.fourslash.js.map +1 -1
- package/dist/tests/fourslash/completions.fstring.stringLiteral.fourslash.js +5 -0
- package/dist/tests/fourslash/completions.fstring.stringLiteral.fourslash.js.map +1 -1
- package/dist/tests/fourslash/completions.stringLiteral.fourslash.js +4 -0
- package/dist/tests/fourslash/completions.stringLiteral.fourslash.js.map +1 -1
- package/dist/tests/fourslash/findallreferences.protocolMemberVariable.fourslash.d.ts +1 -0
- package/dist/tests/fourslash/findallreferences.protocolMemberVariable.fourslash.js +48 -0
- package/dist/tests/fourslash/findallreferences.protocolMemberVariable.fourslash.js.map +1 -0
- package/dist/tests/fourslash/hover.docFromSrc.stubs-package.fourslash.js +0 -1
- package/dist/tests/fourslash/hover.docFromSrc.stubs-package.fourslash.js.map +1 -1
- package/dist/tests/fourslash/hover.inherited.docFromSrc.fourslash.js +8 -2
- package/dist/tests/fourslash/hover.inherited.docFromSrc.fourslash.js.map +1 -1
- package/dist/tests/fourslash/hover.inherited.docFromStub.fourslash.js +5 -2
- package/dist/tests/fourslash/hover.inherited.docFromStub.fourslash.js.map +1 -1
- package/dist/tests/fourslash/signature.docstrings.overloaded.fourslash.js +2 -2
- package/dist/tests/fourslash/signature.docstrings.overloaded.fourslash.js.map +1 -1
- package/dist/tests/harness/fourslash/testState.js +1 -1
- package/dist/tests/harness/fourslash/testState.js.map +1 -1
- package/dist/tests/hoverProvider.test.js +38 -0
- package/dist/tests/hoverProvider.test.js.map +1 -1
- package/dist/tests/importStatementUtils.test.js +6 -3
- package/dist/tests/importStatementUtils.test.js.map +1 -1
- package/dist/tests/ipythonMode.test.js +38 -0
- package/dist/tests/ipythonMode.test.js.map +1 -1
- package/dist/tests/parseTreeUtils.test.js +88 -0
- package/dist/tests/parseTreeUtils.test.js.map +1 -1
- package/dist/tests/parser.test.js +60 -3
- package/dist/tests/parser.test.js.map +1 -1
- package/dist/tests/positionUtils.test.js +23 -0
- package/dist/tests/positionUtils.test.js.map +1 -1
- package/dist/tests/pyrightCli.test.d.ts +1 -0
- package/dist/tests/pyrightCli.test.js +205 -0
- package/dist/tests/pyrightCli.test.js.map +1 -0
- package/dist/tests/pyrightFileSystem.test.js +41 -0
- package/dist/tests/pyrightFileSystem.test.js.map +1 -1
- package/dist/tests/service.test.js +183 -0
- package/dist/tests/service.test.js.map +1 -1
- package/dist/tests/sourceEnumeratorSymlink.test.d.ts +1 -0
- package/dist/tests/sourceEnumeratorSymlink.test.js +203 -0
- package/dist/tests/sourceEnumeratorSymlink.test.js.map +1 -0
- package/dist/tests/stringUtils.test.js +84 -0
- package/dist/tests/stringUtils.test.js.map +1 -1
- package/dist/tests/symlinkAliasInvalidation.test.d.ts +1 -0
- package/dist/tests/symlinkAliasInvalidation.test.js +471 -0
- package/dist/tests/symlinkAliasInvalidation.test.js.map +1 -0
- package/dist/tests/testUtils.d.ts +2 -0
- package/dist/tests/testUtils.js +7 -1
- package/dist/tests/testUtils.js.map +1 -1
- package/dist/tests/textEditUtil.test.js +2 -2
- package/dist/tests/textEditUtil.test.js.map +1 -1
- package/dist/tests/textRangeCollection.test.d.ts +1 -0
- package/dist/tests/textRangeCollection.test.js +137 -0
- package/dist/tests/textRangeCollection.test.js.map +1 -0
- package/dist/tests/typeEquality.test.d.ts +1 -0
- package/dist/tests/typeEquality.test.js +95 -0
- package/dist/tests/typeEquality.test.js.map +1 -0
- package/dist/tests/typeEvaluator1.test.js +24 -3
- package/dist/tests/typeEvaluator1.test.js.map +1 -1
- package/dist/tests/typeEvaluator2.test.js +4 -0
- package/dist/tests/typeEvaluator2.test.js.map +1 -1
- package/dist/tests/typeEvaluator3.test.js +8 -0
- package/dist/tests/typeEvaluator3.test.js.map +1 -1
- package/dist/tests/typeEvaluator4.test.js +8 -0
- package/dist/tests/typeEvaluator4.test.js.map +1 -1
- package/dist/tests/typeEvaluator5.test.js +1 -1
- package/dist/tests/typeEvaluator6.test.js +5 -1
- package/dist/tests/typeEvaluator6.test.js.map +1 -1
- package/dist/tests/typeEvaluator7.test.js +4 -0
- package/dist/tests/typeEvaluator7.test.js.map +1 -1
- package/dist/tests/typeEvaluator8.test.js +4 -0
- package/dist/tests/typeEvaluator8.test.js.map +1 -1
- package/dist/tests/typeServer/typeCache.test.d.ts +1 -0
- package/dist/tests/typeServer/typeCache.test.js +69 -0
- package/dist/tests/typeServer/typeCache.test.js.map +1 -0
- package/dist/tests/typeServer/typeServer.virtualFileRedirect.test.js +18 -0
- package/dist/tests/typeServer/typeServer.virtualFileRedirect.test.js.map +1 -1
- package/dist/tests/typeStubGeneration.test.d.ts +1 -0
- package/dist/tests/typeStubGeneration.test.js +397 -0
- package/dist/tests/typeStubGeneration.test.js.map +1 -0
- package/dist/tests/typeStubOutput.test.d.ts +1 -0
- package/dist/tests/typeStubOutput.test.js +136 -0
- package/dist/tests/typeStubOutput.test.js.map +1 -0
- package/dist/tests/typeUtils.test.d.ts +1 -0
- package/dist/tests/typeUtils.test.js +133 -0
- package/dist/tests/typeUtils.test.js.map +1 -0
- package/dist/tests/uri.test.js +51 -0
- package/dist/tests/uri.test.js.map +1 -1
- package/dist/typeServer/notebookDocumentHandler.d.ts +9 -2
- package/dist/typeServer/notebookDocumentHandler.js +16 -6
- package/dist/typeServer/notebookDocumentHandler.js.map +1 -1
- package/dist/typeServer/programWrapper.d.ts +1 -0
- package/dist/typeServer/programWrapper.js +28 -15
- package/dist/typeServer/programWrapper.js.map +1 -1
- package/dist/typeServer/protocol/tspSupplemental.d.ts +1 -1
- package/dist/typeServer/protocol/tspSupplemental.js +2 -2
- package/dist/typeServer/server.d.ts +13 -2
- package/dist/typeServer/server.js +36 -23
- package/dist/typeServer/server.js.map +1 -1
- package/dist/typeServer/typeCache.d.ts +8 -4
- package/dist/typeServer/typeCache.js +33 -5
- package/dist/typeServer/typeCache.js.map +1 -1
- package/dist/typeServer/typeEvalUtils.d.ts +2 -1
- package/dist/typeServer/typeEvalUtils.js +7 -3
- package/dist/typeServer/typeEvalUtils.js.map +1 -1
- package/dist/typeServer/typeGuards.js +3 -4
- package/dist/typeServer/typeGuards.js.map +1 -1
- package/dist/typeServer/typeServerFileSystem.d.ts +10 -9
- package/dist/typeServer/typeServerFileSystem.js +16 -12
- package/dist/typeServer/typeServerFileSystem.js.map +1 -1
- package/package.json +7 -5
- package/dist/analyzer/parseTreeCleaner.d.ts +0 -8
- package/dist/analyzer/parseTreeCleaner.js +0 -65
- package/dist/analyzer/parseTreeCleaner.js.map +0 -1
- package/dist/analyzer/typeStubWriter.d.ts +0 -17
- package/dist/analyzer/typeStubWriter.js.map +0 -1
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { DiagnosticAddendum } from '../common/diagnostic';
|
|
2
2
|
import { SliceNode, TupleNode } from '../parser/parseNodes';
|
|
3
|
+
import { AnalyzerNodeInfoAccessor } from './analyzerNodeInfo';
|
|
3
4
|
import { ConstraintTracker } from './constraintTracker';
|
|
4
5
|
import { AssignTypeFlags, EvalFlags, TypeEvaluator, TypeResult } from './typeEvaluatorTypes';
|
|
5
6
|
import { ClassType, TupleTypeArg, Type } from './types';
|
|
6
7
|
import { InferenceContext } from './typeUtils';
|
|
7
8
|
export declare function makeTupleObject(evaluator: TypeEvaluator, typeArgs: TupleTypeArg[], isUnpacked?: boolean): Type;
|
|
8
|
-
export declare function getTypeOfTuple(evaluator: TypeEvaluator, node: TupleNode, flags: EvalFlags, inferenceContext
|
|
9
|
-
export declare function getTypeOfTupleWithContext(evaluator: TypeEvaluator, node: TupleNode, flags: EvalFlags, inferenceContext: InferenceContext): TypeResult | undefined;
|
|
9
|
+
export declare function getTypeOfTuple(evaluator: TypeEvaluator, node: TupleNode, flags: EvalFlags, inferenceContext: InferenceContext | undefined, nodeInfo: AnalyzerNodeInfoAccessor): TypeResult;
|
|
10
|
+
export declare function getTypeOfTupleWithContext(evaluator: TypeEvaluator, node: TupleNode, flags: EvalFlags, inferenceContext: InferenceContext, nodeInfo: AnalyzerNodeInfoAccessor): TypeResult | undefined;
|
|
10
11
|
export declare function getTypeOfTupleInferred(evaluator: TypeEvaluator, node: TupleNode, flags: EvalFlags): TypeResult;
|
|
11
12
|
export declare function assignTupleTypeArgs(evaluator: TypeEvaluator, destType: ClassType, srcType: ClassType, diag: DiagnosticAddendum | undefined, constraints: ConstraintTracker | undefined, flags: AssignTypeFlags, recursionCount: number): boolean;
|
|
12
13
|
export declare function adjustTupleTypeArgs(evaluator: TypeEvaluator, destTypeArgs: TupleTypeArg[], srcTypeArgs: TupleTypeArg[], flags: AssignTypeFlags): boolean;
|
package/dist/analyzer/tuples.js
CHANGED
|
@@ -37,7 +37,7 @@ function makeTupleObject(evaluator, typeArgs, isUnpacked = false) {
|
|
|
37
37
|
}
|
|
38
38
|
return types_1.UnknownType.create();
|
|
39
39
|
}
|
|
40
|
-
function getTypeOfTuple(evaluator, node, flags, inferenceContext) {
|
|
40
|
+
function getTypeOfTuple(evaluator, node, flags, inferenceContext, nodeInfo) {
|
|
41
41
|
if ((flags & 256 /* EvalFlags.TypeExpression */) !== 0 && node.parent?.nodeType !== 1 /* ParseNodeType.Argument */) {
|
|
42
42
|
// This is allowed inside of an index trailer, specifically
|
|
43
43
|
// to support Tuple[()], which is the documented way to annotate
|
|
@@ -63,7 +63,7 @@ function getTypeOfTuple(evaluator, node, flags, inferenceContext) {
|
|
|
63
63
|
}
|
|
64
64
|
if (!matchingSubtype) {
|
|
65
65
|
const subtypeResult = evaluator.useSpeculativeMode(node, () => {
|
|
66
|
-
return getTypeOfTupleWithContext(evaluator, node, flags, (0, typeUtils_1.makeInferenceContext)(subtype));
|
|
66
|
+
return getTypeOfTupleWithContext(evaluator, node, flags, (0, typeUtils_1.makeInferenceContext)(subtype), nodeInfo);
|
|
67
67
|
});
|
|
68
68
|
if (subtypeResult && evaluator.assignType(subtype, subtypeResult.type)) {
|
|
69
69
|
matchingSubtype = subtype;
|
|
@@ -75,7 +75,7 @@ function getTypeOfTuple(evaluator, node, flags, inferenceContext) {
|
|
|
75
75
|
}
|
|
76
76
|
let expectedTypeDiagAddendum;
|
|
77
77
|
if (expectedType) {
|
|
78
|
-
const result = getTypeOfTupleWithContext(evaluator, node, flags, (0, typeUtils_1.makeInferenceContext)(expectedType));
|
|
78
|
+
const result = getTypeOfTupleWithContext(evaluator, node, flags, (0, typeUtils_1.makeInferenceContext)(expectedType), nodeInfo);
|
|
79
79
|
if (result && !result.typeErrors) {
|
|
80
80
|
return result;
|
|
81
81
|
}
|
|
@@ -89,7 +89,7 @@ function getTypeOfTuple(evaluator, node, flags, inferenceContext) {
|
|
|
89
89
|
}
|
|
90
90
|
return { ...typeResult, expectedTypeDiagAddendum };
|
|
91
91
|
}
|
|
92
|
-
function getTypeOfTupleWithContext(evaluator, node, flags, inferenceContext) {
|
|
92
|
+
function getTypeOfTupleWithContext(evaluator, node, flags, inferenceContext, nodeInfo) {
|
|
93
93
|
inferenceContext.expectedType = (0, typeUtils_1.transformPossibleRecursiveTypeAlias)(inferenceContext.expectedType);
|
|
94
94
|
if (!(0, types_1.isClassInstance)(inferenceContext.expectedType)) {
|
|
95
95
|
return undefined;
|
|
@@ -116,7 +116,7 @@ function getTypeOfTupleWithContext(evaluator, node, flags, inferenceContext) {
|
|
|
116
116
|
}
|
|
117
117
|
else {
|
|
118
118
|
const tupleConstraints = new constraintTracker_1.ConstraintTracker();
|
|
119
|
-
if (!(0, constraintSolver_1.addConstraintsForExpectedType)(evaluator, types_1.ClassType.cloneAsInstance(tupleClass), inferenceContext.expectedType, tupleConstraints, (0, parseTreeUtils_1.getTypeVarScopesForNode)(node), node.start)) {
|
|
119
|
+
if (!(0, constraintSolver_1.addConstraintsForExpectedType)(evaluator, types_1.ClassType.cloneAsInstance(tupleClass), inferenceContext.expectedType, tupleConstraints, (0, parseTreeUtils_1.getTypeVarScopesForNode)(node, nodeInfo), node.start)) {
|
|
120
120
|
return undefined;
|
|
121
121
|
}
|
|
122
122
|
const specializedTuple = evaluator.solveAndApplyConstraints(tupleClass, tupleConstraints);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tuples.js","sourceRoot":"","sources":["../../../../../src/analyzer/tuples.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tuples.js","sourceRoot":"","sources":["../../../../../src/analyzer/tuples.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
import { ClassDeclaration, Declaration, DeclarationBase, FunctionDeclaration, VariableDeclaration } from '../analyzer/declaration';
|
|
2
2
|
import { SourceMapper } from '../analyzer/sourceMapper';
|
|
3
|
-
import { ClassType, FunctionType, ModuleType, OverloadedType
|
|
3
|
+
import { ClassType, FunctionType, ModuleType, OverloadedType } from '../analyzer/types';
|
|
4
4
|
import { Uri } from '../common/uri/uri';
|
|
5
5
|
import { ModuleNode } from '../parser/parseNodes';
|
|
6
6
|
import { TypeEvaluator } from './typeEvaluatorTypes';
|
|
7
7
|
export declare const DefaultClassIteratorFlagsForFunctions: number;
|
|
8
8
|
export declare function isInheritedFromBuiltin(type: FunctionType | OverloadedType, classType?: ClassType): boolean;
|
|
9
|
-
export declare function
|
|
10
|
-
|
|
9
|
+
export declare function getFunctionOwnDocString(type: FunctionType, sourceMapper: SourceMapper): string | undefined;
|
|
10
|
+
export declare function resolveMethodDocInfo(type: FunctionType | OverloadedType, classType: ClassType | undefined, matchedOverloads: FunctionType[] | undefined, sourceMapper: SourceMapper, evaluator: TypeEvaluator): FunctionDocStringInfo | undefined;
|
|
11
|
+
export declare function resolveConstructorDocInfo(classType: ClassType, matchedOverloads: FunctionType[] | undefined, sourceMapper: SourceMapper, evaluator: TypeEvaluator): FunctionDocStringInfo | undefined;
|
|
12
|
+
export interface FunctionDocStringInfo {
|
|
11
13
|
docString: string;
|
|
12
14
|
forceLiteral?: boolean;
|
|
13
15
|
sourceDecl?: FunctionDeclaration;
|
|
14
16
|
}
|
|
15
|
-
export declare function getFunctionDocStringInheritedInfo(type: FunctionType, resolvedDecl: Declaration | undefined, sourceMapper: SourceMapper, classType?: ClassType): FunctionDocStringInfo | undefined;
|
|
16
|
-
export declare function getOverloadedDocStringsInherited(type: OverloadedType, resolvedDecls: Declaration[], sourceMapper: SourceMapper, evaluator: TypeEvaluator, classType?: ClassType): string[];
|
|
17
17
|
export declare function getPropertyDocStringInherited(decl: FunctionDeclaration, sourceMapper: SourceMapper, evaluator: TypeEvaluator): string | undefined;
|
|
18
18
|
export declare function getVariableInStubFileDocStrings(decl: VariableDeclaration, sourceMapper: SourceMapper): string[];
|
|
19
19
|
export declare function isBuiltInModule(uri: Uri | undefined): boolean;
|
|
@@ -23,6 +23,4 @@ export declare function getModuleDocString(type: ModuleType, resolvedDecl: Decla
|
|
|
23
23
|
export declare function getClassDocString(classType: ClassType, resolvedDecl: Declaration | undefined, sourceMapper: SourceMapper): string | undefined;
|
|
24
24
|
export declare function getFunctionOrClassDeclDocString(decl: FunctionDeclaration | ClassDeclaration): string | undefined;
|
|
25
25
|
export declare function getVariableDocString(decl: VariableDeclaration | undefined, sourceMapper: SourceMapper): string | undefined;
|
|
26
|
-
export declare function getOverloadedDocStrings(type: Type, resolvedDecl: Declaration | undefined, sourceMapper: SourceMapper): string[] | undefined;
|
|
27
26
|
export declare function getFunctionDocStringFromDeclarationInfo(resolvedDecl: FunctionDeclaration, sourceMapper: SourceMapper): FunctionDocStringInfo | undefined;
|
|
28
|
-
export {};
|
|
@@ -44,9 +44,9 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
44
44
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
45
45
|
exports.DefaultClassIteratorFlagsForFunctions = void 0;
|
|
46
46
|
exports.isInheritedFromBuiltin = isInheritedFromBuiltin;
|
|
47
|
-
exports.
|
|
48
|
-
exports.
|
|
49
|
-
exports.
|
|
47
|
+
exports.getFunctionOwnDocString = getFunctionOwnDocString;
|
|
48
|
+
exports.resolveMethodDocInfo = resolveMethodDocInfo;
|
|
49
|
+
exports.resolveConstructorDocInfo = resolveConstructorDocInfo;
|
|
50
50
|
exports.getPropertyDocStringInherited = getPropertyDocStringInherited;
|
|
51
51
|
exports.getVariableInStubFileDocStrings = getVariableInStubFileDocStrings;
|
|
52
52
|
exports.isBuiltInModule = isBuiltInModule;
|
|
@@ -56,7 +56,6 @@ exports.getModuleDocString = getModuleDocString;
|
|
|
56
56
|
exports.getClassDocString = getClassDocString;
|
|
57
57
|
exports.getFunctionOrClassDeclDocString = getFunctionOrClassDeclDocString;
|
|
58
58
|
exports.getVariableDocString = getVariableDocString;
|
|
59
|
-
exports.getOverloadedDocStrings = getOverloadedDocStrings;
|
|
60
59
|
exports.getFunctionDocStringFromDeclarationInfo = getFunctionDocStringFromDeclarationInfo;
|
|
61
60
|
const declaration_1 = require("../analyzer/declaration");
|
|
62
61
|
const ParseTreeUtils = __importStar(require("../analyzer/parseTreeUtils"));
|
|
@@ -83,77 +82,213 @@ function isInheritedFromBuiltin(type, classType) {
|
|
|
83
82
|
!!type.priv.boundToType &&
|
|
84
83
|
!types_1.ClassType.isBuiltIn(type.priv.boundToType));
|
|
85
84
|
}
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
85
|
+
// ===========================================================================
|
|
86
|
+
// Unified spec-ordered docstring resolution (component core).
|
|
87
|
+
//
|
|
88
|
+
// These implement the docstring-resolution-order spec and are the single source
|
|
89
|
+
// of ordering for every callable docstring surface (functions, methods, overloads,
|
|
90
|
+
// constructors). They operate on the FULL member symbol plus the call-matched
|
|
91
|
+
// overload(s) so that Rule A (matched overload -> implementation -> other overloads)
|
|
92
|
+
// applies uniformly, and they walk the MRO (derived-first, excluding builtin bases
|
|
93
|
+
// but always considering the class itself) for inheritance. Stub->source fallback
|
|
94
|
+
// is centralized in _functionDocInfo via _getFunctionDocStringFromDeclarationInfo.
|
|
95
|
+
// ===========================================================================
|
|
96
|
+
// Rule A within one class's member: matched overload -> implementation -> other
|
|
97
|
+
// overloads (declaration order). Returns the first candidate that has a docstring.
|
|
98
|
+
function _selectMemberDocInfo(memberType, matchedOverloads, sourceMapper) {
|
|
99
|
+
if ((0, types_1.isFunction)(memberType)) {
|
|
100
|
+
return _functionDocInfo(memberType, sourceMapper);
|
|
101
|
+
}
|
|
102
|
+
if (!(0, types_1.isOverloaded)(memberType)) {
|
|
103
|
+
return undefined;
|
|
104
|
+
}
|
|
105
|
+
const overloads = types_1.OverloadedType.getOverloads(memberType);
|
|
106
|
+
const impl = types_1.OverloadedType.getImplementation(memberType);
|
|
107
|
+
// Tier 1: the call-matched overload(s). First read the matched overload's OWN docstring
|
|
108
|
+
// directly; this is robust to declaration-cleared specializations (e.g. a ParamSpec/Callable
|
|
109
|
+
// transform via applyParamSpecValue clones the overload with shared.docString copied but its
|
|
110
|
+
// declaration dropped, so identity/declaration matching against the re-fetched symbol would
|
|
111
|
+
// miss it). Then fall back to the corresponding original overload from the full symbol.
|
|
112
|
+
if (matchedOverloads && matchedOverloads.length > 0) {
|
|
113
|
+
// matchedOverloads is a hint forwarded from the caller (e.g. resolveConstructorDocInfo
|
|
114
|
+
// forwards the same hint to both __init__ and __new__). Only trust a matched overload that
|
|
115
|
+
// actually belongs to this member; otherwise another member's matched overload could
|
|
116
|
+
// short-circuit Rule B here. Name is preserved across binding/specialization, so filtering
|
|
117
|
+
// by name is a safe scope check.
|
|
118
|
+
const memberName = overloads.length > 0 ? overloads[0].shared.name : undefined;
|
|
119
|
+
for (const matched of matchedOverloads) {
|
|
120
|
+
if (memberName !== undefined && matched.shared.name !== memberName) {
|
|
121
|
+
continue;
|
|
122
|
+
}
|
|
123
|
+
const info = _functionDocInfo(matched, sourceMapper);
|
|
124
|
+
if (info) {
|
|
125
|
+
return info;
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
for (const overload of overloads) {
|
|
129
|
+
if (_isMatchedOverload(overload, matchedOverloads)) {
|
|
130
|
+
const info = _functionDocInfo(overload, sourceMapper);
|
|
131
|
+
if (info) {
|
|
132
|
+
return info;
|
|
110
133
|
}
|
|
111
134
|
}
|
|
112
135
|
}
|
|
113
136
|
}
|
|
114
|
-
|
|
115
|
-
|
|
137
|
+
// Tier 2: the implementation.
|
|
138
|
+
if (impl && (0, types_1.isFunction)(impl)) {
|
|
139
|
+
const info = _functionDocInfo(impl, sourceMapper);
|
|
140
|
+
if (info) {
|
|
141
|
+
return info;
|
|
142
|
+
}
|
|
116
143
|
}
|
|
117
|
-
|
|
118
|
-
|
|
144
|
+
// Tier 3: the remaining overloads, in declaration order.
|
|
145
|
+
for (const overload of overloads) {
|
|
146
|
+
const info = _functionDocInfo(overload, sourceMapper);
|
|
147
|
+
if (info) {
|
|
148
|
+
return info;
|
|
149
|
+
}
|
|
119
150
|
}
|
|
120
|
-
return
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
151
|
+
return undefined;
|
|
152
|
+
}
|
|
153
|
+
function _isMatchedOverload(overload, matchedOverloads) {
|
|
154
|
+
// Match by object identity first, then by shared declaration. The latter keeps the
|
|
155
|
+
// matched-overload tier robust to binding/specialization (e.g. a generic `Box[int]()`
|
|
156
|
+
// whose matched overload is a specialized clone); `shared.declaration` is preserved
|
|
157
|
+
// across those transforms. If it ever were not, this falls through to the impl/other tiers.
|
|
158
|
+
return matchedOverloads.some((m) => m === overload || (!!m.shared.declaration && m.shared.declaration === overload.shared.declaration));
|
|
159
|
+
}
|
|
160
|
+
function _functionDocInfo(type, sourceMapper) {
|
|
161
|
+
if (type.shared.docString) {
|
|
162
|
+
// Leave forceLiteral undefined so downstream formatting can apply its built-in-module
|
|
163
|
+
// literal heuristic (matching the legacy getFunctionDocStringInheritedInfo behavior).
|
|
164
|
+
return {
|
|
165
|
+
docString: type.shared.docString,
|
|
166
|
+
sourceDecl: type.shared.declaration && (0, declaration_1.isFunctionDeclaration)(type.shared.declaration)
|
|
167
|
+
? type.shared.declaration
|
|
168
|
+
: undefined,
|
|
169
|
+
};
|
|
170
|
+
}
|
|
171
|
+
if (type.shared.declaration) {
|
|
172
|
+
return _getFunctionDocStringFromDeclarationInfo(type.shared.declaration, sourceMapper);
|
|
173
|
+
}
|
|
174
|
+
return undefined;
|
|
126
175
|
}
|
|
127
|
-
function
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
176
|
+
// Resolve ONLY the passed function's own docstring (with stub->source fallback), without borrowing
|
|
177
|
+
// from sibling overloads, the implementation, the class, or the MRO. Used where each overload must
|
|
178
|
+
// show its own docstring (e.g. signature-help enumeration) rather than a symbol-level resolved one.
|
|
179
|
+
function getFunctionOwnDocString(type, sourceMapper) {
|
|
180
|
+
return _functionDocInfo(type, sourceMapper)?.docString;
|
|
181
|
+
}
|
|
182
|
+
// Resolve a function/method docstring per spec. For a class member, resolve the class's OWN
|
|
183
|
+
// member first (the full, unnarrowed overload set) via Rule A, then walk base classes
|
|
184
|
+
// (excluding builtin bases) for inheritance. For a free function, resolve the passed type.
|
|
185
|
+
// The builtin-inheritance guard and the trailing type.shared.docString fallback mirror the
|
|
186
|
+
// legacy getFunctionDocStringInheritedInfo behavior so builtin docs don't leak into user classes.
|
|
187
|
+
function resolveMethodDocInfo(type, classType, matchedOverloads, sourceMapper, evaluator) {
|
|
188
|
+
const memberName = _memberNameOfType(type);
|
|
189
|
+
// Step 1: the member's own docstring (Rule A over the full overload set on its class), unless
|
|
190
|
+
// the member is inherited from a builtin (its generic doc should not surface on a user class).
|
|
132
191
|
if (!isInheritedFromBuiltin(type, classType)) {
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
192
|
+
let ownType = type;
|
|
193
|
+
if (classType && memberName) {
|
|
194
|
+
const symbol = types_1.ClassType.getSymbolTable(classType).get(memberName);
|
|
195
|
+
if (symbol) {
|
|
196
|
+
ownType = evaluator.getEffectiveTypeOfSymbol(symbol);
|
|
137
197
|
}
|
|
138
198
|
}
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
const
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
if (
|
|
151
|
-
|
|
199
|
+
else if (!classType && memberName) {
|
|
200
|
+
// Free/module-level function: re-fetch the full (unnarrowed) overloaded symbol so
|
|
201
|
+
// sibling overloads are visible when the passed type was narrowed to the matched
|
|
202
|
+
// overload. Only adopt the re-fetched type when it is overloaded; otherwise keep the
|
|
203
|
+
// passed type so a decorator / functools.wraps-synthesized function (whose docstring
|
|
204
|
+
// is not on the raw declared symbol) is not discarded.
|
|
205
|
+
const primary = (0, types_1.isOverloaded)(type) ? types_1.OverloadedType.getOverloads(type)[0] : type;
|
|
206
|
+
const declNode = primary?.shared.declaration?.node;
|
|
207
|
+
if (declNode) {
|
|
208
|
+
const symbolWithScope = evaluator.lookUpSymbolRecursive(declNode, memberName,
|
|
209
|
+
/* honorCodeFlow */ false);
|
|
210
|
+
if (symbolWithScope) {
|
|
211
|
+
const refetched = evaluator.getEffectiveTypeOfSymbol(symbolWithScope.symbol);
|
|
212
|
+
if ((0, types_1.isOverloaded)(refetched)) {
|
|
213
|
+
ownType = refetched;
|
|
214
|
+
}
|
|
152
215
|
}
|
|
153
216
|
}
|
|
154
217
|
}
|
|
218
|
+
const own = _selectMemberDocInfo(ownType, matchedOverloads, sourceMapper);
|
|
219
|
+
if (own?.docString) {
|
|
220
|
+
return own;
|
|
221
|
+
}
|
|
155
222
|
}
|
|
156
|
-
|
|
223
|
+
// Step 2: inheritance — walk base classes (exclude builtin bases; the original class was
|
|
224
|
+
// handled in step 1), applying Rule A per class.
|
|
225
|
+
if (classType && memberName) {
|
|
226
|
+
for (const [mroClass] of (0, typeUtils_1.getClassIterator)(classType, 0 /* ClassIteratorFlags.Default */)) {
|
|
227
|
+
if (!(0, types_1.isInstantiableClass)(mroClass)) {
|
|
228
|
+
continue;
|
|
229
|
+
}
|
|
230
|
+
if (types_1.ClassType.isSameGenericClass(mroClass, classType)) {
|
|
231
|
+
continue;
|
|
232
|
+
}
|
|
233
|
+
if (types_1.ClassType.isBuiltIn(mroClass)) {
|
|
234
|
+
continue;
|
|
235
|
+
}
|
|
236
|
+
const symbol = types_1.ClassType.getSymbolTable(mroClass).get(memberName);
|
|
237
|
+
if (!symbol) {
|
|
238
|
+
continue;
|
|
239
|
+
}
|
|
240
|
+
const info = _selectMemberDocInfo(evaluator.getEffectiveTypeOfSymbol(symbol), undefined, sourceMapper);
|
|
241
|
+
if (info?.docString) {
|
|
242
|
+
return info;
|
|
243
|
+
}
|
|
244
|
+
}
|
|
245
|
+
}
|
|
246
|
+
// Step 3: the passed type's own docstring (last resort, mirrors legacy behavior).
|
|
247
|
+
if ((0, types_1.isFunction)(type) && type.shared.docString) {
|
|
248
|
+
return {
|
|
249
|
+
docString: type.shared.docString,
|
|
250
|
+
sourceDecl: type.shared.declaration && (0, declaration_1.isFunctionDeclaration)(type.shared.declaration)
|
|
251
|
+
? type.shared.declaration
|
|
252
|
+
: undefined,
|
|
253
|
+
};
|
|
254
|
+
}
|
|
255
|
+
return undefined;
|
|
256
|
+
}
|
|
257
|
+
function _memberNameOfType(type) {
|
|
258
|
+
if ((0, types_1.isOverloaded)(type)) {
|
|
259
|
+
const overloads = types_1.OverloadedType.getOverloads(type);
|
|
260
|
+
return overloads.length > 0 ? overloads[0].shared.name : undefined;
|
|
261
|
+
}
|
|
262
|
+
return type.shared.name;
|
|
263
|
+
}
|
|
264
|
+
// Resolve a constructor-method docstring per spec (Phase 1). Walk the MRO and, for each
|
|
265
|
+
// class, resolve its own `__init__` then `__new__` via Rule A. Returns undefined so the
|
|
266
|
+
// caller can fall back to the class docstring (Phase 2).
|
|
267
|
+
function resolveConstructorDocInfo(classType, matchedOverloads, sourceMapper, evaluator) {
|
|
268
|
+
for (const [mroClass] of (0, typeUtils_1.getClassIterator)(classType, 0 /* ClassIteratorFlags.Default */)) {
|
|
269
|
+
if (!(0, types_1.isInstantiableClass)(mroClass)) {
|
|
270
|
+
continue;
|
|
271
|
+
}
|
|
272
|
+
if (!types_1.ClassType.isSameGenericClass(mroClass, classType) && types_1.ClassType.isBuiltIn(mroClass)) {
|
|
273
|
+
continue;
|
|
274
|
+
}
|
|
275
|
+
const symbolTable = types_1.ClassType.getSymbolTable(mroClass);
|
|
276
|
+
const initSymbol = symbolTable.get('__init__');
|
|
277
|
+
const initInfo = initSymbol
|
|
278
|
+
? _selectMemberDocInfo(evaluator.getEffectiveTypeOfSymbol(initSymbol), matchedOverloads, sourceMapper)
|
|
279
|
+
: undefined;
|
|
280
|
+
if (initInfo?.docString) {
|
|
281
|
+
return initInfo;
|
|
282
|
+
}
|
|
283
|
+
const newSymbol = symbolTable.get('__new__');
|
|
284
|
+
const newInfo = newSymbol
|
|
285
|
+
? _selectMemberDocInfo(evaluator.getEffectiveTypeOfSymbol(newSymbol), matchedOverloads, sourceMapper)
|
|
286
|
+
: undefined;
|
|
287
|
+
if (newInfo?.docString) {
|
|
288
|
+
return newInfo;
|
|
289
|
+
}
|
|
290
|
+
}
|
|
291
|
+
return undefined;
|
|
157
292
|
}
|
|
158
293
|
function getPropertyDocStringInherited(decl, sourceMapper, evaluator) {
|
|
159
294
|
const enclosingClass = ParseTreeUtils.getEnclosingClass(decl.node.d.name, /* stopAtFunction */ false);
|
|
@@ -242,6 +377,39 @@ function getClassDocString(classType, resolvedDecl, sourceMapper) {
|
|
|
242
377
|
docString = _getFunctionOrClassDeclsDocString(classDecls);
|
|
243
378
|
}
|
|
244
379
|
}
|
|
380
|
+
// Fall back to inheriting a docstring from a base class (approximating
|
|
381
|
+
// Python's `inspect.getdoc`, but excluding builtin bases). Walk the MRO and
|
|
382
|
+
// use the nearest base's docstring. Skip builtin classes (e.g. `object`) so
|
|
383
|
+
// their generic docstrings don't leak, mirroring the method behavior in
|
|
384
|
+
// getFunctionDocStringInherited. Only inherit when the class truly has no
|
|
385
|
+
// docstring of its own. An explicit empty docstring (`""`) is recorded on
|
|
386
|
+
// `classType.shared.docString` and must block inheritance, matching Python
|
|
387
|
+
// `inspect.getdoc`. Note the empty string is discarded by the resolution
|
|
388
|
+
// above (helpers use truthy checks), so we consult the class's own docstring
|
|
389
|
+
// directly rather than the resolved local.
|
|
390
|
+
//
|
|
391
|
+
// Known limitation: unlike the class's own docstring (which resolves through
|
|
392
|
+
// `sourceMapper` to recover `.py` docs behind a `.pyi` stub), this inherited
|
|
393
|
+
// branch reads `mroClass.shared.docString` directly. So an inherited docstring
|
|
394
|
+
// surfaces only when the base doesn't ship a doc-less stub. This keeps the
|
|
395
|
+
// Pyright diff surgical; the async path mirrors the same decision.
|
|
396
|
+
if (docString === undefined && classType.shared.docString === undefined) {
|
|
397
|
+
for (const [mroClass] of (0, typeUtils_1.getClassIterator)(classType, 0 /* ClassIteratorFlags.Default */)) {
|
|
398
|
+
if (!(0, types_1.isInstantiableClass)(mroClass)) {
|
|
399
|
+
continue;
|
|
400
|
+
}
|
|
401
|
+
if (types_1.ClassType.isSameGenericClass(mroClass, classType)) {
|
|
402
|
+
continue;
|
|
403
|
+
}
|
|
404
|
+
if (types_1.ClassType.isBuiltIn(mroClass)) {
|
|
405
|
+
continue;
|
|
406
|
+
}
|
|
407
|
+
if (mroClass.shared.docString) {
|
|
408
|
+
docString = mroClass.shared.docString;
|
|
409
|
+
break;
|
|
410
|
+
}
|
|
411
|
+
}
|
|
412
|
+
}
|
|
245
413
|
return docString;
|
|
246
414
|
}
|
|
247
415
|
function getFunctionOrClassDeclDocString(decl) {
|
|
@@ -258,54 +426,6 @@ function getVariableDocString(decl, sourceMapper) {
|
|
|
258
426
|
return getVariableInStubFileDocStrings(decl, sourceMapper).find((doc) => doc);
|
|
259
427
|
}
|
|
260
428
|
}
|
|
261
|
-
function getOverloadedDocStrings(type, resolvedDecl, sourceMapper) {
|
|
262
|
-
if (!(0, types_1.isOverloaded)(type)) {
|
|
263
|
-
return undefined;
|
|
264
|
-
}
|
|
265
|
-
const docStrings = [];
|
|
266
|
-
const overloads = types_1.OverloadedType.getOverloads(type);
|
|
267
|
-
const impl = types_1.OverloadedType.getImplementation(type);
|
|
268
|
-
if (overloads.some((o) => o.shared.docString)) {
|
|
269
|
-
overloads.forEach((overload) => {
|
|
270
|
-
if (overload.shared.docString) {
|
|
271
|
-
docStrings.push(overload.shared.docString);
|
|
272
|
-
}
|
|
273
|
-
});
|
|
274
|
-
}
|
|
275
|
-
if (impl && (0, types_1.isFunction)(impl) && impl.shared.docString) {
|
|
276
|
-
docStrings.push(impl.shared.docString);
|
|
277
|
-
}
|
|
278
|
-
// Fallback: try to extract docstrings from per-overload declarations.
|
|
279
|
-
// This handles cases where overloads are specialized (e.g. via a Callable[P, T]
|
|
280
|
-
// decorator) and shared.docString was not propagated to the specialized types.
|
|
281
|
-
if (docStrings.length === 0) {
|
|
282
|
-
for (const overload of overloads) {
|
|
283
|
-
if (overload.shared.declaration) {
|
|
284
|
-
const declDocString = _getFunctionDocStringFromDeclaration(overload.shared.declaration, sourceMapper);
|
|
285
|
-
if (declDocString) {
|
|
286
|
-
docStrings.push(declDocString);
|
|
287
|
-
}
|
|
288
|
-
}
|
|
289
|
-
}
|
|
290
|
-
if (docStrings.length === 0 && impl && (0, types_1.isFunction)(impl) && impl.shared.declaration) {
|
|
291
|
-
const declDocString = _getFunctionDocStringFromDeclaration(impl.shared.declaration, sourceMapper);
|
|
292
|
-
if (declDocString) {
|
|
293
|
-
docStrings.push(declDocString);
|
|
294
|
-
}
|
|
295
|
-
}
|
|
296
|
-
}
|
|
297
|
-
if (docStrings.length === 0 &&
|
|
298
|
-
resolvedDecl &&
|
|
299
|
-
(0, sourceMapper_1.isStubFile)(resolvedDecl.uri) &&
|
|
300
|
-
(0, declaration_1.isFunctionDeclaration)(resolvedDecl)) {
|
|
301
|
-
const implDecls = sourceMapper.findFunctionDeclarations(resolvedDecl);
|
|
302
|
-
const docString = _getFunctionOrClassDeclsDocString(implDecls);
|
|
303
|
-
if (docString) {
|
|
304
|
-
docStrings.push(docString);
|
|
305
|
-
}
|
|
306
|
-
}
|
|
307
|
-
return docStrings;
|
|
308
|
-
}
|
|
309
429
|
function _getPropertyDocStringInherited(decl, sourceMapper, evaluator, classType) {
|
|
310
430
|
if (!decl || !(0, declaration_1.isFunctionDeclaration)(decl)) {
|
|
311
431
|
return;
|
|
@@ -349,29 +469,6 @@ function _getFunctionDocStringFromDeclaration(resolvedDecl, sourceMapper) {
|
|
|
349
469
|
function getFunctionDocStringFromDeclarationInfo(resolvedDecl, sourceMapper) {
|
|
350
470
|
return _getFunctionDocStringFromDeclarationInfo(resolvedDecl, sourceMapper);
|
|
351
471
|
}
|
|
352
|
-
function _getFunctionDocStringInfo(type, resolvedDecl, sourceMapper) {
|
|
353
|
-
if (!(0, types_1.isFunction)(type)) {
|
|
354
|
-
return undefined;
|
|
355
|
-
}
|
|
356
|
-
if (type.shared.docString) {
|
|
357
|
-
return {
|
|
358
|
-
docString: type.shared.docString,
|
|
359
|
-
sourceDecl: type.shared.declaration && (0, declaration_1.isFunctionDeclaration)(type.shared.declaration)
|
|
360
|
-
? type.shared.declaration
|
|
361
|
-
: resolvedDecl,
|
|
362
|
-
};
|
|
363
|
-
}
|
|
364
|
-
if (resolvedDecl) {
|
|
365
|
-
const docInfo = _getFunctionDocStringFromDeclarationInfo(resolvedDecl, sourceMapper);
|
|
366
|
-
if (docInfo) {
|
|
367
|
-
return docInfo;
|
|
368
|
-
}
|
|
369
|
-
}
|
|
370
|
-
if (type.shared.declaration) {
|
|
371
|
-
return _getFunctionDocStringFromDeclarationInfo(type.shared.declaration, sourceMapper);
|
|
372
|
-
}
|
|
373
|
-
return undefined;
|
|
374
|
-
}
|
|
375
472
|
function _getFunctionDocStringFromDeclarationInfo(resolvedDecl, sourceMapper) {
|
|
376
473
|
const docInfo = _getFunctionOrClassDeclsDocStringInfo([resolvedDecl]);
|
|
377
474
|
if (docInfo) {
|