@zzzen/pyright-internal 1.2.0-dev.20240324 → 1.2.0-dev.20240407
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 +0 -1
- package/dist/analyzer/analyzerFileInfo.js.map +1 -1
- package/dist/analyzer/binder.js +15 -8
- package/dist/analyzer/binder.js.map +1 -1
- package/dist/analyzer/cacheManager.d.ts +12 -0
- package/dist/analyzer/cacheManager.js +63 -3
- package/dist/analyzer/cacheManager.js.map +1 -1
- package/dist/analyzer/checker.d.ts +2 -3
- package/dist/analyzer/checker.js +18 -13
- package/dist/analyzer/checker.js.map +1 -1
- package/dist/analyzer/codeFlowEngine.js +14 -2
- package/dist/analyzer/codeFlowEngine.js.map +1 -1
- package/dist/analyzer/codeFlowTypes.d.ts +1 -0
- package/dist/analyzer/codeFlowTypes.js.map +1 -1
- package/dist/analyzer/constraintSolver.js +20 -3
- package/dist/analyzer/constraintSolver.js.map +1 -1
- package/dist/analyzer/constructorTransform.js +2 -2
- package/dist/analyzer/constructorTransform.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 +7 -6
- 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 +8 -3
- package/dist/analyzer/enums.js.map +1 -1
- package/dist/analyzer/functionTransform.js +1 -1
- package/dist/analyzer/functionTransform.js.map +1 -1
- package/dist/analyzer/importResolver.js +19 -17
- package/dist/analyzer/importResolver.js.map +1 -1
- package/dist/analyzer/importStatementUtils.d.ts +6 -6
- package/dist/analyzer/importStatementUtils.js +42 -42
- package/dist/analyzer/importStatementUtils.js.map +1 -1
- package/dist/analyzer/namedTuples.js +3 -1
- package/dist/analyzer/namedTuples.js.map +1 -1
- package/dist/analyzer/packageTypeVerifier.js +7 -7
- package/dist/analyzer/packageTypeVerifier.js.map +1 -1
- package/dist/analyzer/parseTreeUtils.d.ts +6 -5
- package/dist/analyzer/parseTreeUtils.js +12 -13
- package/dist/analyzer/parseTreeUtils.js.map +1 -1
- package/dist/analyzer/patternMatching.js +15 -4
- package/dist/analyzer/patternMatching.js.map +1 -1
- package/dist/analyzer/program.d.ts +5 -10
- package/dist/analyzer/program.js +35 -30
- 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 +10 -10
- package/dist/analyzer/properties.js.map +1 -1
- package/dist/analyzer/protocols.js +5 -5
- package/dist/analyzer/protocols.js.map +1 -1
- package/dist/analyzer/service.d.ts +3 -2
- package/dist/analyzer/service.js +24 -15
- package/dist/analyzer/service.js.map +1 -1
- package/dist/analyzer/sourceFile.d.ts +5 -3
- package/dist/analyzer/sourceFile.js +112 -75
- package/dist/analyzer/sourceFile.js.map +1 -1
- package/dist/analyzer/sourceFileInfoUtils.js +4 -4
- package/dist/analyzer/sourceFileInfoUtils.js.map +1 -1
- package/dist/analyzer/sourceMapper.js +6 -6
- package/dist/analyzer/symbol.d.ts +4 -1
- package/dist/analyzer/symbol.js +10 -0
- package/dist/analyzer/symbol.js.map +1 -1
- package/dist/analyzer/symbolUtils.d.ts +1 -0
- package/dist/analyzer/symbolUtils.js +11 -1
- package/dist/analyzer/symbolUtils.js.map +1 -1
- package/dist/analyzer/tracePrinter.js +2 -2
- package/dist/analyzer/tracePrinter.js.map +1 -1
- package/dist/analyzer/typeDocStringUtils.js +1 -1
- package/dist/analyzer/typeDocStringUtils.js.map +1 -1
- package/dist/analyzer/typeEvaluator.js +159 -73
- package/dist/analyzer/typeEvaluator.js.map +1 -1
- package/dist/analyzer/typeGuards.js +16 -9
- package/dist/analyzer/typeGuards.js.map +1 -1
- package/dist/analyzer/typeStubWriter.js +1 -1
- package/dist/analyzer/typeStubWriter.js.map +1 -1
- package/dist/analyzer/typeUtils.d.ts +2 -2
- package/dist/analyzer/typeUtils.js +33 -20
- package/dist/analyzer/typeUtils.js.map +1 -1
- package/dist/analyzer/typedDicts.js +32 -20
- package/dist/analyzer/typedDicts.js.map +1 -1
- package/dist/analyzer/types.d.ts +5 -1
- package/dist/analyzer/types.js +20 -0
- package/dist/analyzer/types.js.map +1 -1
- package/dist/backgroundAnalysis.d.ts +1 -0
- package/dist/backgroundAnalysis.js +6 -2
- package/dist/backgroundAnalysis.js.map +1 -1
- package/dist/backgroundAnalysisBase.d.ts +2 -1
- package/dist/backgroundAnalysisBase.js +6 -1
- package/dist/backgroundAnalysisBase.js.map +1 -1
- package/dist/backgroundThreadBase.d.ts +1 -0
- package/dist/backgroundThreadBase.js +19 -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 +5 -5
- 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 +4 -3
- package/dist/common/extensibility.js.map +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 +3 -15
- package/dist/common/serviceProviderExtensions.js +23 -27
- package/dist/common/serviceProviderExtensions.js.map +1 -1
- package/dist/common/textEditTracker.d.ts +5 -5
- package/dist/common/textEditTracker.js +35 -35
- 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 +11 -59
- 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/autoImporter.d.ts +3 -3
- package/dist/languageService/autoImporter.js +2 -1
- package/dist/languageService/autoImporter.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.d.ts +2 -2
- package/dist/languageService/completionProvider.js +10 -11
- package/dist/languageService/completionProvider.js.map +1 -1
- package/dist/languageService/definitionProvider.js +3 -3
- package/dist/languageService/definitionProvider.js.map +1 -1
- package/dist/languageService/documentHighlightProvider.js +2 -2
- package/dist/languageService/documentHighlightProvider.js.map +1 -1
- package/dist/languageService/documentSymbolCollector.js +3 -3
- package/dist/languageService/documentSymbolCollector.js.map +1 -1
- package/dist/languageService/documentSymbolProvider.d.ts +3 -2
- package/dist/languageService/documentSymbolProvider.js +4 -3
- package/dist/languageService/documentSymbolProvider.js.map +1 -1
- package/dist/languageService/hoverProvider.js +2 -2
- package/dist/languageService/hoverProvider.js.map +1 -1
- package/dist/languageService/importSorter.d.ts +2 -2
- package/dist/languageService/importSorter.js +1 -1
- package/dist/languageService/importSorter.js.map +1 -1
- package/dist/languageService/referencesProvider.d.ts +4 -4
- package/dist/languageService/referencesProvider.js +4 -4
- package/dist/languageService/referencesProvider.js.map +1 -1
- package/dist/languageService/signatureHelpProvider.js +4 -4
- package/dist/languageService/signatureHelpProvider.js.map +1 -1
- package/dist/languageService/symbolIndexer.d.ts +5 -2
- package/dist/languageService/symbolIndexer.js +21 -11
- package/dist/languageService/symbolIndexer.js.map +1 -1
- package/dist/languageService/workspaceSymbolProvider.js +2 -2
- package/dist/languageService/workspaceSymbolProvider.js.map +1 -1
- package/dist/localization/localize.d.ts +3 -0
- package/dist/localization/localize.js +22 -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.en-us.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/nodeMain.d.ts +1 -1
- package/dist/nodeMain.js +2 -2
- package/dist/nodeMain.js.map +1 -1
- package/dist/parser/parser.d.ts +7 -4
- package/dist/parser/parser.js +7 -5
- package/dist/parser/parser.js.map +1 -1
- 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 +4 -2
- package/dist/server.js +15 -11
- package/dist/server.js.map +1 -1
- package/dist/tests/cacheManager.test.js +35 -0
- package/dist/tests/cacheManager.test.js.map +1 -1
- package/dist/tests/chainedSourceFiles.test.js +18 -18
- 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 +6 -6
- package/dist/tests/harness/fourslash/testState.js +42 -37
- 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 +9 -10
- package/dist/tests/importStatementUtils.test.js.map +1 -1
- package/dist/tests/ipythonMode.test.js +1 -1
- package/dist/tests/ipythonMode.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 +6 -5
- package/dist/tests/lsp/languageServer.js.map +1 -1
- package/dist/tests/lsp/languageServerTestUtils.d.ts +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/parser.test.js +14 -14
- package/dist/tests/parser.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/signatureHelp.test.js +1 -1
- package/dist/tests/signatureHelp.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 +8 -6
- package/dist/tests/testStateUtils.js.map +1 -1
- package/dist/tests/testUtils.d.ts +4 -8
- package/dist/tests/testUtils.js +9 -10
- package/dist/tests/testUtils.js.map +1 -1
- package/dist/tests/textEditUtil.test.js +3 -3
- package/dist/tests/textEditUtil.test.js.map +1 -1
- package/dist/tests/typeEvaluator1.test.js +1 -1
- package/dist/tests/typeEvaluator1.test.js.map +1 -1
- package/dist/tests/typeEvaluator3.test.js +11 -5
- package/dist/tests/typeEvaluator3.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
@@ -36,21 +36,44 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
const os = __importStar(require("os"));
|
37
37
|
const assert_1 = __importDefault(require("assert"));
|
38
38
|
const envVarUtils_1 = require("../common/envVarUtils");
|
39
|
+
const workspaceFactory_1 = require("../workspaceFactory");
|
40
|
+
const uriUtils_1 = require("../common/uri/uriUtils");
|
39
41
|
const uri_1 = require("../common/uri/uri");
|
42
|
+
const service_1 = require("../analyzer/service");
|
43
|
+
const console_1 = require("../common/console");
|
44
|
+
const testAccessHost_1 = require("./harness/testAccessHost");
|
45
|
+
const configOptions_1 = require("../common/configOptions");
|
46
|
+
const filesystem_1 = require("./harness/vfs/filesystem");
|
47
|
+
const serviceProviderExtensions_1 = require("../common/serviceProviderExtensions");
|
40
48
|
jest.mock('os', () => ({ __esModule: true, ...jest.requireActual('os') }));
|
49
|
+
const defaultWorkspace = createWorkspace(undefined);
|
50
|
+
const normalworkspace = createWorkspace(uriUtils_1.UriEx.file('/'));
|
41
51
|
test('expands ${workspaceFolder}', () => {
|
42
|
-
const workspaceFolderUri =
|
52
|
+
const workspaceFolderUri = uriUtils_1.UriEx.parse('/src');
|
43
53
|
const test_path = '${workspaceFolder}/foo';
|
44
54
|
const path = `${workspaceFolderUri.getPath()}/foo`;
|
45
55
|
assert_1.default.equal((0, envVarUtils_1.expandPathVariables)(test_path, workspaceFolderUri, []), path);
|
46
56
|
});
|
47
57
|
test('expands ${workspaceFolder:sibling}', () => {
|
48
|
-
const workspaceFolderUri =
|
58
|
+
const workspaceFolderUri = uriUtils_1.UriEx.parse('/src');
|
49
59
|
const workspace = { workspaceName: 'sibling', rootUri: workspaceFolderUri };
|
50
60
|
const test_path = `\${workspaceFolder:${workspace.workspaceName}}/foo`;
|
51
61
|
const path = `${workspaceFolderUri.getPath()}/foo`;
|
52
62
|
assert_1.default.equal((0, envVarUtils_1.expandPathVariables)(test_path, workspaceFolderUri, [workspace]), path);
|
53
63
|
});
|
64
|
+
test('resolvePathWithEnvVariables ${workspaceFolder}', () => {
|
65
|
+
var _a;
|
66
|
+
const workspaceFolderUri = uriUtils_1.UriEx.parse('mem-fs:/hello/there');
|
67
|
+
const test_path = `\${workspaceFolder}/foo`;
|
68
|
+
const path = `${workspaceFolderUri.toString()}/foo`;
|
69
|
+
assert_1.default.equal((0, envVarUtils_1.resolvePathWithEnvVariables)(defaultWorkspace, test_path, []), undefined);
|
70
|
+
const workspace = createWorkspace(workspaceFolderUri);
|
71
|
+
assert_1.default.equal((_a = (0, envVarUtils_1.resolvePathWithEnvVariables)(workspace, test_path, [])) === null || _a === void 0 ? void 0 : _a.toString(), path);
|
72
|
+
});
|
73
|
+
test('test resolvePathWithEnvVariables', () => {
|
74
|
+
(0, assert_1.default)(!(0, envVarUtils_1.resolvePathWithEnvVariables)(defaultWorkspace, '', []));
|
75
|
+
(0, assert_1.default)(!(0, envVarUtils_1.resolvePathWithEnvVariables)(defaultWorkspace, '${workspaceFolder}', []));
|
76
|
+
});
|
54
77
|
describe('expandPathVariables', () => {
|
55
78
|
const OLD_ENV = process.env;
|
56
79
|
beforeEach(() => {
|
@@ -66,6 +89,14 @@ describe('expandPathVariables', () => {
|
|
66
89
|
const path = `${process.env.HOME}/bar`;
|
67
90
|
assert_1.default.equal((0, envVarUtils_1.expandPathVariables)(test_path, uri_1.Uri.empty(), []), path);
|
68
91
|
});
|
92
|
+
test('resolvePathWithEnvVariables ${env:HOME}', () => {
|
93
|
+
var _a, _b;
|
94
|
+
process.env.HOME = '/home/foo';
|
95
|
+
const test_path = '${env:HOME}/bar';
|
96
|
+
const path = `file://${process.env.HOME}/bar`;
|
97
|
+
assert_1.default.equal((_a = (0, envVarUtils_1.resolvePathWithEnvVariables)(defaultWorkspace, test_path, [])) === null || _a === void 0 ? void 0 : _a.toString(), path);
|
98
|
+
assert_1.default.equal((_b = (0, envVarUtils_1.resolvePathWithEnvVariables)(normalworkspace, test_path, [])) === null || _b === void 0 ? void 0 : _b.toString(), path);
|
99
|
+
});
|
69
100
|
test('expands ${env:USERNAME}', () => {
|
70
101
|
process.env.USERNAME = 'foo';
|
71
102
|
const test_path = 'file:///home/${env:USERNAME}/bar';
|
@@ -78,6 +109,14 @@ describe('expandPathVariables', () => {
|
|
78
109
|
const path = `${process.env.VIRTUAL_ENV}/bar`;
|
79
110
|
assert_1.default.equal((0, envVarUtils_1.expandPathVariables)(test_path, uri_1.Uri.empty(), []), path);
|
80
111
|
});
|
112
|
+
test('resolvePathWithEnvVariables ${env:VIRTUAL_ENV}', () => {
|
113
|
+
var _a, _b;
|
114
|
+
process.env.VIRTUAL_ENV = 'https://server/home/foo/.venv/path';
|
115
|
+
const test_path = '${env:VIRTUAL_ENV}/bar';
|
116
|
+
const path = `${process.env.VIRTUAL_ENV}/bar`;
|
117
|
+
assert_1.default.equal((_a = (0, envVarUtils_1.resolvePathWithEnvVariables)(defaultWorkspace, test_path, [])) === null || _a === void 0 ? void 0 : _a.toString(), path);
|
118
|
+
assert_1.default.equal((_b = (0, envVarUtils_1.resolvePathWithEnvVariables)(normalworkspace, test_path, [])) === null || _b === void 0 ? void 0 : _b.toString(), path);
|
119
|
+
});
|
81
120
|
test('expands ~ with os.homedir()', () => {
|
82
121
|
jest.spyOn(os, 'homedir').mockReturnValue('file:///home/foo');
|
83
122
|
process.env.HOME = '';
|
@@ -86,6 +125,19 @@ describe('expandPathVariables', () => {
|
|
86
125
|
const path = `${os.homedir()}/bar`;
|
87
126
|
assert_1.default.equal((0, envVarUtils_1.expandPathVariables)(test_path, uri_1.Uri.empty(), []), path);
|
88
127
|
});
|
128
|
+
test('resolvePathWithEnvVariables ~ with os.homedir()', () => {
|
129
|
+
jest.spyOn(os, 'homedir').mockReturnValue('c:\\home\\foo');
|
130
|
+
process.env.HOME = '';
|
131
|
+
process.env.USERPROFILE = '';
|
132
|
+
const test_path = '~/bar';
|
133
|
+
const fileUri = uriUtils_1.UriEx.file(`${os.homedir()}/bar`);
|
134
|
+
const defaultResult = (0, envVarUtils_1.resolvePathWithEnvVariables)(defaultWorkspace, test_path, []);
|
135
|
+
const normalResult = (0, envVarUtils_1.resolvePathWithEnvVariables)(normalworkspace, test_path, []);
|
136
|
+
assert_1.default.equal(defaultResult === null || defaultResult === void 0 ? void 0 : defaultResult.scheme, fileUri.scheme);
|
137
|
+
assert_1.default.equal(normalResult === null || normalResult === void 0 ? void 0 : normalResult.scheme, fileUri.scheme);
|
138
|
+
assert_1.default.equal(defaultResult === null || defaultResult === void 0 ? void 0 : defaultResult.getFilePath(), fileUri.getFilePath());
|
139
|
+
assert_1.default.equal(normalResult === null || normalResult === void 0 ? void 0 : normalResult.getFilePath(), fileUri.getFilePath());
|
140
|
+
});
|
89
141
|
test('expands ~ with env:HOME', () => {
|
90
142
|
jest.spyOn(os, 'homedir').mockReturnValue('');
|
91
143
|
process.env.HOME = 'file:///home/foo';
|
@@ -127,4 +179,27 @@ describe('expandPathVariables', () => {
|
|
127
179
|
assert_1.default.equal((0, envVarUtils_1.expandPathVariables)(test_path, uri_1.Uri.empty(), []), path);
|
128
180
|
});
|
129
181
|
});
|
182
|
+
function createWorkspace(rootUri) {
|
183
|
+
const fs = new filesystem_1.TestFileSystem(false);
|
184
|
+
return {
|
185
|
+
workspaceName: '',
|
186
|
+
rootUri,
|
187
|
+
pythonPath: undefined,
|
188
|
+
pythonPathKind: workspaceFactory_1.WorkspacePythonPathKind.Mutable,
|
189
|
+
kinds: [workspaceFactory_1.WellKnownWorkspaceKinds.Test],
|
190
|
+
service: new service_1.AnalyzerService('test service', (0, serviceProviderExtensions_1.createServiceProvider)(fs), {
|
191
|
+
console: new console_1.NullConsole(),
|
192
|
+
hostFactory: () => new testAccessHost_1.TestAccessHost(),
|
193
|
+
importResolverFactory: service_1.AnalyzerService.createImportResolver,
|
194
|
+
configOptions: new configOptions_1.ConfigOptions(uri_1.Uri.empty()),
|
195
|
+
}),
|
196
|
+
disableLanguageServices: false,
|
197
|
+
disableTaggedHints: false,
|
198
|
+
disableOrganizeImports: false,
|
199
|
+
disableWorkspaceSymbol: false,
|
200
|
+
isInitialized: (0, workspaceFactory_1.createInitStatus)(),
|
201
|
+
searchPathsToWatch: [],
|
202
|
+
pythonEnvironmentName: undefined,
|
203
|
+
};
|
204
|
+
}
|
130
205
|
//# sourceMappingURL=envVarUtils.test.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"envVarUtils.test.js","sourceRoot":"","sources":["../../../../../src/tests/envVarUtils.test.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uCAAyB;AAEzB,oDAA4B;AAE5B,
|
1
|
+
{"version":3,"file":"envVarUtils.test.js","sourceRoot":"","sources":["../../../../../src/tests/envVarUtils.test.ts"],"names":[],"mappings":"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"}
|
@@ -35,17 +35,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
36
36
|
const assert_1 = __importDefault(require("assert"));
|
37
37
|
const pathUtils_1 = require("../common/pathUtils");
|
38
|
-
const uri_1 = require("../common/uri/uri");
|
39
38
|
const host = __importStar(require("./harness/testHost"));
|
40
39
|
const factory = __importStar(require("./harness/vfs/factory"));
|
41
40
|
const vfs = __importStar(require("./harness/vfs/filesystem"));
|
41
|
+
const uriUtils_1 = require("../common/uri/uriUtils");
|
42
42
|
test('CreateVFS', () => {
|
43
43
|
const cwd = (0, pathUtils_1.normalizeSlashes)('/');
|
44
44
|
const fs = new vfs.TestFileSystem(/*ignoreCase*/ true, { cwd });
|
45
45
|
assert_1.default.equal(fs.cwd(), cwd);
|
46
46
|
});
|
47
47
|
test('Folders', () => {
|
48
|
-
const cwd =
|
48
|
+
const cwd = uriUtils_1.UriEx.file((0, pathUtils_1.normalizeSlashes)('/'));
|
49
49
|
const fs = new vfs.TestFileSystem(/*ignoreCase*/ true, { cwd: cwd.getFilePath() });
|
50
50
|
// no such dir exist
|
51
51
|
assert_1.default.throws(() => {
|
@@ -62,7 +62,7 @@ test('Folders', () => {
|
|
62
62
|
});
|
63
63
|
});
|
64
64
|
test('Folders Recursive', () => {
|
65
|
-
const cwd =
|
65
|
+
const cwd = uriUtils_1.UriEx.file((0, pathUtils_1.normalizeSlashes)('/'));
|
66
66
|
const fs = new vfs.TestFileSystem(/*ignoreCase*/ true, { cwd: cwd.getFilePath() });
|
67
67
|
// no such dir exist
|
68
68
|
assert_1.default.throws(() => {
|
@@ -73,7 +73,7 @@ test('Folders Recursive', () => {
|
|
73
73
|
(0, assert_1.default)(fs.existsSync(path));
|
74
74
|
});
|
75
75
|
test('Files', () => {
|
76
|
-
const cwd =
|
76
|
+
const cwd = uriUtils_1.UriEx.file((0, pathUtils_1.normalizeSlashes)('/'));
|
77
77
|
const fs = new vfs.TestFileSystem(/*ignoreCase*/ true, { cwd: cwd.getFilePath() });
|
78
78
|
const uri = cwd.combinePaths('1.txt');
|
79
79
|
fs.writeFileSync(uri, 'hello', 'utf8');
|
@@ -99,11 +99,11 @@ test('CreateRich', () => {
|
|
99
99
|
const entries = fs.scanSync(cwd, 'descendants-or-self', {});
|
100
100
|
// files + directory + root
|
101
101
|
assert_1.default.equal(entries.length, 10);
|
102
|
-
assert_1.default.equal(fs.readFileSync(
|
103
|
-
assert_1.default.equal(fs.readFileSync(
|
104
|
-
assert_1.default.equal(fs.readFileSync(
|
105
|
-
assert_1.default.equal(fs.readFileSync(
|
106
|
-
assert_1.default.equal(fs.readFileSync(
|
102
|
+
assert_1.default.equal(fs.readFileSync(uriUtils_1.UriEx.file((0, pathUtils_1.normalizeSlashes)('/a/b/c/1.txt')), 'ascii'), 'hello1');
|
103
|
+
assert_1.default.equal(fs.readFileSync(uriUtils_1.UriEx.file((0, pathUtils_1.normalizeSlashes)('/a/b/2.txt')), 'utf8'), 'hello2');
|
104
|
+
assert_1.default.equal(fs.readFileSync(uriUtils_1.UriEx.file((0, pathUtils_1.normalizeSlashes)('/a/3.txt')), 'utf-8'), 'hello3');
|
105
|
+
assert_1.default.equal(fs.readFileSync(uriUtils_1.UriEx.file((0, pathUtils_1.normalizeSlashes)('/4.txt')), 'utf16le'), 'hello4');
|
106
|
+
assert_1.default.equal(fs.readFileSync(uriUtils_1.UriEx.file((0, pathUtils_1.normalizeSlashes)('/a/c/5.txt')), 'ucs2'), 'hello5');
|
107
107
|
});
|
108
108
|
test('Shadow', () => {
|
109
109
|
const cwd = (0, pathUtils_1.normalizeSlashes)('/');
|
@@ -126,7 +126,7 @@ test('Shadow', () => {
|
|
126
126
|
(0, assert_1.default)(shadow2.shadowRoot === shadow1);
|
127
127
|
});
|
128
128
|
test('Diffing', () => {
|
129
|
-
const cwd =
|
129
|
+
const cwd = uriUtils_1.UriEx.file((0, pathUtils_1.normalizeSlashes)('/'));
|
130
130
|
const fs = new vfs.TestFileSystem(/*ignoreCase*/ true, { cwd: cwd.getFilePath() });
|
131
131
|
// first snapshot
|
132
132
|
fs.snapshot();
|
@@ -163,11 +163,11 @@ test('createFromFileSystem1', () => {
|
|
163
163
|
const entries = fs.readdirSync(factory.typeshedFolder);
|
164
164
|
(0, assert_1.default)(entries.length > 0);
|
165
165
|
// confirm file
|
166
|
-
assert_1.default.equal(fs.readFileSync(
|
166
|
+
assert_1.default.equal(fs.readFileSync(uriUtils_1.UriEx.file(filepath), 'utf8'), content);
|
167
167
|
});
|
168
168
|
test('createFromFileSystem2', () => {
|
169
169
|
const fs = factory.createFromFileSystem(host.HOST, /* ignoreCase */ true, { cwd: factory.srcFolder });
|
170
|
-
const entries = fs.readdirSync(
|
170
|
+
const entries = fs.readdirSync(uriUtils_1.UriEx.file(factory.typeshedFolder.getFilePath().toUpperCase()));
|
171
171
|
(0, assert_1.default)(entries.length > 0);
|
172
172
|
});
|
173
173
|
test('createFromFileSystemWithCustomTypeshedPath', () => {
|
@@ -184,7 +184,7 @@ test('createFromFileSystemWithMetadata', () => {
|
|
184
184
|
cwd: factory.srcFolder,
|
185
185
|
meta: { unused: 'unused' },
|
186
186
|
});
|
187
|
-
(0, assert_1.default)(fs.existsSync(
|
187
|
+
(0, assert_1.default)(fs.existsSync(uriUtils_1.UriEx.file(factory.srcFolder)));
|
188
188
|
});
|
189
189
|
function countFile(files) {
|
190
190
|
let count = 0;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"filesystem.test.js","sourceRoot":"","sources":["../../../../../src/tests/filesystem.test.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,oDAA4B;AAE5B,mDAAqE;AACrE,
|
1
|
+
{"version":3,"file":"filesystem.test.js","sourceRoot":"","sources":["../../../../../src/tests/filesystem.test.ts"],"names":[],"mappings":"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"}
|
@@ -37,10 +37,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
37
37
|
const assert_1 = __importDefault(require("assert"));
|
38
38
|
const pathUtils_1 = require("../common/pathUtils");
|
39
39
|
const stringUtils_1 = require("../common/stringUtils");
|
40
|
-
const uri_1 = require("../common/uri/uri");
|
41
40
|
const fourSlashParser_1 = require("./harness/fourslash/fourSlashParser");
|
42
41
|
const host = __importStar(require("./harness/testHost"));
|
43
42
|
const factory = __importStar(require("./harness/vfs/factory"));
|
43
|
+
const uriUtils_1 = require("../common/uri/uriUtils");
|
44
44
|
test('GlobalOptions', () => {
|
45
45
|
const code = `
|
46
46
|
// global options
|
@@ -112,7 +112,7 @@ test('Range', () => {
|
|
112
112
|
const data = (0, fourSlashParser_1.parseTestData)('.', code, 'test.py');
|
113
113
|
assert_1.default.equal(data.files[0].content, content);
|
114
114
|
assert_1.default.deepEqual(data.ranges, [
|
115
|
-
{ fileName: 'test.py', fileUri:
|
115
|
+
{ fileName: 'test.py', fileUri: uriUtils_1.UriEx.file('test.py'), pos: 13, end: 17, marker: undefined },
|
116
116
|
]);
|
117
117
|
});
|
118
118
|
test('Marker', () => {
|
@@ -124,7 +124,7 @@ test('Marker', () => {
|
|
124
124
|
pass`;
|
125
125
|
const data = (0, fourSlashParser_1.parseTestData)('.', code, 'test.py');
|
126
126
|
assert_1.default.equal(data.files[0].content, content);
|
127
|
-
const marker = { fileName: 'test.py', fileUri:
|
127
|
+
const marker = { fileName: 'test.py', fileUri: uriUtils_1.UriEx.file('test.py'), position: 13 };
|
128
128
|
assert_1.default.deepEqual(data.markers, [marker]);
|
129
129
|
assert_1.default.deepEqual(data.markerPositions.get('marker1'), marker);
|
130
130
|
});
|
@@ -139,7 +139,7 @@ test('MarkerWithData', () => {
|
|
139
139
|
const data = (0, fourSlashParser_1.parseTestData)('.', code, 'test.py');
|
140
140
|
assert_1.default.equal(data.files[0].content, content);
|
141
141
|
assert_1.default.deepEqual(data.markers, [
|
142
|
-
{ fileName: 'test.py', fileUri:
|
142
|
+
{ fileName: 'test.py', fileUri: uriUtils_1.UriEx.file('test.py'), position: 13, data: { data1: '1', data2: '2' } },
|
143
143
|
]);
|
144
144
|
assert_1.default.equal(data.markerPositions.size, 0);
|
145
145
|
});
|
@@ -155,7 +155,7 @@ test('MarkerWithDataAndName', () => {
|
|
155
155
|
assert_1.default.equal(data.files[0].content, content);
|
156
156
|
const marker = {
|
157
157
|
fileName: 'test.py',
|
158
|
-
fileUri:
|
158
|
+
fileUri: uriUtils_1.UriEx.file('test.py'),
|
159
159
|
position: 13,
|
160
160
|
data: { name: 'marker1', data1: '1', data2: '2' },
|
161
161
|
};
|
@@ -172,10 +172,10 @@ test('RangeWithMarker', () => {
|
|
172
172
|
pass`;
|
173
173
|
const data = (0, fourSlashParser_1.parseTestData)('.', code, 'test.py');
|
174
174
|
assert_1.default.equal(data.files[0].content, content);
|
175
|
-
const marker = { fileName: 'test.py', fileUri:
|
175
|
+
const marker = { fileName: 'test.py', fileUri: uriUtils_1.UriEx.file('test.py'), position: 13 };
|
176
176
|
assert_1.default.deepEqual(data.markers, [marker]);
|
177
177
|
assert_1.default.deepEqual(data.markerPositions.get('marker1'), marker);
|
178
|
-
assert_1.default.deepEqual(data.ranges, [{ fileName: 'test.py', fileUri:
|
178
|
+
assert_1.default.deepEqual(data.ranges, [{ fileName: 'test.py', fileUri: uriUtils_1.UriEx.file('test.py'), pos: 13, end: 17, marker }]);
|
179
179
|
});
|
180
180
|
test('RangeWithMarkerAndJsonData', () => {
|
181
181
|
// range can have 1 marker in it
|
@@ -189,13 +189,13 @@ test('RangeWithMarkerAndJsonData', () => {
|
|
189
189
|
assert_1.default.equal(data.files[0].content, content);
|
190
190
|
const marker = {
|
191
191
|
fileName: 'test.py',
|
192
|
-
fileUri:
|
192
|
+
fileUri: uriUtils_1.UriEx.file('test.py'),
|
193
193
|
position: 13,
|
194
194
|
data: { name: 'marker1', data1: '1', data2: '2' },
|
195
195
|
};
|
196
196
|
assert_1.default.deepEqual(data.markers, [marker]);
|
197
197
|
assert_1.default.deepEqual(data.markerPositions.get(marker.data.name), marker);
|
198
|
-
assert_1.default.deepEqual(data.ranges, [{ fileName: 'test.py', fileUri:
|
198
|
+
assert_1.default.deepEqual(data.ranges, [{ fileName: 'test.py', fileUri: uriUtils_1.UriEx.file('test.py'), pos: 13, end: 17, marker }]);
|
199
199
|
});
|
200
200
|
test('Multiple Files', () => {
|
201
201
|
// range can have 1 marker in it
|
@@ -286,7 +286,7 @@ test('fourSlashWithFileSystem', () => {
|
|
286
286
|
cwd: (0, pathUtils_1.normalizeSlashes)('/'),
|
287
287
|
});
|
288
288
|
for (const file of data.files) {
|
289
|
-
assert_1.default.equal(fs.readFileSync(
|
289
|
+
assert_1.default.equal(fs.readFileSync(file.fileUri, 'utf8'), getContent((0, pathUtils_1.getBaseFileName)(file.fileName, '.py', false)));
|
290
290
|
}
|
291
291
|
});
|
292
292
|
function getContent(className) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"fourSlashParser.test.js","sourceRoot":"","sources":["../../../../../src/tests/fourSlashParser.test.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"fourSlashParser.test.js","sourceRoot":"","sources":["../../../../../src/tests/fourSlashParser.test.ts"],"names":[],"mappings":"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"}
|
@@ -11,7 +11,7 @@ exports.parseTestData = void 0;
|
|
11
11
|
const collectionUtils_1 = require("../../../common/collectionUtils");
|
12
12
|
const core_1 = require("../../../common/core");
|
13
13
|
const pathUtils_1 = require("../../../common/pathUtils");
|
14
|
-
const
|
14
|
+
const uriUtils_1 = require("../../../common/uri/uriUtils");
|
15
15
|
const factory_1 = require("../vfs/factory");
|
16
16
|
const fourSlashTypes_1 = require("./fourSlashTypes");
|
17
17
|
/**
|
@@ -54,7 +54,8 @@ function parseTestData(basePath, contents, fileName) {
|
|
54
54
|
if ((0, core_1.toBoolean)(currentFileOptions["distlibrary" /* MetadataOptionNames.distLibrary */])) {
|
55
55
|
currentFileName = (0, pathUtils_1.normalizePath)((0, pathUtils_1.combinePaths)(factory_1.distlibFolder.getFilePath(), (0, pathUtils_1.getRelativePath)(currentFileName, normalizedBasePath)));
|
56
56
|
}
|
57
|
-
const
|
57
|
+
const ignoreCase = (0, core_1.toBoolean)(globalOptions["ignorecase" /* GlobalMetadataOptionNames.ignoreCase */]);
|
58
|
+
const file = parseFileContent(currentFileContent, currentFileName, ignoreCase, markerPositions, markers, ranges);
|
58
59
|
file.fileOptions = currentFileOptions;
|
59
60
|
// Store result file
|
60
61
|
files.push(file);
|
@@ -136,7 +137,7 @@ function reportError(fileName, line, col, message) {
|
|
136
137
|
const errorMessage = `${fileName}(${line},${col}): ${message}`;
|
137
138
|
throw new Error(errorMessage);
|
138
139
|
}
|
139
|
-
function recordObjectMarker(fileName, location, text, markerMap, markers) {
|
140
|
+
function recordObjectMarker(fileName, ignoreCase, location, text, markerMap, markers) {
|
140
141
|
let markerValue;
|
141
142
|
try {
|
142
143
|
// Attempt to parse the marker value as JSON
|
@@ -151,7 +152,7 @@ function recordObjectMarker(fileName, location, text, markerMap, markers) {
|
|
151
152
|
}
|
152
153
|
const marker = {
|
153
154
|
fileName,
|
154
|
-
fileUri:
|
155
|
+
fileUri: uriUtils_1.UriEx.file(fileName, !ignoreCase),
|
155
156
|
position: location.position,
|
156
157
|
data: markerValue,
|
157
158
|
};
|
@@ -162,10 +163,10 @@ function recordObjectMarker(fileName, location, text, markerMap, markers) {
|
|
162
163
|
markers.push(marker);
|
163
164
|
return marker;
|
164
165
|
}
|
165
|
-
function recordMarker(fileName, location, name, markerMap, markers) {
|
166
|
+
function recordMarker(fileName, ignoreCase, location, name, markerMap, markers) {
|
166
167
|
const marker = {
|
167
168
|
fileName,
|
168
|
-
fileUri:
|
169
|
+
fileUri: uriUtils_1.UriEx.file(fileName, !ignoreCase),
|
169
170
|
position: location.position,
|
170
171
|
};
|
171
172
|
// Verify markers for uniqueness
|
@@ -180,7 +181,7 @@ function recordMarker(fileName, location, name, markerMap, markers) {
|
|
180
181
|
return marker;
|
181
182
|
}
|
182
183
|
}
|
183
|
-
function parseFileContent(content, fileName, markerMap, markers, ranges) {
|
184
|
+
function parseFileContent(content, fileName, ignoreCase, markerMap, markers, ranges) {
|
184
185
|
content = chompLeadingSpace(content);
|
185
186
|
// Any slash-star comment with a character not in this string is not a marker.
|
186
187
|
const validMarkerChars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz$1234567890_';
|
@@ -233,7 +234,7 @@ function parseFileContent(content, fileName, markerMap, markers, ranges) {
|
|
233
234
|
}
|
234
235
|
const range = {
|
235
236
|
fileName,
|
236
|
-
fileUri:
|
237
|
+
fileUri: uriUtils_1.UriEx.file(fileName, !ignoreCase),
|
237
238
|
pos: rangeStart.position,
|
238
239
|
end: i - 1 - difference,
|
239
240
|
marker: rangeStart.marker,
|
@@ -271,7 +272,7 @@ function parseFileContent(content, fileName, markerMap, markers, ranges) {
|
|
271
272
|
if (previousChar === '|' && currentChar === '}') {
|
272
273
|
// Record the marker
|
273
274
|
const objectMarkerNameText = content.substring(openMarker.sourcePosition + 2, i - 1).trim();
|
274
|
-
const marker = recordObjectMarker(fileName, openMarker, objectMarkerNameText, markerMap, markers);
|
275
|
+
const marker = recordObjectMarker(fileName, ignoreCase, openMarker, objectMarkerNameText, markerMap, markers);
|
275
276
|
if (openRanges.length > 0) {
|
276
277
|
openRanges[openRanges.length - 1].marker = marker;
|
277
278
|
}
|
@@ -288,7 +289,7 @@ function parseFileContent(content, fileName, markerMap, markers, ranges) {
|
|
288
289
|
// Record the marker
|
289
290
|
// start + 2 to ignore the */, -1 on the end to ignore the * (/ is next)
|
290
291
|
const markerNameText = content.substring(openMarker.sourcePosition + 2, i - 1).trim();
|
291
|
-
const marker = recordMarker(fileName, openMarker, markerNameText, markerMap, markers);
|
292
|
+
const marker = recordMarker(fileName, ignoreCase, openMarker, markerNameText, markerMap, markers);
|
292
293
|
if (openRanges.length > 0) {
|
293
294
|
openRanges[openRanges.length - 1].marker = marker;
|
294
295
|
}
|
@@ -347,6 +348,7 @@ function parseFileContent(content, fileName, markerMap, markers, ranges) {
|
|
347
348
|
fileOptions: {},
|
348
349
|
version: 0,
|
349
350
|
fileName,
|
351
|
+
fileUri: uriUtils_1.UriEx.file(fileName, !ignoreCase),
|
350
352
|
};
|
351
353
|
}
|
352
354
|
function chompLeadingSpace(content) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"fourSlashParser.js","sourceRoot":"","sources":["../../../../../../../src/tests/harness/fourslash/fourSlashParser.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"fourSlashParser.js","sourceRoot":"","sources":["../../../../../../../src/tests/harness/fourslash/fourSlashParser.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"fourSlashTypes.js","sourceRoot":"","sources":["../../../../../../../src/tests/harness/fourslash/fourSlashTypes.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;GAMG;AACH,6DAA+C;AAG/C,qCAAqC;AACrC,IAAkB,yBAOjB;AAPD,WAAkB,yBAAyB;IACvC,wDAA2B,CAAA;IAC3B,sDAAyB,CAAA;IACzB,kDAAqB,CAAA;IACrB,gDAAmB,CAAA;IACnB,0EAA6C,CAAA;IAC7C,8DAAiC,CAAA;AACrC,CAAC,EAPiB,yBAAyB,yCAAzB,yBAAyB,QAO1C;AAED,mEAAmE;AACnE,IAAkB,mBAKjB;AALD,WAAkB,mBAAmB;IACjC,4CAAqB,CAAA;IACrB,0CAAmB,CAAA;IACnB,kDAA2B,CAAA;IAC3B,kDAA2B,CAAA;AAC/B,CAAC,EALiB,mBAAmB,mCAAnB,mBAAmB,QAKpC;AAED,0CAA0C;AAC7B,QAAA,iBAAiB,GAAG;;;;;CAKhC,CAAC;
|
1
|
+
{"version":3,"file":"fourSlashTypes.js","sourceRoot":"","sources":["../../../../../../../src/tests/harness/fourslash/fourSlashTypes.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;GAMG;AACH,6DAA+C;AAG/C,qCAAqC;AACrC,IAAkB,yBAOjB;AAPD,WAAkB,yBAAyB;IACvC,wDAA2B,CAAA;IAC3B,sDAAyB,CAAA;IACzB,kDAAqB,CAAA;IACrB,gDAAmB,CAAA;IACnB,0EAA6C,CAAA;IAC7C,8DAAiC,CAAA;AACrC,CAAC,EAPiB,yBAAyB,yCAAzB,yBAAyB,QAO1C;AAED,mEAAmE;AACnE,IAAkB,mBAKjB;AALD,WAAkB,mBAAmB;IACjC,4CAAqB,CAAA;IACrB,0CAAmB,CAAA;IACnB,kDAA2B,CAAA;IAC3B,kDAA2B,CAAA;AAC/B,CAAC,EALiB,mBAAmB,mCAAnB,mBAAmB,QAKpC;AAED,0CAA0C;AAC7B,QAAA,iBAAiB,GAAG;;;;;CAKhC,CAAC;AA2EF,MAAa,qBAAqB;IAAlC;QAKY,qCAAgC,GAAG,qBAAqB,CAAC,YAAY,CAAC;IAuBlF,CAAC;IArBG,uBAAuB;QACnB,IAAI,IAAI,CAAC,gCAAgC,GAAG,CAAC,EAAE;YAC3C,OAAO,KAAK,CAAC;SAChB;QAED,IAAI,IAAI,CAAC,gCAAgC,GAAG,CAAC,EAAE;YAC3C,IAAI,CAAC,gCAAgC,EAAE,CAAC;YACxC,OAAO,KAAK,CAAC;SAChB;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,YAAY,CAAC,aAAa,GAAG,CAAC;QAC1B,KAAK,CAAC,MAAM,CAAC,aAAa,IAAI,CAAC,CAAC,CAAC;QACjC,IAAI,CAAC,gCAAgC,GAAG,aAAa,CAAC;IAC1D,CAAC;IAED,cAAc;QACV,IAAI,CAAC,gCAAgC,GAAG,qBAAqB,CAAC,YAAY,CAAC;IAC/E,CAAC;;AA3BL,sDA4BC;AA3BG,gBAAgB;AAChB,qBAAqB;AACrB,4GAA4G;AACpF,kCAAY,GAAG,CAAC,CAAC,AAAL,CAAM"}
|
@@ -5,9 +5,10 @@ import { AnalyzerServiceOptions } from '../../../analyzer/service';
|
|
5
5
|
import { BackgroundAnalysisBase } from '../../../backgroundAnalysisBase';
|
6
6
|
import { ConsoleInterface } from '../../../common/console';
|
7
7
|
import { FileSystem } from '../../../common/fileSystem';
|
8
|
+
import { ServiceProvider } from '../../../common/serviceProvider';
|
8
9
|
import { Range } from '../../../common/textRange';
|
9
10
|
import { Uri } from '../../../common/uri/uri';
|
10
|
-
import { LanguageServerInterface, MessageAction, ServerSettings, WindowInterface } from '../../../
|
11
|
+
import { LanguageServerInterface, MessageAction, ServerSettings, WindowInterface } from '../../../common/languageServerInterface';
|
11
12
|
import { Workspace } from '../../../workspaceFactory';
|
12
13
|
import { HostSpecificFeatures } from './testState';
|
13
14
|
export declare class TestFeatures implements HostSpecificFeatures {
|
@@ -20,9 +21,9 @@ export declare class TestFeatures implements HostSpecificFeatures {
|
|
20
21
|
export declare class TestLanguageService implements LanguageServerInterface {
|
21
22
|
readonly console: ConsoleInterface;
|
22
23
|
readonly fs: FileSystem;
|
23
|
-
readonly rootUri: Uri;
|
24
24
|
readonly window: TestWindow;
|
25
25
|
readonly supportAdvancedEdits = true;
|
26
|
+
readonly serviceProvider: ServiceProvider;
|
26
27
|
private readonly _workspace;
|
27
28
|
private readonly _defaultWorkspace;
|
28
29
|
constructor(workspace: Workspace, console: ConsoleInterface, fs: FileSystem, options?: AnalyzerServiceOptions);
|