@zzzen/pyright-internal 1.2.0-dev.20230514 → 1.2.0-dev.20230528
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 +4 -3
- package/dist/analyzer/analyzerFileInfo.js.map +1 -1
- package/dist/analyzer/backgroundAnalysisProgram.d.ts +17 -15
- package/dist/analyzer/backgroundAnalysisProgram.js +43 -53
- package/dist/analyzer/backgroundAnalysisProgram.js.map +1 -1
- package/dist/analyzer/binder.d.ts +0 -2
- package/dist/analyzer/binder.js +2 -20
- package/dist/analyzer/binder.js.map +1 -1
- package/dist/analyzer/checker.d.ts +1 -1
- package/dist/analyzer/checker.js +65 -32
- package/dist/analyzer/checker.js.map +1 -1
- package/dist/analyzer/commentUtils.js +15 -16
- package/dist/analyzer/commentUtils.js.map +1 -1
- package/dist/analyzer/constraintSolver.js +6 -2
- package/dist/analyzer/constraintSolver.js.map +1 -1
- package/dist/analyzer/constructorTransform.js +8 -4
- package/dist/analyzer/constructorTransform.js.map +1 -1
- package/dist/analyzer/constructors.js +128 -130
- package/dist/analyzer/constructors.js.map +1 -1
- package/dist/analyzer/dataClasses.js +4 -1
- package/dist/analyzer/dataClasses.js.map +1 -1
- package/dist/analyzer/declarationUtils.js +1 -0
- package/dist/analyzer/declarationUtils.js.map +1 -1
- package/dist/analyzer/docStringConversion.js +1 -1
- package/dist/analyzer/enums.js +1 -1
- package/dist/analyzer/enums.js.map +1 -1
- package/dist/analyzer/importResolver.d.ts +4 -4
- package/dist/analyzer/importResolver.js +46 -40
- package/dist/analyzer/importResolver.js.map +1 -1
- package/dist/analyzer/importResult.d.ts +2 -2
- package/dist/analyzer/importStatementUtils.js +2 -2
- package/dist/analyzer/importStatementUtils.js.map +1 -1
- package/dist/analyzer/packageTypeVerifier.js +1 -1
- package/dist/analyzer/packageTypeVerifier.js.map +1 -1
- package/dist/analyzer/parameterUtils.js +7 -7
- package/dist/analyzer/parameterUtils.js.map +1 -1
- package/dist/analyzer/parseTreeUtils.d.ts +1 -0
- package/dist/analyzer/parseTreeUtils.js +23 -40
- package/dist/analyzer/parseTreeUtils.js.map +1 -1
- package/dist/analyzer/parseTreeWalker.js +2 -2
- package/dist/analyzer/parseTreeWalker.js.map +1 -1
- package/dist/analyzer/patternMatching.js +1 -0
- package/dist/analyzer/patternMatching.js.map +1 -1
- package/dist/analyzer/program.d.ts +12 -18
- package/dist/analyzer/program.js +25 -12
- package/dist/analyzer/program.js.map +1 -1
- package/dist/analyzer/protocols.js +3 -1
- package/dist/analyzer/protocols.js.map +1 -1
- package/dist/analyzer/service.d.ts +4 -4
- package/dist/analyzer/service.js +29 -24
- package/dist/analyzer/service.js.map +1 -1
- package/dist/analyzer/sourceFile.d.ts +1 -6
- package/dist/analyzer/sourceFile.js +12 -27
- package/dist/analyzer/sourceFile.js.map +1 -1
- package/dist/analyzer/sourceMapper.js +1 -1
- package/dist/analyzer/sourceMapper.js.map +1 -1
- package/dist/analyzer/typeCacheUtils.d.ts +9 -2
- package/dist/analyzer/typeCacheUtils.js +52 -9
- package/dist/analyzer/typeCacheUtils.js.map +1 -1
- package/dist/analyzer/typeDocStringUtils.js +1 -1
- package/dist/analyzer/typeDocStringUtils.js.map +1 -1
- package/dist/analyzer/typeEvaluator.d.ts +2 -2
- package/dist/analyzer/typeEvaluator.js +257 -143
- package/dist/analyzer/typeEvaluator.js.map +1 -1
- package/dist/analyzer/typeEvaluatorTypes.d.ts +3 -2
- package/dist/analyzer/typeEvaluatorTypes.js.map +1 -1
- package/dist/analyzer/typeGuards.js +3 -2
- package/dist/analyzer/typeGuards.js.map +1 -1
- package/dist/analyzer/typePrinter.js +17 -10
- package/dist/analyzer/typePrinter.js.map +1 -1
- package/dist/analyzer/typeStubWriter.js +2 -2
- package/dist/analyzer/typeStubWriter.js.map +1 -1
- package/dist/analyzer/typeUtils.d.ts +1 -0
- package/dist/analyzer/typeUtils.js +20 -18
- package/dist/analyzer/typeUtils.js.map +1 -1
- package/dist/analyzer/typeVarContext.js +2 -2
- package/dist/analyzer/typeVarContext.js.map +1 -1
- package/dist/analyzer/typedDicts.js +140 -43
- package/dist/analyzer/typedDicts.js.map +1 -1
- package/dist/analyzer/types.d.ts +9 -1
- package/dist/analyzer/types.js +39 -16
- package/dist/analyzer/types.js.map +1 -1
- package/dist/backgroundAnalysisBase.d.ts +25 -19
- package/dist/backgroundAnalysisBase.js +145 -115
- package/dist/backgroundAnalysisBase.js.map +1 -1
- package/dist/backgroundThreadBase.d.ts +1 -1
- package/dist/backgroundThreadBase.js +1 -1
- package/dist/backgroundThreadBase.js.map +1 -1
- package/dist/commands/dumpFileDebugInfoCommand.js +5 -5
- package/dist/commands/dumpFileDebugInfoCommand.js.map +1 -1
- package/dist/common/commandLineOptions.d.ts +1 -0
- package/dist/common/commandLineOptions.js.map +1 -1
- package/dist/common/configOptions.js +1 -1
- package/dist/common/configOptions.js.map +1 -1
- package/dist/common/extensibility.d.ts +2 -4
- package/dist/common/extensibility.js.map +1 -1
- package/dist/common/textRange.d.ts +3 -3
- package/dist/common/textRange.js +17 -8
- package/dist/common/textRange.js.map +1 -1
- package/dist/common/uriParser.d.ts +1 -0
- package/dist/common/uriParser.js +9 -0
- package/dist/common/uriParser.js.map +1 -1
- package/dist/common/workspaceEditUtils.d.ts +1 -1
- package/dist/common/workspaceEditUtils.js +5 -7
- package/dist/common/workspaceEditUtils.js.map +1 -1
- package/dist/languageServerBase.js +6 -4
- package/dist/languageServerBase.js.map +1 -1
- package/dist/languageService/analyzerServiceExecutor.js +1 -0
- package/dist/languageService/analyzerServiceExecutor.js.map +1 -1
- package/dist/languageService/autoImporter.d.ts +3 -3
- package/dist/languageService/autoImporter.js +3 -3
- package/dist/languageService/autoImporter.js.map +1 -1
- package/dist/languageService/callHierarchyProvider.js +3 -2
- package/dist/languageService/callHierarchyProvider.js.map +1 -1
- package/dist/languageService/completionProvider.d.ts +2 -2
- package/dist/languageService/completionProvider.js +42 -35
- package/dist/languageService/completionProvider.js.map +1 -1
- package/dist/languageService/documentSymbolCollector.js +9 -9
- package/dist/languageService/documentSymbolCollector.js.map +1 -1
- package/dist/languageService/referencesProvider.js +1 -1
- package/dist/languageService/referencesProvider.js.map +1 -1
- package/dist/languageService/renameProvider.d.ts +3 -3
- package/dist/languageService/renameProvider.js +6 -6
- package/dist/languageService/renameProvider.js.map +1 -1
- package/dist/languageService/signatureHelpProvider.js +1 -1
- package/dist/languageService/signatureHelpProvider.js.map +1 -1
- package/dist/languageService/symbolIndexer.d.ts +0 -8
- package/dist/languageService/symbolIndexer.js.map +1 -1
- package/dist/localization/localize.d.ts +23 -3
- package/dist/localization/localize.js +13 -3
- package/dist/localization/localize.js.map +1 -1
- package/dist/localization/package.nls.en-us.json +15 -5
- package/dist/parser/parseNodes.d.ts +19 -11
- package/dist/parser/parseNodes.js +27 -19
- package/dist/parser/parseNodes.js.map +1 -1
- package/dist/parser/parser.d.ts +3 -3
- package/dist/parser/parser.js +146 -169
- package/dist/parser/parser.js.map +1 -1
- package/dist/parser/stringTokenUtils.d.ts +3 -13
- package/dist/parser/stringTokenUtils.js +8 -181
- package/dist/parser/stringTokenUtils.js.map +1 -1
- package/dist/parser/tokenizer.d.ts +3 -0
- package/dist/parser/tokenizer.js +212 -24
- package/dist/parser/tokenizer.js.map +1 -1
- package/dist/parser/tokenizerTypes.d.ts +31 -1
- package/dist/parser/tokenizerTypes.js +51 -1
- package/dist/parser/tokenizerTypes.js.map +1 -1
- package/dist/readonlyAugmentedFileSystem.js +1 -1
- package/dist/readonlyAugmentedFileSystem.js.map +1 -1
- package/dist/tests/docStringConversion.test.js +44 -0
- package/dist/tests/docStringConversion.test.js.map +1 -1
- package/dist/tests/fourslash/fourslash.d.ts +1 -1
- package/dist/tests/fourslash/rename.function.untitledFile.fourslash.d.ts +1 -0
- package/dist/tests/fourslash/rename.function.untitledFile.fourslash.js +17 -0
- package/dist/tests/fourslash/rename.function.untitledFile.fourslash.js.map +1 -0
- package/dist/tests/harness/fourslash/testLanguageService.js +1 -1
- package/dist/tests/harness/fourslash/testLanguageService.js.map +1 -1
- package/dist/tests/harness/fourslash/testState.d.ts +1 -1
- package/dist/tests/harness/fourslash/testState.js +4 -3
- package/dist/tests/harness/fourslash/testState.js.map +1 -1
- package/dist/tests/importResolver.test.js +3 -3
- package/dist/tests/importResolver.test.js.map +1 -1
- package/dist/tests/textRange.test.d.ts +1 -0
- package/dist/tests/textRange.test.js +45 -0
- package/dist/tests/textRange.test.js.map +1 -0
- package/dist/tests/tokenizer.test.js +280 -58
- package/dist/tests/tokenizer.test.js.map +1 -1
- package/dist/tests/typeEvaluator1.test.js +5 -1
- package/dist/tests/typeEvaluator1.test.js.map +1 -1
- package/dist/tests/typeEvaluator2.test.js +9 -1
- package/dist/tests/typeEvaluator2.test.js.map +1 -1
- package/dist/tests/typeEvaluator3.test.js +11 -1
- package/dist/tests/typeEvaluator3.test.js.map +1 -1
- package/dist/tests/typeEvaluator4.test.js +7 -2
- package/dist/tests/typeEvaluator4.test.js.map +1 -1
- package/dist/tests/typeEvaluator5.test.js +8 -0
- package/dist/tests/typeEvaluator5.test.js.map +1 -1
- package/dist/tests/typePrinter.test.js +3 -3
- package/dist/tests/typePrinter.test.js.map +1 -1
- package/dist/workspaceFactory.js +7 -9
- package/dist/workspaceFactory.js.map +1 -1
- package/package.json +1 -1
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"declarationUtils.js","sourceRoot":"","sources":["../../../src/analyzer/declarationUtils.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"declarationUtils.js","sourceRoot":"","sources":["../../../src/analyzer/declarationUtils.ts"],"names":[],"mappings":"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"}
|
@@ -467,7 +467,7 @@ class DocStringConverter {
|
|
467
467
|
return true;
|
468
468
|
}
|
469
469
|
// catch-all for styles except reST
|
470
|
-
const hasArguments = !(line === null || line === void 0 ? void 0 : line.endsWith(':')) && !(line === null || line === void 0 ? void 0 : line.endsWith('::')) && !!line.match(/^\s*.*?\w+(\s*\(
|
470
|
+
const hasArguments = !(line === null || line === void 0 ? void 0 : line.endsWith(':')) && !(line === null || line === void 0 ? void 0 : line.endsWith('::')) && !!line.match(/^\s*.*?\w+(\s*\(.*?\))*\s*:\s*\w+/g);
|
471
471
|
// reSt params. Attempt to put directives lines into their own paragraphs.
|
472
472
|
const restDirective = DirectivesExtraNewlineRegExp.test(line); //line.match(/^\s*:param/);
|
473
473
|
if (hasArguments || restDirective) {
|
package/dist/analyzer/enums.js
CHANGED
@@ -280,7 +280,7 @@ function getTypeOfEnumMember(evaluator, errorNode, classType, memberName, isInco
|
|
280
280
|
// The type wasn't associated with a particular enum literal, so return
|
281
281
|
// a union of all possible enum literals.
|
282
282
|
const literalValues = (0, typeGuards_1.enumerateLiteralsForType)(evaluator, classType);
|
283
|
-
if (literalValues) {
|
283
|
+
if (literalValues && literalValues.length > 0) {
|
284
284
|
return {
|
285
285
|
type: (0, types_1.combineTypes)(literalValues.map((literalClass) => {
|
286
286
|
const literalValue = literalClass.literalValue;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"enums.js","sourceRoot":"","sources":["../../../src/analyzer/enums.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"enums.js","sourceRoot":"","sources":["../../../src/analyzer/enums.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;AAEH,2CAAyC;AAEzC,yDAAiD;AAEjD,qDAAwF;AACxF,qCAA+C;AAC/C,uDAAuD;AAEvD,6CAAwD;AACxD,2CAAiG;AACjG,mCAWiB;AAEjB,SAAgB,eAAe,CAAC,SAAiB;IAC7C,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IACzE,OAAO,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC;AACvD,CAAC;AAHD,0CAGC;AAED,qDAAqD;AACrD,SAAgB,cAAc,CAC1B,SAAwB,EACxB,SAAyB,EACzB,SAAoB,EACpB,OAA2B;IAE3B,MAAM,QAAQ,GAAG,IAAA,8BAAW,EAAC,SAAS,CAAC,CAAC;IAExC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QACtB,OAAO,SAAS,CAAC;KACpB;IAED,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC3B,IACI,OAAO,CAAC,gBAAgB,mBAA4B;QACpD,CAAC,OAAO,CAAC,eAAe;QACxB,OAAO,CAAC,eAAe,CAAC,QAAQ,wBAA6B;QAC7D,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;QAC5C,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,oBAAyB,EACtE;QACE,OAAO,SAAS,CAAC;KACpB;IAED,MAAM,SAAS,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC/E,MAAM,SAAS,GAAG,iBAAS,CAAC,kBAAkB,CAC1C,SAAS,EACT,IAAA,iCAAgB,EAAC,SAAS,EAAE,QAAQ,CAAC,UAAU,EAAE,SAAS,CAAC,EAC3D,QAAQ,CAAC,UAAU,EACnB,QAAQ,CAAC,QAAQ,2BAEjB,IAAA,gCAAe,EAAC,SAAS,CAAC;IAC1B,uBAAuB,CAAC,SAAS,EACjC,SAAS,CAAC,OAAO,CAAC,kBAAkB,CACvC,CAAC;IACF,SAAS,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC9C,IAAA,mCAAuB,EAAC,SAAS,CAAC,CAAC;IAEnC,MAAM,WAAW,GAAG,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC;IAC7C,WAAW,CAAC,GAAG,CACX,WAAW,EACX,eAAM,CAAC,cAAc,CAAC,sDAA6D,EAAE,SAAS,CAAC,CAClG,CAAC;IAEF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QACpB,OAAO,SAAS,CAAC;KACpB;IAED,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC3B,IAAI,OAAO,CAAC,gBAAgB,mBAA4B,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;QAClF,OAAO,SAAS,CAAC;KACpB;IAED,MAAM,YAAY,GAAG,SAAS,CAAC,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAChE,IAAI,CAAC,YAAY,IAAI,CAAC,IAAA,2BAAmB,EAAC,YAAY,CAAC,EAAE;QACrD,OAAO,SAAS,CAAC;KACpB;IACD,MAAM,iBAAiB,GAAG,iBAAS,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;IAE/D,gEAAgE;IAChE,0BAA0B;IAC1B,0BAA0B;IAC1B,kCAAkC;IAClC,kCAAkC;IAClC,iDAAiD;IACjD,iDAAiD;IACjD,0CAA0C;IAC1C,IAAI,OAAO,CAAC,eAAe,CAAC,QAAQ,wBAA6B,EAAE;QAC/D,8CAA8C;QAC9C,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,oBAAyB,CAAC,EAAE;YACxF,OAAO,SAAS,CAAC;SACpB;QAED,MAAM,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO;aAC1C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;aACnB,IAAI,CAAC,EAAE,CAAC;aACR,IAAI,EAAE,CAAC;QAEZ,gCAAgC;QAChC,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAE3C,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,UAAU,CAAC,OAAO,EAAE,EAAE;YACnD,IAAI,CAAC,SAAS,EAAE;gBACZ,OAAO,SAAS,CAAC;aACpB;YAED,MAAM,SAAS,GAAG,iBAAS,CAAC,gBAAgB,CAAC,iBAAS,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;YAEjG,MAAM,WAAW,GAAG,IAAI,mBAAW,CAC/B,SAAS,CAAC,OAAO,CAAC,QAAQ,EAC1B,SAAS,CAAC,OAAO,CAAC,IAAI,EACtB,SAAS,EACT,SAAS,CACZ,CAAC;YAEF,MAAM,SAAS,GAAG,eAAM,CAAC,cAAc,sBAEnC,iBAAS,CAAC,gBAAgB,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAC7D,CAAC;YAEF,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;SACzC;QAED,OAAO,SAAS,CAAC;KACpB;IAED,IACI,OAAO,CAAC,eAAe,CAAC,QAAQ,kBAAuB;QACvD,OAAO,CAAC,eAAe,CAAC,QAAQ,mBAAwB,EAC1D;QACE,MAAM,OAAO,GACT,OAAO,CAAC,eAAe,CAAC,QAAQ,kBAAuB;YACnD,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO;YACjC,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,WAAW,CAAC;QAE9C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACtB,OAAO,SAAS,CAAC;SACpB;QAED,8DAA8D;QAC9D,iEAAiE;QACjE,IAAI,cAAc,GAAG,KAAK,CAAC;QAC3B,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE;YAC5C,IAAI,KAAK,KAAK,CAAC,EAAE;gBACb,cAAc,GAAG,KAAK,CAAC,QAAQ,wBAA6B,CAAC;aAChE;YAED,IAAI,QAA+B,CAAC;YACpC,IAAI,SAA2B,CAAC;YAEhC,IAAI,KAAK,CAAC,QAAQ,wBAA6B,EAAE;gBAC7C,IAAI,CAAC,cAAc,EAAE;oBACjB,OAAO,SAAS,CAAC;iBACpB;gBAED,QAAQ,GAAG,KAAK,CAAC;gBACjB,SAAS,GAAG,iBAAS,CAAC,gBAAgB,CAAC,iBAAS,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;aAC9F;iBAAM,IAAI,KAAK,CAAC,QAAQ,mBAAwB,EAAE;gBAC/C,IAAI,cAAc,EAAE;oBAChB,OAAO,SAAS,CAAC;iBACpB;gBAED,IAAI,KAAK,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;oBAChC,OAAO,SAAS,CAAC;iBACpB;gBACD,QAAQ,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBAChC,SAAS,GAAG,SAAS,CAAC,mBAAmB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;aACxE;iBAAM;gBACH,OAAO,SAAS,CAAC;aACpB;YAED,IACI,QAAQ,CAAC,QAAQ,wBAA6B;gBAC9C,QAAQ,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;gBAC7B,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,oBAAyB,EACvD;gBACE,OAAO,SAAS,CAAC;aACpB;YAED,MAAM,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YAE5C,MAAM,WAAW,GAAG,IAAI,mBAAW,CAC/B,SAAS,CAAC,OAAO,CAAC,QAAQ,EAC1B,SAAS,CAAC,OAAO,CAAC,IAAI,EACtB,SAAS,EACT,SAAS,CACZ,CAAC;YAEF,MAAM,SAAS,GAAG,eAAM,CAAC,cAAc,sBAEnC,iBAAS,CAAC,gBAAgB,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAC7D,CAAC;YAEF,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;SACzC;KACJ;IAED,IAAI,OAAO,CAAC,eAAe,CAAC,QAAQ,wBAA6B,EAAE;QAC/D,MAAM,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC;QAChD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACtB,OAAO,SAAS,CAAC;SACpB;QAED,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;YACzB,kDAAkD;YAClD,IAAI,KAAK,CAAC,QAAQ,gCAAqC,EAAE;gBACrD,OAAO,SAAS,CAAC;aACpB;YAED,MAAM,QAAQ,GAAG,KAAK,CAAC,aAAa,CAAC;YACrC,MAAM,SAAS,GAAG,SAAS,CAAC,mBAAmB,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC;YAE5E,IACI,QAAQ,CAAC,QAAQ,wBAA6B;gBAC9C,QAAQ,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;gBAC7B,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,oBAAyB,EACvD;gBACE,OAAO,SAAS,CAAC;aACpB;YAED,MAAM,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YAC5C,MAAM,WAAW,GAAG,IAAI,mBAAW,CAC/B,SAAS,CAAC,OAAO,CAAC,QAAQ,EAC1B,SAAS,CAAC,OAAO,CAAC,IAAI,EACtB,SAAS,EACT,SAAS,CACZ,CAAC;YAEF,MAAM,SAAS,GAAG,eAAM,CAAC,cAAc,sBAEnC,iBAAS,CAAC,gBAAgB,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAC7D,CAAC;YAEF,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;SACzC;KACJ;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAzND,wCAyNC;AAED,SAAgB,iCAAiC,CAC7C,SAAwB,EACxB,IAAc,EACd,YAAwB;;IAExB,gEAAgE;IAChE,wDAAwD;IACxD,MAAM,kBAAkB,GAAG,IAAA,kCAAiB,EAAC,IAAI,EAAE,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAC9E,IAAI,CAAC,kBAAkB,EAAE;QACrB,OAAO,SAAS,CAAC;KACpB;IAED,MAAM,aAAa,GAAG,SAAS,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;IACnE,IAAI,CAAC,aAAa,IAAI,CAAC,iBAAS,CAAC,WAAW,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE;QACnE,OAAO,SAAS,CAAC;KACpB;IAED,iEAAiE;IACjE,yEAAyE;IACzE,mEAAmE;IACnE,sEAAsE;IACtE,kEAAkE;IAClE,oEAAoE;IACpE,wCAAwC;IACxC,IAAI,qBAAqB,GACrB,CAAC,CAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,QAAQ,wBAA6B,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,KAAK,IAAI,CAAC;QAC3F,CAAC,CAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,QAAQ,6BAAiC;YACnD,IAAI,CAAC,MAAM,CAAC,eAAe,KAAK,IAAI;YACpC,CAAA,MAAA,IAAI,CAAC,MAAM,CAAC,MAAM,0CAAE,QAAQ,wBAA6B,CAAC;QAC9D,CAAC,IAAA,8BAAW,EAAC,IAAI,CAAC,CAAC,UAAU;YACzB,CAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,QAAQ,6BAAiC;YACtD,IAAI,CAAC,MAAM,CAAC,eAAe,KAAK,IAAI,CAAC,CAAC;IAE9C,oFAAoF;IACpF,mCAAmC;IACnC,IAAI,IAAA,oCAAkB,EAAC,IAAI,CAAC,KAAK,CAAC,EAAE;QAChC,qBAAqB,GAAG,KAAK,CAAC;KACjC;IAED,qFAAqF;IACrF,IAAI,IAAI,CAAC,KAAK,KAAK,MAAM,IAAI,IAAI,CAAC,KAAK,KAAK,OAAO,EAAE;QACjD,qBAAqB,GAAG,KAAK,CAAC;KACjC;IAED,IAAI,SAAe,CAAC;IAEpB,gEAAgE;IAChE,qEAAqE;IACrE,oEAAoE;IACpE,wBAAwB;IACxB,MAAM,SAAS,GAAG,IAAA,6BAAiB,EAAC,aAAa,CAAC,SAAS,EAAE,SAAS,0BAAyC,CAAC;IAChH,IAAI,SAAS,EAAE;QACX,+DAA+D;QAC/D,8DAA8D;QAC9D,2DAA2D;QAC3D,SAAS,GAAG,eAAO,CAAC,MAAM,EAAE,CAAC;KAChC;SAAM;QACH,SAAS,GAAG,YAAY,EAAE,CAAC;KAC9B;IAED,iCAAiC;IACjC,IAAI,IAAA,uBAAe,EAAC,SAAS,CAAC,IAAI,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;QACvE,qBAAqB,GAAG,KAAK,CAAC;KACjC;IAED,IAAI,qBAAqB,EAAE;QACvB,MAAM,WAAW,GAAG,IAAI,mBAAW,CAC/B,aAAa,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,EACxC,aAAa,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,EACpC,IAAI,CAAC,KAAK,EACV,SAAS,CACZ,CAAC;QACF,OAAO,iBAAS,CAAC,eAAe,CAAC,iBAAS,CAAC,gBAAgB,CAAC,aAAa,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;KACtG;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AA5ED,8EA4EC;AAED,SAAgB,iBAAiB,CAAC,SAAwB,EAAE,IAAyB;IACjF,MAAM,SAAS,GAAG,IAAA,kCAAiB,EAAC,IAAI,CAAC,IAAI,EAAE,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAC1E,IAAI,CAAC,SAAS,EAAE;QACZ,OAAO,KAAK,CAAC;KAChB;IAED,MAAM,SAAS,GAAG,SAAS,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;IACtD,IAAI,CAAC,SAAS,EAAE;QACZ,OAAO,KAAK,CAAC;KAChB;IAED,OAAO,iBAAS,CAAC,WAAW,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;AACtD,CAAC;AAZD,8CAYC;AAED,SAAgB,mBAAmB,CAC/B,SAAwB,EACxB,SAAoB,EACpB,SAAoB,EACpB,UAAkB,EAClB,YAAqB;IAErB,wEAAwE;IACxE,IAAI,CAAC,iBAAS,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE;QACnC,OAAO,SAAS,CAAC;KACpB;IAED,MAAM,YAAY,GAAG,SAAS,CAAC,YAAY,CAAC;IAE5C,IAAI,UAAU,KAAK,MAAM,IAAI,UAAU,KAAK,QAAQ,EAAE;QAClD,MAAM,QAAQ,GAAG,SAAS,CAAC,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC5D,IAAI,CAAC,IAAA,2BAAmB,EAAC,QAAQ,CAAC,EAAE;YAChC,OAAO,SAAS,CAAC;SACpB;QAED,MAAM,YAAY,GAAG,CAAC,KAAkB,EAAE,EAAE;YACxC,OAAO,iBAAS,CAAC,eAAe,CAAC,iBAAS,CAAC,gBAAgB,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC3F,CAAC,CAAC;QAEF,IAAI,YAAY,EAAE;YACd,IAAA,cAAM,EAAC,YAAY,YAAY,mBAAW,CAAC,CAAC;YAC5C,OAAO,EAAE,IAAI,EAAE,YAAY,CAAC,YAAY,CAAC,EAAE,YAAY,EAAE,CAAC;SAC7D;QAED,uEAAuE;QACvE,yCAAyC;QACzC,MAAM,aAAa,GAAG,IAAA,qCAAwB,EAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QACrE,IAAI,aAAa,EAAE;YACf,OAAO;gBACH,IAAI,EAAE,IAAA,oBAAY,EACd,aAAa,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE;oBAC/B,MAAM,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC;oBAC/C,IAAA,cAAM,EAAC,YAAY,YAAY,mBAAW,CAAC,CAAC;oBAC5C,OAAO,YAAY,CAAC,YAAY,CAAC,CAAC;gBACtC,CAAC,CAAC,CACL;gBACD,YAAY;aACf,CAAC;SACL;KACJ;IAED,IAAI,UAAU,KAAK,OAAO,IAAI,UAAU,KAAK,SAAS,EAAE;QACpD,kEAAkE;QAClE,oEAAoE;QACpE,mEAAmE;QACnE,4DAA4D;QAC5D,MAAM,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,kBAAkB,CAAC;QACvD,IAAI,SAAS,IAAI,IAAA,eAAO,EAAC,SAAS,CAAC,IAAI,CAAC,iBAAS,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE;YACpE,OAAO,EAAE,IAAI,EAAE,eAAO,CAAC,MAAM,EAAE,EAAE,YAAY,EAAE,CAAC;SACnD;QAED,IAAI,YAAY,EAAE;YACd,IAAA,cAAM,EAAC,YAAY,YAAY,mBAAW,CAAC,CAAC;YAC5C,OAAO,EAAE,IAAI,EAAE,YAAY,CAAC,QAAQ,EAAE,YAAY,EAAE,CAAC;SACxD;QAED,uEAAuE;QACvE,yCAAyC;QACzC,MAAM,aAAa,GAAG,IAAA,qCAAwB,EAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QACrE,IAAI,aAAa,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3C,OAAO;gBACH,IAAI,EAAE,IAAA,oBAAY,EACd,aAAa,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE;oBAC/B,MAAM,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC;oBAC/C,IAAA,cAAM,EAAC,YAAY,YAAY,mBAAW,CAAC,CAAC;oBAC5C,OAAO,YAAY,CAAC,QAAQ,CAAC;gBACjC,CAAC,CAAC,CACL;gBACD,YAAY;aACf,CAAC;SACL;KACJ;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AA/ED,kDA+EC;AAED,SAAgB,oBAAoB,CAAC,SAAwB,EAAE,IAAoB;IAC/E,MAAM,mBAAmB,GAAG,IAAA,kCAAiB,EAAC,IAAI,CAAC,CAAC;IAEpD,IAAI,mBAAmB,EAAE;QACrB,MAAM,aAAa,GAAG,SAAS,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAC;QACpE,IAAI,aAAa,EAAE;YACf,MAAM,UAAU,GAAG,SAAS,CAAC,qBAAqB,CAC9C,IAAI,EACJ,iBAAS,CAAC,eAAe,CAAC,aAAa,CAAC,SAAS,CAAC,EAClD,uBAAuB,CAC1B,CAAC;YAEF,8DAA8D;YAC9D,2DAA2D;YAC3D,iDAAiD;YACjD,IACI,UAAU;gBACV,IAAA,kBAAU,EAAC,UAAU,CAAC,IAAI,CAAC;gBAC3B,UAAU,CAAC,SAAS;gBACpB,IAAA,eAAO,EAAC,UAAU,CAAC,SAAS,CAAC;gBAC7B,CAAC,iBAAS,CAAC,SAAS,CAAC,UAAU,CAAC,SAAS,EAAE,MAAM,CAAC,EACpD;gBACE,IAAI,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE;oBAC5C,OAAO,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC;iBACrD;aACJ;SACJ;KACJ;IAED,OAAO,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AACnD,CAAC;AA9BD,oDA8BC"}
|
@@ -9,7 +9,7 @@ export interface ImportedModuleDescriptor {
|
|
9
9
|
leadingDots: number;
|
10
10
|
nameParts: string[];
|
11
11
|
hasTrailingDot?: boolean | undefined;
|
12
|
-
importedSymbols: string
|
12
|
+
importedSymbols: Set<string> | undefined;
|
13
13
|
}
|
14
14
|
export interface ModuleNameAndType {
|
15
15
|
moduleName: string;
|
@@ -57,7 +57,7 @@ export declare class ImportResolver {
|
|
57
57
|
protected resolveImportInternal(sourceFilePath: string, execEnv: ExecutionEnvironment, moduleDescriptor: ImportedModuleDescriptor): ImportResult;
|
58
58
|
protected fileExistsCached(path: string): boolean;
|
59
59
|
protected dirExistsCached(path: string): boolean;
|
60
|
-
protected addResultsToCache(execEnv: ExecutionEnvironment, importName: string, importResult: ImportResult,
|
60
|
+
protected addResultsToCache(sourceFilePath: string, execEnv: ExecutionEnvironment, importName: string, importResult: ImportResult, moduleDescriptor: ImportedModuleDescriptor | undefined, fromUserFile: boolean): ImportResult;
|
61
61
|
protected resolveAbsoluteImport(sourceFilePath: string | undefined, rootPath: string, execEnv: ExecutionEnvironment, moduleDescriptor: ImportedModuleDescriptor, importName: string, importFailureInfo: string[], allowPartial?: boolean, allowNativeLib?: boolean, useStubPackage?: boolean, allowPyi?: boolean, lookForPyTyped?: boolean): ImportResult;
|
62
62
|
protected getTypeshedPathEx(execEnv: ExecutionEnvironment, importFailureInfo: string[]): string | undefined;
|
63
63
|
protected resolveImportEx(sourceFilePath: string, execEnv: ExecutionEnvironment, moduleDescriptor: ImportedModuleDescriptor, importName: string, importFailureInfo?: string[], allowPyi?: boolean): ImportResult | undefined;
|
@@ -65,7 +65,7 @@ export declare class ImportResolver {
|
|
65
65
|
protected getNativeModuleName(fileName: string): string | undefined;
|
66
66
|
protected getModuleNameFromPath(containerPath: string, filePath: string, stripTopContainerDir?: boolean): string | undefined;
|
67
67
|
protected getModuleNameInfoFromPath(containerPath: string, filePath: string, stripTopContainerDir?: boolean): ModuleNameInfoFromPath | undefined;
|
68
|
-
protected filterImplicitImports(importResult: ImportResult, importedSymbols: string
|
68
|
+
protected filterImplicitImports(importResult: ImportResult, importedSymbols: Set<string> | undefined): ImportResult;
|
69
69
|
protected formatImportName(moduleDescriptor: ImportedModuleDescriptor): string;
|
70
70
|
protected getParentImportResolutionRoot(sourceFilePath: string, executionRoot: string | undefined): string;
|
71
71
|
private _resolveImportStrict;
|
@@ -74,7 +74,7 @@ export declare class ImportResolver {
|
|
74
74
|
private _invalidateFileSystemCache;
|
75
75
|
private _splitPath;
|
76
76
|
private _resolveAbsoluteImport;
|
77
|
-
private
|
77
|
+
private _getImportCacheKey;
|
78
78
|
private _lookUpResultsInCache;
|
79
79
|
private _isNamespacePackageResolved;
|
80
80
|
private _resolveBestAbsoluteImport;
|
@@ -45,7 +45,7 @@ const pyTypedUtils_1 = require("./pyTypedUtils");
|
|
45
45
|
const symbolNameUtils_1 = require("./symbolNameUtils");
|
46
46
|
function createImportedModuleDescriptor(moduleName) {
|
47
47
|
if (moduleName.length === 0) {
|
48
|
-
return { leadingDots: 0, nameParts: [], importedSymbols:
|
48
|
+
return { leadingDots: 0, nameParts: [], importedSymbols: new Set() };
|
49
49
|
}
|
50
50
|
let startIndex = 0;
|
51
51
|
let leadingDots = 0;
|
@@ -58,7 +58,7 @@ function createImportedModuleDescriptor(moduleName) {
|
|
58
58
|
return {
|
59
59
|
leadingDots,
|
60
60
|
nameParts: moduleName.slice(startIndex).split('.'),
|
61
|
-
importedSymbols:
|
61
|
+
importedSymbols: new Set(),
|
62
62
|
};
|
63
63
|
}
|
64
64
|
exports.createImportedModuleDescriptor = createImportedModuleDescriptor;
|
@@ -310,7 +310,7 @@ class ImportResolver {
|
|
310
310
|
const info = [];
|
311
311
|
const paths = (PythonPathUtils.findPythonSearchPaths(this.fileSystem, this._configOptions, this.host, info) || []).map((p) => this.fileSystem.realCasePath(p));
|
312
312
|
// Remove duplicates (yes, it happens).
|
313
|
-
this._cachedPythonSearchPaths = { paths:
|
313
|
+
this._cachedPythonSearchPaths = { paths: Array.from(new Set(paths)), failureInfo: info };
|
314
314
|
}
|
315
315
|
// Make sure we cache the logs as well so we can find out why search path failed.
|
316
316
|
importFailureInfo.push(...this._cachedPythonSearchPaths.failureInfo);
|
@@ -429,9 +429,11 @@ class ImportResolver {
|
|
429
429
|
}
|
430
430
|
return false;
|
431
431
|
}
|
432
|
-
addResultsToCache(execEnv, importName, importResult,
|
433
|
-
|
434
|
-
|
432
|
+
addResultsToCache(sourceFilePath, execEnv, importName, importResult, moduleDescriptor, fromUserFile) {
|
433
|
+
// If the import is relative, include the source file path in the key.
|
434
|
+
const relativeSourceFilePath = moduleDescriptor && moduleDescriptor.leadingDots > 0 ? sourceFilePath : '';
|
435
|
+
(0, collectionUtils_1.getOrAdd)(this._cachedImportResults, execEnv.root, () => new Map()).set(this._getImportCacheKey(relativeSourceFilePath, importName, fromUserFile), importResult);
|
436
|
+
return this.filterImplicitImports(importResult, moduleDescriptor === null || moduleDescriptor === void 0 ? void 0 : moduleDescriptor.importedSymbols);
|
435
437
|
}
|
436
438
|
// Follows import resolution algorithm defined in PEP-420:
|
437
439
|
// https://www.python.org/dev/peps/pep-0420/
|
@@ -440,7 +442,7 @@ class ImportResolver {
|
|
440
442
|
// Look for packaged stubs first. PEP 561 indicates that package authors can ship
|
441
443
|
// their stubs separately from their package implementation by appending the string
|
442
444
|
// '-stubs' to its top - level directory name. We'll look there first.
|
443
|
-
const importResult = this._resolveAbsoluteImport(
|
445
|
+
const importResult = this._resolveAbsoluteImport(rootPath, execEnv, moduleDescriptor, importName, importFailureInfo, allowPartial,
|
444
446
|
/* allowNativeLib */ false,
|
445
447
|
/* useStubPackage */ true,
|
446
448
|
/* allowPyi */ true,
|
@@ -454,7 +456,7 @@ class ImportResolver {
|
|
454
456
|
}
|
455
457
|
}
|
456
458
|
}
|
457
|
-
return this._resolveAbsoluteImport(
|
459
|
+
return this._resolveAbsoluteImport(rootPath, execEnv, moduleDescriptor, importName, importFailureInfo, allowPartial, allowNativeLib,
|
458
460
|
/* useStubPackage */ false, allowPyi, lookForPyTyped);
|
459
461
|
}
|
460
462
|
// Intended to be overridden by subclasses to provide additional stub
|
@@ -532,19 +534,22 @@ class ImportResolver {
|
|
532
534
|
filterImplicitImports(importResult, importedSymbols) {
|
533
535
|
if (importedSymbols === undefined) {
|
534
536
|
const newImportResult = Object.assign({}, importResult);
|
535
|
-
newImportResult.filteredImplicitImports =
|
537
|
+
newImportResult.filteredImplicitImports = new Map();
|
536
538
|
return newImportResult;
|
537
539
|
}
|
538
|
-
if (importedSymbols.
|
540
|
+
if (importedSymbols.size === 0) {
|
539
541
|
return importResult;
|
540
542
|
}
|
541
|
-
if (importResult.implicitImports.
|
543
|
+
if (importResult.implicitImports.size === 0) {
|
542
544
|
return importResult;
|
543
545
|
}
|
544
|
-
const filteredImplicitImports =
|
545
|
-
|
546
|
+
const filteredImplicitImports = new Map();
|
547
|
+
importResult.implicitImports.forEach((implicitImport) => {
|
548
|
+
if (importedSymbols.has(implicitImport.name)) {
|
549
|
+
filteredImplicitImports.set(implicitImport.name, implicitImport);
|
550
|
+
}
|
546
551
|
});
|
547
|
-
if (filteredImplicitImports.
|
552
|
+
if (filteredImplicitImports.size === importResult.implicitImports.size) {
|
548
553
|
return importResult;
|
549
554
|
}
|
550
555
|
const newImportResult = Object.assign({}, importResult);
|
@@ -575,22 +580,25 @@ class ImportResolver {
|
|
575
580
|
importType: 2 /* Local */,
|
576
581
|
isStubFile: false,
|
577
582
|
isNativeLib: false,
|
578
|
-
implicitImports:
|
579
|
-
filteredImplicitImports:
|
583
|
+
implicitImports: new Map(),
|
584
|
+
filteredImplicitImports: new Map(),
|
580
585
|
nonStubImportResult: undefined,
|
581
586
|
};
|
582
587
|
this.ensurePartialStubPackages(execEnv);
|
583
588
|
// Is it a relative import?
|
584
589
|
if (moduleDescriptor.leadingDots > 0) {
|
590
|
+
const cachedResults = this._lookUpResultsInCache(sourceFilePath, execEnv, importName, moduleDescriptor, fromUserFile);
|
591
|
+
if (cachedResults) {
|
592
|
+
return cachedResults;
|
593
|
+
}
|
585
594
|
const relativeImport = this._resolveRelativeImport(sourceFilePath, execEnv, moduleDescriptor, importName, importFailureInfo);
|
586
595
|
if (relativeImport) {
|
587
596
|
relativeImport.isRelative = true;
|
588
|
-
return relativeImport;
|
597
|
+
return this.addResultsToCache(sourceFilePath, execEnv, importName, relativeImport, moduleDescriptor, fromUserFile);
|
589
598
|
}
|
590
599
|
}
|
591
600
|
else {
|
592
|
-
|
593
|
-
const cachedResults = this._lookUpResultsInCache(execEnv, importName, moduleDescriptor.importedSymbols, fromUserFile);
|
601
|
+
const cachedResults = this._lookUpResultsInCache(sourceFilePath, execEnv, importName, moduleDescriptor, fromUserFile);
|
594
602
|
if (cachedResults) {
|
595
603
|
// In most cases, we can simply return a cached entry. However, there are cases
|
596
604
|
// where the cached entry refers to a previously-resolved namespace package
|
@@ -612,11 +620,11 @@ class ImportResolver {
|
|
612
620
|
this._resolveBestAbsoluteImport(sourceFilePath, execEnv, moduleDescriptor,
|
613
621
|
/* allowPyi */ false) || notFoundResult;
|
614
622
|
}
|
615
|
-
return this.addResultsToCache(execEnv, importName, bestImport, moduleDescriptor
|
623
|
+
return this.addResultsToCache(sourceFilePath, execEnv, importName, bestImport, moduleDescriptor, fromUserFile);
|
616
624
|
}
|
617
625
|
}
|
618
|
-
return this.addResultsToCache(execEnv, importName, notFoundResult,
|
619
|
-
/*
|
626
|
+
return this.addResultsToCache(sourceFilePath, execEnv, importName, notFoundResult,
|
627
|
+
/* moduleDescriptor */ undefined, fromUserFile);
|
620
628
|
}
|
621
629
|
_getCompletionSuggestionsStrict(sourceFilePath, execEnv, moduleDescriptor) {
|
622
630
|
const importFailureInfo = [];
|
@@ -790,7 +798,7 @@ class ImportResolver {
|
|
790
798
|
const fileOrDirName = pathComponents[pathComponents.length - 1];
|
791
799
|
return [containingPath, fileOrDirName];
|
792
800
|
}
|
793
|
-
_resolveAbsoluteImport(
|
801
|
+
_resolveAbsoluteImport(rootPath, execEnv, moduleDescriptor, importName, importFailureInfo, allowPartial, allowNativeLib, useStubPackage, allowPyi, lookForPyTyped) {
|
794
802
|
if (useStubPackage) {
|
795
803
|
importFailureInfo.push(`Attempting to resolve stub package using root path '${rootPath}'`);
|
796
804
|
}
|
@@ -806,7 +814,7 @@ class ImportResolver {
|
|
806
814
|
let isStubPackage = false;
|
807
815
|
let isStubFile = false;
|
808
816
|
let isNativeLib = false;
|
809
|
-
let implicitImports =
|
817
|
+
let implicitImports = new Map();
|
810
818
|
let packageDirectory;
|
811
819
|
let pyTypedInfo;
|
812
820
|
// Handle the "from . import XXX" case.
|
@@ -957,19 +965,21 @@ class ImportResolver {
|
|
957
965
|
packageDirectory,
|
958
966
|
};
|
959
967
|
}
|
960
|
-
|
961
|
-
return `${importName}-${fromUserFile}`;
|
968
|
+
_getImportCacheKey(sourceFilePath, importName, fromUserFile) {
|
969
|
+
return `${sourceFilePath}-${importName}-${fromUserFile}`;
|
962
970
|
}
|
963
|
-
_lookUpResultsInCache(execEnv, importName,
|
971
|
+
_lookUpResultsInCache(sourceFilePath, execEnv, importName, moduleDescriptor, fromUserFile) {
|
964
972
|
const cacheForExecEnv = this._cachedImportResults.get(execEnv.root);
|
965
973
|
if (!cacheForExecEnv) {
|
966
974
|
return undefined;
|
967
975
|
}
|
968
|
-
|
976
|
+
// If the import is relative, include the source file path in the key.
|
977
|
+
const relativeSourceFilePath = moduleDescriptor.leadingDots > 0 ? sourceFilePath : '';
|
978
|
+
const cachedEntry = cacheForExecEnv.get(this._getImportCacheKey(relativeSourceFilePath, importName, fromUserFile));
|
969
979
|
if (!cachedEntry) {
|
970
980
|
return undefined;
|
971
981
|
}
|
972
|
-
return this.filterImplicitImports(cachedEntry, importedSymbols);
|
982
|
+
return this.filterImplicitImports(cachedEntry, moduleDescriptor.importedSymbols);
|
973
983
|
}
|
974
984
|
// Determines whether a namespace package resolves all of the symbols
|
975
985
|
// requested in the module descriptor. Namespace packages have no "__init__.py"
|
@@ -978,15 +988,11 @@ class ImportResolver {
|
|
978
988
|
// are all satisfied by submodules (as listed in the implicit imports).
|
979
989
|
_isNamespacePackageResolved(moduleDescriptor, implicitImports) {
|
980
990
|
if (moduleDescriptor.importedSymbols) {
|
981
|
-
if (!moduleDescriptor.importedSymbols.some((symbol) => {
|
982
|
-
return implicitImports.some((implicitImport) => {
|
983
|
-
return implicitImport.name === symbol;
|
984
|
-
});
|
985
|
-
})) {
|
991
|
+
if (!Array.from(moduleDescriptor.importedSymbols.keys()).some((symbol) => implicitImports.has(symbol))) {
|
986
992
|
return false;
|
987
993
|
}
|
988
994
|
}
|
989
|
-
else if (implicitImports.
|
995
|
+
else if (implicitImports.size === 0) {
|
990
996
|
return false;
|
991
997
|
}
|
992
998
|
return true;
|
@@ -1277,8 +1283,8 @@ class ImportResolver {
|
|
1277
1283
|
}
|
1278
1284
|
});
|
1279
1285
|
}
|
1280
|
-
const flattenPaths =
|
1281
|
-
this._cachedTypeshedThirdPartyPackageRoots =
|
1286
|
+
const flattenPaths = Array.from(this._cachedTypeshedThirdPartyPackagePaths.values()).flatMap((v) => v);
|
1287
|
+
this._cachedTypeshedThirdPartyPackageRoots = Array.from(new Set(flattenPaths)).sort();
|
1282
1288
|
}
|
1283
1289
|
_getCompletionSuggestionsTypeshedPath(sourceFilePath, execEnv, moduleDescriptor, isStdLib, suggestions) {
|
1284
1290
|
const importFailureInfo = [];
|
@@ -1506,7 +1512,7 @@ class ImportResolver {
|
|
1506
1512
|
nonStubImportResult: undefined,
|
1507
1513
|
};
|
1508
1514
|
}
|
1509
|
-
return
|
1515
|
+
return absImport;
|
1510
1516
|
}
|
1511
1517
|
_getCompletionSuggestionsRelative(sourceFilePath, execEnv, moduleDescriptor, suggestions) {
|
1512
1518
|
// Determine which search path this file is part of.
|
@@ -1614,7 +1620,7 @@ class ImportResolver {
|
|
1614
1620
|
const moduleDescriptor = {
|
1615
1621
|
leadingDots: leadingDots,
|
1616
1622
|
nameParts: [...parentNameParts, name],
|
1617
|
-
importedSymbols:
|
1623
|
+
importedSymbols: new Set(),
|
1618
1624
|
};
|
1619
1625
|
// Make sure we don't use parent folder resolution when checking whether the given name is resolvable.
|
1620
1626
|
if (strictOnly) {
|
@@ -1711,7 +1717,7 @@ class ImportResolver {
|
|
1711
1717
|
}
|
1712
1718
|
}
|
1713
1719
|
}
|
1714
|
-
return
|
1720
|
+
return implicitImportMap;
|
1715
1721
|
}
|
1716
1722
|
_resolveNativeModuleStub(nativeLibPath, execEnv, importName, moduleDescriptor, importFailureInfo, resolvedPaths) {
|
1717
1723
|
let moduleFullName = importName;
|