@zzzen/pyright-internal 1.2.0-dev.20240324 → 1.2.0-dev.20240331
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/analyzer/binder.js +4 -1
- package/dist/analyzer/binder.js.map +1 -1
- package/dist/analyzer/cacheManager.d.ts +1 -0
- package/dist/analyzer/cacheManager.js +4 -1
- package/dist/analyzer/cacheManager.js.map +1 -1
- package/dist/analyzer/checker.d.ts +1 -2
- package/dist/analyzer/checker.js +10 -5
- package/dist/analyzer/checker.js.map +1 -1
- package/dist/analyzer/constructors.d.ts +3 -2
- package/dist/analyzer/constructors.js +76 -54
- package/dist/analyzer/constructors.js.map +1 -1
- package/dist/analyzer/dataClasses.js +2 -0
- package/dist/analyzer/dataClasses.js.map +1 -1
- package/dist/analyzer/declaration.js +1 -1
- package/dist/analyzer/declaration.js.map +1 -1
- package/dist/analyzer/enums.js +1 -0
- package/dist/analyzer/enums.js.map +1 -1
- package/dist/analyzer/importResolver.js +19 -17
- package/dist/analyzer/importResolver.js.map +1 -1
- package/dist/analyzer/namedTuples.js +2 -0
- package/dist/analyzer/namedTuples.js.map +1 -1
- package/dist/analyzer/packageTypeVerifier.js +1 -1
- package/dist/analyzer/packageTypeVerifier.js.map +1 -1
- package/dist/analyzer/parseTreeUtils.d.ts +1 -1
- package/dist/analyzer/patternMatching.js +14 -3
- package/dist/analyzer/patternMatching.js.map +1 -1
- package/dist/analyzer/program.d.ts +1 -7
- package/dist/analyzer/program.js +15 -19
- package/dist/analyzer/program.js.map +1 -1
- package/dist/analyzer/programTypes.d.ts +11 -0
- package/dist/analyzer/programTypes.js +11 -0
- package/dist/analyzer/programTypes.js.map +1 -0
- package/dist/analyzer/service.d.ts +2 -2
- package/dist/analyzer/service.js +20 -14
- package/dist/analyzer/service.js.map +1 -1
- package/dist/analyzer/sourceFile.js +4 -4
- package/dist/analyzer/sourceFile.js.map +1 -1
- package/dist/analyzer/sourceFileInfoUtils.js +3 -3
- package/dist/analyzer/sourceFileInfoUtils.js.map +1 -1
- package/dist/analyzer/tracePrinter.js +2 -2
- package/dist/analyzer/tracePrinter.js.map +1 -1
- package/dist/analyzer/typeEvaluator.js +53 -24
- package/dist/analyzer/typeEvaluator.js.map +1 -1
- package/dist/analyzer/typeGuards.js +14 -7
- package/dist/analyzer/typeGuards.js.map +1 -1
- package/dist/analyzer/typeUtils.d.ts +2 -2
- package/dist/analyzer/typeUtils.js +20 -4
- package/dist/analyzer/typeUtils.js.map +1 -1
- package/dist/analyzer/typedDicts.js +3 -0
- package/dist/analyzer/typedDicts.js.map +1 -1
- package/dist/backgroundAnalysis.js +1 -1
- package/dist/backgroundAnalysis.js.map +1 -1
- package/dist/backgroundAnalysisBase.js +1 -1
- package/dist/backgroundAnalysisBase.js.map +1 -1
- package/dist/backgroundThreadBase.js +15 -10
- package/dist/backgroundThreadBase.js.map +1 -1
- package/dist/commands/commandController.d.ts +2 -1
- package/dist/commands/commandController.js +3 -0
- package/dist/commands/commandController.js.map +1 -1
- package/dist/commands/createTypeStub.d.ts +1 -1
- package/dist/commands/createTypeStub.js +3 -3
- package/dist/commands/createTypeStub.js.map +1 -1
- package/dist/commands/dumpFileDebugInfoCommand.d.ts +1 -1
- package/dist/commands/dumpFileDebugInfoCommand.js +1 -1
- package/dist/commands/dumpFileDebugInfoCommand.js.map +1 -1
- package/dist/commands/quickActionCommand.d.ts +1 -1
- package/dist/commands/quickActionCommand.js +2 -2
- package/dist/commands/quickActionCommand.js.map +1 -1
- package/dist/commands/restartServer.d.ts +1 -1
- package/dist/common/cancellationUtils.js +2 -2
- package/dist/common/cancellationUtils.js.map +1 -1
- package/dist/common/caseSensitivityDetector.d.ts +6 -0
- package/dist/common/caseSensitivityDetector.js +18 -0
- package/dist/common/caseSensitivityDetector.js.map +1 -0
- package/dist/common/commandLineOptions.d.ts +3 -2
- package/dist/common/commandLineOptions.js.map +1 -1
- package/dist/common/commandUtils.js +1 -1
- package/dist/common/commandUtils.js.map +1 -1
- package/dist/common/configOptions.js +3 -3
- package/dist/common/configOptions.js.map +1 -1
- package/dist/common/envVarUtils.d.ts +1 -0
- package/dist/common/envVarUtils.js +42 -7
- package/dist/common/envVarUtils.js.map +1 -1
- package/dist/common/extensibility.d.ts +1 -1
- package/dist/common/fileBasedCancellationUtils.js +2 -2
- package/dist/common/fileBasedCancellationUtils.js.map +1 -1
- package/dist/common/fileSystem.d.ts +0 -1
- package/dist/common/fileSystem.js.map +1 -1
- package/dist/common/fullAccessHost.js +4 -3
- package/dist/common/fullAccessHost.js.map +1 -1
- package/dist/common/languageServerInterface.d.ts +62 -0
- package/dist/common/languageServerInterface.js +10 -0
- package/dist/common/languageServerInterface.js.map +1 -0
- package/dist/common/realFileSystem.d.ts +8 -4
- package/dist/common/realFileSystem.js +56 -17
- package/dist/common/realFileSystem.js.map +1 -1
- package/dist/common/serviceKeys.d.ts +21 -0
- package/dist/common/serviceKeys.js +26 -0
- package/dist/common/serviceKeys.js.map +1 -0
- package/dist/common/serviceProviderExtensions.d.ts +2 -16
- package/dist/common/serviceProviderExtensions.js +19 -27
- package/dist/common/serviceProviderExtensions.js.map +1 -1
- package/dist/common/textEditTracker.js +2 -2
- package/dist/common/textEditTracker.js.map +1 -1
- package/dist/common/uri/constantUri.d.ts +36 -0
- package/dist/common/uri/constantUri.js +112 -0
- package/dist/common/uri/constantUri.js.map +1 -0
- package/dist/common/uri/emptyUri.d.ts +3 -31
- package/dist/common/uri/emptyUri.js +3 -84
- package/dist/common/uri/emptyUri.js.map +1 -1
- package/dist/common/uri/fileUri.d.ts +1 -0
- package/dist/common/uri/fileUri.js +3 -2
- package/dist/common/uri/fileUri.js.map +1 -1
- package/dist/common/uri/uri.d.ts +11 -3
- package/dist/common/uri/uri.js +31 -20
- package/dist/common/uri/uri.js.map +1 -1
- package/dist/common/uri/uriUtils.d.ts +11 -5
- package/dist/common/uri/uriUtils.js +31 -53
- package/dist/common/uri/uriUtils.js.map +1 -1
- package/dist/common/workspaceEditUtils.js +4 -4
- package/dist/common/workspaceEditUtils.js.map +1 -1
- package/dist/languageServerBase.d.ts +9 -57
- package/dist/languageServerBase.js +18 -8
- package/dist/languageServerBase.js.map +1 -1
- package/dist/languageService/analyzerServiceExecutor.d.ts +1 -1
- package/dist/languageService/analyzerServiceExecutor.js +4 -5
- package/dist/languageService/analyzerServiceExecutor.js.map +1 -1
- package/dist/languageService/callHierarchyProvider.js +6 -6
- package/dist/languageService/callHierarchyProvider.js.map +1 -1
- package/dist/languageService/codeActionProvider.js +43 -42
- package/dist/languageService/codeActionProvider.js.map +1 -1
- package/dist/languageService/completionProvider.js +2 -2
- package/dist/languageService/completionProvider.js.map +1 -1
- package/dist/languageService/definitionProvider.js +2 -2
- package/dist/languageService/definitionProvider.js.map +1 -1
- package/dist/languageService/documentSymbolCollector.js +2 -2
- package/dist/languageService/documentSymbolCollector.js.map +1 -1
- package/dist/languageService/documentSymbolProvider.d.ts +3 -2
- package/dist/languageService/documentSymbolProvider.js +3 -2
- package/dist/languageService/documentSymbolProvider.js.map +1 -1
- package/dist/languageService/referencesProvider.js +2 -2
- package/dist/languageService/referencesProvider.js.map +1 -1
- package/dist/languageService/signatureHelpProvider.js +2 -2
- package/dist/languageService/signatureHelpProvider.js.map +1 -1
- package/dist/languageService/symbolIndexer.d.ts +4 -1
- package/dist/languageService/symbolIndexer.js +21 -11
- package/dist/languageService/symbolIndexer.js.map +1 -1
- package/dist/languageService/workspaceSymbolProvider.js +1 -1
- package/dist/languageService/workspaceSymbolProvider.js.map +1 -1
- package/dist/localization/localize.js +21 -16
- package/dist/localization/localize.js.map +1 -1
- package/dist/localization/package.nls.cs.json +1 -0
- package/dist/localization/package.nls.de.json +1 -0
- package/dist/localization/package.nls.es.json +1 -0
- package/dist/localization/package.nls.fr.json +1 -0
- package/dist/localization/package.nls.it.json +1 -0
- package/dist/localization/package.nls.ja.json +1 -0
- package/dist/localization/package.nls.ko.json +1 -0
- package/dist/localization/package.nls.pl.json +1 -0
- package/dist/localization/package.nls.pt-br.json +1 -0
- package/dist/localization/package.nls.qps-ploc.json +1 -0
- package/dist/localization/package.nls.ru.json +1 -0
- package/dist/localization/package.nls.tr.json +1 -0
- package/dist/localization/package.nls.zh-cn.json +1 -0
- package/dist/localization/package.nls.zh-tw.json +1 -0
- package/dist/pyright.js +6 -6
- package/dist/pyright.js.map +1 -1
- package/dist/pyrightFileSystem.d.ts +3 -1
- package/dist/pyrightFileSystem.js +14 -9
- package/dist/pyrightFileSystem.js.map +1 -1
- package/dist/readonlyAugmentedFileSystem.d.ts +0 -1
- package/dist/readonlyAugmentedFileSystem.js +0 -3
- package/dist/readonlyAugmentedFileSystem.js.map +1 -1
- package/dist/server.d.ts +3 -1
- package/dist/server.js +14 -10
- package/dist/server.js.map +1 -1
- package/dist/tests/chainedSourceFiles.test.js +12 -12
- package/dist/tests/chainedSourceFiles.test.js.map +1 -1
- package/dist/tests/completions.test.js +4 -4
- package/dist/tests/completions.test.js.map +1 -1
- package/dist/tests/config.test.js +19 -14
- package/dist/tests/config.test.js.map +1 -1
- package/dist/tests/documentSymbolCollector.test.js +2 -3
- package/dist/tests/documentSymbolCollector.test.js.map +1 -1
- package/dist/tests/envVarUtils.test.js +77 -2
- package/dist/tests/envVarUtils.test.js.map +1 -1
- package/dist/tests/filesystem.test.js +13 -13
- package/dist/tests/filesystem.test.js.map +1 -1
- package/dist/tests/fourSlashParser.test.js +10 -10
- package/dist/tests/fourSlashParser.test.js.map +1 -1
- package/dist/tests/harness/fourslash/fourSlashParser.js +12 -10
- package/dist/tests/harness/fourslash/fourSlashParser.js.map +1 -1
- package/dist/tests/harness/fourslash/fourSlashTypes.d.ts +1 -0
- package/dist/tests/harness/fourslash/fourSlashTypes.js.map +1 -1
- package/dist/tests/harness/fourslash/testLanguageService.d.ts +3 -2
- package/dist/tests/harness/fourslash/testLanguageService.js +2 -2
- package/dist/tests/harness/fourslash/testLanguageService.js.map +1 -1
- package/dist/tests/harness/fourslash/testState.d.ts +3 -3
- package/dist/tests/harness/fourslash/testState.js +36 -32
- package/dist/tests/harness/fourslash/testState.js.map +1 -1
- package/dist/tests/harness/fourslash/workspaceEditTestUtils.js +1 -1
- package/dist/tests/harness/fourslash/workspaceEditTestUtils.js.map +1 -1
- package/dist/tests/harness/testHost.d.ts +7 -0
- package/dist/tests/harness/testHost.js +33 -14
- package/dist/tests/harness/testHost.js.map +1 -1
- package/dist/tests/harness/vfs/factory.d.ts +3 -4
- package/dist/tests/harness/vfs/factory.js +7 -6
- package/dist/tests/harness/vfs/factory.js.map +1 -1
- package/dist/tests/harness/vfs/filesystem.d.ts +5 -3
- package/dist/tests/harness/vfs/filesystem.js +22 -15
- package/dist/tests/harness/vfs/filesystem.js.map +1 -1
- package/dist/tests/importResolver.test.js +35 -34
- package/dist/tests/importResolver.test.js.map +1 -1
- package/dist/tests/importStatementUtils.test.js +5 -6
- package/dist/tests/importStatementUtils.test.js.map +1 -1
- package/dist/tests/logger.test.js +1 -1
- package/dist/tests/logger.test.js.map +1 -1
- package/dist/tests/lsp/languageServer.js +5 -4
- package/dist/tests/lsp/languageServer.js.map +1 -1
- package/dist/tests/lsp/languageServerTestUtils.js +15 -10
- package/dist/tests/lsp/languageServerTestUtils.js.map +1 -1
- package/dist/tests/parseTreeUtils.test.js +1 -2
- package/dist/tests/parseTreeUtils.test.js.map +1 -1
- package/dist/tests/pyrightFileSystem.test.js +6 -5
- package/dist/tests/pyrightFileSystem.test.js.map +1 -1
- package/dist/tests/serialization.test.js +5 -5
- package/dist/tests/serialization.test.js.map +1 -1
- package/dist/tests/service.test.js +16 -25
- package/dist/tests/service.test.js.map +1 -1
- package/dist/tests/sourceFile.test.js +8 -5
- package/dist/tests/sourceFile.test.js.map +1 -1
- package/dist/tests/sourceMapperUtils.test.js +4 -4
- package/dist/tests/sourceMapperUtils.test.js.map +1 -1
- package/dist/tests/testState.test.js +5 -5
- package/dist/tests/testState.test.js.map +1 -1
- package/dist/tests/testStateUtils.js +6 -6
- package/dist/tests/testStateUtils.js.map +1 -1
- package/dist/tests/testUtils.js +6 -4
- package/dist/tests/testUtils.js.map +1 -1
- package/dist/tests/typeEvaluator3.test.js +1 -1
- package/dist/tests/typePrinter.test.js.map +1 -1
- package/dist/tests/uri.test.js +220 -199
- package/dist/tests/uri.test.js.map +1 -1
- package/dist/tests/workspaceEditUtils.test.js +7 -7
- package/dist/tests/workspaceEditUtils.test.js.map +1 -1
- package/dist/tests/zipfs.test.js +7 -5
- package/dist/tests/zipfs.test.js.map +1 -1
- package/dist/workspaceFactory.d.ts +15 -6
- package/dist/workspaceFactory.js +16 -10
- package/dist/workspaceFactory.js.map +1 -1
- package/package.json +5 -5
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseTreeUtils.test.js","sourceRoot":"","sources":["../../../../../src/tests/parseTreeUtils.test.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AAEH,oDAA4B;AAE5B,+DAeoC;AACpC,mDAAgE;AAChE,
|
|
1
|
+
{"version":3,"file":"parseTreeUtils.test.js","sourceRoot":"","sources":["../../../../../src/tests/parseTreeUtils.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,11 +11,12 @@ 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");
|
|
15
14
|
const pyrightFileSystem_1 = require("../pyrightFileSystem");
|
|
16
15
|
const filesystem_1 = require("./harness/vfs/filesystem");
|
|
16
|
+
const uri_1 = require("../common/uri/uri");
|
|
17
|
+
const uriUtils_1 = require("../common/uri/uriUtils");
|
|
17
18
|
const libraryRoot = (0, pathUtils_1.combinePaths)((0, pathUtils_1.normalizeSlashes)('/'), pathConsts_1.lib, pathConsts_1.sitePackages);
|
|
18
|
-
const libraryRootUri =
|
|
19
|
+
const libraryRootUri = uriUtils_1.UriEx.file(libraryRoot);
|
|
19
20
|
test('virtual file exists', () => {
|
|
20
21
|
const files = [
|
|
21
22
|
{
|
|
@@ -141,7 +142,7 @@ test('existing stub file', () => {
|
|
|
141
142
|
});
|
|
142
143
|
test('multiple package installed', () => {
|
|
143
144
|
const extraRoot = (0, pathUtils_1.combinePaths)((0, pathUtils_1.normalizeSlashes)('/'), pathConsts_1.lib, 'extra');
|
|
144
|
-
const extraRootUri =
|
|
145
|
+
const extraRootUri = uriUtils_1.UriEx.file(extraRoot);
|
|
145
146
|
const files = [
|
|
146
147
|
{
|
|
147
148
|
path: (0, pathUtils_1.combinePaths)(libraryRoot, 'myLib-stubs', 'partialStub.pyi'),
|
|
@@ -171,7 +172,7 @@ test('multiple package installed', () => {
|
|
|
171
172
|
});
|
|
172
173
|
test('bundled partial stubs', () => {
|
|
173
174
|
const bundledPath = (0, pathUtils_1.combinePaths)((0, pathUtils_1.normalizeSlashes)('/'), 'bundled');
|
|
174
|
-
const bundledPathUri =
|
|
175
|
+
const bundledPathUri = uriUtils_1.UriEx.file(bundledPath);
|
|
175
176
|
const files = [
|
|
176
177
|
{
|
|
177
178
|
path: (0, pathUtils_1.combinePaths)(bundledPath, 'myLib-stubs', 'partialStub.pyi'),
|
|
@@ -204,7 +205,7 @@ function createFileSystem(files) {
|
|
|
204
205
|
const path = (0, pathUtils_1.normalizeSlashes)(file.path);
|
|
205
206
|
const dir = (0, pathUtils_1.getDirectoryPath)(path);
|
|
206
207
|
fs.mkdirpSync(dir);
|
|
207
|
-
fs.writeFileSync(uri_1.Uri.file(path), file.content);
|
|
208
|
+
fs.writeFileSync(uri_1.Uri.file(path, fs), file.content);
|
|
208
209
|
}
|
|
209
210
|
return new pyrightFileSystem_1.PyrightFileSystem(fs);
|
|
210
211
|
}
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"pyrightFileSystem.test.js","sourceRoot":"","sources":["../../../../../src/tests/pyrightFileSystem.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
13
13
|
exports.serializationTests = void 0;
|
|
14
14
|
const assert_1 = __importDefault(require("assert"));
|
|
15
15
|
const backgroundThreadBase_1 = require("../backgroundThreadBase");
|
|
16
|
-
const
|
|
16
|
+
const uriUtils_1 = require("../common/uri/uriUtils");
|
|
17
17
|
function serializationTests(serializer = backgroundThreadBase_1.serialize, deserializer = backgroundThreadBase_1.deserialize) {
|
|
18
18
|
test('Simple string', () => {
|
|
19
19
|
const serialized = serializer('hello');
|
|
@@ -71,14 +71,14 @@ function serializationTests(serializer = backgroundThreadBase_1.serialize, deser
|
|
|
71
71
|
assert_1.default.deepStrictEqual(deserialized, { a: null });
|
|
72
72
|
});
|
|
73
73
|
test('Object with URI', () => {
|
|
74
|
-
const serialized = serializer({ a:
|
|
74
|
+
const serialized = serializer({ a: uriUtils_1.UriEx.file('hello') });
|
|
75
75
|
const deserialized = deserializer(serialized);
|
|
76
|
-
assert_1.default.deepStrictEqual(deserialized, { a:
|
|
76
|
+
assert_1.default.deepStrictEqual(deserialized, { a: uriUtils_1.UriEx.file('hello') });
|
|
77
77
|
});
|
|
78
78
|
test('Object with URI array', () => {
|
|
79
|
-
const serialized = serializer({ a: [
|
|
79
|
+
const serialized = serializer({ a: [uriUtils_1.UriEx.file('hello'), uriUtils_1.UriEx.file('world')] });
|
|
80
80
|
const deserialized = deserializer(serialized);
|
|
81
|
-
assert_1.default.deepStrictEqual(deserialized, { a: [
|
|
81
|
+
assert_1.default.deepStrictEqual(deserialized, { a: [uriUtils_1.UriEx.file('hello'), uriUtils_1.UriEx.file('world')] });
|
|
82
82
|
});
|
|
83
83
|
}
|
|
84
84
|
exports.serializationTests = serializationTests;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serialization.test.js","sourceRoot":"","sources":["../../../../../src/tests/serialization.test.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;AAEH,oDAA4B;AAE5B,kEAAiE;AACjE,
|
|
1
|
+
{"version":3,"file":"serialization.test.js","sourceRoot":"","sources":["../../../../../src/tests/serialization.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,23 +12,19 @@ const assert_1 = __importDefault(require("assert"));
|
|
|
12
12
|
const vscode_jsonrpc_1 = require("vscode-jsonrpc");
|
|
13
13
|
const sourceFile_1 = require("../analyzer/sourceFile");
|
|
14
14
|
const pathUtils_1 = require("../common/pathUtils");
|
|
15
|
-
const uri_1 = require("../common/uri/uri");
|
|
16
15
|
const testState_1 = require("./harness/fourslash/testState");
|
|
16
|
+
const uri_1 = require("../common/uri/uri");
|
|
17
17
|
test('random library file changed', () => {
|
|
18
18
|
const state = (0, testState_1.parseAndGetTestState)('', '/projectRoot').state;
|
|
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
|
+
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleLibraryFileWatchChanges(uri_1.Uri.file('/site-packages/test.py', state.serviceProvider), [uri_1.Uri.file('/site-packages', state.serviceProvider)]), true);
|
|
22
20
|
});
|
|
23
21
|
test('random library file starting with . changed', () => {
|
|
24
22
|
const state = (0, testState_1.parseAndGetTestState)('', '/projectRoot').state;
|
|
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
|
+
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleLibraryFileWatchChanges(uri_1.Uri.file('/site-packages/.test.py', state.serviceProvider), [uri_1.Uri.file('/site-packages', state.serviceProvider)]), false);
|
|
28
24
|
});
|
|
29
25
|
test('random library file changed, nested search paths', () => {
|
|
30
26
|
const state = (0, testState_1.parseAndGetTestState)('', '/projectRoot').state;
|
|
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);
|
|
27
|
+
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleLibraryFileWatchChanges(uri_1.Uri.file('/lib/.venv/site-packages/myFile.py', state.serviceProvider), [uri_1.Uri.file('/lib', state.serviceProvider), uri_1.Uri.file('/lib/.venv/site-packages', state.serviceProvider)]), true);
|
|
32
28
|
});
|
|
33
29
|
test('random library file changed, nested search paths, fs is not case sensitive', () => {
|
|
34
30
|
const code = `
|
|
@@ -36,7 +32,7 @@ test('random library file changed, nested search paths, fs is not case sensitive
|
|
|
36
32
|
// @ignoreCase: true
|
|
37
33
|
`;
|
|
38
34
|
const state = (0, testState_1.parseAndGetTestState)(code, '/projectRoot').state;
|
|
39
|
-
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleLibraryFileWatchChanges(uri_1.Uri.file('/lib/.venv/site-packages/myFile.py',
|
|
35
|
+
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleLibraryFileWatchChanges(uri_1.Uri.file('/lib/.venv/site-packages/myFile.py', state.serviceProvider), [uri_1.Uri.file('/lib', state.serviceProvider), uri_1.Uri.file('/LIB/.venv/site-packages', state.serviceProvider)]), true);
|
|
40
36
|
});
|
|
41
37
|
test('random library file changed, nested search paths, fs is case sensitive', () => {
|
|
42
38
|
const code = `
|
|
@@ -44,7 +40,7 @@ test('random library file changed, nested search paths, fs is case sensitive', (
|
|
|
44
40
|
// @ignoreCase: false
|
|
45
41
|
`;
|
|
46
42
|
const state = (0, testState_1.parseAndGetTestState)(code, '/projectRoot').state;
|
|
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);
|
|
43
|
+
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleLibraryFileWatchChanges(uri_1.Uri.file('/lib/.venv/site-packages/myFile.py', state.serviceProvider), [uri_1.Uri.file('/lib', state.serviceProvider), uri_1.Uri.file('/LIB/.venv/site-packages', state.serviceProvider)]), false);
|
|
48
44
|
});
|
|
49
45
|
test('random library file starting with . changed, fs is not case sensitive', () => {
|
|
50
46
|
const code = `
|
|
@@ -52,10 +48,7 @@ test('random library file starting with . changed, fs is not case sensitive', ()
|
|
|
52
48
|
// @ignoreCase: true
|
|
53
49
|
`;
|
|
54
50
|
const state = (0, testState_1.parseAndGetTestState)(code, '/projectRoot').state;
|
|
55
|
-
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleLibraryFileWatchChanges(uri_1.Uri.file('/lib/.test.py',
|
|
56
|
-
uri_1.Uri.file('/LIB', false),
|
|
57
|
-
uri_1.Uri.file('/lib/site-packages', false),
|
|
58
|
-
]), false);
|
|
51
|
+
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleLibraryFileWatchChanges(uri_1.Uri.file('/lib/.test.py', state.serviceProvider), [uri_1.Uri.file('/LIB', state.serviceProvider), uri_1.Uri.file('/lib/site-packages', state.serviceProvider)]), false);
|
|
59
52
|
});
|
|
60
53
|
test('random library file starting with . changed, fs is case sensitive', () => {
|
|
61
54
|
const code = `
|
|
@@ -63,14 +56,11 @@ test('random library file starting with . changed, fs is case sensitive', () =>
|
|
|
63
56
|
// @ignoreCase: false
|
|
64
57
|
`;
|
|
65
58
|
const state = (0, testState_1.parseAndGetTestState)(code, '/projectRoot').state;
|
|
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'),
|
|
69
|
-
]), true);
|
|
59
|
+
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleLibraryFileWatchChanges(uri_1.Uri.file('/lib/.test.py', state.serviceProvider), [uri_1.Uri.file('/LIB', state.serviceProvider), uri_1.Uri.file('/lib/site-packages', state.serviceProvider)]), true);
|
|
70
60
|
});
|
|
71
61
|
test('random library file under a folder starting with . changed', () => {
|
|
72
62
|
const state = (0, testState_1.parseAndGetTestState)('', '/projectRoot').state;
|
|
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);
|
|
63
|
+
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleLibraryFileWatchChanges(uri_1.Uri.file('/site-packages/.testFolder/test.py', state.serviceProvider), [uri_1.Uri.file('/site-packages', state.serviceProvider)]), false);
|
|
74
64
|
});
|
|
75
65
|
test('basic file change', () => {
|
|
76
66
|
const code = `
|
|
@@ -133,7 +123,8 @@ test('random folder changed', () => {
|
|
|
133
123
|
//// # empty
|
|
134
124
|
`;
|
|
135
125
|
const state = (0, testState_1.parseAndGetTestState)(code, '/projectRoot').state;
|
|
136
|
-
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleSourceFileWatchChanges(uri_1.Uri.file('/randomFolder'
|
|
126
|
+
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleSourceFileWatchChanges(uri_1.Uri.file('/randomFolder', state.serviceProvider),
|
|
127
|
+
/* isFile */ false), false);
|
|
137
128
|
});
|
|
138
129
|
test('excluded folder changed', () => {
|
|
139
130
|
const code = `
|
|
@@ -219,7 +210,7 @@ test('program containsSourceFileIn', () => {
|
|
|
219
210
|
//// # empty
|
|
220
211
|
`;
|
|
221
212
|
const state = (0, testState_1.parseAndGetTestState)(code, '/projectRoot').state;
|
|
222
|
-
(0, assert_1.default)(state.workspace.service.test_program.containsSourceFileIn(
|
|
213
|
+
(0, assert_1.default)(state.workspace.service.test_program.containsSourceFileIn(state.activeFile.fileUri));
|
|
223
214
|
});
|
|
224
215
|
test('service runEditMode', () => {
|
|
225
216
|
const code = `
|
|
@@ -232,9 +223,9 @@ test('service runEditMode', () => {
|
|
|
232
223
|
const state = (0, testState_1.parseAndGetTestState)(code, '/projectRoot').state;
|
|
233
224
|
const open = state.getMarkerByName('open');
|
|
234
225
|
const closed = state.getMarkerByName('closed');
|
|
235
|
-
const openUri =
|
|
236
|
-
const closedUri =
|
|
237
|
-
const newFileUri = uri_1.Uri.file((0, pathUtils_1.combinePaths)((0, pathUtils_1.getDirectoryPath)(open.fileName), 'interimFile.py'));
|
|
226
|
+
const openUri = open.fileUri;
|
|
227
|
+
const closedUri = closed.fileUri;
|
|
228
|
+
const newFileUri = uri_1.Uri.file((0, pathUtils_1.combinePaths)((0, pathUtils_1.getDirectoryPath)(open.fileName), 'interimFile.py'), state.serviceProvider);
|
|
238
229
|
state.testFS.writeFileSync(newFileUri, '# empty', 'utf8');
|
|
239
230
|
const options = {
|
|
240
231
|
isTracked: true,
|
|
@@ -279,6 +270,6 @@ function testSourceFileWatchChange(code, expected = true, isFile = true) {
|
|
|
279
270
|
const state = (0, testState_1.parseAndGetTestState)(code, '/projectRoot').state;
|
|
280
271
|
const marker = state.getMarkerByName('marker');
|
|
281
272
|
const path = isFile ? marker.fileName : (0, pathUtils_1.getDirectoryPath)(marker.fileName);
|
|
282
|
-
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleSourceFileWatchChanges(uri_1.Uri.file(path), isFile), expected);
|
|
273
|
+
assert_1.default.strictEqual(state.workspace.service.test_shouldHandleSourceFileWatchChanges(uri_1.Uri.file(path, state.serviceProvider), isFile), expected);
|
|
283
274
|
}
|
|
284
275
|
//# 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,mDAAmD;AACnD,uDAAqD;AACrD,mDAAqE;AACrE,
|
|
1
|
+
{"version":3,"file":"service.test.js","sourceRoot":"","sources":["../../../../../src/tests/service.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,14 +39,17 @@ const fullAccessHost_1 = require("../common/fullAccessHost");
|
|
|
39
39
|
const pathUtils_1 = require("../common/pathUtils");
|
|
40
40
|
const realFileSystem_1 = require("../common/realFileSystem");
|
|
41
41
|
const serviceProviderExtensions_1 = require("../common/serviceProviderExtensions");
|
|
42
|
-
const uri_1 = require("../common/uri/uri");
|
|
43
42
|
const testState_1 = require("./harness/fourslash/testState");
|
|
43
|
+
const uri_1 = require("../common/uri/uri");
|
|
44
44
|
test('Empty', () => {
|
|
45
45
|
const filePath = (0, pathUtils_1.combinePaths)(process.cwd(), 'tests/samples/test_file1.py');
|
|
46
|
-
const
|
|
47
|
-
const
|
|
48
|
-
const
|
|
49
|
-
const
|
|
46
|
+
const tempFile = new realFileSystem_1.RealTempFile();
|
|
47
|
+
const fs = (0, realFileSystem_1.createFromRealFileSystem)(tempFile);
|
|
48
|
+
const serviceProvider = (0, serviceProviderExtensions_1.createServiceProvider)(tempFile, fs);
|
|
49
|
+
const sourceFile = new sourceFile_1.SourceFile(serviceProvider, uri_1.Uri.file(filePath, serviceProvider), '', false, false, {
|
|
50
|
+
isEditMode: false,
|
|
51
|
+
});
|
|
52
|
+
const configOptions = new configOptions_1.ConfigOptions(uri_1.Uri.file(process.cwd(), serviceProvider));
|
|
50
53
|
const sp = (0, serviceProviderExtensions_1.createServiceProvider)(fs);
|
|
51
54
|
const importResolver = new importResolver_1.ImportResolver(sp, configOptions, new fullAccessHost_1.FullAccessHost(sp));
|
|
52
55
|
sourceFile.parse(configOptions, importResolver);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sourceFile.test.js","sourceRoot":"","sources":["../../../../../src/tests/sourceFile.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;GAOG;AACH,+CAAiC;AAEjC,+DAA4D;AAC5D,uDAAoD;AACpD,2DAAwD;AACxD,6DAA0D;AAC1D,mDAAmD;AACnD,
|
|
1
|
+
{"version":3,"file":"sourceFile.test.js","sourceRoot":"","sources":["../../../../../src/tests/sourceFile.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;GAOG;AACH,+CAAiC;AAEjC,+DAA4D;AAC5D,uDAAoD;AACpD,2DAAwD;AACxD,6DAA0D;AAC1D,mDAAmD;AACnD,6DAAkF;AAClF,mFAA4E;AAC5E,6DAAqE;AACrE,2CAAwC;AAExC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE;IACf,MAAM,QAAQ,GAAG,IAAA,wBAAY,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,6BAA6B,CAAC,CAAC;IAC5E,MAAM,QAAQ,GAAG,IAAI,6BAAY,EAAE,CAAC;IACpC,MAAM,EAAE,GAAG,IAAA,yCAAwB,EAAC,QAAQ,CAAC,CAAC;IAC9C,MAAM,eAAe,GAAG,IAAA,iDAAqB,EAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IAC5D,MAAM,UAAU,GAAG,IAAI,uBAAU,CAAC,eAAe,EAAE,SAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE;QACtG,UAAU,EAAE,KAAK;KACpB,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,IAAI,6BAAa,CAAC,SAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,eAAe,CAAC,CAAC,CAAC;IAClF,MAAM,EAAE,GAAG,IAAA,iDAAqB,EAAC,EAAE,CAAC,CAAC;IACrC,MAAM,cAAc,GAAG,IAAI,+BAAc,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,+BAAc,CAAC,EAAE,CAAC,CAAC,CAAC;IAErF,UAAU,CAAC,KAAK,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;AACpD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iBAAiB,EAAE,GAAG,EAAE;;IACzB,MAAM,IAAI,GAAG;;;KAGZ,CAAC;IAEF,MAAM,KAAK,GAAG,IAAA,gCAAoB,EAAC,IAAI,CAAC,CAAC,KAAK,CAAC;IAC/C,MAAM,MAAM,GAAG,KAAK,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;IAE/C,MAAM,CAAC,WAAW,CACd,MAAA,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,0CAAE,cAAc,EAAE,EACpF,WAAW,CACd,CAAC;IAEF,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,sBAAsB,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IACtE,MAAM,CAAC,WAAW,CAAC,MAAA,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,0CAAE,cAAc,EAAE,EAAE,EAAE,CAAC,CAAC;AACjH,CAAC,CAAC,CAAC"}
|
|
@@ -13,14 +13,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
13
13
|
const assert_1 = __importDefault(require("assert"));
|
|
14
14
|
const vscode_jsonrpc_1 = require("vscode-jsonrpc");
|
|
15
15
|
const sourceMapperUtils_1 = require("../analyzer/sourceMapperUtils");
|
|
16
|
-
const uri_1 = require("../common/uri/uri");
|
|
17
16
|
const testState_1 = require("./harness/fourslash/testState");
|
|
18
17
|
const declaration_1 = require("../analyzer/declaration");
|
|
19
18
|
const textRange_1 = require("../common/textRange");
|
|
19
|
+
const uriUtils_1 = require("../common/uri/uriUtils");
|
|
20
20
|
function buildImportTree(sourceFile, targetFile, importResolver, token) {
|
|
21
|
-
return (0, sourceMapperUtils_1.buildImportTree)(
|
|
21
|
+
return (0, sourceMapperUtils_1.buildImportTree)(uriUtils_1.UriEx.file(sourceFile), uriUtils_1.UriEx.file(targetFile), (from) => {
|
|
22
22
|
const resolved = importResolver(from.getFilePath().slice(1));
|
|
23
|
-
return resolved.map((f) =>
|
|
23
|
+
return resolved.map((f) => uriUtils_1.UriEx.file(f));
|
|
24
24
|
}, token).map((u) => u.getFilePath().slice(1));
|
|
25
25
|
}
|
|
26
26
|
describe('BuildImportTree', () => {
|
|
@@ -167,7 +167,7 @@ function assertTypeAlias(code) {
|
|
|
167
167
|
assert_1.default.strictEqual((_a = type.typeAliasInfo) === null || _a === void 0 ? void 0 : _a.name, 'M');
|
|
168
168
|
assert_1.default.strictEqual(type.typeAliasInfo.moduleName, 'test');
|
|
169
169
|
const marker = state.getMarkerByName('marker');
|
|
170
|
-
const markerUri =
|
|
170
|
+
const markerUri = marker.fileUri;
|
|
171
171
|
const mapper = state.program.getSourceMapper(markerUri, vscode_jsonrpc_1.CancellationToken.None,
|
|
172
172
|
/* mapCompiled */ false,
|
|
173
173
|
/* preferStubs */ true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sourceMapperUtils.test.js","sourceRoot":"","sources":["../../../../../src/tests/sourceMapperUtils.test.ts"],"names":[],"mappings":";;;;;AAAA;;;;;;GAMG;AACH,oDAA4B;AAC5B,mDAA4E;AAE5E,qEAAuF;AACvF,
|
|
1
|
+
{"version":3,"file":"sourceMapperUtils.test.js","sourceRoot":"","sources":["../../../../../src/tests/sourceMapperUtils.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,10 +36,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
36
36
|
const assert_1 = __importDefault(require("assert"));
|
|
37
37
|
const pathUtils_1 = require("../common/pathUtils");
|
|
38
38
|
const stringUtils_1 = require("../common/stringUtils");
|
|
39
|
-
const uri_1 = require("../common/uri/uri");
|
|
40
39
|
const runner_1 = require("./harness/fourslash/runner");
|
|
41
40
|
const testState_1 = require("./harness/fourslash/testState");
|
|
42
41
|
const factory = __importStar(require("./harness/vfs/factory"));
|
|
42
|
+
const uri_1 = require("../common/uri/uri");
|
|
43
43
|
test('Create', () => {
|
|
44
44
|
const code = `
|
|
45
45
|
// @filename: file1.py
|
|
@@ -65,7 +65,7 @@ test('Multiple files', () => {
|
|
|
65
65
|
`;
|
|
66
66
|
const state = (0, testState_1.parseAndGetTestState)(code, factory.srcFolder).state;
|
|
67
67
|
assert_1.default.equal(state.cwd(), (0, pathUtils_1.normalizeSlashes)('/'));
|
|
68
|
-
(0, assert_1.default)(state.fs.existsSync(uri_1.Uri.file((0, pathUtils_1.normalizeSlashes)((0, pathUtils_1.combinePaths)(factory.srcFolder, 'file1.py')))));
|
|
68
|
+
(0, assert_1.default)(state.fs.existsSync(uri_1.Uri.file((0, pathUtils_1.normalizeSlashes)((0, pathUtils_1.combinePaths)(factory.srcFolder, 'file1.py')), state.serviceProvider)));
|
|
69
69
|
});
|
|
70
70
|
test('Configuration', () => {
|
|
71
71
|
var _a;
|
|
@@ -133,7 +133,7 @@ test('Configuration', () => {
|
|
|
133
133
|
`;
|
|
134
134
|
const state = (0, testState_1.parseAndGetTestState)(code, factory.srcFolder).state;
|
|
135
135
|
assert_1.default.equal(state.cwd(), (0, pathUtils_1.normalizeSlashes)('/'));
|
|
136
|
-
(0, assert_1.default)(state.fs.existsSync(uri_1.Uri.file((0, pathUtils_1.normalizeSlashes)((0, pathUtils_1.combinePaths)(factory.srcFolder, 'file1.py')))));
|
|
136
|
+
(0, assert_1.default)(state.fs.existsSync(uri_1.Uri.file((0, pathUtils_1.normalizeSlashes)((0, pathUtils_1.combinePaths)(factory.srcFolder, 'file1.py')), state.serviceProvider)));
|
|
137
137
|
assert_1.default.equal(state.configOptions.diagnosticRuleSet.reportMissingImports, 'error');
|
|
138
138
|
assert_1.default.equal(state.configOptions.diagnosticRuleSet.reportMissingModuleSource, 'warning');
|
|
139
139
|
assert_1.default.equal((_a = state.configOptions.stubPath) === null || _a === void 0 ? void 0 : _a.getFilePath(), (0, pathUtils_1.normalizeSlashes)('/src/typestubs'));
|
|
@@ -172,7 +172,7 @@ test('ProjectRoot', () => {
|
|
|
172
172
|
`;
|
|
173
173
|
const state = (0, testState_1.parseAndGetTestState)(code).state;
|
|
174
174
|
assert_1.default.equal(state.cwd(), (0, pathUtils_1.normalizeSlashes)('/root'));
|
|
175
|
-
(0, assert_1.default)(state.fs.existsSync(uri_1.Uri.file((0, pathUtils_1.normalizeSlashes)('/root/file1.py'))));
|
|
175
|
+
(0, assert_1.default)(state.fs.existsSync(uri_1.Uri.file((0, pathUtils_1.normalizeSlashes)('/root/file1.py'), state.serviceProvider)));
|
|
176
176
|
assert_1.default.equal(state.configOptions.projectRoot.getFilePath(), (0, pathUtils_1.normalizeSlashes)('/root'));
|
|
177
177
|
});
|
|
178
178
|
test('CustomTypeshedFolder', () => {
|
|
@@ -199,7 +199,7 @@ test('IgnoreCase', () => {
|
|
|
199
199
|
//// pass
|
|
200
200
|
`;
|
|
201
201
|
const state = (0, testState_1.parseAndGetTestState)(code, factory.srcFolder).state;
|
|
202
|
-
(0, assert_1.default)(state.fs.existsSync(uri_1.Uri.file((0, pathUtils_1.normalizeSlashes)((0, pathUtils_1.combinePaths)(factory.srcFolder, 'FILE1.py')))));
|
|
202
|
+
(0, assert_1.default)(state.fs.existsSync(uri_1.Uri.file((0, pathUtils_1.normalizeSlashes)((0, pathUtils_1.combinePaths)(factory.srcFolder, 'FILE1.py')), state.serviceProvider)));
|
|
203
203
|
});
|
|
204
204
|
test('GoToMarker', () => {
|
|
205
205
|
const code = `
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testState.test.js","sourceRoot":"","sources":["../../../../../src/tests/testState.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"testState.test.js","sourceRoot":"","sources":["../../../../../src/tests/testState.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,10 +18,10 @@ const collectionUtils_1 = require("../common/collectionUtils");
|
|
|
18
18
|
const core_1 = require("../common/core");
|
|
19
19
|
const debug_1 = require("../common/debug");
|
|
20
20
|
const textRange_1 = require("../common/textRange");
|
|
21
|
-
const uri_1 = require("../common/uri/uri");
|
|
22
21
|
const uriUtils_1 = require("../common/uri/uriUtils");
|
|
23
22
|
const workspaceEditUtils_1 = require("../common/workspaceEditUtils");
|
|
24
23
|
const documentSymbolCollector_1 = require("../languageService/documentSymbolCollector");
|
|
24
|
+
const uri_1 = require("../common/uri/uri");
|
|
25
25
|
function convertFileEditActionToString(edit) {
|
|
26
26
|
return `'${edit.replacementText.replace(/\n/g, '!n!')}'@'${edit.fileUri}:(${edit.range.start.line},${edit.range.start.character})-(${edit.range.end.line},${edit.range.end.character})'`;
|
|
27
27
|
}
|
|
@@ -55,7 +55,7 @@ function applyFileEditActions(state, fileEditActions) {
|
|
|
55
55
|
const editsPerFileMap = (0, collectionUtils_1.createMapFromItems)(fileEditActions.edits, (e) => e.fileUri.key);
|
|
56
56
|
for (const [editFileName, editsPerFile] of editsPerFileMap) {
|
|
57
57
|
const result = _applyEdits(state, editFileName, editsPerFile);
|
|
58
|
-
state.testFS.writeFileSync(uri_1.Uri.file(editFileName), result.text, 'utf8');
|
|
58
|
+
state.testFS.writeFileSync(uri_1.Uri.file(editFileName, state.serviceProvider), result.text, 'utf8');
|
|
59
59
|
// Update open file content if the file is in opened state.
|
|
60
60
|
if (result.version) {
|
|
61
61
|
let openedFilePath = editFileName;
|
|
@@ -64,7 +64,7 @@ function applyFileEditActions(state, fileEditActions) {
|
|
|
64
64
|
openedFilePath = renamed.newFileUri.getFilePath();
|
|
65
65
|
state.program.setFileClosed(renamed.oldFileUri);
|
|
66
66
|
}
|
|
67
|
-
state.program.setFileOpened(uri_1.Uri.file(openedFilePath), result.version + 1, result.text);
|
|
67
|
+
state.program.setFileOpened(uri_1.Uri.file(openedFilePath, state.serviceProvider), result.version + 1, result.text);
|
|
68
68
|
}
|
|
69
69
|
}
|
|
70
70
|
// Second, apply filename change to disk or rename directory.
|
|
@@ -101,20 +101,20 @@ function applyFileEditActions(state, fileEditActions) {
|
|
|
101
101
|
}
|
|
102
102
|
exports.applyFileEditActions = applyFileEditActions;
|
|
103
103
|
function _applyEdits(state, filePath, edits) {
|
|
104
|
-
const sourceFile = state.program.getBoundSourceFile(uri_1.Uri.file(filePath));
|
|
104
|
+
const sourceFile = state.program.getBoundSourceFile(uri_1.Uri.file(filePath, state.serviceProvider));
|
|
105
105
|
const parseResults = sourceFile.getParseResults();
|
|
106
106
|
const current = (0, workspaceEditUtils_1.applyTextEditsToString)(edits.filter((e) => e.fileUri.getFilePath() === filePath), parseResults.tokenizerOutput.lines, parseResults.text);
|
|
107
107
|
return { version: sourceFile.getClientVersion(), text: current };
|
|
108
108
|
}
|
|
109
109
|
function verifyReferencesAtPosition(program, configOption, symbolNames, fileName, position, ranges) {
|
|
110
|
-
const sourceFile = program.getBoundSourceFile(uri_1.Uri.file(fileName));
|
|
110
|
+
const sourceFile = program.getBoundSourceFile(uri_1.Uri.file(fileName, program.serviceProvider));
|
|
111
111
|
(0, assert_1.default)(sourceFile);
|
|
112
112
|
const node = (0, parseTreeUtils_1.findNodeByOffset)(sourceFile.getParseResults().parseTree, position);
|
|
113
113
|
const decls = documentSymbolCollector_1.DocumentSymbolCollector.getDeclarationsForNode(program, node,
|
|
114
114
|
/* resolveLocalName */ true, vscode_languageserver_1.CancellationToken.None);
|
|
115
115
|
const rangesByFile = (0, collectionUtils_1.createMapFromItems)(ranges, (r) => r.fileName);
|
|
116
116
|
for (const rangeFileName of rangesByFile.keys()) {
|
|
117
|
-
const collector = new documentSymbolCollector_1.DocumentSymbolCollector(program, (0, core_1.isArray)(symbolNames) ? symbolNames : [symbolNames], decls, program.getBoundSourceFile(uri_1.Uri.file(rangeFileName)).getParseResults().parseTree, vscode_languageserver_1.CancellationToken.None, {
|
|
117
|
+
const collector = new documentSymbolCollector_1.DocumentSymbolCollector(program, (0, core_1.isArray)(symbolNames) ? symbolNames : [symbolNames], decls, program.getBoundSourceFile(uri_1.Uri.file(rangeFileName, program.serviceProvider)).getParseResults().parseTree, vscode_languageserver_1.CancellationToken.None, {
|
|
118
118
|
treatModuleInImportAndFromImportSame: true,
|
|
119
119
|
skipUnreachableCode: false,
|
|
120
120
|
});
|