@zzzen/pyright-internal 1.2.0-dev.20240317 → 1.2.0-dev.20240331
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.js +1 -1
- package/dist/analyzer/analyzerFileInfo.js.map +1 -1
- package/dist/analyzer/binder.js +4 -1
- package/dist/analyzer/binder.js.map +1 -1
- package/dist/analyzer/cacheManager.d.ts +1 -0
- package/dist/analyzer/cacheManager.js +4 -1
- package/dist/analyzer/cacheManager.js.map +1 -1
- package/dist/analyzer/checker.d.ts +1 -2
- package/dist/analyzer/checker.js +16 -11
- package/dist/analyzer/checker.js.map +1 -1
- package/dist/analyzer/constructors.d.ts +3 -2
- package/dist/analyzer/constructors.js +76 -54
- package/dist/analyzer/constructors.js.map +1 -1
- package/dist/analyzer/dataClasses.js +2 -0
- package/dist/analyzer/dataClasses.js.map +1 -1
- package/dist/analyzer/declaration.js +1 -1
- package/dist/analyzer/declaration.js.map +1 -1
- package/dist/analyzer/deprecatedSymbols.js +40 -40
- package/dist/analyzer/deprecatedSymbols.js.map +1 -1
- package/dist/analyzer/enums.js +1 -0
- package/dist/analyzer/enums.js.map +1 -1
- package/dist/analyzer/importResolver.js +25 -23
- package/dist/analyzer/importResolver.js.map +1 -1
- package/dist/analyzer/namedTuples.js +2 -0
- package/dist/analyzer/namedTuples.js.map +1 -1
- package/dist/analyzer/operations.js +1 -1
- package/dist/analyzer/operations.js.map +1 -1
- package/dist/analyzer/packageTypeVerifier.js +1 -1
- package/dist/analyzer/packageTypeVerifier.js.map +1 -1
- package/dist/analyzer/parseTreeUtils.d.ts +1 -1
- package/dist/analyzer/patternMatching.js +14 -3
- package/dist/analyzer/patternMatching.js.map +1 -1
- package/dist/analyzer/program.d.ts +1 -7
- package/dist/analyzer/program.js +15 -19
- package/dist/analyzer/program.js.map +1 -1
- package/dist/analyzer/programTypes.d.ts +11 -0
- package/dist/analyzer/programTypes.js +11 -0
- package/dist/analyzer/programTypes.js.map +1 -0
- package/dist/analyzer/properties.js +2 -8
- package/dist/analyzer/properties.js.map +1 -1
- package/dist/analyzer/pythonPathUtils.js +1 -2
- package/dist/analyzer/pythonPathUtils.js.map +1 -1
- package/dist/analyzer/service.d.ts +2 -2
- package/dist/analyzer/service.js +20 -14
- package/dist/analyzer/service.js.map +1 -1
- package/dist/analyzer/sourceFile.js +4 -4
- package/dist/analyzer/sourceFile.js.map +1 -1
- package/dist/analyzer/sourceFileInfoUtils.js +3 -3
- package/dist/analyzer/sourceFileInfoUtils.js.map +1 -1
- package/dist/analyzer/staticExpressions.js +52 -30
- package/dist/analyzer/staticExpressions.js.map +1 -1
- package/dist/analyzer/tracePrinter.js +2 -2
- package/dist/analyzer/tracePrinter.js.map +1 -1
- package/dist/analyzer/typeEvaluator.js +81 -56
- package/dist/analyzer/typeEvaluator.js.map +1 -1
- package/dist/analyzer/typeGuards.js +14 -7
- package/dist/analyzer/typeGuards.js.map +1 -1
- package/dist/analyzer/typeUtils.d.ts +2 -2
- package/dist/analyzer/typeUtils.js +41 -5
- package/dist/analyzer/typeUtils.js.map +1 -1
- package/dist/analyzer/typedDicts.js +3 -0
- package/dist/analyzer/typedDicts.js.map +1 -1
- package/dist/backgroundAnalysis.js +1 -1
- package/dist/backgroundAnalysis.js.map +1 -1
- package/dist/backgroundAnalysisBase.js +1 -1
- package/dist/backgroundAnalysisBase.js.map +1 -1
- package/dist/backgroundThreadBase.js +23 -11
- package/dist/backgroundThreadBase.js.map +1 -1
- package/dist/commands/commandController.d.ts +2 -1
- package/dist/commands/commandController.js +3 -0
- package/dist/commands/commandController.js.map +1 -1
- package/dist/commands/createTypeStub.d.ts +1 -1
- package/dist/commands/createTypeStub.js +3 -3
- package/dist/commands/createTypeStub.js.map +1 -1
- package/dist/commands/dumpFileDebugInfoCommand.d.ts +1 -1
- package/dist/commands/dumpFileDebugInfoCommand.js +1 -1
- package/dist/commands/dumpFileDebugInfoCommand.js.map +1 -1
- package/dist/commands/quickActionCommand.d.ts +1 -1
- package/dist/commands/quickActionCommand.js +2 -2
- package/dist/commands/quickActionCommand.js.map +1 -1
- package/dist/commands/restartServer.d.ts +1 -1
- package/dist/common/cancellationUtils.js +2 -2
- package/dist/common/cancellationUtils.js.map +1 -1
- package/dist/common/caseSensitivityDetector.d.ts +6 -0
- package/dist/common/caseSensitivityDetector.js +18 -0
- package/dist/common/caseSensitivityDetector.js.map +1 -0
- package/dist/common/commandLineOptions.d.ts +3 -2
- package/dist/common/commandLineOptions.js.map +1 -1
- package/dist/common/commandUtils.js +1 -1
- package/dist/common/commandUtils.js.map +1 -1
- package/dist/common/configOptions.js +7 -7
- package/dist/common/configOptions.js.map +1 -1
- package/dist/common/envVarUtils.d.ts +1 -0
- package/dist/common/envVarUtils.js +42 -7
- package/dist/common/envVarUtils.js.map +1 -1
- package/dist/common/extensibility.d.ts +1 -1
- package/dist/common/fileBasedCancellationUtils.js +2 -2
- package/dist/common/fileBasedCancellationUtils.js.map +1 -1
- package/dist/common/fileSystem.d.ts +0 -1
- package/dist/common/fileSystem.js.map +1 -1
- package/dist/common/fullAccessHost.js +11 -6
- package/dist/common/fullAccessHost.js.map +1 -1
- package/dist/common/languageServerInterface.d.ts +62 -0
- package/dist/common/languageServerInterface.js +10 -0
- package/dist/common/languageServerInterface.js.map +1 -0
- package/dist/common/pythonVersion.d.ts +36 -20
- package/dist/common/pythonVersion.js +160 -54
- package/dist/common/pythonVersion.js.map +1 -1
- package/dist/common/realFileSystem.d.ts +8 -4
- package/dist/common/realFileSystem.js +56 -17
- package/dist/common/realFileSystem.js.map +1 -1
- package/dist/common/serviceKeys.d.ts +21 -0
- package/dist/common/serviceKeys.js +26 -0
- package/dist/common/serviceKeys.js.map +1 -0
- package/dist/common/serviceProviderExtensions.d.ts +2 -16
- package/dist/common/serviceProviderExtensions.js +19 -27
- package/dist/common/serviceProviderExtensions.js.map +1 -1
- package/dist/common/textEditTracker.js +2 -2
- package/dist/common/textEditTracker.js.map +1 -1
- package/dist/common/uri/constantUri.d.ts +36 -0
- package/dist/common/uri/constantUri.js +112 -0
- package/dist/common/uri/constantUri.js.map +1 -0
- package/dist/common/uri/emptyUri.d.ts +3 -31
- package/dist/common/uri/emptyUri.js +3 -84
- package/dist/common/uri/emptyUri.js.map +1 -1
- package/dist/common/uri/fileUri.d.ts +1 -0
- package/dist/common/uri/fileUri.js +3 -2
- package/dist/common/uri/fileUri.js.map +1 -1
- package/dist/common/uri/uri.d.ts +11 -3
- package/dist/common/uri/uri.js +31 -20
- package/dist/common/uri/uri.js.map +1 -1
- package/dist/common/uri/uriUtils.d.ts +11 -5
- package/dist/common/uri/uriUtils.js +31 -53
- package/dist/common/uri/uriUtils.js.map +1 -1
- package/dist/common/workspaceEditUtils.js +4 -4
- package/dist/common/workspaceEditUtils.js.map +1 -1
- package/dist/languageServerBase.d.ts +9 -57
- package/dist/languageServerBase.js +18 -8
- package/dist/languageServerBase.js.map +1 -1
- package/dist/languageService/analyzerServiceExecutor.d.ts +1 -1
- package/dist/languageService/analyzerServiceExecutor.js +4 -5
- package/dist/languageService/analyzerServiceExecutor.js.map +1 -1
- package/dist/languageService/callHierarchyProvider.js +6 -6
- package/dist/languageService/callHierarchyProvider.js.map +1 -1
- package/dist/languageService/codeActionProvider.js +43 -42
- package/dist/languageService/codeActionProvider.js.map +1 -1
- package/dist/languageService/completionProvider.js +4 -4
- package/dist/languageService/completionProvider.js.map +1 -1
- package/dist/languageService/definitionProvider.js +2 -2
- package/dist/languageService/definitionProvider.js.map +1 -1
- package/dist/languageService/documentSymbolCollector.js +2 -2
- package/dist/languageService/documentSymbolCollector.js.map +1 -1
- package/dist/languageService/documentSymbolProvider.d.ts +3 -2
- package/dist/languageService/documentSymbolProvider.js +3 -2
- package/dist/languageService/documentSymbolProvider.js.map +1 -1
- package/dist/languageService/referencesProvider.js +2 -2
- package/dist/languageService/referencesProvider.js.map +1 -1
- package/dist/languageService/signatureHelpProvider.js +2 -2
- package/dist/languageService/signatureHelpProvider.js.map +1 -1
- package/dist/languageService/symbolIndexer.d.ts +4 -1
- package/dist/languageService/symbolIndexer.js +21 -11
- package/dist/languageService/symbolIndexer.js.map +1 -1
- package/dist/languageService/workspaceSymbolProvider.js +1 -1
- package/dist/languageService/workspaceSymbolProvider.js.map +1 -1
- package/dist/localization/localize.js +21 -16
- 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.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/parser/parser.js +24 -21
- package/dist/parser/parser.js.map +1 -1
- package/dist/parser/unicode.js +3456 -2853
- package/dist/parser/unicode.js.map +1 -1
- package/dist/pyright.js +7 -7
- package/dist/pyright.js.map +1 -1
- package/dist/pyrightFileSystem.d.ts +3 -1
- package/dist/pyrightFileSystem.js +14 -9
- package/dist/pyrightFileSystem.js.map +1 -1
- package/dist/readonlyAugmentedFileSystem.d.ts +0 -1
- package/dist/readonlyAugmentedFileSystem.js +0 -3
- package/dist/readonlyAugmentedFileSystem.js.map +1 -1
- package/dist/server.d.ts +3 -1
- package/dist/server.js +14 -10
- package/dist/server.js.map +1 -1
- package/dist/tests/chainedSourceFiles.test.js +12 -12
- package/dist/tests/chainedSourceFiles.test.js.map +1 -1
- package/dist/tests/checker.test.js +11 -11
- package/dist/tests/checker.test.js.map +1 -1
- package/dist/tests/completions.test.js +4 -4
- package/dist/tests/completions.test.js.map +1 -1
- package/dist/tests/config.test.js +26 -21
- package/dist/tests/config.test.js.map +1 -1
- package/dist/tests/documentSymbolCollector.test.js +2 -3
- package/dist/tests/documentSymbolCollector.test.js.map +1 -1
- package/dist/tests/envVarUtils.test.js +77 -2
- package/dist/tests/envVarUtils.test.js.map +1 -1
- package/dist/tests/filesystem.test.js +13 -13
- package/dist/tests/filesystem.test.js.map +1 -1
- package/dist/tests/fourSlashParser.test.js +12 -12
- package/dist/tests/fourSlashParser.test.js.map +1 -1
- package/dist/tests/harness/fourslash/fourSlashParser.js +12 -10
- package/dist/tests/harness/fourslash/fourSlashParser.js.map +1 -1
- package/dist/tests/harness/fourslash/fourSlashTypes.d.ts +1 -0
- package/dist/tests/harness/fourslash/fourSlashTypes.js.map +1 -1
- package/dist/tests/harness/fourslash/testLanguageService.d.ts +3 -2
- 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 +3 -3
- package/dist/tests/harness/fourslash/testState.js +36 -32
- package/dist/tests/harness/fourslash/testState.js.map +1 -1
- package/dist/tests/harness/fourslash/workspaceEditTestUtils.js +1 -1
- package/dist/tests/harness/fourslash/workspaceEditTestUtils.js.map +1 -1
- package/dist/tests/harness/testHost.d.ts +7 -0
- package/dist/tests/harness/testHost.js +33 -14
- package/dist/tests/harness/testHost.js.map +1 -1
- package/dist/tests/harness/vfs/factory.d.ts +3 -4
- package/dist/tests/harness/vfs/factory.js +7 -6
- package/dist/tests/harness/vfs/factory.js.map +1 -1
- package/dist/tests/harness/vfs/filesystem.d.ts +5 -3
- package/dist/tests/harness/vfs/filesystem.js +22 -15
- package/dist/tests/harness/vfs/filesystem.js.map +1 -1
- package/dist/tests/importResolver.test.js +35 -34
- package/dist/tests/importResolver.test.js.map +1 -1
- package/dist/tests/importStatementUtils.test.js +5 -6
- package/dist/tests/importStatementUtils.test.js.map +1 -1
- package/dist/tests/languageServer.test.js +1 -1
- package/dist/tests/languageServer.test.js.map +1 -1
- package/dist/tests/logger.test.js +1 -1
- package/dist/tests/logger.test.js.map +1 -1
- package/dist/tests/lsp/customLsp.d.ts +1 -1
- package/dist/tests/lsp/languageServer.js +7 -5
- package/dist/tests/lsp/languageServer.js.map +1 -1
- package/dist/tests/lsp/languageServerTestUtils.js +21 -16
- package/dist/tests/lsp/languageServerTestUtils.js.map +1 -1
- package/dist/tests/parseTreeUtils.test.js +1 -2
- package/dist/tests/parseTreeUtils.test.js.map +1 -1
- package/dist/tests/pyrightFileSystem.test.js +6 -5
- package/dist/tests/pyrightFileSystem.test.js.map +1 -1
- package/dist/tests/serialization.test.js +5 -5
- package/dist/tests/serialization.test.js.map +1 -1
- package/dist/tests/service.test.js +16 -25
- package/dist/tests/service.test.js.map +1 -1
- package/dist/tests/sourceFile.test.js +8 -5
- package/dist/tests/sourceFile.test.js.map +1 -1
- package/dist/tests/sourceMapperUtils.test.js +4 -4
- package/dist/tests/sourceMapperUtils.test.js.map +1 -1
- package/dist/tests/testState.test.js +5 -5
- package/dist/tests/testState.test.js.map +1 -1
- package/dist/tests/testStateUtils.js +6 -6
- package/dist/tests/testStateUtils.js.map +1 -1
- package/dist/tests/testUtils.js +6 -4
- package/dist/tests/testUtils.js.map +1 -1
- package/dist/tests/typeEvaluator1.test.js +16 -12
- package/dist/tests/typeEvaluator1.test.js.map +1 -1
- package/dist/tests/typeEvaluator2.test.js +2 -2
- package/dist/tests/typeEvaluator2.test.js.map +1 -1
- package/dist/tests/typeEvaluator3.test.js +57 -57
- package/dist/tests/typeEvaluator3.test.js.map +1 -1
- package/dist/tests/typeEvaluator4.test.js +21 -21
- package/dist/tests/typeEvaluator4.test.js.map +1 -1
- package/dist/tests/typeEvaluator5.test.js +27 -27
- package/dist/tests/typeEvaluator5.test.js.map +1 -1
- package/dist/tests/typePrinter.test.js.map +1 -1
- package/dist/tests/uri.test.js +220 -199
- package/dist/tests/uri.test.js.map +1 -1
- package/dist/tests/workspaceEditUtils.test.js +7 -7
- package/dist/tests/workspaceEditUtils.test.js.map +1 -1
- package/dist/tests/zipfs.test.js +7 -5
- package/dist/tests/zipfs.test.js.map +1 -1
- package/dist/workspaceFactory.d.ts +15 -6
- package/dist/workspaceFactory.js +16 -10
- package/dist/workspaceFactory.js.map +1 -1
- package/package.json +5 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.test.js","sourceRoot":"","sources":["../../../../../src/tests/service.test.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;AAEH,oDAA4B;AAE5B,mDAAmD;AACnD,uDAAqD;AACrD,mDAAqE;AACrE,
|
|
1
|
+
{"version":3,"file":"service.test.js","sourceRoot":"","sources":["../../../../../src/tests/service.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,14 +39,17 @@ const fullAccessHost_1 = require("../common/fullAccessHost");
|
|
|
39
39
|
const pathUtils_1 = require("../common/pathUtils");
|
|
40
40
|
const realFileSystem_1 = require("../common/realFileSystem");
|
|
41
41
|
const serviceProviderExtensions_1 = require("../common/serviceProviderExtensions");
|
|
42
|
-
const uri_1 = require("../common/uri/uri");
|
|
43
42
|
const testState_1 = require("./harness/fourslash/testState");
|
|
43
|
+
const uri_1 = require("../common/uri/uri");
|
|
44
44
|
test('Empty', () => {
|
|
45
45
|
const filePath = (0, pathUtils_1.combinePaths)(process.cwd(), 'tests/samples/test_file1.py');
|
|
46
|
-
const
|
|
47
|
-
const
|
|
48
|
-
const
|
|
49
|
-
const
|
|
46
|
+
const tempFile = new realFileSystem_1.RealTempFile();
|
|
47
|
+
const fs = (0, realFileSystem_1.createFromRealFileSystem)(tempFile);
|
|
48
|
+
const serviceProvider = (0, serviceProviderExtensions_1.createServiceProvider)(tempFile, fs);
|
|
49
|
+
const sourceFile = new sourceFile_1.SourceFile(serviceProvider, uri_1.Uri.file(filePath, serviceProvider), '', false, false, {
|
|
50
|
+
isEditMode: false,
|
|
51
|
+
});
|
|
52
|
+
const configOptions = new configOptions_1.ConfigOptions(uri_1.Uri.file(process.cwd(), serviceProvider));
|
|
50
53
|
const sp = (0, serviceProviderExtensions_1.createServiceProvider)(fs);
|
|
51
54
|
const importResolver = new importResolver_1.ImportResolver(sp, configOptions, new fullAccessHost_1.FullAccessHost(sp));
|
|
52
55
|
sourceFile.parse(configOptions, importResolver);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sourceFile.test.js","sourceRoot":"","sources":["../../../../../src/tests/sourceFile.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;GAOG;AACH,+CAAiC;AAEjC,+DAA4D;AAC5D,uDAAoD;AACpD,2DAAwD;AACxD,6DAA0D;AAC1D,mDAAmD;AACnD,
|
|
1
|
+
{"version":3,"file":"sourceFile.test.js","sourceRoot":"","sources":["../../../../../src/tests/sourceFile.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;GAOG;AACH,+CAAiC;AAEjC,+DAA4D;AAC5D,uDAAoD;AACpD,2DAAwD;AACxD,6DAA0D;AAC1D,mDAAmD;AACnD,6DAAkF;AAClF,mFAA4E;AAC5E,6DAAqE;AACrE,2CAAwC;AAExC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;IACf,MAAM,QAAQ,GAAG,IAAA,wBAAY,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,6BAA6B,CAAC,CAAC;IAC5E,MAAM,QAAQ,GAAG,IAAI,6BAAY,EAAE,CAAC;IACpC,MAAM,EAAE,GAAG,IAAA,yCAAwB,EAAC,QAAQ,CAAC,CAAC;IAC9C,MAAM,eAAe,GAAG,IAAA,iDAAqB,EAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IAC5D,MAAM,UAAU,GAAG,IAAI,uBAAU,CAAC,eAAe,EAAE,SAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE;QACtG,UAAU,EAAE,KAAK;KACpB,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,IAAI,6BAAa,CAAC,SAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,eAAe,CAAC,CAAC,CAAC;IAClF,MAAM,EAAE,GAAG,IAAA,iDAAqB,EAAC,EAAE,CAAC,CAAC;IACrC,MAAM,cAAc,GAAG,IAAI,+BAAc,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,+BAAc,CAAC,EAAE,CAAC,CAAC,CAAC;IAErF,UAAU,CAAC,KAAK,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;AACpD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iBAAiB,EAAE,GAAG,EAAE;;IACzB,MAAM,IAAI,GAAG;;;KAGZ,CAAC;IAEF,MAAM,KAAK,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC,KAAK,CAAC;IAC/C,MAAM,MAAM,GAAG,KAAK,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;IAE/C,MAAM,CAAC,WAAW,CACd,MAAA,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,0CAAE,cAAc,EAAE,EACpF,WAAW,CACd,CAAC;IAEF,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,sBAAsB,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IACtE,MAAM,CAAC,WAAW,CAAC,MAAA,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,0CAAE,cAAc,EAAE,EAAE,EAAE,CAAC,CAAC;AACjH,CAAC,CAAC,CAAC"}
|
|
@@ -13,14 +13,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
13
13
|
const assert_1 = __importDefault(require("assert"));
|
|
14
14
|
const vscode_jsonrpc_1 = require("vscode-jsonrpc");
|
|
15
15
|
const sourceMapperUtils_1 = require("../analyzer/sourceMapperUtils");
|
|
16
|
-
const uri_1 = require("../common/uri/uri");
|
|
17
16
|
const testState_1 = require("./harness/fourslash/testState");
|
|
18
17
|
const declaration_1 = require("../analyzer/declaration");
|
|
19
18
|
const textRange_1 = require("../common/textRange");
|
|
19
|
+
const uriUtils_1 = require("../common/uri/uriUtils");
|
|
20
20
|
function buildImportTree(sourceFile, targetFile, importResolver, token) {
|
|
21
|
-
return (0, sourceMapperUtils_1.buildImportTree)(
|
|
21
|
+
return (0, sourceMapperUtils_1.buildImportTree)(uriUtils_1.UriEx.file(sourceFile), uriUtils_1.UriEx.file(targetFile), (from) => {
|
|
22
22
|
const resolved = importResolver(from.getFilePath().slice(1));
|
|
23
|
-
return resolved.map((f) =>
|
|
23
|
+
return resolved.map((f) => uriUtils_1.UriEx.file(f));
|
|
24
24
|
}, token).map((u) => u.getFilePath().slice(1));
|
|
25
25
|
}
|
|
26
26
|
describe('BuildImportTree', () => {
|
|
@@ -167,7 +167,7 @@ function assertTypeAlias(code) {
|
|
|
167
167
|
assert_1.default.strictEqual((_a = type.typeAliasInfo) === null || _a === void 0 ? void 0 : _a.name, 'M');
|
|
168
168
|
assert_1.default.strictEqual(type.typeAliasInfo.moduleName, 'test');
|
|
169
169
|
const marker = state.getMarkerByName('marker');
|
|
170
|
-
const markerUri =
|
|
170
|
+
const markerUri = marker.fileUri;
|
|
171
171
|
const mapper = state.program.getSourceMapper(markerUri, vscode_jsonrpc_1.CancellationToken.None,
|
|
172
172
|
/* mapCompiled */ false,
|
|
173
173
|
/* preferStubs */ true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sourceMapperUtils.test.js","sourceRoot":"","sources":["../../../../../src/tests/sourceMapperUtils.test.ts"],"names":[],"mappings":";;;;;AAAA;;;;;;GAMG;AACH,oDAA4B;AAC5B,mDAA4E;AAE5E,qEAAuF;AACvF,
|
|
1
|
+
{"version":3,"file":"sourceMapperUtils.test.js","sourceRoot":"","sources":["../../../../../src/tests/sourceMapperUtils.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,10 +36,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
36
36
|
const assert_1 = __importDefault(require("assert"));
|
|
37
37
|
const pathUtils_1 = require("../common/pathUtils");
|
|
38
38
|
const stringUtils_1 = require("../common/stringUtils");
|
|
39
|
-
const uri_1 = require("../common/uri/uri");
|
|
40
39
|
const runner_1 = require("./harness/fourslash/runner");
|
|
41
40
|
const testState_1 = require("./harness/fourslash/testState");
|
|
42
41
|
const factory = __importStar(require("./harness/vfs/factory"));
|
|
42
|
+
const uri_1 = require("../common/uri/uri");
|
|
43
43
|
test('Create', () => {
|
|
44
44
|
const code = `
|
|
45
45
|
// @filename: file1.py
|
|
@@ -65,7 +65,7 @@ test('Multiple files', () => {
|
|
|
65
65
|
`;
|
|
66
66
|
const state = (0, testState_1.parseAndGetTestState)(code, factory.srcFolder).state;
|
|
67
67
|
assert_1.default.equal(state.cwd(), (0, pathUtils_1.normalizeSlashes)('/'));
|
|
68
|
-
(0, assert_1.default)(state.fs.existsSync(uri_1.Uri.file((0, pathUtils_1.normalizeSlashes)((0, pathUtils_1.combinePaths)(factory.srcFolder, 'file1.py')))));
|
|
68
|
+
(0, assert_1.default)(state.fs.existsSync(uri_1.Uri.file((0, pathUtils_1.normalizeSlashes)((0, pathUtils_1.combinePaths)(factory.srcFolder, 'file1.py')), state.serviceProvider)));
|
|
69
69
|
});
|
|
70
70
|
test('Configuration', () => {
|
|
71
71
|
var _a;
|
|
@@ -133,7 +133,7 @@ test('Configuration', () => {
|
|
|
133
133
|
`;
|
|
134
134
|
const state = (0, testState_1.parseAndGetTestState)(code, factory.srcFolder).state;
|
|
135
135
|
assert_1.default.equal(state.cwd(), (0, pathUtils_1.normalizeSlashes)('/'));
|
|
136
|
-
(0, assert_1.default)(state.fs.existsSync(uri_1.Uri.file((0, pathUtils_1.normalizeSlashes)((0, pathUtils_1.combinePaths)(factory.srcFolder, 'file1.py')))));
|
|
136
|
+
(0, assert_1.default)(state.fs.existsSync(uri_1.Uri.file((0, pathUtils_1.normalizeSlashes)((0, pathUtils_1.combinePaths)(factory.srcFolder, 'file1.py')), state.serviceProvider)));
|
|
137
137
|
assert_1.default.equal(state.configOptions.diagnosticRuleSet.reportMissingImports, 'error');
|
|
138
138
|
assert_1.default.equal(state.configOptions.diagnosticRuleSet.reportMissingModuleSource, 'warning');
|
|
139
139
|
assert_1.default.equal((_a = state.configOptions.stubPath) === null || _a === void 0 ? void 0 : _a.getFilePath(), (0, pathUtils_1.normalizeSlashes)('/src/typestubs'));
|
|
@@ -172,7 +172,7 @@ test('ProjectRoot', () => {
|
|
|
172
172
|
`;
|
|
173
173
|
const state = (0, testState_1.parseAndGetTestState)(code).state;
|
|
174
174
|
assert_1.default.equal(state.cwd(), (0, pathUtils_1.normalizeSlashes)('/root'));
|
|
175
|
-
(0, assert_1.default)(state.fs.existsSync(uri_1.Uri.file((0, pathUtils_1.normalizeSlashes)('/root/file1.py'))));
|
|
175
|
+
(0, assert_1.default)(state.fs.existsSync(uri_1.Uri.file((0, pathUtils_1.normalizeSlashes)('/root/file1.py'), state.serviceProvider)));
|
|
176
176
|
assert_1.default.equal(state.configOptions.projectRoot.getFilePath(), (0, pathUtils_1.normalizeSlashes)('/root'));
|
|
177
177
|
});
|
|
178
178
|
test('CustomTypeshedFolder', () => {
|
|
@@ -199,7 +199,7 @@ test('IgnoreCase', () => {
|
|
|
199
199
|
//// pass
|
|
200
200
|
`;
|
|
201
201
|
const state = (0, testState_1.parseAndGetTestState)(code, factory.srcFolder).state;
|
|
202
|
-
(0, assert_1.default)(state.fs.existsSync(uri_1.Uri.file((0, pathUtils_1.normalizeSlashes)((0, pathUtils_1.combinePaths)(factory.srcFolder, 'FILE1.py')))));
|
|
202
|
+
(0, assert_1.default)(state.fs.existsSync(uri_1.Uri.file((0, pathUtils_1.normalizeSlashes)((0, pathUtils_1.combinePaths)(factory.srcFolder, 'FILE1.py')), state.serviceProvider)));
|
|
203
203
|
});
|
|
204
204
|
test('GoToMarker', () => {
|
|
205
205
|
const code = `
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testState.test.js","sourceRoot":"","sources":["../../../../../src/tests/testState.test.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,oDAA4B;AAE5B,mDAAkF;AAClF,uDAAoE;AACpE,2CAAwC;AAExC,uDAAqE;AACrE,6DAAqE;AACrE,+DAAiD;AAEjD,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE;IAChB,MAAM,IAAI,GAAG;;;;KAIZ,CAAC;IAEF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC;IACnD,IAAA,gBAAM,EAAC,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AAC/C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gBAAgB,EAAE,GAAG,EAAE;IACxB,MAAM,IAAI,GAAG;;;;;;;;;;;;KAYZ,CAAC;IAEF,MAAM,KAAK,GAAG,IAAA,gCAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC;IAElE,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,IAAA,4BAAgB,EAAC,GAAG,CAAC,CAAC,CAAC;IACjD,IAAA,gBAAM,EAAC,KAAK,CAAC,EAAE,CAAC,UAAU,CAAC,SAAG,CAAC,IAAI,CAAC,IAAA,4BAAgB,EAAC,IAAA,wBAAY,EAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACzG,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE;;IACvB,MAAM,IAAI,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA6DZ,CAAC;IAEF,MAAM,KAAK,GAAG,IAAA,gCAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC;IAElE,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,IAAA,4BAAgB,EAAC,GAAG,CAAC,CAAC,CAAC;IACjD,IAAA,gBAAM,EAAC,KAAK,CAAC,EAAE,CAAC,UAAU,CAAC,SAAG,CAAC,IAAI,CAAC,IAAA,4BAAgB,EAAC,IAAA,wBAAY,EAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAErG,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,iBAAiB,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;IAClF,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,iBAAiB,CAAC,yBAAyB,EAAE,SAAS,CAAC,CAAC;IACzF,gBAAM,CAAC,KAAK,CAAC,MAAA,KAAK,CAAC,aAAa,CAAC,QAAQ,0CAAE,WAAW,EAAE,EAAE,IAAA,4BAAgB,EAAC,gBAAgB,CAAC,CAAC,CAAC;AAClG,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE;;IAChC,MAAM,IAAI,GAAG;;;;;KAKZ,CAAC;IAEF,MAAM,KAAK,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC,KAAK,CAAC;IAC/C,gBAAM,CAAC,KAAK,CAAC,MAAA,KAAK,CAAC,aAAa,CAAC,QAAQ,0CAAE,WAAW,EAAE,EAAE,IAAA,4BAAgB,EAAC,gBAAgB,CAAC,CAAC,CAAC;AAClG,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mCAAmC,EAAE,GAAG,EAAE;;IAC3C,MAAM,IAAI,GAAG;;;;;;KAMZ,CAAC;IAEF,MAAM,KAAK,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC,KAAK,CAAC;IAC/C,gBAAM,CAAC,KAAK,CAAC,MAAA,KAAK,CAAC,aAAa,CAAC,QAAQ,0CAAE,WAAW,EAAE,EAAE,IAAA,4BAAgB,EAAC,iBAAiB,CAAC,CAAC,CAAC;AACnG,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,aAAa,EAAE,GAAG,EAAE;IACrB,MAAM,IAAI,GAAG;;;;;;;KAOZ,CAAC;IAEF,MAAM,KAAK,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC,KAAK,CAAC;IAE/C,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,IAAA,4BAAgB,EAAC,OAAO,CAAC,CAAC,CAAC;IACrD,IAAA,gBAAM,EAAC,KAAK,CAAC,EAAE,CAAC,UAAU,CAAC,SAAG,CAAC,IAAI,CAAC,IAAA,4BAAgB,EAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;IAE1E,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,WAAW,CAAC,WAAW,EAAE,EAAE,IAAA,4BAAgB,EAAC,OAAO,CAAC,CAAC,CAAC;AAC3F,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sBAAsB,EAAE,GAAG,EAAE;IAC9B,0EAA0E;IAC1E,2EAA2E;IAC3E,+EAA+E;IAC/E,sCAAsC;IACtC,MAAM,IAAI,GAAG;;gBAED,SAAS;KACpB,CAAC;IAEF,wEAAwE;IACxE,+DAA+D;IAC/D,MAAM,KAAK,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC,KAAK,CAAC;IAC/C,IAAA,gBAAM,EAAC,KAAK,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,CAAC,IAAA,uBAAW,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AAC9F,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,YAAY,EAAE,GAAG,EAAE;IACpB,MAAM,IAAI,GAAG;;;;;;;KAOZ,CAAC;IAEF,MAAM,KAAK,GAAG,IAAA,gCAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC;IAElE,IAAA,gBAAM,EAAC,KAAK,CAAC,EAAE,CAAC,UAAU,CAAC,SAAG,CAAC,IAAI,CAAC,IAAA,4BAAgB,EAAC,IAAA,wBAAY,EAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACzG,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,YAAY,EAAE,GAAG,EAAE;IACpB,MAAM,IAAI,GAAG;;;KAGZ,CAAC;IAEF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC;IACnD,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAEnD,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAC5B,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;IAC/C,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,oBAAoB,EAAE,MAAO,CAAC,QAAQ,CAAC,CAAC;IAE3D,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACzB,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;IAC/C,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,oBAAoB,EAAE,MAAO,CAAC,QAAQ,CAAC,CAAC;IAC3D,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC;AACzC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gBAAgB,EAAE,GAAG,EAAE;IACxB,MAAM,IAAI,GAAG;;;;;;;;KAQZ,CAAC;IAEF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACpD,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAEpD,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,KAAK,CAAC,cAAc,CAAC,CAAC,OAAQ,EAAE,OAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;QAC7C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,gBAAM,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,OAAQ,CAAC,QAAQ,EAAE,OAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IAElE,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,EAAE,OAAQ,CAAC,QAAQ,CAAC,CAAC;IAC3D,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,oBAAoB,EAAE,OAAQ,CAAC,QAAQ,CAAC,CAAC;IAC5D,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC;AACzC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,SAAS,EAAE,GAAG,EAAE;IACjB,MAAM,IAAI,GAAG;;;;;;;;KAQZ,CAAC;IAEF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAEpD,gBAAM,CAAC,SAAS,CAAC,KAAK,CAAC,aAAa,CAAC,OAAQ,CAAC,EAAE,SAAS,CAAC,CAAC;IAC3D,gBAAM,CAAC,SAAS,CACZ,KAAK;SACA,UAAU,EAAE;SACZ,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;SAClC,IAAI,CAAC,yCAA2B,CAAC,EACtC,KAAK,CAAC,cAAc,EAAE,CAAC,IAAI,CAAC,yCAA2B,CAAC,CAC3D,CAAC;AACN,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,cAAc,EAAE,GAAG,EAAE;IACtB,MAAM,IAAI,GAAG;;;;KAIZ,CAAC;IAEF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACpD,KAAK,CAAC,YAAY,CAAC,OAAQ,CAAC,QAAQ,CAAC,CAAC;IAEtC,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,oBAAoB,EAAE,OAAQ,CAAC,QAAQ,CAAC,CAAC;IAC5D,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC;AACzC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE;IAChB,MAAM,IAAI,GAAG;;;;;;;;;KASZ,CAAC;IAEF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC;IAEnD,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAE7B,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,oBAAoB,EAAE,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAE,CAAC,QAAQ,CAAC,CAAC;IACtF,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC,QAAQ,CAAC,CAAC;AAChF,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iBAAiB,EAAE,GAAG,EAAE;IACzB,MAAM,IAAI,GAAG;;;;;;;;;KASZ,CAAC;IAEF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC;IACnD,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAE9C,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,oBAAoB,EAAE,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAE,CAAC,QAAQ,CAAC,CAAC;IACtF,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC,QAAQ,CAAC,CAAC;AAChF,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,aAAa,EAAE,GAAG,EAAE;IACrB,MAAM,IAAI,GAAG;;;;;;;;;KASZ,CAAC;IAEF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAE7B,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAEzB,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IACxD,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACpD,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;AAChD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,YAAY,EAAE,GAAG,EAAE;IACpB,MAAM,IAAI,GAAG;;;;;;;;;KASZ,CAAC;IAEF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAE7B,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAEpB,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACpD,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;AAChD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE;IACvB,MAAM,IAAI,GAAG;;;;;;;;;KASZ,CAAC;IAEF,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC;IAE7C,MAAM,OAAO,GAAY,EAAE,CAAC;IAC5B,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE;QACtB,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC;QACpD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,gBAAM,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC5E,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iBAAiB,EAAE,GAAG,EAAE;IACzB,MAAM,IAAI,GAAG;;;;;;;;;;KAUZ,CAAC;IAEF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC;IAEnD,gBAAM,CAAC,SAAS,CACZ,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAC7C,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CACnE,CAAC;AACN,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,cAAc,EAAE,GAAG,EAAE;IACtB,MAAM,IAAI,GAAG;;;;;;;;;;KAUZ,CAAC;IAEF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC;IACnD,MAAM,GAAG,GAAG,KAAK,CAAC,eAAe,EAAE,CAAC;IAEpC,gBAAM,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/D,gBAAM,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACxD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,gBAAgB,EAAE,GAAG,EAAE;IACxB,MAAM,IAAI,GAAG;;;;;;;;;KASZ,CAAC;IAEF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC;IACnD,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC;IAErD,KAAK,CAAC,OAAO,EAAE,CAAC;IAChB,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,oBAAoB,EAAE,CAAC,CAAC,CAAC;IAE5C,KAAK,CAAC,OAAO,EAAE,CAAC;IAChB,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,oBAAoB,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAEvE,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACpC,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAEnC,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,oBAAoB,EAAE,MAAM,CAAC,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;IACzE,gBAAM,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC;AACzC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACjC,MAAM,IAAI,GAAG;;;;;;;;;;;;;KAaZ,CAAC;IAEF,IAAA,gCAAuB,EAAC,IAAA,4BAAgB,EAAC,GAAG,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;AACtE,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE;IAChC,MAAM,IAAI,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAkCZ,CAAC;IAEF,IAAA,gCAAuB,EAAC,OAAO,CAAC,SAAS,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;AAClE,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE;IAChC,MAAM,IAAI,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA2DZ,CAAC;IAEF,IAAA,gCAAuB,EAAC,OAAO,CAAC,SAAS,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;AAClE,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"testState.test.js","sourceRoot":"","sources":["../../../../../src/tests/testState.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,10 +18,10 @@ const collectionUtils_1 = require("../common/collectionUtils");
|
|
|
18
18
|
const core_1 = require("../common/core");
|
|
19
19
|
const debug_1 = require("../common/debug");
|
|
20
20
|
const textRange_1 = require("../common/textRange");
|
|
21
|
-
const uri_1 = require("../common/uri/uri");
|
|
22
21
|
const uriUtils_1 = require("../common/uri/uriUtils");
|
|
23
22
|
const workspaceEditUtils_1 = require("../common/workspaceEditUtils");
|
|
24
23
|
const documentSymbolCollector_1 = require("../languageService/documentSymbolCollector");
|
|
24
|
+
const uri_1 = require("../common/uri/uri");
|
|
25
25
|
function convertFileEditActionToString(edit) {
|
|
26
26
|
return `'${edit.replacementText.replace(/\n/g, '!n!')}'@'${edit.fileUri}:(${edit.range.start.line},${edit.range.start.character})-(${edit.range.end.line},${edit.range.end.character})'`;
|
|
27
27
|
}
|
|
@@ -55,7 +55,7 @@ function applyFileEditActions(state, fileEditActions) {
|
|
|
55
55
|
const editsPerFileMap = (0, collectionUtils_1.createMapFromItems)(fileEditActions.edits, (e) => e.fileUri.key);
|
|
56
56
|
for (const [editFileName, editsPerFile] of editsPerFileMap) {
|
|
57
57
|
const result = _applyEdits(state, editFileName, editsPerFile);
|
|
58
|
-
state.testFS.writeFileSync(uri_1.Uri.file(editFileName), result.text, 'utf8');
|
|
58
|
+
state.testFS.writeFileSync(uri_1.Uri.file(editFileName, state.serviceProvider), result.text, 'utf8');
|
|
59
59
|
// Update open file content if the file is in opened state.
|
|
60
60
|
if (result.version) {
|
|
61
61
|
let openedFilePath = editFileName;
|
|
@@ -64,7 +64,7 @@ function applyFileEditActions(state, fileEditActions) {
|
|
|
64
64
|
openedFilePath = renamed.newFileUri.getFilePath();
|
|
65
65
|
state.program.setFileClosed(renamed.oldFileUri);
|
|
66
66
|
}
|
|
67
|
-
state.program.setFileOpened(uri_1.Uri.file(openedFilePath), result.version + 1, result.text);
|
|
67
|
+
state.program.setFileOpened(uri_1.Uri.file(openedFilePath, state.serviceProvider), result.version + 1, result.text);
|
|
68
68
|
}
|
|
69
69
|
}
|
|
70
70
|
// Second, apply filename change to disk or rename directory.
|
|
@@ -101,20 +101,20 @@ function applyFileEditActions(state, fileEditActions) {
|
|
|
101
101
|
}
|
|
102
102
|
exports.applyFileEditActions = applyFileEditActions;
|
|
103
103
|
function _applyEdits(state, filePath, edits) {
|
|
104
|
-
const sourceFile = state.program.getBoundSourceFile(uri_1.Uri.file(filePath));
|
|
104
|
+
const sourceFile = state.program.getBoundSourceFile(uri_1.Uri.file(filePath, state.serviceProvider));
|
|
105
105
|
const parseResults = sourceFile.getParseResults();
|
|
106
106
|
const current = (0, workspaceEditUtils_1.applyTextEditsToString)(edits.filter((e) => e.fileUri.getFilePath() === filePath), parseResults.tokenizerOutput.lines, parseResults.text);
|
|
107
107
|
return { version: sourceFile.getClientVersion(), text: current };
|
|
108
108
|
}
|
|
109
109
|
function verifyReferencesAtPosition(program, configOption, symbolNames, fileName, position, ranges) {
|
|
110
|
-
const sourceFile = program.getBoundSourceFile(uri_1.Uri.file(fileName));
|
|
110
|
+
const sourceFile = program.getBoundSourceFile(uri_1.Uri.file(fileName, program.serviceProvider));
|
|
111
111
|
(0, assert_1.default)(sourceFile);
|
|
112
112
|
const node = (0, parseTreeUtils_1.findNodeByOffset)(sourceFile.getParseResults().parseTree, position);
|
|
113
113
|
const decls = documentSymbolCollector_1.DocumentSymbolCollector.getDeclarationsForNode(program, node,
|
|
114
114
|
/* resolveLocalName */ true, vscode_languageserver_1.CancellationToken.None);
|
|
115
115
|
const rangesByFile = (0, collectionUtils_1.createMapFromItems)(ranges, (r) => r.fileName);
|
|
116
116
|
for (const rangeFileName of rangesByFile.keys()) {
|
|
117
|
-
const collector = new documentSymbolCollector_1.DocumentSymbolCollector(program, (0, core_1.isArray)(symbolNames) ? symbolNames : [symbolNames], decls, program.getBoundSourceFile(uri_1.Uri.file(rangeFileName)).getParseResults().parseTree, vscode_languageserver_1.CancellationToken.None, {
|
|
117
|
+
const collector = new documentSymbolCollector_1.DocumentSymbolCollector(program, (0, core_1.isArray)(symbolNames) ? symbolNames : [symbolNames], decls, program.getBoundSourceFile(uri_1.Uri.file(rangeFileName, program.serviceProvider)).getParseResults().parseTree, vscode_languageserver_1.CancellationToken.None, {
|
|
118
118
|
treatModuleInImportAndFromImportSame: true,
|
|
119
119
|
skipUnreachableCode: false,
|
|
120
120
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testStateUtils.js","sourceRoot":"","sources":["../../../../../src/tests/testStateUtils.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;AAEH,oDAA4B;AAE5B,iEAA0D;AAC1D,+DAA8D;AAE9D,+DAA+D;AAE/D,yCAAyC;AACzC,2CAA8C;AAE9C,mDAAgE;AAChE,
|
|
1
|
+
{"version":3,"file":"testStateUtils.js","sourceRoot":"","sources":["../../../../../src/tests/testStateUtils.ts"],"names":[],"mappings":"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"}
|
package/dist/tests/testUtils.js
CHANGED
|
@@ -46,6 +46,7 @@ const realFileSystem_1 = require("../common/realFileSystem");
|
|
|
46
46
|
const serviceProviderExtensions_1 = require("../common/serviceProviderExtensions");
|
|
47
47
|
const uri_1 = require("../common/uri/uri");
|
|
48
48
|
const parser_1 = require("../parser/parser");
|
|
49
|
+
const uriUtils_1 = require("../common/uri/uriUtils");
|
|
49
50
|
// This is a bit gross, but it's necessary to allow the fallback typeshed
|
|
50
51
|
// directory to be located when running within the jest environment. This
|
|
51
52
|
// assumes that the working directory has been set appropriately before
|
|
@@ -71,7 +72,7 @@ function parseText(textToParse, diagSink, parseOptions = new parser_1.ParseOptio
|
|
|
71
72
|
return parser.parseSourceFile(textToParse, parseOptions, diagSink);
|
|
72
73
|
}
|
|
73
74
|
exports.parseText = parseText;
|
|
74
|
-
function parseSampleFile(fileName, diagSink, execEnvironment = new configOptions_1.ExecutionEnvironment('python',
|
|
75
|
+
function parseSampleFile(fileName, diagSink, execEnvironment = new configOptions_1.ExecutionEnvironment('python', uriUtils_1.UriEx.file('.'),
|
|
75
76
|
/* defaultPythonVersion */ undefined,
|
|
76
77
|
/* defaultPythonPlatform */ undefined,
|
|
77
78
|
/* defaultExtraPaths */ undefined)) {
|
|
@@ -90,11 +91,12 @@ exports.parseSampleFile = parseSampleFile;
|
|
|
90
91
|
function typeAnalyzeSampleFiles(fileNames, configOptions = new configOptions_1.ConfigOptions(uri_1.Uri.empty()), console) {
|
|
91
92
|
// Always enable "test mode".
|
|
92
93
|
configOptions.internalTestMode = true;
|
|
93
|
-
const
|
|
94
|
-
const
|
|
94
|
+
const tempFile = new realFileSystem_1.RealTempFile();
|
|
95
|
+
const fs = (0, realFileSystem_1.createFromRealFileSystem)(tempFile);
|
|
96
|
+
const serviceProvider = (0, serviceProviderExtensions_1.createServiceProvider)(fs, console || new console_1.NullConsole(), tempFile);
|
|
95
97
|
const importResolver = new importResolver_1.ImportResolver(serviceProvider, configOptions, new fullAccessHost_1.FullAccessHost(serviceProvider));
|
|
96
98
|
const program = new program_1.Program(importResolver, configOptions, serviceProvider);
|
|
97
|
-
const fileUris = fileNames.map((name) =>
|
|
99
|
+
const fileUris = fileNames.map((name) => uriUtils_1.UriEx.file(resolveSampleFilePath(name)));
|
|
98
100
|
program.setTrackedFiles(fileUris);
|
|
99
101
|
// Set a "pre-check callback" so we can evaluate the types of each NameNode
|
|
100
102
|
// prior to checking the full document. This will exercise the contextual
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testUtils.js","sourceRoot":"","sources":["../../../../../src/tests/testUtils.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,+CAAiC;AACjC,uCAAyB;AACzB,2CAA6B;AAE7B,+DAA4D;AAC5D,iDAA8C;AAC9C,uDAAwD;AAExD,2DAA8E;AAC9E,+CAAqE;AACrE,2CAAuC;AAGvC,6DAA0D;AAC1D,
|
|
1
|
+
{"version":3,"file":"testUtils.js","sourceRoot":"","sources":["../../../../../src/tests/testUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -510,28 +510,28 @@ test('Unpack2', () => {
|
|
|
510
510
|
test('Unpack3', () => {
|
|
511
511
|
const configOptions = new configOptions_1.ConfigOptions(uri_1.Uri.empty());
|
|
512
512
|
// Analyze with Python 3.7 settings.
|
|
513
|
-
configOptions.defaultPythonVersion = pythonVersion_1.
|
|
513
|
+
configOptions.defaultPythonVersion = pythonVersion_1.pythonVersion3_7;
|
|
514
514
|
const analysisResults37 = TestUtils.typeAnalyzeSampleFiles(['unpack3.py'], configOptions);
|
|
515
515
|
TestUtils.validateResults(analysisResults37, 1);
|
|
516
516
|
// Analyze with Python 3.8 settings.
|
|
517
|
-
configOptions.defaultPythonVersion = pythonVersion_1.
|
|
517
|
+
configOptions.defaultPythonVersion = pythonVersion_1.pythonVersion3_8;
|
|
518
518
|
const analysisResults38 = TestUtils.typeAnalyzeSampleFiles(['unpack3.py'], configOptions);
|
|
519
519
|
TestUtils.validateResults(analysisResults38, 0);
|
|
520
520
|
});
|
|
521
521
|
test('Unpack4', () => {
|
|
522
522
|
const configOptions = new configOptions_1.ConfigOptions(uri_1.Uri.empty());
|
|
523
523
|
// Analyze with Python 3.8 settings.
|
|
524
|
-
configOptions.defaultPythonVersion = pythonVersion_1.
|
|
524
|
+
configOptions.defaultPythonVersion = pythonVersion_1.pythonVersion3_8;
|
|
525
525
|
const analysisResults38 = TestUtils.typeAnalyzeSampleFiles(['unpack4.py'], configOptions);
|
|
526
526
|
TestUtils.validateResults(analysisResults38, 2);
|
|
527
527
|
// Analyze with Python 3.9 settings.
|
|
528
|
-
configOptions.defaultPythonVersion = pythonVersion_1.
|
|
528
|
+
configOptions.defaultPythonVersion = pythonVersion_1.pythonVersion3_9;
|
|
529
529
|
const analysisResults39 = TestUtils.typeAnalyzeSampleFiles(['unpack4.py'], configOptions);
|
|
530
530
|
TestUtils.validateResults(analysisResults39, 1);
|
|
531
531
|
});
|
|
532
532
|
test('Unpack4', () => {
|
|
533
533
|
const configOptions = new configOptions_1.ConfigOptions(uri_1.Uri.empty());
|
|
534
|
-
configOptions.defaultPythonVersion = pythonVersion_1.
|
|
534
|
+
configOptions.defaultPythonVersion = pythonVersion_1.pythonVersion3_11;
|
|
535
535
|
const analysisResults = TestUtils.typeAnalyzeSampleFiles(['unpack5.py'], configOptions);
|
|
536
536
|
TestUtils.validateResults(analysisResults, 0);
|
|
537
537
|
});
|
|
@@ -606,11 +606,11 @@ test('Call2', () => {
|
|
|
606
606
|
test('Call3', () => {
|
|
607
607
|
const configOptions = new configOptions_1.ConfigOptions(uri_1.Uri.empty());
|
|
608
608
|
// Analyze with Python 3.7 settings. This will generate more errors.
|
|
609
|
-
configOptions.defaultPythonVersion = pythonVersion_1.
|
|
609
|
+
configOptions.defaultPythonVersion = pythonVersion_1.pythonVersion3_7;
|
|
610
610
|
const analysisResults37 = TestUtils.typeAnalyzeSampleFiles(['call3.py'], configOptions);
|
|
611
611
|
TestUtils.validateResults(analysisResults37, 36);
|
|
612
612
|
// Analyze with Python 3.8 settings.
|
|
613
|
-
configOptions.defaultPythonVersion = pythonVersion_1.
|
|
613
|
+
configOptions.defaultPythonVersion = pythonVersion_1.pythonVersion3_8;
|
|
614
614
|
const analysisResults38 = TestUtils.typeAnalyzeSampleFiles(['call3.py'], configOptions);
|
|
615
615
|
TestUtils.validateResults(analysisResults38, 20);
|
|
616
616
|
});
|
|
@@ -882,6 +882,10 @@ test('Property16', () => {
|
|
|
882
882
|
const analysisResults = TestUtils.typeAnalyzeSampleFiles(['property16.py']);
|
|
883
883
|
TestUtils.validateResults(analysisResults, 1);
|
|
884
884
|
});
|
|
885
|
+
test('Property17', () => {
|
|
886
|
+
const analysisResults = TestUtils.typeAnalyzeSampleFiles(['property17.py']);
|
|
887
|
+
TestUtils.validateResults(analysisResults, 0);
|
|
888
|
+
});
|
|
885
889
|
test('Operator1', () => {
|
|
886
890
|
const analysisResults = TestUtils.typeAnalyzeSampleFiles(['operator1.py']);
|
|
887
891
|
TestUtils.validateResults(analysisResults, 5);
|
|
@@ -1187,16 +1191,16 @@ test('TupleUnpack1', () => {
|
|
|
1187
1191
|
});
|
|
1188
1192
|
test('TupleUnpack2', () => {
|
|
1189
1193
|
const configOptions = new configOptions_1.ConfigOptions(uri_1.Uri.empty());
|
|
1190
|
-
configOptions.defaultPythonVersion = pythonVersion_1.
|
|
1194
|
+
configOptions.defaultPythonVersion = pythonVersion_1.pythonVersion3_10;
|
|
1191
1195
|
const analysisResults1 = TestUtils.typeAnalyzeSampleFiles(['tupleUnpack2.py'], configOptions);
|
|
1192
1196
|
TestUtils.validateResults(analysisResults1, 18);
|
|
1193
|
-
configOptions.defaultPythonVersion = pythonVersion_1.
|
|
1197
|
+
configOptions.defaultPythonVersion = pythonVersion_1.pythonVersion3_11;
|
|
1194
1198
|
const analysisResults2 = TestUtils.typeAnalyzeSampleFiles(['tupleUnpack2.py'], configOptions);
|
|
1195
1199
|
TestUtils.validateResults(analysisResults2, 4);
|
|
1196
1200
|
});
|
|
1197
1201
|
test('TupleUnpack3', () => {
|
|
1198
1202
|
const configOptions = new configOptions_1.ConfigOptions(uri_1.Uri.empty());
|
|
1199
|
-
configOptions.defaultPythonVersion = pythonVersion_1.
|
|
1203
|
+
configOptions.defaultPythonVersion = pythonVersion_1.pythonVersion3_11;
|
|
1200
1204
|
const analysisResults1 = TestUtils.typeAnalyzeSampleFiles(['tupleUnpack3.py'], configOptions);
|
|
1201
1205
|
TestUtils.validateResults(analysisResults1, 1);
|
|
1202
1206
|
});
|
|
@@ -1250,11 +1254,11 @@ test('Dictionary4', () => {
|
|
|
1250
1254
|
});
|
|
1251
1255
|
test('StaticExpression1', () => {
|
|
1252
1256
|
const configOptions = new configOptions_1.ConfigOptions(uri_1.Uri.empty());
|
|
1253
|
-
configOptions.defaultPythonVersion = pythonVersion_1.
|
|
1257
|
+
configOptions.defaultPythonVersion = pythonVersion_1.pythonVersion3_8;
|
|
1254
1258
|
configOptions.defaultPythonPlatform = 'windows';
|
|
1255
1259
|
const analysisResults1 = TestUtils.typeAnalyzeSampleFiles(['staticExpression1.py'], configOptions);
|
|
1256
1260
|
TestUtils.validateResults(analysisResults1, 9);
|
|
1257
|
-
configOptions.defaultPythonVersion = pythonVersion_1.
|
|
1261
|
+
configOptions.defaultPythonVersion = pythonVersion_1.pythonVersion3_11;
|
|
1258
1262
|
configOptions.defaultPythonPlatform = 'Linux';
|
|
1259
1263
|
const analysisResults2 = TestUtils.typeAnalyzeSampleFiles(['staticExpression1.py'], configOptions);
|
|
1260
1264
|
TestUtils.validateResults(analysisResults2, 6);
|