@zzzen/pyright-internal 1.2.0-dev.20231203 → 1.2.0-dev.20231210
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 +4 -3
- package/dist/analyzer/analyzerFileInfo.js.map +1 -1
- package/dist/analyzer/backgroundAnalysisProgram.d.ts +15 -14
- package/dist/analyzer/backgroundAnalysisProgram.js +38 -38
- package/dist/analyzer/backgroundAnalysisProgram.js.map +1 -1
- package/dist/analyzer/binder.js +56 -52
- package/dist/analyzer/binder.js.map +1 -1
- package/dist/analyzer/checker.js +43 -33
- package/dist/analyzer/checker.js.map +1 -1
- package/dist/analyzer/circularDependency.d.ts +3 -2
- package/dist/analyzer/circularDependency.js.map +1 -1
- package/dist/analyzer/codeFlowEngine.js +29 -36
- package/dist/analyzer/codeFlowEngine.js.map +1 -1
- package/dist/analyzer/constraintSolver.js +3 -5
- package/dist/analyzer/constraintSolver.js.map +1 -1
- package/dist/analyzer/dataClasses.js +1 -1
- package/dist/analyzer/dataClasses.js.map +1 -1
- package/dist/analyzer/declaration.d.ts +5 -3
- package/dist/analyzer/declaration.js +3 -2
- package/dist/analyzer/declaration.js.map +1 -1
- package/dist/analyzer/declarationUtils.d.ts +3 -2
- package/dist/analyzer/declarationUtils.js +14 -12
- package/dist/analyzer/declarationUtils.js.map +1 -1
- package/dist/analyzer/enums.js +1 -1
- package/dist/analyzer/enums.js.map +1 -1
- package/dist/analyzer/importResolver.d.ts +29 -25
- package/dist/analyzer/importResolver.js +300 -301
- package/dist/analyzer/importResolver.js.map +1 -1
- package/dist/analyzer/importResult.d.ts +5 -4
- package/dist/analyzer/importResult.js.map +1 -1
- package/dist/analyzer/importStatementUtils.d.ts +5 -4
- package/dist/analyzer/importStatementUtils.js +23 -22
- package/dist/analyzer/importStatementUtils.js.map +1 -1
- package/dist/analyzer/namedTuples.js +3 -3
- package/dist/analyzer/namedTuples.js.map +1 -1
- package/dist/analyzer/packageTypeReport.d.ts +7 -6
- package/dist/analyzer/packageTypeReport.js +4 -4
- package/dist/analyzer/packageTypeReport.js.map +1 -1
- package/dist/analyzer/packageTypeVerifier.js +68 -64
- package/dist/analyzer/packageTypeVerifier.js.map +1 -1
- package/dist/analyzer/parentDirectoryCache.d.ts +7 -6
- package/dist/analyzer/parentDirectoryCache.js +9 -10
- package/dist/analyzer/parentDirectoryCache.js.map +1 -1
- package/dist/analyzer/parseTreeUtils.d.ts +1 -1
- package/dist/analyzer/parseTreeUtils.js +6 -3
- package/dist/analyzer/parseTreeUtils.js.map +1 -1
- package/dist/analyzer/patternMatching.js +79 -14
- package/dist/analyzer/patternMatching.js.map +1 -1
- package/dist/analyzer/program.d.ts +27 -26
- package/dist/analyzer/program.js +162 -156
- package/dist/analyzer/program.js.map +1 -1
- package/dist/analyzer/properties.js +3 -3
- package/dist/analyzer/properties.js.map +1 -1
- package/dist/analyzer/pyTypedUtils.d.ts +3 -2
- package/dist/analyzer/pyTypedUtils.js +4 -5
- package/dist/analyzer/pyTypedUtils.js.map +1 -1
- package/dist/analyzer/pythonPathUtils.d.ts +7 -6
- package/dist/analyzer/pythonPathUtils.js +21 -23
- package/dist/analyzer/pythonPathUtils.js.map +1 -1
- package/dist/analyzer/service.d.ts +24 -23
- package/dist/analyzer/service.js +187 -183
- package/dist/analyzer/service.js.map +1 -1
- package/dist/analyzer/sourceFile.d.ts +4 -5
- package/dist/analyzer/sourceFile.js +68 -56
- 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/sourceMapper.d.ts +11 -10
- package/dist/analyzer/sourceMapper.js +59 -62
- package/dist/analyzer/sourceMapper.js.map +1 -1
- package/dist/analyzer/sourceMapperUtils.d.ts +2 -1
- package/dist/analyzer/sourceMapperUtils.js +2 -2
- package/dist/analyzer/sourceMapperUtils.js.map +1 -1
- package/dist/analyzer/tracePrinter.d.ts +3 -2
- package/dist/analyzer/tracePrinter.js +21 -23
- package/dist/analyzer/tracePrinter.js.map +1 -1
- package/dist/analyzer/typeDocStringUtils.d.ts +2 -1
- package/dist/analyzer/typeDocStringUtils.js +14 -17
- package/dist/analyzer/typeDocStringUtils.js.map +1 -1
- package/dist/analyzer/typeEvaluator.js +172 -102
- package/dist/analyzer/typeEvaluator.js.map +1 -1
- package/dist/analyzer/typeGuards.js +3 -3
- package/dist/analyzer/typeGuards.js.map +1 -1
- package/dist/analyzer/typePrinter.d.ts +2 -0
- package/dist/analyzer/typePrinter.js +48 -8
- package/dist/analyzer/typePrinter.js.map +1 -1
- package/dist/analyzer/typeStubWriter.d.ts +2 -1
- package/dist/analyzer/typeStubWriter.js +2 -2
- package/dist/analyzer/typeStubWriter.js.map +1 -1
- package/dist/analyzer/typeUtils.d.ts +4 -2
- package/dist/analyzer/typeUtils.js +16 -5
- package/dist/analyzer/typeUtils.js.map +1 -1
- package/dist/analyzer/typedDicts.js +4 -4
- package/dist/analyzer/typedDicts.js.map +1 -1
- package/dist/analyzer/types.d.ts +5 -4
- package/dist/analyzer/types.js +4 -4
- package/dist/analyzer/types.js.map +1 -1
- package/dist/backgroundAnalysis.d.ts +1 -2
- package/dist/backgroundAnalysis.js +6 -4
- package/dist/backgroundAnalysis.js.map +1 -1
- package/dist/backgroundAnalysisBase.d.ts +22 -20
- package/dist/backgroundAnalysisBase.js +76 -55
- package/dist/backgroundAnalysisBase.js.map +1 -1
- package/dist/backgroundThreadBase.d.ts +1 -1
- package/dist/backgroundThreadBase.js +20 -11
- package/dist/backgroundThreadBase.js.map +1 -1
- package/dist/commands/createTypeStub.js +3 -2
- package/dist/commands/createTypeStub.js.map +1 -1
- package/dist/commands/dumpFileDebugInfoCommand.js +21 -20
- package/dist/commands/dumpFileDebugInfoCommand.js.map +1 -1
- package/dist/commands/quickActionCommand.js +5 -5
- package/dist/commands/quickActionCommand.js.map +1 -1
- package/dist/common/configOptions.d.ts +14 -13
- package/dist/common/configOptions.js +29 -27
- package/dist/common/configOptions.js.map +1 -1
- package/dist/common/diagnostic.d.ts +6 -5
- package/dist/common/diagnostic.js +2 -2
- package/dist/common/diagnostic.js.map +1 -1
- package/dist/common/diagnosticSink.d.ts +2 -1
- package/dist/common/diagnosticSink.js.map +1 -1
- package/dist/common/editAction.d.ts +6 -5
- package/dist/common/editAction.js +2 -2
- package/dist/common/editAction.js.map +1 -1
- package/dist/common/envVarUtils.d.ts +2 -1
- package/dist/common/envVarUtils.js +20 -28
- package/dist/common/envVarUtils.js.map +1 -1
- package/dist/common/extensibility.d.ts +19 -19
- package/dist/common/extensibility.js.map +1 -1
- package/dist/common/fileSystem.d.ts +29 -28
- package/dist/common/fileWatcher.d.ts +3 -2
- package/dist/common/fileWatcher.js.map +1 -1
- package/dist/common/fullAccessHost.d.ts +8 -7
- package/dist/common/fullAccessHost.js +21 -16
- package/dist/common/fullAccessHost.js.map +1 -1
- package/dist/common/host.d.ts +7 -6
- package/dist/common/host.js +1 -1
- package/dist/common/host.js.map +1 -1
- package/dist/common/logTracker.d.ts +2 -1
- package/dist/common/logTracker.js +4 -4
- package/dist/common/logTracker.js.map +1 -1
- package/dist/common/pathUtils.d.ts +1 -28
- package/dist/common/pathUtils.js +17 -366
- package/dist/common/pathUtils.js.map +1 -1
- package/dist/common/realFileSystem.d.ts +7 -3
- package/dist/common/realFileSystem.js +78 -60
- package/dist/common/realFileSystem.js.map +1 -1
- package/dist/common/serviceProviderExtensions.d.ts +2 -1
- package/dist/common/serviceProviderExtensions.js +5 -2
- package/dist/common/serviceProviderExtensions.js.map +1 -1
- package/dist/common/textEditTracker.d.ts +2 -1
- package/dist/common/textEditTracker.js +28 -28
- package/dist/common/textEditTracker.js.map +1 -1
- package/dist/common/textRange.d.ts +2 -1
- package/dist/common/textRange.js.map +1 -1
- package/dist/common/uri/baseUri.d.ts +51 -0
- package/dist/common/uri/baseUri.js +194 -0
- package/dist/common/uri/baseUri.js.map +1 -0
- package/dist/common/uri/emptyUri.d.ts +32 -0
- package/dist/common/uri/emptyUri.js +122 -0
- package/dist/common/uri/emptyUri.js.map +1 -0
- package/dist/common/uri/fileUri.d.ts +36 -0
- package/dist/common/uri/fileUri.js +180 -0
- package/dist/common/uri/fileUri.js.map +1 -0
- package/dist/common/uri/memoization.d.ts +3 -0
- package/dist/common/uri/memoization.js +72 -0
- package/dist/common/uri/memoization.js.map +1 -0
- package/dist/common/uri/uri.d.ts +50 -0
- package/dist/common/uri/uri.js +104 -0
- package/dist/common/uri/uri.js.map +1 -0
- package/dist/common/uri/uriUtils.d.ts +39 -0
- package/dist/common/uri/uriUtils.js +362 -0
- package/dist/common/uri/uriUtils.js.map +1 -0
- package/dist/common/uri/webUri.d.ts +36 -0
- package/dist/common/uri/webUri.js +207 -0
- package/dist/common/uri/webUri.js.map +1 -0
- package/dist/common/workspaceEditUtils.d.ts +8 -8
- package/dist/common/workspaceEditUtils.js +34 -37
- package/dist/common/workspaceEditUtils.js.map +1 -1
- package/dist/languageServerBase.d.ts +19 -22
- package/dist/languageServerBase.js +91 -95
- package/dist/languageServerBase.js.map +1 -1
- package/dist/languageService/analyzerServiceExecutor.d.ts +2 -1
- package/dist/languageService/analyzerServiceExecutor.js +14 -16
- package/dist/languageService/analyzerServiceExecutor.js.map +1 -1
- package/dist/languageService/autoImporter.d.ts +11 -9
- package/dist/languageService/autoImporter.js +45 -44
- package/dist/languageService/autoImporter.js.map +1 -1
- package/dist/languageService/callHierarchyProvider.d.ts +3 -2
- package/dist/languageService/callHierarchyProvider.js +23 -35
- package/dist/languageService/callHierarchyProvider.js.map +1 -1
- package/dist/languageService/codeActionProvider.d.ts +2 -1
- package/dist/languageService/codeActionProvider.js +8 -10
- package/dist/languageService/codeActionProvider.js.map +1 -1
- package/dist/languageService/completionProvider.d.ts +7 -6
- package/dist/languageService/completionProvider.js +32 -30
- package/dist/languageService/completionProvider.js.map +1 -1
- package/dist/languageService/completionProviderUtils.d.ts +2 -1
- package/dist/languageService/completionProviderUtils.js +1 -1
- package/dist/languageService/completionProviderUtils.js.map +1 -1
- package/dist/languageService/definitionProvider.d.ts +4 -3
- package/dist/languageService/definitionProvider.js +26 -24
- package/dist/languageService/definitionProvider.js.map +1 -1
- package/dist/languageService/documentHighlightProvider.d.ts +3 -2
- package/dist/languageService/documentHighlightProvider.js +3 -3
- package/dist/languageService/documentHighlightProvider.js.map +1 -1
- package/dist/languageService/documentSymbolCollector.js +8 -7
- package/dist/languageService/documentSymbolCollector.js.map +1 -1
- package/dist/languageService/documentSymbolProvider.d.ts +5 -4
- package/dist/languageService/documentSymbolProvider.js +9 -11
- package/dist/languageService/documentSymbolProvider.js.map +1 -1
- package/dist/languageService/hoverProvider.d.ts +4 -3
- package/dist/languageService/hoverProvider.js +6 -5
- package/dist/languageService/hoverProvider.js.map +1 -1
- package/dist/languageService/navigationUtils.d.ts +2 -1
- package/dist/languageService/navigationUtils.js +2 -3
- package/dist/languageService/navigationUtils.js.map +1 -1
- package/dist/languageService/quickActions.d.ts +2 -1
- package/dist/languageService/quickActions.js +3 -3
- package/dist/languageService/quickActions.js.map +1 -1
- package/dist/languageService/referencesProvider.d.ts +10 -9
- package/dist/languageService/referencesProvider.js +28 -28
- package/dist/languageService/referencesProvider.js.map +1 -1
- package/dist/languageService/renameProvider.d.ts +4 -3
- package/dist/languageService/renameProvider.js +17 -18
- package/dist/languageService/renameProvider.js.map +1 -1
- package/dist/languageService/signatureHelpProvider.d.ts +3 -2
- package/dist/languageService/signatureHelpProvider.js +4 -4
- package/dist/languageService/signatureHelpProvider.js.map +1 -1
- package/dist/languageService/symbolIndexer.d.ts +2 -1
- package/dist/languageService/symbolIndexer.js +1 -1
- package/dist/languageService/symbolIndexer.js.map +1 -1
- package/dist/languageService/tooltipUtils.js +10 -4
- package/dist/languageService/tooltipUtils.js.map +1 -1
- package/dist/languageService/workspaceSymbolProvider.d.ts +4 -3
- package/dist/languageService/workspaceSymbolProvider.js +10 -11
- package/dist/languageService/workspaceSymbolProvider.js.map +1 -1
- package/dist/localization/localize.d.ts +1 -0
- package/dist/localization/localize.js +1 -0
- package/dist/localization/localize.js.map +1 -1
- package/dist/localization/package.nls.en-us.json +2 -1
- package/dist/pyright.js +18 -17
- package/dist/pyright.js.map +1 -1
- package/dist/pyrightFileSystem.d.ts +13 -13
- package/dist/pyrightFileSystem.js +38 -43
- package/dist/pyrightFileSystem.js.map +1 -1
- package/dist/readonlyAugmentedFileSystem.d.ts +29 -28
- package/dist/readonlyAugmentedFileSystem.js +62 -65
- package/dist/readonlyAugmentedFileSystem.js.map +1 -1
- package/dist/server.js +21 -20
- package/dist/server.js.map +1 -1
- package/dist/tests/chainedSourceFiles.test.js +39 -30
- package/dist/tests/chainedSourceFiles.test.js.map +1 -1
- package/dist/tests/checker.test.js +31 -30
- package/dist/tests/checker.test.js.map +1 -1
- package/dist/tests/completions.test.js +7 -3
- package/dist/tests/completions.test.js.map +1 -1
- package/dist/tests/config.test.js +24 -22
- package/dist/tests/config.test.js.map +1 -1
- package/dist/tests/documentSymbolCollector.test.js +3 -2
- package/dist/tests/documentSymbolCollector.test.js.map +1 -1
- package/dist/tests/filesystem.test.js +37 -35
- package/dist/tests/filesystem.test.js.map +1 -1
- package/dist/tests/fourSlashParser.test.js +4 -4
- package/dist/tests/fourSlashParser.test.js.map +1 -1
- package/dist/tests/fourslash/hover.docstring.alias.fourslash.js +27 -11
- package/dist/tests/fourslash/hover.docstring.alias.fourslash.js.map +1 -1
- package/dist/tests/harness/fourslash/fourSlashParser.js +2 -2
- package/dist/tests/harness/fourslash/fourSlashParser.js.map +1 -1
- package/dist/tests/harness/fourslash/testLanguageService.d.ts +4 -5
- package/dist/tests/harness/fourslash/testLanguageService.js +9 -15
- package/dist/tests/harness/fourslash/testLanguageService.js.map +1 -1
- package/dist/tests/harness/fourslash/testState.d.ts +4 -4
- package/dist/tests/harness/fourslash/testState.js +91 -51
- package/dist/tests/harness/fourslash/testState.js.map +1 -1
- package/dist/tests/harness/testAccessHost.d.ts +3 -2
- package/dist/tests/harness/testAccessHost.js +2 -1
- package/dist/tests/harness/testAccessHost.js.map +1 -1
- package/dist/tests/harness/testHost.js +13 -11
- package/dist/tests/harness/testHost.js.map +1 -1
- package/dist/tests/harness/vfs/factory.d.ts +3 -2
- package/dist/tests/harness/vfs/factory.js +5 -4
- package/dist/tests/harness/vfs/factory.js.map +1 -1
- package/dist/tests/harness/vfs/filesystem.d.ts +32 -31
- package/dist/tests/harness/vfs/filesystem.js +47 -49
- package/dist/tests/harness/vfs/filesystem.js.map +1 -1
- package/dist/tests/harness/vfs/pathValidation.js +1 -10
- package/dist/tests/harness/vfs/pathValidation.js.map +1 -1
- package/dist/tests/importResolver.test.js +81 -58
- package/dist/tests/importResolver.test.js.map +1 -1
- package/dist/tests/importStatementUtils.test.js +10 -9
- package/dist/tests/importStatementUtils.test.js.map +1 -1
- package/dist/tests/ipythonMode.test.js +12 -11
- package/dist/tests/ipythonMode.test.js.map +1 -1
- package/dist/tests/logger.test.js +2 -1
- package/dist/tests/logger.test.js.map +1 -1
- package/dist/tests/parseTreeUtils.test.js +2 -1
- package/dist/tests/parseTreeUtils.test.js.map +1 -1
- package/dist/tests/pathUtils.test.js +3 -138
- package/dist/tests/pathUtils.test.js.map +1 -1
- package/dist/tests/pyrightFileSystem.test.js +38 -34
- package/dist/tests/pyrightFileSystem.test.js.map +1 -1
- package/dist/tests/service.test.js +37 -42
- package/dist/tests/service.test.js.map +1 -1
- package/dist/tests/signatureHelp.test.js +3 -2
- package/dist/tests/signatureHelp.test.js.map +1 -1
- package/dist/tests/sourceFile.test.js +8 -7
- package/dist/tests/sourceFile.test.js.map +1 -1
- package/dist/tests/sourceMapperUtils.test.js +13 -6
- package/dist/tests/sourceMapperUtils.test.js.map +1 -1
- package/dist/tests/testState.test.js +13 -9
- package/dist/tests/testState.test.js.map +1 -1
- package/dist/tests/testStateUtils.d.ts +2 -5
- package/dist/tests/testStateUtils.js +27 -64
- package/dist/tests/testStateUtils.js.map +1 -1
- package/dist/tests/testUtils.d.ts +3 -5
- package/dist/tests/testUtils.js +15 -64
- package/dist/tests/testUtils.js.map +1 -1
- package/dist/tests/textEditUtil.test.js +4 -3
- package/dist/tests/textEditUtil.test.js.map +1 -1
- package/dist/tests/typeEvaluator1.test.js +16 -15
- package/dist/tests/typeEvaluator1.test.js.map +1 -1
- package/dist/tests/typeEvaluator2.test.js +18 -9
- package/dist/tests/typeEvaluator2.test.js.map +1 -1
- package/dist/tests/typeEvaluator3.test.js +73 -62
- package/dist/tests/typeEvaluator3.test.js.map +1 -1
- package/dist/tests/typeEvaluator4.test.js +20 -19
- package/dist/tests/typeEvaluator4.test.js.map +1 -1
- package/dist/tests/typeEvaluator5.test.js +28 -27
- package/dist/tests/typeEvaluator5.test.js.map +1 -1
- package/dist/tests/typePrinter.test.js +4 -3
- package/dist/tests/typePrinter.test.js.map +1 -1
- package/dist/tests/uri.test.d.ts +1 -0
- package/dist/tests/uri.test.js +695 -0
- package/dist/tests/uri.test.js.map +1 -0
- package/dist/tests/workspaceEditUtils.test.js +28 -28
- package/dist/tests/workspaceEditUtils.test.js.map +1 -1
- package/dist/tests/zipfs.test.js +11 -11
- package/dist/tests/zipfs.test.js.map +1 -1
- package/dist/workspaceFactory.d.ts +13 -14
- package/dist/workspaceFactory.js +54 -55
- package/dist/workspaceFactory.js.map +1 -1
- package/package.json +2 -2
- package/dist/common/uriParser.d.ts +0 -24
- package/dist/common/uriParser.js +0 -45
- package/dist/common/uriParser.js.map +0 -1
@@ -11,9 +11,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
11
11
|
const assert_1 = __importDefault(require("assert"));
|
12
12
|
const pathConsts_1 = require("../common/pathConsts");
|
13
13
|
const pathUtils_1 = require("../common/pathUtils");
|
14
|
+
const uri_1 = require("../common/uri/uri");
|
14
15
|
const pyrightFileSystem_1 = require("../pyrightFileSystem");
|
15
16
|
const filesystem_1 = require("./harness/vfs/filesystem");
|
16
17
|
const libraryRoot = (0, pathUtils_1.combinePaths)((0, pathUtils_1.normalizeSlashes)('/'), pathConsts_1.lib, pathConsts_1.sitePackages);
|
18
|
+
const libraryRootUri = uri_1.Uri.file(libraryRoot);
|
17
19
|
test('virtual file exists', () => {
|
18
20
|
const files = [
|
19
21
|
{
|
@@ -34,19 +36,19 @@ test('virtual file exists', () => {
|
|
34
36
|
},
|
35
37
|
];
|
36
38
|
const fs = createFileSystem(files);
|
37
|
-
fs.processPartialStubPackages([
|
38
|
-
const stubFile =
|
39
|
+
fs.processPartialStubPackages([libraryRootUri], [libraryRootUri]);
|
40
|
+
const stubFile = libraryRootUri.combinePaths('myLib', 'partialStub.pyi');
|
39
41
|
(0, assert_1.default)(fs.existsSync(stubFile));
|
40
|
-
(0, assert_1.default)(fs.
|
41
|
-
const myLib =
|
42
|
+
(0, assert_1.default)(fs.isMappedUri(stubFile));
|
43
|
+
const myLib = libraryRootUri.combinePaths('myLib');
|
42
44
|
const entries = fs.readdirEntriesSync(myLib);
|
43
45
|
assert_1.default.strictEqual(3, entries.length);
|
44
|
-
const subDirFile =
|
46
|
+
const subDirFile = libraryRootUri.combinePaths('myLib', 'subdir', '__init__.pyi');
|
45
47
|
(0, assert_1.default)(fs.existsSync(subDirFile));
|
46
|
-
(0, assert_1.default)(fs.
|
48
|
+
(0, assert_1.default)(fs.isMappedUri(subDirFile));
|
47
49
|
const fakeFile = entries.filter((e) => e.name.endsWith('.pyi'))[0];
|
48
50
|
(0, assert_1.default)(fakeFile.isFile());
|
49
|
-
(0, assert_1.default)(!fs.existsSync(
|
51
|
+
(0, assert_1.default)(!fs.existsSync(libraryRootUri.combinePaths('myLib-stubs')));
|
50
52
|
});
|
51
53
|
test('virtual file coexists with real', () => {
|
52
54
|
const files = [
|
@@ -72,21 +74,21 @@ test('virtual file coexists with real', () => {
|
|
72
74
|
},
|
73
75
|
];
|
74
76
|
const fs = createFileSystem(files);
|
75
|
-
fs.processPartialStubPackages([
|
76
|
-
const stubFile =
|
77
|
+
fs.processPartialStubPackages([libraryRootUri], [libraryRootUri]);
|
78
|
+
const stubFile = libraryRootUri.combinePaths('myLib', 'partialStub.pyi');
|
77
79
|
(0, assert_1.default)(fs.existsSync(stubFile));
|
78
|
-
(0, assert_1.default)(fs.
|
79
|
-
const myLib =
|
80
|
+
(0, assert_1.default)(fs.isMappedUri(stubFile));
|
81
|
+
const myLib = libraryRootUri.combinePaths('myLib');
|
80
82
|
const entries = fs.readdirEntriesSync(myLib);
|
81
83
|
assert_1.default.strictEqual(3, entries.length);
|
82
|
-
const subDirFile =
|
84
|
+
const subDirFile = libraryRootUri.combinePaths('myLib', 'subdir', '__init__.pyi');
|
83
85
|
(0, assert_1.default)(fs.existsSync(subDirFile));
|
84
|
-
(0, assert_1.default)(
|
85
|
-
const subDirPyiFile =
|
86
|
+
(0, assert_1.default)(fs.isMappedUri(subDirFile));
|
87
|
+
const subDirPyiFile = libraryRootUri.combinePaths('myLib', 'subdir', '__init__.pyi');
|
86
88
|
(0, assert_1.default)(fs.existsSync(subDirPyiFile));
|
87
89
|
const fakeFile = entries.filter((e) => e.name.endsWith('.pyi'))[0];
|
88
90
|
(0, assert_1.default)(fakeFile.isFile());
|
89
|
-
(0, assert_1.default)(!fs.existsSync(
|
91
|
+
(0, assert_1.default)(!fs.existsSync(libraryRootUri.combinePaths('myLib-stubs')));
|
90
92
|
});
|
91
93
|
test('virtual file not exist', () => {
|
92
94
|
const files = [
|
@@ -100,13 +102,13 @@ test('virtual file not exist', () => {
|
|
100
102
|
},
|
101
103
|
];
|
102
104
|
const fs = createFileSystem(files);
|
103
|
-
fs.processPartialStubPackages([
|
104
|
-
(0, assert_1.default)(!fs.existsSync(
|
105
|
-
const myLib =
|
105
|
+
fs.processPartialStubPackages([libraryRootUri], [libraryRootUri]);
|
106
|
+
(0, assert_1.default)(!fs.existsSync(libraryRootUri.combinePaths('myLib', 'partialStub.pyi')));
|
107
|
+
const myLib = libraryRootUri.combinePaths('myLib');
|
106
108
|
const entries = fs.readdirEntriesSync(myLib);
|
107
109
|
assert_1.default.strictEqual(1, entries.length);
|
108
110
|
assert_1.default.strictEqual(0, entries.filter((e) => e.name.endsWith('.pyi')).length);
|
109
|
-
(0, assert_1.default)(fs.existsSync(
|
111
|
+
(0, assert_1.default)(fs.existsSync(libraryRootUri.combinePaths('myLib-stubs')));
|
110
112
|
});
|
111
113
|
test('existing stub file', () => {
|
112
114
|
const files = [
|
@@ -128,17 +130,18 @@ test('existing stub file', () => {
|
|
128
130
|
},
|
129
131
|
];
|
130
132
|
const fs = createFileSystem(files);
|
131
|
-
fs.processPartialStubPackages([
|
132
|
-
const stubFile =
|
133
|
+
fs.processPartialStubPackages([libraryRootUri], [libraryRootUri]);
|
134
|
+
const stubFile = libraryRootUri.combinePaths('myLib', 'partialStub.pyi');
|
133
135
|
(0, assert_1.default)(fs.existsSync(stubFile));
|
134
|
-
const myLib =
|
136
|
+
const myLib = libraryRootUri.combinePaths('myLib');
|
135
137
|
const entries = fs.readdirEntriesSync(myLib);
|
136
138
|
assert_1.default.strictEqual(2, entries.length);
|
137
139
|
assert_1.default.strictEqual('def test(): ...', fs.readFileSync(stubFile, 'utf8'));
|
138
|
-
(0, assert_1.default)(!fs.existsSync(
|
140
|
+
(0, assert_1.default)(!fs.existsSync(libraryRootUri.combinePaths('myLib-stubs')));
|
139
141
|
});
|
140
142
|
test('multiple package installed', () => {
|
141
143
|
const extraRoot = (0, pathUtils_1.combinePaths)((0, pathUtils_1.normalizeSlashes)('/'), pathConsts_1.lib, 'extra');
|
144
|
+
const extraRootUri = uri_1.Uri.file(extraRoot);
|
142
145
|
const files = [
|
143
146
|
{
|
144
147
|
path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'partialStub.pyi'),
|
@@ -158,16 +161,17 @@ test('multiple package installed', () => {
|
|
158
161
|
},
|
159
162
|
];
|
160
163
|
const fs = createFileSystem(files);
|
161
|
-
fs.processPartialStubPackages([
|
162
|
-
(0, assert_1.default)(fs.isPathScanned(
|
163
|
-
(0, assert_1.default)(fs.isPathScanned(
|
164
|
-
(0, assert_1.default)(fs.existsSync(
|
165
|
-
(0, assert_1.default)(fs.existsSync(
|
166
|
-
assert_1.default.strictEqual(2, fs.readdirEntriesSync(
|
167
|
-
assert_1.default.strictEqual(2, fs.readdirEntriesSync(
|
164
|
+
fs.processPartialStubPackages([libraryRootUri, extraRootUri], [libraryRootUri, extraRootUri]);
|
165
|
+
(0, assert_1.default)(fs.isPathScanned(libraryRootUri));
|
166
|
+
(0, assert_1.default)(fs.isPathScanned(extraRootUri));
|
167
|
+
(0, assert_1.default)(fs.existsSync(libraryRootUri.combinePaths('myLib', 'partialStub.pyi')));
|
168
|
+
(0, assert_1.default)(fs.existsSync(extraRootUri.combinePaths('myLib', 'partialStub.pyi')));
|
169
|
+
assert_1.default.strictEqual(2, fs.readdirEntriesSync(libraryRootUri.combinePaths('myLib')).length);
|
170
|
+
assert_1.default.strictEqual(2, fs.readdirEntriesSync(extraRootUri.combinePaths('myLib')).length);
|
168
171
|
});
|
169
172
|
test('bundled partial stubs', () => {
|
170
173
|
const bundledPath = (0, pathUtils_1.combinePaths)((0, pathUtils_1.normalizeSlashes)('/'), 'bundled');
|
174
|
+
const bundledPathUri = uri_1.Uri.file(bundledPath);
|
171
175
|
const files = [
|
172
176
|
{
|
173
177
|
path: (0, pathUtils_1.combinePaths)(bundledPath, 'myLib-stubs', 'partialStub.pyi'),
|
@@ -187,10 +191,10 @@ test('bundled partial stubs', () => {
|
|
187
191
|
},
|
188
192
|
];
|
189
193
|
const fs = createFileSystem(files);
|
190
|
-
fs.processPartialStubPackages([
|
191
|
-
const stubFile =
|
194
|
+
fs.processPartialStubPackages([bundledPathUri], [libraryRootUri], bundledPathUri);
|
195
|
+
const stubFile = libraryRootUri.combinePaths('myLib', 'partialStub.pyi');
|
192
196
|
(0, assert_1.default)(!fs.existsSync(stubFile));
|
193
|
-
const myLib =
|
197
|
+
const myLib = libraryRootUri.combinePaths('myLib');
|
194
198
|
const entries = fs.readdirEntriesSync(myLib);
|
195
199
|
assert_1.default.strictEqual(2, entries.length);
|
196
200
|
});
|
@@ -200,7 +204,7 @@ function createFileSystem(files) {
|
|
200
204
|
const path = (0, pathUtils_1.normalizeSlashes)(file.path);
|
201
205
|
const dir = (0, pathUtils_1.getDirectoryPath)(path);
|
202
206
|
fs.mkdirpSync(dir);
|
203
|
-
fs.writeFileSync(path, file.content);
|
207
|
+
fs.writeFileSync(uri_1.Uri.file(path), file.content);
|
204
208
|
}
|
205
209
|
return new pyrightFileSystem_1.PyrightFileSystem(fs);
|
206
210
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"pyrightFileSystem.test.js","sourceRoot":"","sources":["../../../src/tests/pyrightFileSystem.test.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;AAEH,oDAA4B;AAE5B,qDAAyD;AACzD,mDAAuF;AACvF,4DAAyD;AACzD,yDAA0D;AAE1D,MAAM,WAAW,GAAG,IAAA,wBAAY,EAAC,IAAA,4BAAgB,EAAC,GAAG,CAAC,EAAE,gBAAG,EAAE,yBAAY,CAAC,CAAC;
|
1
|
+
{"version":3,"file":"pyrightFileSystem.test.js","sourceRoot":"","sources":["../../../src/tests/pyrightFileSystem.test.ts"],"names":[],"mappings":"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"}
|
@@ -9,24 +9,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
9
9
|
};
|
10
10
|
Object.defineProperty(exports, "__esModule", { value: true });
|
11
11
|
const assert_1 = __importDefault(require("assert"));
|
12
|
-
const pathUtils_1 = require("../common/pathUtils");
|
13
|
-
const testState_1 = require("./harness/fourslash/testState");
|
14
12
|
const vscode_jsonrpc_1 = require("vscode-jsonrpc");
|
15
13
|
const sourceFile_1 = require("../analyzer/sourceFile");
|
14
|
+
const pathUtils_1 = require("../common/pathUtils");
|
15
|
+
const uri_1 = require("../common/uri/uri");
|
16
|
+
const testState_1 = require("./harness/fourslash/testState");
|
16
17
|
test('random library file changed', () => {
|
17
18
|
const state = (0, testState_1.parseAndGetTestState)('', '/projectRoot').state;
|
18
|
-
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleLibraryFileWatchChanges('/site-packages/test.py', [
|
19
|
+
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleLibraryFileWatchChanges(uri_1.Uri.file('/site-packages/test.py'), [
|
20
|
+
uri_1.Uri.file('/site-packages'),
|
21
|
+
]), true);
|
19
22
|
});
|
20
23
|
test('random library file starting with . changed', () => {
|
21
24
|
const state = (0, testState_1.parseAndGetTestState)('', '/projectRoot').state;
|
22
|
-
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleLibraryFileWatchChanges('/site-packages/.test.py', [
|
25
|
+
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleLibraryFileWatchChanges(uri_1.Uri.file('/site-packages/.test.py'), [
|
26
|
+
uri_1.Uri.file('/site-packages'),
|
27
|
+
]), false);
|
23
28
|
});
|
24
29
|
test('random library file changed, nested search paths', () => {
|
25
30
|
const state = (0, testState_1.parseAndGetTestState)('', '/projectRoot').state;
|
26
|
-
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleLibraryFileWatchChanges('/lib/.venv/site-packages/myFile.py', [
|
27
|
-
'/lib',
|
28
|
-
'/lib/.venv/site-packages',
|
29
|
-
]), true);
|
31
|
+
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleLibraryFileWatchChanges(uri_1.Uri.file('/lib/.venv/site-packages/myFile.py'), [uri_1.Uri.file('/lib'), uri_1.Uri.file('/lib/.venv/site-packages')]), true);
|
30
32
|
});
|
31
33
|
test('random library file changed, nested search paths, fs is not case sensitive', () => {
|
32
34
|
const code = `
|
@@ -34,10 +36,7 @@ test('random library file changed, nested search paths, fs is not case sensitive
|
|
34
36
|
// @ignoreCase: true
|
35
37
|
`;
|
36
38
|
const state = (0, testState_1.parseAndGetTestState)(code, '/projectRoot').state;
|
37
|
-
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleLibraryFileWatchChanges('/lib/.venv/site-packages/myFile.py', [
|
38
|
-
'/lib',
|
39
|
-
'/LIB/.venv/site-packages',
|
40
|
-
]), true);
|
39
|
+
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleLibraryFileWatchChanges(uri_1.Uri.file('/lib/.venv/site-packages/myFile.py', false), [uri_1.Uri.file('/lib', false), uri_1.Uri.file('/LIB/.venv/site-packages', false)]), true);
|
41
40
|
});
|
42
41
|
test('random library file changed, nested search paths, fs is case sensitive', () => {
|
43
42
|
const code = `
|
@@ -45,10 +44,7 @@ test('random library file changed, nested search paths, fs is case sensitive', (
|
|
45
44
|
// @ignoreCase: false
|
46
45
|
`;
|
47
46
|
const state = (0, testState_1.parseAndGetTestState)(code, '/projectRoot').state;
|
48
|
-
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleLibraryFileWatchChanges('/lib/.venv/site-packages/myFile.py', [
|
49
|
-
'/lib',
|
50
|
-
'/LIB/.venv/site-packages',
|
51
|
-
]), false);
|
47
|
+
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleLibraryFileWatchChanges(uri_1.Uri.file('/lib/.venv/site-packages/myFile.py'), [uri_1.Uri.file('/lib'), uri_1.Uri.file('/LIB/.venv/site-packages')]), false);
|
52
48
|
});
|
53
49
|
test('random library file starting with . changed, fs is not case sensitive', () => {
|
54
50
|
const code = `
|
@@ -56,9 +52,9 @@ test('random library file starting with . changed, fs is not case sensitive', ()
|
|
56
52
|
// @ignoreCase: true
|
57
53
|
`;
|
58
54
|
const state = (0, testState_1.parseAndGetTestState)(code, '/projectRoot').state;
|
59
|
-
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleLibraryFileWatchChanges('/lib/.test.py', [
|
60
|
-
'/LIB',
|
61
|
-
'/lib/site-packages',
|
55
|
+
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleLibraryFileWatchChanges(uri_1.Uri.file('/lib/.test.py', false), [
|
56
|
+
uri_1.Uri.file('/LIB', false),
|
57
|
+
uri_1.Uri.file('/lib/site-packages', false),
|
62
58
|
]), false);
|
63
59
|
});
|
64
60
|
test('random library file starting with . changed, fs is case sensitive', () => {
|
@@ -67,16 +63,14 @@ test('random library file starting with . changed, fs is case sensitive', () =>
|
|
67
63
|
// @ignoreCase: false
|
68
64
|
`;
|
69
65
|
const state = (0, testState_1.parseAndGetTestState)(code, '/projectRoot').state;
|
70
|
-
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleLibraryFileWatchChanges('/lib/.test.py', [
|
71
|
-
'/LIB',
|
72
|
-
'/lib/site-packages',
|
66
|
+
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleLibraryFileWatchChanges(uri_1.Uri.file('/lib/.test.py'), [
|
67
|
+
uri_1.Uri.file('/LIB'),
|
68
|
+
uri_1.Uri.file('/lib/site-packages'),
|
73
69
|
]), true);
|
74
70
|
});
|
75
71
|
test('random library file under a folder starting with . changed', () => {
|
76
72
|
const state = (0, testState_1.parseAndGetTestState)('', '/projectRoot').state;
|
77
|
-
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleLibraryFileWatchChanges('/site-packages/.testFolder/test.py', [
|
78
|
-
'/site-packages',
|
79
|
-
]), false);
|
73
|
+
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleLibraryFileWatchChanges(uri_1.Uri.file('/site-packages/.testFolder/test.py'), [uri_1.Uri.file('/site-packages')]), false);
|
80
74
|
});
|
81
75
|
test('basic file change', () => {
|
82
76
|
const code = `
|
@@ -131,7 +125,7 @@ test('excluded but still part of program', () => {
|
|
131
125
|
const marker = state.getMarkerByName('marker');
|
132
126
|
while (state.workspace.service.test_program.analyze())
|
133
127
|
;
|
134
|
-
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleSourceFileWatchChanges(marker.fileName, /* isFile */ true), true);
|
128
|
+
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleSourceFileWatchChanges(uri_1.Uri.file(marker.fileName), /* isFile */ true), true);
|
135
129
|
});
|
136
130
|
test('random folder changed', () => {
|
137
131
|
const code = `
|
@@ -139,7 +133,7 @@ test('random folder changed', () => {
|
|
139
133
|
//// # empty
|
140
134
|
`;
|
141
135
|
const state = (0, testState_1.parseAndGetTestState)(code, '/projectRoot').state;
|
142
|
-
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleSourceFileWatchChanges('/randomFolder', /* isFile */ false), false);
|
136
|
+
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleSourceFileWatchChanges(uri_1.Uri.file('/randomFolder'), /* isFile */ false), false);
|
143
137
|
});
|
144
138
|
test('excluded folder changed', () => {
|
145
139
|
const code = `
|
@@ -225,7 +219,7 @@ test('program containsSourceFileIn', () => {
|
|
225
219
|
//// # empty
|
226
220
|
`;
|
227
221
|
const state = (0, testState_1.parseAndGetTestState)(code, '/projectRoot').state;
|
228
|
-
(0, assert_1.default)(state.workspace.service.test_program.containsSourceFileIn(state.activeFile.fileName));
|
222
|
+
(0, assert_1.default)(state.workspace.service.test_program.containsSourceFileIn(uri_1.Uri.file(state.activeFile.fileName)));
|
229
223
|
});
|
230
224
|
test('service runEditMode', () => {
|
231
225
|
const code = `
|
@@ -238,13 +232,14 @@ test('service runEditMode', () => {
|
|
238
232
|
const state = (0, testState_1.parseAndGetTestState)(code, '/projectRoot').state;
|
239
233
|
const open = state.getMarkerByName('open');
|
240
234
|
const closed = state.getMarkerByName('closed');
|
241
|
-
const
|
242
|
-
|
235
|
+
const openUri = uri_1.Uri.file(open.fileName);
|
236
|
+
const closedUri = uri_1.Uri.file(closed.fileName);
|
237
|
+
const newFileUri = uri_1.Uri.file((0, pathUtils_1.combinePaths)((0, pathUtils_1.getDirectoryPath)(open.fileName), 'interimFile.py'));
|
238
|
+
state.testFS.writeFileSync(newFileUri, '# empty', 'utf8');
|
243
239
|
const options = {
|
244
240
|
isTracked: true,
|
245
241
|
ipythonMode: sourceFile_1.IPythonMode.None,
|
246
|
-
|
247
|
-
realFilePath: closed.fileName,
|
242
|
+
chainedFileUri: newFileUri,
|
248
243
|
};
|
249
244
|
// try run edit mode
|
250
245
|
verifyRunEditMode('# first');
|
@@ -253,27 +248,27 @@ test('service runEditMode', () => {
|
|
253
248
|
function verifyRunEditMode(value) {
|
254
249
|
var _a, _b;
|
255
250
|
state.workspace.service.runEditMode((p) => {
|
256
|
-
p.addInterimFile(
|
257
|
-
p.setFileOpened(
|
258
|
-
p.setFileOpened(
|
259
|
-
const interim = p.getSourceFileInfo(
|
251
|
+
p.addInterimFile(newFileUri);
|
252
|
+
p.setFileOpened(openUri, 0, value, options);
|
253
|
+
p.setFileOpened(closedUri, 0, value, options);
|
254
|
+
const interim = p.getSourceFileInfo(newFileUri);
|
260
255
|
(0, assert_1.default)(interim);
|
261
|
-
const openFile = p.getSourceFileInfo(
|
256
|
+
const openFile = p.getSourceFileInfo(openUri);
|
262
257
|
(0, assert_1.default)(openFile);
|
263
258
|
(0, assert_1.default)(openFile.isOpenByClient);
|
264
259
|
assert_1.default.strictEqual(value, openFile.sourceFile.getFileContent());
|
265
|
-
const closedFile = p.getSourceFileInfo(
|
260
|
+
const closedFile = p.getSourceFileInfo(closedUri);
|
266
261
|
(0, assert_1.default)(closedFile);
|
267
262
|
(0, assert_1.default)(closedFile.isOpenByClient);
|
268
263
|
assert_1.default.strictEqual(value, closedFile.sourceFile.getFileContent());
|
269
264
|
}, vscode_jsonrpc_1.CancellationToken.None);
|
270
|
-
const interim = state.workspace.service.test_program.getSourceFileInfo(
|
265
|
+
const interim = state.workspace.service.test_program.getSourceFileInfo(newFileUri);
|
271
266
|
(0, assert_1.default)(!interim);
|
272
|
-
const openFile = state.workspace.service.test_program.getSourceFileInfo(
|
267
|
+
const openFile = state.workspace.service.test_program.getSourceFileInfo(openUri);
|
273
268
|
(0, assert_1.default)(openFile);
|
274
269
|
(0, assert_1.default)(openFile.isOpenByClient);
|
275
270
|
assert_1.default.strictEqual('', (_a = openFile.sourceFile.getFileContent()) === null || _a === void 0 ? void 0 : _a.trim());
|
276
|
-
const closedFile = state.workspace.service.test_program.getSourceFileInfo(
|
271
|
+
const closedFile = state.workspace.service.test_program.getSourceFileInfo(closedUri);
|
277
272
|
(0, assert_1.default)(closedFile);
|
278
273
|
(0, assert_1.default)(!closedFile.isOpenByClient);
|
279
274
|
const content = (_b = closedFile.sourceFile.getFileContent()) !== null && _b !== void 0 ? _b : '';
|
@@ -284,6 +279,6 @@ function testSourceFileWatchChange(code, expected = true, isFile = true) {
|
|
284
279
|
const state = (0, testState_1.parseAndGetTestState)(code, '/projectRoot').state;
|
285
280
|
const marker = state.getMarkerByName('marker');
|
286
281
|
const path = isFile ? marker.fileName : (0, pathUtils_1.getDirectoryPath)(marker.fileName);
|
287
|
-
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleSourceFileWatchChanges(path, isFile), expected);
|
282
|
+
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleSourceFileWatchChanges(uri_1.Uri.file(path), isFile), expected);
|
288
283
|
}
|
289
284
|
//# sourceMappingURL=service.test.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"service.test.js","sourceRoot":"","sources":["../../../src/tests/service.test.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;AAEH,oDAA4B;AAE5B,
|
1
|
+
{"version":3,"file":"service.test.js","sourceRoot":"","sources":["../../../src/tests/service.test.ts"],"names":[],"mappings":"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"}
|
@@ -13,6 +13,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
const assert_1 = __importDefault(require("assert"));
|
14
14
|
const vscode_languageserver_1 = require("vscode-languageserver");
|
15
15
|
const positionUtils_1 = require("../common/positionUtils");
|
16
|
+
const uri_1 = require("../common/uri/uri");
|
16
17
|
const signatureHelpProvider_1 = require("../languageService/signatureHelpProvider");
|
17
18
|
const testState_1 = require("./harness/fourslash/testState");
|
18
19
|
test('invalid position in format string segment', () => {
|
@@ -66,9 +67,9 @@ test('within arguments in format string segment', () => {
|
|
66
67
|
function checkSignatureHelp(code, expects) {
|
67
68
|
const state = (0, testState_1.parseAndGetTestState)(code).state;
|
68
69
|
const marker = state.getMarkerByName('marker');
|
69
|
-
const parseResults = state.workspace.service.getParseResult(marker.fileName);
|
70
|
+
const parseResults = state.workspace.service.getParseResult(uri_1.Uri.file(marker.fileName));
|
70
71
|
const position = (0, positionUtils_1.convertOffsetToPosition)(marker.position, parseResults.tokenizerOutput.lines);
|
71
|
-
const actual = new signatureHelpProvider_1.SignatureHelpProvider(state.workspace.service.test_program, marker.fileName, position, vscode_languageserver_1.MarkupKind.Markdown,
|
72
|
+
const actual = new signatureHelpProvider_1.SignatureHelpProvider(state.workspace.service.test_program, uri_1.Uri.file(marker.fileName), position, vscode_languageserver_1.MarkupKind.Markdown,
|
72
73
|
/*hasSignatureLabelOffsetCapability*/ true,
|
73
74
|
/*hasActiveParameterCapability*/ true,
|
74
75
|
/*context*/ undefined, vscode_languageserver_1.CancellationToken.None).getSignatureHelp();
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"signatureHelp.test.js","sourceRoot":"","sources":["../../../src/tests/signatureHelp.test.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AAEH,oDAA4B;AAC5B,iEAAsE;AAEtE,2DAAkE;AAClE,oFAAiF;AACjF,6DAAqE;AAErE,IAAI,CAAC,2CAA2C,EAAE,GAAG,EAAE;IACnD,MAAM,IAAI,GAAG;;;KAGZ,CAAC;IAEF,kBAAkB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AACpC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yCAAyC,EAAE,GAAG,EAAE;IACjD,MAAM,IAAI,GAAG;;;KAGZ,CAAC;IAEF,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,oDAAoD,EAAE,GAAG,EAAE;IAC5D,MAAM,IAAI,GAAG;;;KAGZ,CAAC;IAEF,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sDAAsD,EAAE,GAAG,EAAE;IAC9D,MAAM,IAAI,GAAG;;;KAGZ,CAAC;IAEF,kBAAkB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AACpC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sCAAsC,EAAE,GAAG,EAAE;IAC9C,MAAM,IAAI,GAAG;;;;;;KAMZ,CAAC;IAEF,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2CAA2C,EAAE,GAAG,EAAE;IACnD,MAAM,IAAI,GAAG;;;;;;KAMZ,CAAC;IAEF,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC;AAEH,SAAS,kBAAkB,CAAC,IAAY,EAAE,OAAgB;IACtD,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,YAAY,GAAG,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAE,CAAC;
|
1
|
+
{"version":3,"file":"signatureHelp.test.js","sourceRoot":"","sources":["../../../src/tests/signatureHelp.test.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AAEH,oDAA4B;AAC5B,iEAAsE;AAEtE,2DAAkE;AAClE,2CAAwC;AACxC,oFAAiF;AACjF,6DAAqE;AAErE,IAAI,CAAC,2CAA2C,EAAE,GAAG,EAAE;IACnD,MAAM,IAAI,GAAG;;;KAGZ,CAAC;IAEF,kBAAkB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AACpC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yCAAyC,EAAE,GAAG,EAAE;IACjD,MAAM,IAAI,GAAG;;;KAGZ,CAAC;IAEF,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,oDAAoD,EAAE,GAAG,EAAE;IAC5D,MAAM,IAAI,GAAG;;;KAGZ,CAAC;IAEF,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sDAAsD,EAAE,GAAG,EAAE;IAC9D,MAAM,IAAI,GAAG;;;KAGZ,CAAC;IAEF,kBAAkB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AACpC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sCAAsC,EAAE,GAAG,EAAE;IAC9C,MAAM,IAAI,GAAG;;;;;;KAMZ,CAAC;IAEF,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2CAA2C,EAAE,GAAG,EAAE;IACnD,MAAM,IAAI,GAAG;;;;;;KAMZ,CAAC;IAEF,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACnC,CAAC,CAAC,CAAC;AAEH,SAAS,kBAAkB,CAAC,IAAY,EAAE,OAAgB;IACtD,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,YAAY,GAAG,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,cAAc,CAAC,SAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAE,CAAC;IACxF,MAAM,QAAQ,GAAG,IAAA,uCAAuB,EAAC,MAAM,CAAC,QAAQ,EAAE,YAAY,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;IAE9F,MAAM,MAAM,GAAG,IAAI,6CAAqB,CACpC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,EACpC,SAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EACzB,QAAQ,EACR,kCAAU,CAAC,QAAQ;IACnB,qCAAqC,CAAC,IAAI;IAC1C,gCAAgC,CAAC,IAAI;IACrC,WAAW,CAAC,SAAS,EACrB,yCAAiB,CAAC,IAAI,CACzB,CAAC,gBAAgB,EAAE,CAAC;IAErB,gBAAM,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAC1C,CAAC"}
|
@@ -38,16 +38,17 @@ const configOptions_1 = require("../common/configOptions");
|
|
38
38
|
const fullAccessHost_1 = require("../common/fullAccessHost");
|
39
39
|
const pathUtils_1 = require("../common/pathUtils");
|
40
40
|
const realFileSystem_1 = require("../common/realFileSystem");
|
41
|
-
const testState_1 = require("./harness/fourslash/testState");
|
42
41
|
const serviceProviderExtensions_1 = require("../common/serviceProviderExtensions");
|
42
|
+
const uri_1 = require("../common/uri/uri");
|
43
|
+
const testState_1 = require("./harness/fourslash/testState");
|
43
44
|
test('Empty', () => {
|
44
45
|
const filePath = (0, pathUtils_1.combinePaths)(process.cwd(), 'tests/samples/test_file1.py');
|
45
46
|
const fs = (0, realFileSystem_1.createFromRealFileSystem)();
|
46
47
|
const serviceProvider = (0, serviceProviderExtensions_1.createServiceProvider)(fs);
|
47
|
-
const sourceFile = new sourceFile_1.SourceFile(serviceProvider, filePath, '', false, false, { isEditMode: false });
|
48
|
-
const configOptions = new configOptions_1.ConfigOptions(process.cwd());
|
48
|
+
const sourceFile = new sourceFile_1.SourceFile(serviceProvider, uri_1.Uri.file(filePath), '', false, false, { isEditMode: false });
|
49
|
+
const configOptions = new configOptions_1.ConfigOptions(uri_1.Uri.file(process.cwd()));
|
49
50
|
const sp = (0, serviceProviderExtensions_1.createServiceProvider)(fs);
|
50
|
-
const importResolver = new importResolver_1.ImportResolver(sp, configOptions, new fullAccessHost_1.FullAccessHost(
|
51
|
+
const importResolver = new importResolver_1.ImportResolver(sp, configOptions, new fullAccessHost_1.FullAccessHost(sp));
|
51
52
|
sourceFile.parse(configOptions, importResolver);
|
52
53
|
});
|
53
54
|
test('Empty Open file', () => {
|
@@ -58,8 +59,8 @@ test('Empty Open file', () => {
|
|
58
59
|
`;
|
59
60
|
const state = (0, testState_1.parseAndGetTestState)(code).state;
|
60
61
|
const marker = state.getMarkerByName('marker');
|
61
|
-
assert.strictEqual((_a = state.workspace.service.test_program.getSourceFile(marker.fileName)) === null || _a === void 0 ? void 0 : _a.getFileContent(), '# Content');
|
62
|
-
state.workspace.service.updateOpenFileContents(marker.fileName, 1, '');
|
63
|
-
assert.strictEqual((_b = state.workspace.service.test_program.getSourceFile(marker.fileName)) === null || _b === void 0 ? void 0 : _b.getFileContent(), '');
|
62
|
+
assert.strictEqual((_a = state.workspace.service.test_program.getSourceFile(uri_1.Uri.file(marker.fileName))) === null || _a === void 0 ? void 0 : _a.getFileContent(), '# Content');
|
63
|
+
state.workspace.service.updateOpenFileContents(uri_1.Uri.file(marker.fileName), 1, '');
|
64
|
+
assert.strictEqual((_b = state.workspace.service.test_program.getSourceFile(uri_1.Uri.file(marker.fileName))) === null || _b === void 0 ? void 0 : _b.getFileContent(), '');
|
64
65
|
});
|
65
66
|
//# sourceMappingURL=sourceFile.test.js.map
|
@@ -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,6DAAoE;AACpE,
|
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,6DAAoE;AACpE,mFAA4E;AAC5E,2CAAwC;AACxC,6DAAqE;AAErE,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;IACf,MAAM,QAAQ,GAAG,IAAA,wBAAY,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,6BAA6B,CAAC,CAAC;IAC5E,MAAM,EAAE,GAAG,IAAA,yCAAwB,GAAE,CAAC;IACtC,MAAM,eAAe,GAAG,IAAA,iDAAqB,EAAC,EAAE,CAAC,CAAC;IAClD,MAAM,UAAU,GAAG,IAAI,uBAAU,CAAC,eAAe,EAAE,SAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;IAChH,MAAM,aAAa,GAAG,IAAI,6BAAa,CAAC,SAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IACjE,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,SAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,0CAAE,cAAc,EAAE,EAC/F,WAAW,CACd,CAAC;IAEF,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,sBAAsB,CAAC,SAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IACjF,MAAM,CAAC,WAAW,CACd,MAAA,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,SAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,0CAAE,cAAc,EAAE,EAC/F,EAAE,CACL,CAAC;AACN,CAAC,CAAC,CAAC"}
|
@@ -33,10 +33,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
33
33
|
const assert = __importStar(require("assert"));
|
34
34
|
const vscode_jsonrpc_1 = require("vscode-jsonrpc");
|
35
35
|
const sourceMapperUtils_1 = require("../analyzer/sourceMapperUtils");
|
36
|
+
const uri_1 = require("../common/uri/uri");
|
37
|
+
function buildImportTree(sourceFile, targetFile, importResolver, token) {
|
38
|
+
return (0, sourceMapperUtils_1.buildImportTree)(uri_1.Uri.file(sourceFile), uri_1.Uri.file(targetFile), (from) => {
|
39
|
+
const resolved = importResolver(from.getFilePath().slice(1));
|
40
|
+
return resolved.map((f) => uri_1.Uri.file(f));
|
41
|
+
}, token).map((u) => u.getFilePath().slice(1));
|
42
|
+
}
|
36
43
|
describe('BuildImportTree', () => {
|
37
44
|
const tokenSource = new vscode_jsonrpc_1.CancellationTokenSource();
|
38
45
|
test('Simple', () => {
|
39
|
-
const results =
|
46
|
+
const results = buildImportTree('A', 'C', (f) => {
|
40
47
|
switch (f) {
|
41
48
|
case 'C':
|
42
49
|
return ['B'];
|
@@ -50,7 +57,7 @@ describe('BuildImportTree', () => {
|
|
50
57
|
assert.deepEqual(results, ['C', 'B']);
|
51
58
|
});
|
52
59
|
test('Recursion', () => {
|
53
|
-
const results =
|
60
|
+
const results = buildImportTree('A', 'E', (f) => {
|
54
61
|
switch (f) {
|
55
62
|
case 'E':
|
56
63
|
return ['D'];
|
@@ -68,7 +75,7 @@ describe('BuildImportTree', () => {
|
|
68
75
|
assert.deepEqual(results, ['E', 'D', 'B']);
|
69
76
|
});
|
70
77
|
test('Multiple Paths', () => {
|
71
|
-
const results =
|
78
|
+
const results = buildImportTree('A', 'G', (f) => {
|
72
79
|
switch (f) {
|
73
80
|
case 'G':
|
74
81
|
return ['F', 'H', 'I'];
|
@@ -88,7 +95,7 @@ describe('BuildImportTree', () => {
|
|
88
95
|
assert.deepEqual(results, ['G', 'F', 'D', 'B']);
|
89
96
|
});
|
90
97
|
test('No paths', () => {
|
91
|
-
const results =
|
98
|
+
const results = buildImportTree('A', 'G', (f) => {
|
92
99
|
switch (f) {
|
93
100
|
case 'G':
|
94
101
|
return ['F', 'H', 'I'];
|
@@ -111,7 +118,7 @@ describe('BuildImportTree', () => {
|
|
111
118
|
.map(() => String.fromCharCode(start++));
|
112
119
|
}
|
113
120
|
test('Too deep', () => {
|
114
|
-
const results =
|
121
|
+
const results = buildImportTree('Z', 'A', (f) => {
|
115
122
|
const start = f.charCodeAt(0);
|
116
123
|
const end = 'Y'.charCodeAt(0);
|
117
124
|
return genArray(start, end);
|
@@ -121,7 +128,7 @@ describe('BuildImportTree', () => {
|
|
121
128
|
test('Canceled', () => {
|
122
129
|
const canceled = new vscode_jsonrpc_1.CancellationTokenSource();
|
123
130
|
canceled.cancel();
|
124
|
-
const results =
|
131
|
+
const results = buildImportTree('A', 'E', (f) => {
|
125
132
|
switch (f) {
|
126
133
|
case 'E':
|
127
134
|
return ['D'];
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"sourceMapperUtils.test.js","sourceRoot":"","sources":["../../../src/tests/sourceMapperUtils.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;GAMG;AACH,+CAAiC;AACjC,
|
1
|
+
{"version":3,"file":"sourceMapperUtils.test.js","sourceRoot":"","sources":["../../../src/tests/sourceMapperUtils.test.ts"],"names":[],"mappings":"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"}
|