@zzzen/pyright-internal 1.2.0-dev.20231203 → 1.2.0-dev.20231217
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 +67 -62
- 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 +47 -47
- package/dist/analyzer/codeFlowEngine.js.map +1 -1
- package/dist/analyzer/codeFlowTypes.d.ts +0 -1
- package/dist/analyzer/codeFlowTypes.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/decorators.js +14 -43
- package/dist/analyzer/decorators.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 +7 -4
- package/dist/analyzer/parseTreeUtils.js.map +1 -1
- package/dist/analyzer/patternMatching.js +102 -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 +6 -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 +190 -184
- 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 +61 -63
- 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 +259 -152
- package/dist/analyzer/typeEvaluator.js.map +1 -1
- package/dist/analyzer/typeGuards.d.ts +1 -0
- package/dist/analyzer/typeGuards.js +5 -4
- 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 +5 -2
- package/dist/analyzer/typeUtils.js +37 -10
- 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 +10 -6
- package/dist/analyzer/types.js +7 -5
- 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 +2 -1
- 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 +98 -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 +35 -38
- 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 +11 -3
- 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 +2 -0
- package/dist/localization/localize.js +2 -0
- package/dist/localization/localize.js.map +1 -1
- package/dist/localization/package.nls.en-us.json +3 -1
- package/dist/parser/parseNodes.d.ts +1 -0
- package/dist/parser/parseNodes.js +1 -0
- package/dist/parser/parseNodes.js.map +1 -1
- package/dist/parser/parser.js +18 -15
- package/dist/parser/parser.js.map +1 -1
- package/dist/pyright.js +16 -15
- 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/classDeclaration.test.d.ts +1 -0
- package/dist/tests/classDeclaration.test.js +166 -0
- package/dist/tests/classDeclaration.test.js.map +1 -0
- 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/fourslash/workspaceEditTestUtils.js +4 -0
- package/dist/tests/harness/fourslash/workspaceEditTestUtils.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 +106 -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 +73 -35
- 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 +22 -9
- package/dist/tests/typeEvaluator2.test.js.map +1 -1
- package/dist/tests/typeEvaluator3.test.js +86 -63
- package/dist/tests/typeEvaluator3.test.js.map +1 -1
- package/dist/tests/typeEvaluator4.test.js +29 -20
- 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
@@ -1,26 +1,6 @@
|
|
1
1
|
"use strict";
|
2
|
-
var
|
3
|
-
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
7
|
-
}
|
8
|
-
Object.defineProperty(o, k2, desc);
|
9
|
-
}) : (function(o, m, k, k2) {
|
10
|
-
if (k2 === undefined) k2 = k;
|
11
|
-
o[k2] = m[k];
|
12
|
-
}));
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
15
|
-
}) : function(o, v) {
|
16
|
-
o["default"] = v;
|
17
|
-
});
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
19
|
-
if (mod && mod.__esModule) return mod;
|
20
|
-
var result = {};
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
22
|
-
__setModuleDefault(result, mod);
|
23
|
-
return result;
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
24
4
|
};
|
25
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
26
6
|
/*
|
@@ -30,13 +10,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
30
10
|
*
|
31
11
|
* Unit tests for pyright sourceMapperUtils module.
|
32
12
|
*/
|
33
|
-
const
|
13
|
+
const assert_1 = __importDefault(require("assert"));
|
34
14
|
const vscode_jsonrpc_1 = require("vscode-jsonrpc");
|
15
|
+
const declaration_1 = require("../analyzer/declaration");
|
35
16
|
const sourceMapperUtils_1 = require("../analyzer/sourceMapperUtils");
|
17
|
+
const textRange_1 = require("../common/textRange");
|
18
|
+
const uri_1 = require("../common/uri/uri");
|
19
|
+
const testState_1 = require("./harness/fourslash/testState");
|
20
|
+
function buildImportTree(sourceFile, targetFile, importResolver, token) {
|
21
|
+
return (0, sourceMapperUtils_1.buildImportTree)(uri_1.Uri.file(sourceFile), uri_1.Uri.file(targetFile), (from) => {
|
22
|
+
const resolved = importResolver(from.getFilePath().slice(1));
|
23
|
+
return resolved.map((f) => uri_1.Uri.file(f));
|
24
|
+
}, token).map((u) => u.getFilePath().slice(1));
|
25
|
+
}
|
36
26
|
describe('BuildImportTree', () => {
|
37
27
|
const tokenSource = new vscode_jsonrpc_1.CancellationTokenSource();
|
38
28
|
test('Simple', () => {
|
39
|
-
const results =
|
29
|
+
const results = buildImportTree('A', 'C', (f) => {
|
40
30
|
switch (f) {
|
41
31
|
case 'C':
|
42
32
|
return ['B'];
|
@@ -47,10 +37,10 @@ describe('BuildImportTree', () => {
|
|
47
37
|
}
|
48
38
|
return [];
|
49
39
|
}, tokenSource.token);
|
50
|
-
|
40
|
+
assert_1.default.deepEqual(results, ['C', 'B']);
|
51
41
|
});
|
52
42
|
test('Recursion', () => {
|
53
|
-
const results =
|
43
|
+
const results = buildImportTree('A', 'E', (f) => {
|
54
44
|
switch (f) {
|
55
45
|
case 'E':
|
56
46
|
return ['D'];
|
@@ -65,10 +55,10 @@ describe('BuildImportTree', () => {
|
|
65
55
|
}
|
66
56
|
return [];
|
67
57
|
}, tokenSource.token);
|
68
|
-
|
58
|
+
assert_1.default.deepEqual(results, ['E', 'D', 'B']);
|
69
59
|
});
|
70
60
|
test('Multiple Paths', () => {
|
71
|
-
const results =
|
61
|
+
const results = buildImportTree('A', 'G', (f) => {
|
72
62
|
switch (f) {
|
73
63
|
case 'G':
|
74
64
|
return ['F', 'H', 'I'];
|
@@ -85,10 +75,10 @@ describe('BuildImportTree', () => {
|
|
85
75
|
}
|
86
76
|
return [];
|
87
77
|
}, tokenSource.token);
|
88
|
-
|
78
|
+
assert_1.default.deepEqual(results, ['G', 'F', 'D', 'B']);
|
89
79
|
});
|
90
80
|
test('No paths', () => {
|
91
|
-
const results =
|
81
|
+
const results = buildImportTree('A', 'G', (f) => {
|
92
82
|
switch (f) {
|
93
83
|
case 'G':
|
94
84
|
return ['F', 'H', 'I'];
|
@@ -103,7 +93,7 @@ describe('BuildImportTree', () => {
|
|
103
93
|
}
|
104
94
|
return [];
|
105
95
|
}, tokenSource.token);
|
106
|
-
|
96
|
+
assert_1.default.deepEqual(results, ['G']);
|
107
97
|
});
|
108
98
|
function genArray(start, end) {
|
109
99
|
return Array(end - start)
|
@@ -111,17 +101,17 @@ describe('BuildImportTree', () => {
|
|
111
101
|
.map(() => String.fromCharCode(start++));
|
112
102
|
}
|
113
103
|
test('Too deep', () => {
|
114
|
-
const results =
|
104
|
+
const results = buildImportTree('Z', 'A', (f) => {
|
115
105
|
const start = f.charCodeAt(0);
|
116
106
|
const end = 'Y'.charCodeAt(0);
|
117
107
|
return genArray(start, end);
|
118
108
|
}, tokenSource.token);
|
119
|
-
|
109
|
+
assert_1.default.deepEqual(results, ['A']);
|
120
110
|
});
|
121
111
|
test('Canceled', () => {
|
122
112
|
const canceled = new vscode_jsonrpc_1.CancellationTokenSource();
|
123
113
|
canceled.cancel();
|
124
|
-
const results =
|
114
|
+
const results = buildImportTree('A', 'E', (f) => {
|
125
115
|
switch (f) {
|
126
116
|
case 'E':
|
127
117
|
return ['D'];
|
@@ -136,7 +126,55 @@ describe('BuildImportTree', () => {
|
|
136
126
|
}
|
137
127
|
return [];
|
138
128
|
}, canceled.token);
|
139
|
-
|
129
|
+
assert_1.default.deepEqual(results, ['E']);
|
140
130
|
});
|
141
131
|
});
|
132
|
+
test('find type alias decl', () => {
|
133
|
+
const code = `
|
134
|
+
// @filename: test.py
|
135
|
+
//// from typing import Mapping
|
136
|
+
//// [|/*decl*/M|] = Mapping
|
137
|
+
////
|
138
|
+
//// def foo(/*marker*/m: M): pass
|
139
|
+
`;
|
140
|
+
assertTypeAlias(code);
|
141
|
+
});
|
142
|
+
test('find type alias decl from inferred type', () => {
|
143
|
+
const code = `
|
144
|
+
// @filename: test.py
|
145
|
+
//// from typing import Mapping
|
146
|
+
//// [|/*decl*/M|] = Mapping
|
147
|
+
////
|
148
|
+
//// def foo(m: M):
|
149
|
+
//// return m
|
150
|
+
|
151
|
+
// @filename: test1.py
|
152
|
+
//// from test import foo
|
153
|
+
//// a = { "hello": 10 }
|
154
|
+
////
|
155
|
+
//// /*marker*/b = foo(a)
|
156
|
+
`;
|
157
|
+
assertTypeAlias(code);
|
158
|
+
});
|
159
|
+
function assertTypeAlias(code) {
|
160
|
+
var _a;
|
161
|
+
const state = (0, testState_1.parseAndGetTestState)(code).state;
|
162
|
+
const node = (0, testState_1.getNodeAtMarker)(state, 'marker');
|
163
|
+
(0, assert_1.default)(node.nodeType === 38 /* ParseNodeType.Name */);
|
164
|
+
const type = state.program.evaluator.getType(node);
|
165
|
+
(0, assert_1.default)((type === null || type === void 0 ? void 0 : type.category) === 6 /* TypeCategory.Class */);
|
166
|
+
assert_1.default.strictEqual(type.details.name, 'Mapping');
|
167
|
+
assert_1.default.strictEqual((_a = type.typeAliasInfo) === null || _a === void 0 ? void 0 : _a.name, 'M');
|
168
|
+
assert_1.default.strictEqual(type.typeAliasInfo.moduleName, 'test');
|
169
|
+
const marker = state.getMarkerByName('marker');
|
170
|
+
const markerUri = uri_1.Uri.file(marker.fileName, state.fs.isCaseSensitive);
|
171
|
+
const mapper = state.program.getSourceMapper(markerUri, vscode_jsonrpc_1.CancellationToken.None,
|
172
|
+
/* mapCompiled */ false,
|
173
|
+
/* preferStubs */ true);
|
174
|
+
const range = state.getRangeByMarkerName('decl');
|
175
|
+
const decls = mapper.findDeclarationsByType(markerUri, type, /* userTypeAlias */ true);
|
176
|
+
const decl = decls.find((d) => (0, declaration_1.isVariableDeclaration)(d) && d.typeAliasName && d.typeAliasName.value === 'M');
|
177
|
+
(0, assert_1.default)(decl);
|
178
|
+
assert_1.default.deepEqual(textRange_1.TextRange.create(decl.node.start, decl.node.length), textRange_1.TextRange.fromBounds(range.pos, range.end));
|
179
|
+
}
|
142
180
|
//# sourceMappingURL=sourceMapperUtils.test.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"sourceMapperUtils.test.js","sourceRoot":"","sources":["../../../src/tests/sourceMapperUtils.test.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"sourceMapperUtils.test.js","sourceRoot":"","sources":["../../../src/tests/sourceMapperUtils.test.ts"],"names":[],"mappings":"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"}
|
@@ -36,6 +36,7 @@ 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");
|
39
40
|
const runner_1 = require("./harness/fourslash/runner");
|
40
41
|
const testState_1 = require("./harness/fourslash/testState");
|
41
42
|
const factory = __importStar(require("./harness/vfs/factory"));
|
@@ -64,9 +65,10 @@ test('Multiple files', () => {
|
|
64
65
|
`;
|
65
66
|
const state = (0, testState_1.parseAndGetTestState)(code, factory.srcFolder).state;
|
66
67
|
assert_1.default.equal(state.cwd(), (0, pathUtils_1.normalizeSlashes)('/'));
|
67
|
-
(0, assert_1.default)(state.fs.existsSync((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')))));
|
68
69
|
});
|
69
70
|
test('Configuration', () => {
|
71
|
+
var _a;
|
70
72
|
const code = `
|
71
73
|
// @filename: pyrightconfig.json
|
72
74
|
//// {
|
@@ -131,12 +133,13 @@ test('Configuration', () => {
|
|
131
133
|
`;
|
132
134
|
const state = (0, testState_1.parseAndGetTestState)(code, factory.srcFolder).state;
|
133
135
|
assert_1.default.equal(state.cwd(), (0, pathUtils_1.normalizeSlashes)('/'));
|
134
|
-
(0, assert_1.default)(state.fs.existsSync((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')))));
|
135
137
|
assert_1.default.equal(state.configOptions.diagnosticRuleSet.reportMissingImports, 'error');
|
136
138
|
assert_1.default.equal(state.configOptions.diagnosticRuleSet.reportMissingModuleSource, 'warning');
|
137
|
-
assert_1.default.equal(state.configOptions.stubPath, (0, pathUtils_1.normalizeSlashes)('/src/typestubs'));
|
139
|
+
assert_1.default.equal((_a = state.configOptions.stubPath) === null || _a === void 0 ? void 0 : _a.getFilePath(), (0, pathUtils_1.normalizeSlashes)('/src/typestubs'));
|
138
140
|
});
|
139
141
|
test('stubPath configuration', () => {
|
142
|
+
var _a;
|
140
143
|
const code = `
|
141
144
|
// @filename: pyrightconfig.json
|
142
145
|
//// {
|
@@ -144,9 +147,10 @@ test('stubPath configuration', () => {
|
|
144
147
|
//// }
|
145
148
|
`;
|
146
149
|
const state = (0, testState_1.parseAndGetTestState)(code).state;
|
147
|
-
assert_1.default.equal(state.configOptions.stubPath, (0, pathUtils_1.normalizeSlashes)('/src/typestubs'));
|
150
|
+
assert_1.default.equal((_a = state.configOptions.stubPath) === null || _a === void 0 ? void 0 : _a.getFilePath(), (0, pathUtils_1.normalizeSlashes)('/src/typestubs'));
|
148
151
|
});
|
149
152
|
test('Duplicated stubPath configuration', () => {
|
153
|
+
var _a;
|
150
154
|
const code = `
|
151
155
|
// @filename: pyrightconfig.json
|
152
156
|
//// {
|
@@ -155,7 +159,7 @@ test('Duplicated stubPath configuration', () => {
|
|
155
159
|
//// }
|
156
160
|
`;
|
157
161
|
const state = (0, testState_1.parseAndGetTestState)(code).state;
|
158
|
-
assert_1.default.equal(state.configOptions.stubPath, (0, pathUtils_1.normalizeSlashes)('/src/typestubs2'));
|
162
|
+
assert_1.default.equal((_a = state.configOptions.stubPath) === null || _a === void 0 ? void 0 : _a.getFilePath(), (0, pathUtils_1.normalizeSlashes)('/src/typestubs2'));
|
159
163
|
});
|
160
164
|
test('ProjectRoot', () => {
|
161
165
|
const code = `
|
@@ -168,8 +172,8 @@ test('ProjectRoot', () => {
|
|
168
172
|
`;
|
169
173
|
const state = (0, testState_1.parseAndGetTestState)(code).state;
|
170
174
|
assert_1.default.equal(state.cwd(), (0, pathUtils_1.normalizeSlashes)('/root'));
|
171
|
-
(0, assert_1.default)(state.fs.existsSync((0, pathUtils_1.normalizeSlashes)('/root/file1.py')));
|
172
|
-
assert_1.default.equal(state.configOptions.projectRoot, (0, pathUtils_1.normalizeSlashes)('/root'));
|
175
|
+
(0, assert_1.default)(state.fs.existsSync(uri_1.Uri.file((0, pathUtils_1.normalizeSlashes)('/root/file1.py'))));
|
176
|
+
assert_1.default.equal(state.configOptions.projectRoot.getFilePath(), (0, pathUtils_1.normalizeSlashes)('/root'));
|
173
177
|
});
|
174
178
|
test('CustomTypeshedFolder', () => {
|
175
179
|
// use differnt physical folder as typeshed folder. this is different than
|
@@ -183,7 +187,7 @@ test('CustomTypeshedFolder', () => {
|
|
183
187
|
// mount the folder this file is in as typeshed folder and check whether
|
184
188
|
// in typeshed folder in virtual file system, this file exists.
|
185
189
|
const state = (0, testState_1.parseAndGetTestState)(code).state;
|
186
|
-
(0, assert_1.default)(state.fs.existsSync((0, pathUtils_1.combinePaths)(factory.typeshedFolder, (0, pathUtils_1.getFileName)(__filename))));
|
190
|
+
(0, assert_1.default)(state.fs.existsSync(uri_1.Uri.file((0, pathUtils_1.combinePaths)(factory.typeshedFolder, (0, pathUtils_1.getFileName)(__filename)))));
|
187
191
|
});
|
188
192
|
test('IgnoreCase', () => {
|
189
193
|
const code = `
|
@@ -195,7 +199,7 @@ test('IgnoreCase', () => {
|
|
195
199
|
//// pass
|
196
200
|
`;
|
197
201
|
const state = (0, testState_1.parseAndGetTestState)(code, factory.srcFolder).state;
|
198
|
-
(0, assert_1.default)(state.fs.existsSync((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')))));
|
199
203
|
});
|
200
204
|
test('GoToMarker', () => {
|
201
205
|
const code = `
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"testState.test.js","sourceRoot":"","sources":["../../../src/tests/testState.test.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"testState.test.js","sourceRoot":"","sources":["../../../src/tests/testState.test.ts"],"names":[],"mappings":"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"}
|
@@ -1,13 +1,10 @@
|
|
1
|
-
import {
|
1
|
+
import { Program } from '../analyzer/program';
|
2
|
+
import { ConfigOptions } from '../common/configOptions';
|
2
3
|
import { FileEditAction, FileEditActions } from '../common/editAction';
|
3
|
-
import { FileSystem } from '../common/fileSystem';
|
4
4
|
import { Range } from './harness/fourslash/fourSlashTypes';
|
5
5
|
import { TestState } from './harness/fourslash/testState';
|
6
|
-
import { Program } from '../analyzer/program';
|
7
|
-
import { ConfigOptions } from '../common/configOptions';
|
8
6
|
export declare function convertFileEditActionToString(edit: FileEditAction): string;
|
9
7
|
export declare function convertRangeToFileEditAction(state: TestState, range: Range, replacementText?: string): FileEditAction;
|
10
8
|
export declare function verifyEdits(state: TestState, fileEditActions: FileEditActions, ranges: Range[], replacementText: string | undefined): void;
|
11
9
|
export declare function applyFileEditActions(state: TestState, fileEditActions: FileEditActions): void;
|
12
|
-
export declare function convertWorkspaceEditToFileEditActions(fs: FileSystem, edit: WorkspaceEdit): FileEditActions;
|
13
10
|
export declare function verifyReferencesAtPosition(program: Program, configOption: ConfigOptions, symbolNames: string | string[], fileName: string, position: number, ranges: Range[]): void;
|
@@ -10,26 +10,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
10
10
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
11
11
|
};
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
13
|
-
exports.verifyReferencesAtPosition = exports.
|
13
|
+
exports.verifyReferencesAtPosition = exports.applyFileEditActions = exports.verifyEdits = exports.convertRangeToFileEditAction = exports.convertFileEditActionToString = void 0;
|
14
14
|
const assert_1 = __importDefault(require("assert"));
|
15
|
+
const vscode_languageserver_1 = require("vscode-languageserver");
|
16
|
+
const parseTreeUtils_1 = require("../analyzer/parseTreeUtils");
|
15
17
|
const collectionUtils_1 = require("../common/collectionUtils");
|
18
|
+
const core_1 = require("../common/core");
|
16
19
|
const debug_1 = require("../common/debug");
|
17
|
-
const pathUtils_1 = require("../common/pathUtils");
|
18
20
|
const textRange_1 = require("../common/textRange");
|
21
|
+
const uri_1 = require("../common/uri/uri");
|
22
|
+
const uriUtils_1 = require("../common/uri/uriUtils");
|
19
23
|
const workspaceEditUtils_1 = require("../common/workspaceEditUtils");
|
20
|
-
const vscode_languageserver_1 = require("vscode-languageserver");
|
21
|
-
const parseTreeUtils_1 = require("../analyzer/parseTreeUtils");
|
22
24
|
const documentSymbolCollector_1 = require("../languageService/documentSymbolCollector");
|
23
|
-
const core_1 = require("../common/core");
|
24
25
|
function convertFileEditActionToString(edit) {
|
25
|
-
return `'${edit.replacementText.replace(/\n/g, '!n!')}'@'${edit.
|
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})'`;
|
26
27
|
}
|
27
28
|
exports.convertFileEditActionToString = convertFileEditActionToString;
|
28
29
|
function convertRangeToFileEditAction(state, range, replacementText) {
|
29
30
|
var _a, _b;
|
30
31
|
const data = (_a = range.marker) === null || _a === void 0 ? void 0 : _a.data;
|
31
32
|
return {
|
32
|
-
|
33
|
+
fileUri: uri_1.Uri.file(range.fileName),
|
33
34
|
replacementText: ((_b = replacementText !== null && replacementText !== void 0 ? replacementText : data === null || data === void 0 ? void 0 : data.r) !== null && _b !== void 0 ? _b : 'N/A').replace(/!n!/g, '\n'),
|
34
35
|
range: state.convertPositionRange(range),
|
35
36
|
};
|
@@ -39,7 +40,7 @@ function verifyEdits(state, fileEditActions, ranges, replacementText) {
|
|
39
40
|
for (const edit of fileEditActions.edits) {
|
40
41
|
const expected = ranges.map((r) => convertRangeToFileEditAction(state, r, replacementText));
|
41
42
|
(0, assert_1.default)(expected.some((a) => {
|
42
|
-
return (a.
|
43
|
+
return (a.fileUri === edit.fileUri &&
|
43
44
|
(0, textRange_1.rangesAreEqual)(a.range, edit.range) &&
|
44
45
|
a.replacementText === edit.replacementText);
|
45
46
|
}), `can't find ${convertFileEditActionToString(edit)} in ${expected
|
@@ -51,43 +52,43 @@ exports.verifyEdits = verifyEdits;
|
|
51
52
|
function applyFileEditActions(state, fileEditActions) {
|
52
53
|
// Apply changes
|
53
54
|
// First, apply text changes
|
54
|
-
const editsPerFileMap = (0, collectionUtils_1.createMapFromItems)(fileEditActions.edits, (e) => e.
|
55
|
+
const editsPerFileMap = (0, collectionUtils_1.createMapFromItems)(fileEditActions.edits, (e) => e.fileUri.key);
|
55
56
|
for (const [editFileName, editsPerFile] of editsPerFileMap) {
|
56
57
|
const result = _applyEdits(state, editFileName, editsPerFile);
|
57
|
-
state.testFS.writeFileSync(editFileName, result.text, 'utf8');
|
58
|
+
state.testFS.writeFileSync(uri_1.Uri.file(editFileName), result.text, 'utf8');
|
58
59
|
// Update open file content if the file is in opened state.
|
59
60
|
if (result.version) {
|
60
61
|
let openedFilePath = editFileName;
|
61
|
-
const renamed = fileEditActions.fileOperations.find((o) => o.kind === 'rename' && o.
|
62
|
+
const renamed = fileEditActions.fileOperations.find((o) => o.kind === 'rename' && o.oldFileUri.getFilePath() === editFileName);
|
62
63
|
if ((renamed === null || renamed === void 0 ? void 0 : renamed.kind) === 'rename') {
|
63
|
-
openedFilePath = renamed.
|
64
|
-
state.program.setFileClosed(renamed.
|
64
|
+
openedFilePath = renamed.newFileUri.getFilePath();
|
65
|
+
state.program.setFileClosed(renamed.oldFileUri);
|
65
66
|
}
|
66
|
-
state.program.setFileOpened(openedFilePath, result.version + 1, result.text);
|
67
|
+
state.program.setFileOpened(uri_1.Uri.file(openedFilePath), result.version + 1, result.text);
|
67
68
|
}
|
68
69
|
}
|
69
70
|
// Second, apply filename change to disk or rename directory.
|
70
71
|
for (const fileOperation of fileEditActions.fileOperations) {
|
71
72
|
switch (fileOperation.kind) {
|
72
73
|
case 'create': {
|
73
|
-
state.testFS.mkdirpSync((
|
74
|
-
state.testFS.writeFileSync(fileOperation.
|
74
|
+
state.testFS.mkdirpSync(fileOperation.fileUri.getDirectory().getFilePath());
|
75
|
+
state.testFS.writeFileSync(fileOperation.fileUri, '');
|
75
76
|
break;
|
76
77
|
}
|
77
78
|
case 'rename': {
|
78
|
-
if ((0,
|
79
|
-
state.testFS.mkdirpSync((
|
80
|
-
state.testFS.renameSync(fileOperation.
|
79
|
+
if ((0, uriUtils_1.isFile)(state.testFS, fileOperation.oldFileUri)) {
|
80
|
+
state.testFS.mkdirpSync(fileOperation.newFileUri.getDirectory().getFilePath());
|
81
|
+
state.testFS.renameSync(fileOperation.oldFileUri.getFilePath(), fileOperation.newFileUri.getFilePath());
|
81
82
|
// Add new file as tracked file
|
82
|
-
state.program.addTrackedFile(fileOperation.
|
83
|
+
state.program.addTrackedFile(fileOperation.newFileUri);
|
83
84
|
}
|
84
85
|
else {
|
85
|
-
state.testFS.renameSync(fileOperation.
|
86
|
+
state.testFS.renameSync(fileOperation.oldFileUri.getFilePath(), fileOperation.newFileUri.getFilePath());
|
86
87
|
}
|
87
88
|
break;
|
88
89
|
}
|
89
90
|
case 'delete': {
|
90
|
-
state.testFS.rimrafSync(fileOperation.
|
91
|
+
state.testFS.rimrafSync(fileOperation.fileUri.getFilePath());
|
91
92
|
break;
|
92
93
|
}
|
93
94
|
default:
|
@@ -100,58 +101,20 @@ function applyFileEditActions(state, fileEditActions) {
|
|
100
101
|
}
|
101
102
|
exports.applyFileEditActions = applyFileEditActions;
|
102
103
|
function _applyEdits(state, filePath, edits) {
|
103
|
-
const sourceFile = state.program.getBoundSourceFile(filePath);
|
104
|
+
const sourceFile = state.program.getBoundSourceFile(uri_1.Uri.file(filePath));
|
104
105
|
const parseResults = sourceFile.getParseResults();
|
105
|
-
const current = (0, workspaceEditUtils_1.applyTextEditsToString)(edits.filter((e) => e.
|
106
|
+
const current = (0, workspaceEditUtils_1.applyTextEditsToString)(edits.filter((e) => e.fileUri.getFilePath() === filePath), parseResults.tokenizerOutput.lines, parseResults.text);
|
106
107
|
return { version: sourceFile.getClientVersion(), text: current };
|
107
108
|
}
|
108
|
-
function convertWorkspaceEditToFileEditActions(fs, edit) {
|
109
|
-
const edits = [];
|
110
|
-
const fileOperations = [];
|
111
|
-
if (edit.changes) {
|
112
|
-
for (const kv of Object.entries(edit.changes)) {
|
113
|
-
const filePath = (0, pathUtils_1.convertUriToPath)(fs, kv[0]);
|
114
|
-
kv[1].forEach((e) => edits.push({ filePath, range: e.range, replacementText: e.newText }));
|
115
|
-
}
|
116
|
-
}
|
117
|
-
if (edit.documentChanges) {
|
118
|
-
for (const change of edit.documentChanges) {
|
119
|
-
if (vscode_languageserver_1.TextDocumentEdit.is(change)) {
|
120
|
-
for (const e of change.edits) {
|
121
|
-
edits.push({
|
122
|
-
filePath: (0, pathUtils_1.convertUriToPath)(fs, change.textDocument.uri),
|
123
|
-
range: e.range,
|
124
|
-
replacementText: e.newText,
|
125
|
-
});
|
126
|
-
}
|
127
|
-
}
|
128
|
-
else if (vscode_languageserver_1.CreateFile.is(change)) {
|
129
|
-
fileOperations.push({ kind: 'create', filePath: (0, pathUtils_1.convertUriToPath)(fs, change.uri) });
|
130
|
-
}
|
131
|
-
else if (vscode_languageserver_1.RenameFile.is(change)) {
|
132
|
-
fileOperations.push({
|
133
|
-
kind: 'rename',
|
134
|
-
oldFilePath: (0, pathUtils_1.convertUriToPath)(fs, change.oldUri),
|
135
|
-
newFilePath: (0, pathUtils_1.convertUriToPath)(fs, change.newUri),
|
136
|
-
});
|
137
|
-
}
|
138
|
-
else if (vscode_languageserver_1.DeleteFile.is(change)) {
|
139
|
-
fileOperations.push({ kind: 'delete', filePath: (0, pathUtils_1.convertUriToPath)(fs, change.uri) });
|
140
|
-
}
|
141
|
-
}
|
142
|
-
}
|
143
|
-
return { edits, fileOperations: fileOperations };
|
144
|
-
}
|
145
|
-
exports.convertWorkspaceEditToFileEditActions = convertWorkspaceEditToFileEditActions;
|
146
109
|
function verifyReferencesAtPosition(program, configOption, symbolNames, fileName, position, ranges) {
|
147
|
-
const sourceFile = program.getBoundSourceFile(fileName);
|
110
|
+
const sourceFile = program.getBoundSourceFile(uri_1.Uri.file(fileName));
|
148
111
|
(0, assert_1.default)(sourceFile);
|
149
112
|
const node = (0, parseTreeUtils_1.findNodeByOffset)(sourceFile.getParseResults().parseTree, position);
|
150
113
|
const decls = documentSymbolCollector_1.DocumentSymbolCollector.getDeclarationsForNode(program, node,
|
151
114
|
/* resolveLocalName */ true, vscode_languageserver_1.CancellationToken.None);
|
152
115
|
const rangesByFile = (0, collectionUtils_1.createMapFromItems)(ranges, (r) => r.fileName);
|
153
116
|
for (const rangeFileName of rangesByFile.keys()) {
|
154
|
-
const collector = new documentSymbolCollector_1.DocumentSymbolCollector(program, (0, core_1.isArray)(symbolNames) ? symbolNames : [symbolNames], decls, program.getBoundSourceFile(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)).getParseResults().parseTree, vscode_languageserver_1.CancellationToken.None, {
|
155
118
|
treatModuleInImportAndFromImportSame: true,
|
156
119
|
skipUnreachableCode: false,
|
157
120
|
});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"testStateUtils.js","sourceRoot":"","sources":["../../../src/tests/testStateUtils.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;AAEH,oDAA4B;
|
1
|
+
{"version":3,"file":"testStateUtils.js","sourceRoot":"","sources":["../../../src/tests/testStateUtils.ts"],"names":[],"mappings":"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"}
|
@@ -1,12 +1,12 @@
|
|
1
|
-
import { AnalyzerFileInfo } from '../analyzer/analyzerFileInfo';
|
2
1
|
import { Program } from '../analyzer/program';
|
3
2
|
import { ConfigOptions, ExecutionEnvironment } from '../common/configOptions';
|
4
3
|
import { ConsoleWithLogLevel } from '../common/console';
|
5
4
|
import { Diagnostic } from '../common/diagnostic';
|
6
5
|
import { DiagnosticSink } from '../common/diagnosticSink';
|
6
|
+
import { Uri } from '../common/uri/uri';
|
7
7
|
import { ParseOptions, ParseResults } from '../parser/parser';
|
8
8
|
export interface FileAnalysisResult {
|
9
|
-
|
9
|
+
fileUri: Uri;
|
10
10
|
parseResults?: ParseResults | undefined;
|
11
11
|
errors: Diagnostic[];
|
12
12
|
warnings: Diagnostic[];
|
@@ -23,9 +23,7 @@ export declare function resolveSampleFilePath(fileName: string): string;
|
|
23
23
|
export declare function readSampleFile(fileName: string): string;
|
24
24
|
export declare function parseText(textToParse: string, diagSink: DiagnosticSink, parseOptions?: ParseOptions): ParseResults;
|
25
25
|
export declare function parseSampleFile(fileName: string, diagSink: DiagnosticSink, execEnvironment?: ExecutionEnvironment): FileParseResult;
|
26
|
-
export declare function buildAnalyzerFileInfo(filePath: string, fileContents: string, parseResults: ParseResults, configOptions: ConfigOptions): AnalyzerFileInfo;
|
27
|
-
export declare function bindSampleFile(fileName: string, configOptions?: ConfigOptions): FileAnalysisResult;
|
28
26
|
export declare function typeAnalyzeSampleFiles(fileNames: string[], configOptions?: ConfigOptions, console?: ConsoleWithLogLevel): FileAnalysisResult[];
|
29
|
-
export declare function getAnalysisResults(program: Program,
|
27
|
+
export declare function getAnalysisResults(program: Program, fileUris: Uri[], configOptions?: ConfigOptions): FileAnalysisResult[];
|
30
28
|
export declare function printDiagnostics(fileResults: FileAnalysisResult): void;
|
31
29
|
export declare function validateResults(results: FileAnalysisResult[], errorCount: number, warningCount?: number, infoCount?: number, unusedCode?: number, unreachableCode?: number, deprecated?: number): void;
|