@zzzen/pyright-internal 1.2.0-dev.20240317 → 1.2.0-dev.20240331
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/analyzer/analyzerFileInfo.js +1 -1
- package/dist/analyzer/analyzerFileInfo.js.map +1 -1
- package/dist/analyzer/binder.js +4 -1
- package/dist/analyzer/binder.js.map +1 -1
- package/dist/analyzer/cacheManager.d.ts +1 -0
- package/dist/analyzer/cacheManager.js +4 -1
- package/dist/analyzer/cacheManager.js.map +1 -1
- package/dist/analyzer/checker.d.ts +1 -2
- package/dist/analyzer/checker.js +16 -11
- package/dist/analyzer/checker.js.map +1 -1
- package/dist/analyzer/constructors.d.ts +3 -2
- package/dist/analyzer/constructors.js +76 -54
- package/dist/analyzer/constructors.js.map +1 -1
- package/dist/analyzer/dataClasses.js +2 -0
- package/dist/analyzer/dataClasses.js.map +1 -1
- package/dist/analyzer/declaration.js +1 -1
- package/dist/analyzer/declaration.js.map +1 -1
- package/dist/analyzer/deprecatedSymbols.js +40 -40
- package/dist/analyzer/deprecatedSymbols.js.map +1 -1
- package/dist/analyzer/enums.js +1 -0
- package/dist/analyzer/enums.js.map +1 -1
- package/dist/analyzer/importResolver.js +25 -23
- package/dist/analyzer/importResolver.js.map +1 -1
- package/dist/analyzer/namedTuples.js +2 -0
- package/dist/analyzer/namedTuples.js.map +1 -1
- package/dist/analyzer/operations.js +1 -1
- package/dist/analyzer/operations.js.map +1 -1
- package/dist/analyzer/packageTypeVerifier.js +1 -1
- package/dist/analyzer/packageTypeVerifier.js.map +1 -1
- package/dist/analyzer/parseTreeUtils.d.ts +1 -1
- package/dist/analyzer/patternMatching.js +14 -3
- package/dist/analyzer/patternMatching.js.map +1 -1
- package/dist/analyzer/program.d.ts +1 -7
- package/dist/analyzer/program.js +15 -19
- package/dist/analyzer/program.js.map +1 -1
- package/dist/analyzer/programTypes.d.ts +11 -0
- package/dist/analyzer/programTypes.js +11 -0
- package/dist/analyzer/programTypes.js.map +1 -0
- package/dist/analyzer/properties.js +2 -8
- package/dist/analyzer/properties.js.map +1 -1
- package/dist/analyzer/pythonPathUtils.js +1 -2
- package/dist/analyzer/pythonPathUtils.js.map +1 -1
- package/dist/analyzer/service.d.ts +2 -2
- package/dist/analyzer/service.js +20 -14
- package/dist/analyzer/service.js.map +1 -1
- package/dist/analyzer/sourceFile.js +4 -4
- package/dist/analyzer/sourceFile.js.map +1 -1
- package/dist/analyzer/sourceFileInfoUtils.js +3 -3
- package/dist/analyzer/sourceFileInfoUtils.js.map +1 -1
- package/dist/analyzer/staticExpressions.js +52 -30
- package/dist/analyzer/staticExpressions.js.map +1 -1
- package/dist/analyzer/tracePrinter.js +2 -2
- package/dist/analyzer/tracePrinter.js.map +1 -1
- package/dist/analyzer/typeEvaluator.js +81 -56
- package/dist/analyzer/typeEvaluator.js.map +1 -1
- package/dist/analyzer/typeGuards.js +14 -7
- package/dist/analyzer/typeGuards.js.map +1 -1
- package/dist/analyzer/typeUtils.d.ts +2 -2
- package/dist/analyzer/typeUtils.js +41 -5
- package/dist/analyzer/typeUtils.js.map +1 -1
- package/dist/analyzer/typedDicts.js +3 -0
- package/dist/analyzer/typedDicts.js.map +1 -1
- package/dist/backgroundAnalysis.js +1 -1
- package/dist/backgroundAnalysis.js.map +1 -1
- package/dist/backgroundAnalysisBase.js +1 -1
- package/dist/backgroundAnalysisBase.js.map +1 -1
- package/dist/backgroundThreadBase.js +23 -11
- package/dist/backgroundThreadBase.js.map +1 -1
- package/dist/commands/commandController.d.ts +2 -1
- package/dist/commands/commandController.js +3 -0
- package/dist/commands/commandController.js.map +1 -1
- package/dist/commands/createTypeStub.d.ts +1 -1
- package/dist/commands/createTypeStub.js +3 -3
- package/dist/commands/createTypeStub.js.map +1 -1
- package/dist/commands/dumpFileDebugInfoCommand.d.ts +1 -1
- package/dist/commands/dumpFileDebugInfoCommand.js +1 -1
- package/dist/commands/dumpFileDebugInfoCommand.js.map +1 -1
- package/dist/commands/quickActionCommand.d.ts +1 -1
- package/dist/commands/quickActionCommand.js +2 -2
- package/dist/commands/quickActionCommand.js.map +1 -1
- package/dist/commands/restartServer.d.ts +1 -1
- package/dist/common/cancellationUtils.js +2 -2
- package/dist/common/cancellationUtils.js.map +1 -1
- package/dist/common/caseSensitivityDetector.d.ts +6 -0
- package/dist/common/caseSensitivityDetector.js +18 -0
- package/dist/common/caseSensitivityDetector.js.map +1 -0
- package/dist/common/commandLineOptions.d.ts +3 -2
- package/dist/common/commandLineOptions.js.map +1 -1
- package/dist/common/commandUtils.js +1 -1
- package/dist/common/commandUtils.js.map +1 -1
- package/dist/common/configOptions.js +7 -7
- package/dist/common/configOptions.js.map +1 -1
- package/dist/common/envVarUtils.d.ts +1 -0
- package/dist/common/envVarUtils.js +42 -7
- package/dist/common/envVarUtils.js.map +1 -1
- package/dist/common/extensibility.d.ts +1 -1
- package/dist/common/fileBasedCancellationUtils.js +2 -2
- package/dist/common/fileBasedCancellationUtils.js.map +1 -1
- package/dist/common/fileSystem.d.ts +0 -1
- package/dist/common/fileSystem.js.map +1 -1
- package/dist/common/fullAccessHost.js +11 -6
- package/dist/common/fullAccessHost.js.map +1 -1
- package/dist/common/languageServerInterface.d.ts +62 -0
- package/dist/common/languageServerInterface.js +10 -0
- package/dist/common/languageServerInterface.js.map +1 -0
- package/dist/common/pythonVersion.d.ts +36 -20
- package/dist/common/pythonVersion.js +160 -54
- package/dist/common/pythonVersion.js.map +1 -1
- package/dist/common/realFileSystem.d.ts +8 -4
- package/dist/common/realFileSystem.js +56 -17
- package/dist/common/realFileSystem.js.map +1 -1
- package/dist/common/serviceKeys.d.ts +21 -0
- package/dist/common/serviceKeys.js +26 -0
- package/dist/common/serviceKeys.js.map +1 -0
- package/dist/common/serviceProviderExtensions.d.ts +2 -16
- package/dist/common/serviceProviderExtensions.js +19 -27
- package/dist/common/serviceProviderExtensions.js.map +1 -1
- package/dist/common/textEditTracker.js +2 -2
- package/dist/common/textEditTracker.js.map +1 -1
- package/dist/common/uri/constantUri.d.ts +36 -0
- package/dist/common/uri/constantUri.js +112 -0
- package/dist/common/uri/constantUri.js.map +1 -0
- package/dist/common/uri/emptyUri.d.ts +3 -31
- package/dist/common/uri/emptyUri.js +3 -84
- package/dist/common/uri/emptyUri.js.map +1 -1
- package/dist/common/uri/fileUri.d.ts +1 -0
- package/dist/common/uri/fileUri.js +3 -2
- package/dist/common/uri/fileUri.js.map +1 -1
- package/dist/common/uri/uri.d.ts +11 -3
- package/dist/common/uri/uri.js +31 -20
- package/dist/common/uri/uri.js.map +1 -1
- package/dist/common/uri/uriUtils.d.ts +11 -5
- package/dist/common/uri/uriUtils.js +31 -53
- package/dist/common/uri/uriUtils.js.map +1 -1
- package/dist/common/workspaceEditUtils.js +4 -4
- package/dist/common/workspaceEditUtils.js.map +1 -1
- package/dist/languageServerBase.d.ts +9 -57
- package/dist/languageServerBase.js +18 -8
- package/dist/languageServerBase.js.map +1 -1
- package/dist/languageService/analyzerServiceExecutor.d.ts +1 -1
- package/dist/languageService/analyzerServiceExecutor.js +4 -5
- package/dist/languageService/analyzerServiceExecutor.js.map +1 -1
- package/dist/languageService/callHierarchyProvider.js +6 -6
- package/dist/languageService/callHierarchyProvider.js.map +1 -1
- package/dist/languageService/codeActionProvider.js +43 -42
- package/dist/languageService/codeActionProvider.js.map +1 -1
- package/dist/languageService/completionProvider.js +4 -4
- package/dist/languageService/completionProvider.js.map +1 -1
- package/dist/languageService/definitionProvider.js +2 -2
- package/dist/languageService/definitionProvider.js.map +1 -1
- package/dist/languageService/documentSymbolCollector.js +2 -2
- package/dist/languageService/documentSymbolCollector.js.map +1 -1
- package/dist/languageService/documentSymbolProvider.d.ts +3 -2
- package/dist/languageService/documentSymbolProvider.js +3 -2
- package/dist/languageService/documentSymbolProvider.js.map +1 -1
- package/dist/languageService/referencesProvider.js +2 -2
- package/dist/languageService/referencesProvider.js.map +1 -1
- package/dist/languageService/signatureHelpProvider.js +2 -2
- package/dist/languageService/signatureHelpProvider.js.map +1 -1
- package/dist/languageService/symbolIndexer.d.ts +4 -1
- package/dist/languageService/symbolIndexer.js +21 -11
- package/dist/languageService/symbolIndexer.js.map +1 -1
- package/dist/languageService/workspaceSymbolProvider.js +1 -1
- package/dist/languageService/workspaceSymbolProvider.js.map +1 -1
- package/dist/localization/localize.js +21 -16
- package/dist/localization/localize.js.map +1 -1
- package/dist/localization/package.nls.cs.json +1 -0
- package/dist/localization/package.nls.de.json +1 -0
- package/dist/localization/package.nls.es.json +1 -0
- package/dist/localization/package.nls.fr.json +1 -0
- package/dist/localization/package.nls.it.json +1 -0
- package/dist/localization/package.nls.ja.json +1 -0
- package/dist/localization/package.nls.ko.json +1 -0
- package/dist/localization/package.nls.pl.json +1 -0
- package/dist/localization/package.nls.pt-br.json +1 -0
- package/dist/localization/package.nls.qps-ploc.json +1 -0
- package/dist/localization/package.nls.ru.json +1 -0
- package/dist/localization/package.nls.tr.json +1 -0
- package/dist/localization/package.nls.zh-cn.json +1 -0
- package/dist/localization/package.nls.zh-tw.json +1 -0
- package/dist/parser/parser.js +24 -21
- package/dist/parser/parser.js.map +1 -1
- package/dist/parser/unicode.js +3456 -2853
- package/dist/parser/unicode.js.map +1 -1
- package/dist/pyright.js +7 -7
- package/dist/pyright.js.map +1 -1
- package/dist/pyrightFileSystem.d.ts +3 -1
- package/dist/pyrightFileSystem.js +14 -9
- package/dist/pyrightFileSystem.js.map +1 -1
- package/dist/readonlyAugmentedFileSystem.d.ts +0 -1
- package/dist/readonlyAugmentedFileSystem.js +0 -3
- package/dist/readonlyAugmentedFileSystem.js.map +1 -1
- package/dist/server.d.ts +3 -1
- package/dist/server.js +14 -10
- package/dist/server.js.map +1 -1
- package/dist/tests/chainedSourceFiles.test.js +12 -12
- package/dist/tests/chainedSourceFiles.test.js.map +1 -1
- package/dist/tests/checker.test.js +11 -11
- package/dist/tests/checker.test.js.map +1 -1
- package/dist/tests/completions.test.js +4 -4
- package/dist/tests/completions.test.js.map +1 -1
- package/dist/tests/config.test.js +26 -21
- package/dist/tests/config.test.js.map +1 -1
- package/dist/tests/documentSymbolCollector.test.js +2 -3
- package/dist/tests/documentSymbolCollector.test.js.map +1 -1
- package/dist/tests/envVarUtils.test.js +77 -2
- package/dist/tests/envVarUtils.test.js.map +1 -1
- package/dist/tests/filesystem.test.js +13 -13
- package/dist/tests/filesystem.test.js.map +1 -1
- package/dist/tests/fourSlashParser.test.js +12 -12
- package/dist/tests/fourSlashParser.test.js.map +1 -1
- package/dist/tests/harness/fourslash/fourSlashParser.js +12 -10
- package/dist/tests/harness/fourslash/fourSlashParser.js.map +1 -1
- package/dist/tests/harness/fourslash/fourSlashTypes.d.ts +1 -0
- package/dist/tests/harness/fourslash/fourSlashTypes.js.map +1 -1
- package/dist/tests/harness/fourslash/testLanguageService.d.ts +3 -2
- package/dist/tests/harness/fourslash/testLanguageService.js +2 -2
- package/dist/tests/harness/fourslash/testLanguageService.js.map +1 -1
- package/dist/tests/harness/fourslash/testState.d.ts +3 -3
- package/dist/tests/harness/fourslash/testState.js +36 -32
- package/dist/tests/harness/fourslash/testState.js.map +1 -1
- package/dist/tests/harness/fourslash/workspaceEditTestUtils.js +1 -1
- package/dist/tests/harness/fourslash/workspaceEditTestUtils.js.map +1 -1
- package/dist/tests/harness/testHost.d.ts +7 -0
- package/dist/tests/harness/testHost.js +33 -14
- package/dist/tests/harness/testHost.js.map +1 -1
- package/dist/tests/harness/vfs/factory.d.ts +3 -4
- package/dist/tests/harness/vfs/factory.js +7 -6
- package/dist/tests/harness/vfs/factory.js.map +1 -1
- package/dist/tests/harness/vfs/filesystem.d.ts +5 -3
- package/dist/tests/harness/vfs/filesystem.js +22 -15
- package/dist/tests/harness/vfs/filesystem.js.map +1 -1
- package/dist/tests/importResolver.test.js +35 -34
- package/dist/tests/importResolver.test.js.map +1 -1
- package/dist/tests/importStatementUtils.test.js +5 -6
- package/dist/tests/importStatementUtils.test.js.map +1 -1
- package/dist/tests/languageServer.test.js +1 -1
- package/dist/tests/languageServer.test.js.map +1 -1
- package/dist/tests/logger.test.js +1 -1
- package/dist/tests/logger.test.js.map +1 -1
- package/dist/tests/lsp/customLsp.d.ts +1 -1
- package/dist/tests/lsp/languageServer.js +7 -5
- package/dist/tests/lsp/languageServer.js.map +1 -1
- package/dist/tests/lsp/languageServerTestUtils.js +21 -16
- package/dist/tests/lsp/languageServerTestUtils.js.map +1 -1
- package/dist/tests/parseTreeUtils.test.js +1 -2
- package/dist/tests/parseTreeUtils.test.js.map +1 -1
- package/dist/tests/pyrightFileSystem.test.js +6 -5
- package/dist/tests/pyrightFileSystem.test.js.map +1 -1
- package/dist/tests/serialization.test.js +5 -5
- package/dist/tests/serialization.test.js.map +1 -1
- package/dist/tests/service.test.js +16 -25
- package/dist/tests/service.test.js.map +1 -1
- package/dist/tests/sourceFile.test.js +8 -5
- package/dist/tests/sourceFile.test.js.map +1 -1
- package/dist/tests/sourceMapperUtils.test.js +4 -4
- package/dist/tests/sourceMapperUtils.test.js.map +1 -1
- package/dist/tests/testState.test.js +5 -5
- package/dist/tests/testState.test.js.map +1 -1
- package/dist/tests/testStateUtils.js +6 -6
- package/dist/tests/testStateUtils.js.map +1 -1
- package/dist/tests/testUtils.js +6 -4
- package/dist/tests/testUtils.js.map +1 -1
- package/dist/tests/typeEvaluator1.test.js +16 -12
- package/dist/tests/typeEvaluator1.test.js.map +1 -1
- package/dist/tests/typeEvaluator2.test.js +2 -2
- package/dist/tests/typeEvaluator2.test.js.map +1 -1
- package/dist/tests/typeEvaluator3.test.js +57 -57
- package/dist/tests/typeEvaluator3.test.js.map +1 -1
- package/dist/tests/typeEvaluator4.test.js +21 -21
- package/dist/tests/typeEvaluator4.test.js.map +1 -1
- package/dist/tests/typeEvaluator5.test.js +27 -27
- package/dist/tests/typeEvaluator5.test.js.map +1 -1
- package/dist/tests/typePrinter.test.js.map +1 -1
- package/dist/tests/uri.test.js +220 -199
- package/dist/tests/uri.test.js.map +1 -1
- package/dist/tests/workspaceEditUtils.test.js +7 -7
- package/dist/tests/workspaceEditUtils.test.js.map +1 -1
- package/dist/tests/zipfs.test.js +7 -5
- package/dist/tests/zipfs.test.js.map +1 -1
- package/dist/workspaceFactory.d.ts +15 -6
- package/dist/workspaceFactory.js +16 -10
- package/dist/workspaceFactory.js.map +1 -1
- package/package.json +5 -5
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"languageServer.js","sourceRoot":"","sources":["../../../../../../src/tests/lsp/languageServer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;GAMG;AACH,qDAWoC;AACpC,mDAAiG;AAEjG,oDAAiE;AACjE,sDAAyE;AACzE,kEAA+D;AAC/D,8CAA2C;AAC3C,0EAAqE;AACrE,qEAAuD;AACvD,oDAAoD;AAEpD,iEAAwF;AAExF,qEAAuD;
|
1
|
+
{"version":3,"file":"languageServer.js","sourceRoot":"","sources":["../../../../../../src/tests/lsp/languageServer.ts"],"names":[],"mappings":"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"}
|
@@ -41,6 +41,7 @@ const path_1 = __importDefault(require("path"));
|
|
41
41
|
const vscode_languageserver_protocol_1 = require("vscode-languageserver-protocol");
|
42
42
|
const node_1 = require("vscode-languageserver/node");
|
43
43
|
const configOptions_1 = require("../../common/configOptions");
|
44
|
+
const core_1 = require("../../common/core");
|
44
45
|
const deferred_1 = require("../../common/deferred");
|
45
46
|
const diagnosticSink_1 = require("../../common/diagnosticSink");
|
46
47
|
const fullAccessHost_1 = require("../../common/fullAccessHost");
|
@@ -49,6 +50,7 @@ const positionUtils_1 = require("../../common/positionUtils");
|
|
49
50
|
const pythonVersion_1 = require("../../common/pythonVersion");
|
50
51
|
const fileUri_1 = require("../../common/uri/fileUri");
|
51
52
|
const uri_1 = require("../../common/uri/uri");
|
53
|
+
const uriUtils_1 = require("../../common/uri/uriUtils");
|
52
54
|
const parser_1 = require("../../parser/parser");
|
53
55
|
const fourSlashParser_1 = require("../harness/fourslash/fourSlashParser");
|
54
56
|
const testStateUtils_1 = require("../harness/fourslash/testStateUtils");
|
@@ -66,7 +68,7 @@ exports.DEFAULT_WORKSPACE_ROOT = (0, pathUtils_1.combinePaths)('/', 'src');
|
|
66
68
|
exports.ERROR_SCRIPT_OUTPUT = 'Error: script failed to run';
|
67
69
|
exports.STALL_SCRIPT_OUTPUT = 'Timeout: script never finished running';
|
68
70
|
class TestHostOptions {
|
69
|
-
constructor({ version = pythonVersion_1.
|
71
|
+
constructor({ version = pythonVersion_1.pythonVersion3_10, platform = configOptions_1.PythonPlatform.Linux, searchPaths = [factory_1.libFolder, factory_1.distlibFolder], runScript = async (pythonPath, scriptPath, args, cwd, token) => {
|
70
72
|
return { stdout: '', stderr: '' };
|
71
73
|
}, } = {}) {
|
72
74
|
this.version = version;
|
@@ -143,10 +145,11 @@ function createFileSystem(projectRoot, testData, optionalHost) {
|
|
143
145
|
exports.createFileSystem = createFileSystem;
|
144
146
|
const settingsMap = new Map();
|
145
147
|
function updateSettingsMap(info, settings) {
|
148
|
+
const ignoreCase = (0, core_1.toBoolean)(info.testData.globalOptions["ignorecase" /* GlobalMetadataOptionNames.ignoreCase */]);
|
146
149
|
// Normalize the URIs for all of the settings.
|
147
150
|
settings.forEach((s) => {
|
148
151
|
if (s.item.scopeUri) {
|
149
|
-
s.item.scopeUri =
|
152
|
+
s.item.scopeUri = uriUtils_1.UriEx.parse(s.item.scopeUri, !ignoreCase).toString();
|
150
153
|
}
|
151
154
|
});
|
152
155
|
const current = settingsMap.get(info) || [];
|
@@ -158,7 +161,7 @@ function getParseResults(fileContents, isStubFile = false, ipythonMode = 0) {
|
|
158
161
|
const parseOptions = new parser_1.ParseOptions();
|
159
162
|
parseOptions.ipythonMode = ipythonMode;
|
160
163
|
parseOptions.isStubFile = isStubFile;
|
161
|
-
parseOptions.pythonVersion = pythonVersion_1.
|
164
|
+
parseOptions.pythonVersion = pythonVersion_1.pythonVersion3_10;
|
162
165
|
parseOptions.skipFunctionAndClassBody = false;
|
163
166
|
// Parse the token stream, building the abstract syntax tree.
|
164
167
|
const parser = new parser_1.Parser();
|
@@ -218,23 +221,18 @@ class TestProgressPart {
|
|
218
221
|
this._context.sendNotification(node_1.WorkDoneProgressCancelNotification.type, { token: this._token });
|
219
222
|
}
|
220
223
|
}
|
221
|
-
async function runPyrightServer(projectRoots, code, callInitialize = true, extraSettings, pythonVersion = pythonVersion_1.
|
224
|
+
async function runPyrightServer(projectRoots, code, callInitialize = true, extraSettings, pythonVersion = pythonVersion_1.pythonVersion3_10, backgroundAnalysis) {
|
222
225
|
var _a;
|
223
|
-
// Normalize the URIs for all of the settings.
|
224
|
-
extraSettings === null || extraSettings === void 0 ? void 0 : extraSettings.forEach((s) => {
|
225
|
-
if (s.item.scopeUri) {
|
226
|
-
s.item.scopeUri = uri_1.Uri.parse(s.item.scopeUri, true).toString();
|
227
|
-
}
|
228
|
-
});
|
229
226
|
// Setup the test data we need to send for Test server startup.
|
230
227
|
const projectRootsArray = Array.isArray(projectRoots) ? projectRoots : [projectRoots];
|
228
|
+
// Here all Uri has `isCaseSensitive` as true.
|
231
229
|
const testServerData = {
|
232
230
|
testName: (_a = expect.getState().currentTestName) !== null && _a !== void 0 ? _a : 'NoName',
|
233
231
|
code,
|
234
|
-
projectRoots: projectRootsArray.map((p) => (p.includes(':') ?
|
235
|
-
pythonVersion,
|
232
|
+
projectRoots: projectRootsArray.map((p) => (p.includes(':') ? uriUtils_1.UriEx.parse(p) : uriUtils_1.UriEx.file(p))),
|
233
|
+
pythonVersion: pythonVersion.toString(),
|
236
234
|
backgroundAnalysis,
|
237
|
-
logFile:
|
235
|
+
logFile: uriUtils_1.UriEx.file(path_1.default.join(__dirname, `log${process.pid}.txt`)),
|
238
236
|
pid: process.pid.toString(),
|
239
237
|
};
|
240
238
|
(0, exports.logToDisk)(`Starting test ${testServerData.testName}`, testServerData.logFile);
|
@@ -243,6 +241,13 @@ async function runPyrightServer(projectRoots, code, callInitialize = true, extra
|
|
243
241
|
const testData = (0, fourSlashParser_1.parseTestData)(testServerData.projectRoots.length === 1
|
244
242
|
? getFileLikePath(testServerData.projectRoots[0])
|
245
243
|
: exports.DEFAULT_WORKSPACE_ROOT, testServerData.code, 'noname.py');
|
244
|
+
const ignoreCase = (0, core_1.toBoolean)(testData.globalOptions["ignorecase" /* GlobalMetadataOptionNames.ignoreCase */]);
|
245
|
+
// Normalize the URIs for all of the settings.
|
246
|
+
extraSettings === null || extraSettings === void 0 ? void 0 : extraSettings.forEach((s) => {
|
247
|
+
if (s.item.scopeUri) {
|
248
|
+
s.item.scopeUri = uriUtils_1.UriEx.parse(s.item.scopeUri, !ignoreCase).toString();
|
249
|
+
}
|
250
|
+
});
|
246
251
|
// Start listening to the 'client' side of the connection.
|
247
252
|
const disposables = [];
|
248
253
|
const connection = createServerConnection(testServerData, disposables);
|
@@ -268,7 +273,7 @@ async function runPyrightServer(projectRoots, code, callInitialize = true, extra
|
|
268
273
|
workspaceEdits: [],
|
269
274
|
workspaceEditsEvent: workspaceEditsEmitter.event,
|
270
275
|
getInitializeParams: () => getInitializeParams(testServerData.projectRoots),
|
271
|
-
convertPathToUri: (path) =>
|
276
|
+
convertPathToUri: (path) => uriUtils_1.UriEx.file(path, !ignoreCase),
|
272
277
|
dispose: async () => {
|
273
278
|
// Send shutdown. This should disconnect the dispatcher and kill the server.
|
274
279
|
await connection.sendRequest(vscode_languageserver_protocol_1.ShutdownRequest.type, undefined);
|
@@ -286,9 +291,9 @@ async function runPyrightServer(projectRoots, code, callInitialize = true, extra
|
|
286
291
|
}), info.connection.onNotification(vscode_languageserver_protocol_1.LogMessageNotification.type, (p) => {
|
287
292
|
info.logs.push(p);
|
288
293
|
}), info.connection.onRequest(vscode_languageserver_protocol_1.SemanticTokensRefreshRequest.type, () => {
|
289
|
-
//
|
294
|
+
// Empty. Silently ignore for now.
|
290
295
|
}), info.connection.onRequest(vscode_languageserver_protocol_1.InlayHintRefreshRequest.type, () => {
|
291
|
-
//
|
296
|
+
// Empty. Silently ignore for now.
|
292
297
|
}), info.connection.onRequest(vscode_languageserver_protocol_1.ApplyWorkspaceEditRequest.type, (p) => {
|
293
298
|
info.workspaceEdits.push(p);
|
294
299
|
workspaceEditsEmitter.fire(p);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"languageServerTestUtils.js","sourceRoot":"","sources":["../../../../../../src/tests/lsp/languageServerTestUtils.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"languageServerTestUtils.js","sourceRoot":"","sources":["../../../../../../src/tests/lsp/languageServerTestUtils.ts"],"names":[],"mappings":"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"}
|
@@ -13,7 +13,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
const assert_1 = __importDefault(require("assert"));
|
14
14
|
const parseTreeUtils_1 = require("../analyzer/parseTreeUtils");
|
15
15
|
const textRange_1 = require("../common/textRange");
|
16
|
-
const uri_1 = require("../common/uri/uri");
|
17
16
|
const parseNodes_1 = require("../parser/parseNodes");
|
18
17
|
const testState_1 = require("./harness/fourslash/testState");
|
19
18
|
test('isImportModuleName', () => {
|
@@ -262,7 +261,7 @@ test('printExpression', () => {
|
|
262
261
|
});
|
263
262
|
function testNodeRange(state, markerName, type, includeTrailingBlankLines = false) {
|
264
263
|
const range = state.getRangeByMarkerName(markerName);
|
265
|
-
const sourceFile = state.program.getBoundSourceFile(
|
264
|
+
const sourceFile = state.program.getBoundSourceFile(range.marker.fileUri);
|
266
265
|
const statementNode = (0, parseTreeUtils_1.getFirstAncestorOrSelfOfKind)((0, testState_1.getNodeAtMarker)(state, markerName), type);
|
267
266
|
const statementRange = (0, parseTreeUtils_1.getFullStatementRange)(statementNode, sourceFile.getParseResults(), {
|
268
267
|
includeTrailingBlankLines,
|
@@ -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":";AAAA;;;;;;GAMG;;;;;;AAEH,oDAA4B;AAE5B,kEAAiE;AACjE,qDAA+C;AAE/C,SAAgB,kBAAkB,CAAC,UAAU,GAAG,gCAAS,EAAE,YAAY,GAAG,kCAAW;IACjF,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE;QACvB,MAAM,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;QACvC,MAAM,YAAY,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC;QAC9C,gBAAM,CAAC,WAAW,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE;QACvB,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;QACnC,MAAM,YAAY,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC;QAC9C,gBAAM,CAAC,WAAW,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,gBAAgB,EAAE,GAAG,EAAE;QACxB,MAAM,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,YAAY,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC;QAC9C,gBAAM,CAAC,WAAW,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,eAAe,EAAE,GAAG,EAAE;QACvB,MAAM,UAAU,GAAG,UAAU,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QACpD,MAAM,YAAY,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC;QAC9C,gBAAM,CAAC,eAAe,CAAC,YAAY,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,cAAc,EAAE,GAAG,EAAE;QACtB,MAAM,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;QAC5C,MAAM,YAAY,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC;QAC9C,gBAAM,CAAC,eAAe,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAC1B,MAAM,UAAU,GAAG,UAAU,CAAC;YAC1B,CAAC,EAAE,IAAI,GAAG,CAAiB;gBACvB,CAAC,OAAO,EAAE,CAAC,CAAC;gBACZ,CAAC,OAAO,EAAE,CAAC,CAAC;aACf,CAAC;SACL,CAAC,CAAC;QACH,MAAM,YAAY,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC;QAC9C,gBAAM,CAAC,eAAe,CAAC,YAAY,EAAE;YACjC,CAAC,EAAE,IAAI,GAAG,CAAiB;gBACvB,CAAC,OAAO,EAAE,CAAC,CAAC;gBACZ,CAAC,OAAO,EAAE,CAAC,CAAC;aACf,CAAC;SACL,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAC1B,MAAM,UAAU,GAAG,UAAU,CAAC,EAAE,CAAC,EAAE,IAAI,GAAG,CAAS,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;QAC1E,MAAM,YAAY,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC;QAC9C,gBAAM,CAAC,eAAe,CAAC,YAAY,EAAE,EAAE,CAAC,EAAE,IAAI,GAAG,CAAS,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;IACrF,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,uBAAuB,EAAE,GAAG,EAAE;QAC/B,MAAM,UAAU,GAAG,UAAU,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QAChD,MAAM,YAAY,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC;QAC9C,gBAAM,CAAC,eAAe,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAC1B,MAAM,UAAU,GAAG,UAAU,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3C,MAAM,YAAY,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC;QAC9C,gBAAM,CAAC,eAAe,CAAC,YAAY,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,iBAAiB,EAAE,GAAG,EAAE;QACzB,MAAM,UAAU,GAAG,UAAU,CAAC,EAAE,CAAC,EAAE,gBAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC1D,MAAM,YAAY,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC;QAC9C,gBAAM,CAAC,eAAe,CAAC,YAAY,EAAE,EAAE,CAAC,EAAE,gBAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,uBAAuB,EAAE,GAAG,EAAE;QAC/B,MAAM,UAAU,GAAG,UAAU,CAAC,EAAE,CAAC,EAAE,CAAC,gBAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,gBAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;QACjF,MAAM,YAAY,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC;QAC9C,gBAAM,CAAC,eAAe,CAAC,YAAY,EAAE,EAAE,CAAC,EAAE,CAAC,gBAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,gBAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;IAC5F,CAAC,CAAC,CAAC;AACP,CAAC;AA5ED,gDA4EC;AAED,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC3B,kBAAkB,EAAE,CAAC;AACzB,CAAC,CAAC,CAAC"}
|
@@ -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
|