@zzzen/pyright-internal 1.2.0-dev.20231203 → 1.2.0-dev.20231217
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/analyzer/analyzerFileInfo.d.ts +4 -3
- package/dist/analyzer/analyzerFileInfo.js.map +1 -1
- package/dist/analyzer/backgroundAnalysisProgram.d.ts +15 -14
- package/dist/analyzer/backgroundAnalysisProgram.js +38 -38
- package/dist/analyzer/backgroundAnalysisProgram.js.map +1 -1
- package/dist/analyzer/binder.js +67 -62
- package/dist/analyzer/binder.js.map +1 -1
- package/dist/analyzer/checker.js +43 -33
- package/dist/analyzer/checker.js.map +1 -1
- package/dist/analyzer/circularDependency.d.ts +3 -2
- package/dist/analyzer/circularDependency.js.map +1 -1
- package/dist/analyzer/codeFlowEngine.js +47 -47
- package/dist/analyzer/codeFlowEngine.js.map +1 -1
- package/dist/analyzer/codeFlowTypes.d.ts +0 -1
- package/dist/analyzer/codeFlowTypes.js.map +1 -1
- package/dist/analyzer/constraintSolver.js +3 -5
- package/dist/analyzer/constraintSolver.js.map +1 -1
- package/dist/analyzer/dataClasses.js +1 -1
- package/dist/analyzer/dataClasses.js.map +1 -1
- package/dist/analyzer/declaration.d.ts +5 -3
- package/dist/analyzer/declaration.js +3 -2
- package/dist/analyzer/declaration.js.map +1 -1
- package/dist/analyzer/declarationUtils.d.ts +3 -2
- package/dist/analyzer/declarationUtils.js +14 -12
- package/dist/analyzer/declarationUtils.js.map +1 -1
- package/dist/analyzer/decorators.js +14 -43
- package/dist/analyzer/decorators.js.map +1 -1
- package/dist/analyzer/enums.js +1 -1
- package/dist/analyzer/enums.js.map +1 -1
- package/dist/analyzer/importResolver.d.ts +29 -25
- package/dist/analyzer/importResolver.js +300 -301
- package/dist/analyzer/importResolver.js.map +1 -1
- package/dist/analyzer/importResult.d.ts +5 -4
- package/dist/analyzer/importResult.js.map +1 -1
- package/dist/analyzer/importStatementUtils.d.ts +5 -4
- package/dist/analyzer/importStatementUtils.js +23 -22
- package/dist/analyzer/importStatementUtils.js.map +1 -1
- package/dist/analyzer/namedTuples.js +3 -3
- package/dist/analyzer/namedTuples.js.map +1 -1
- package/dist/analyzer/packageTypeReport.d.ts +7 -6
- package/dist/analyzer/packageTypeReport.js +4 -4
- package/dist/analyzer/packageTypeReport.js.map +1 -1
- package/dist/analyzer/packageTypeVerifier.js +68 -64
- package/dist/analyzer/packageTypeVerifier.js.map +1 -1
- package/dist/analyzer/parentDirectoryCache.d.ts +7 -6
- package/dist/analyzer/parentDirectoryCache.js +9 -10
- package/dist/analyzer/parentDirectoryCache.js.map +1 -1
- package/dist/analyzer/parseTreeUtils.d.ts +1 -1
- package/dist/analyzer/parseTreeUtils.js +7 -4
- package/dist/analyzer/parseTreeUtils.js.map +1 -1
- package/dist/analyzer/patternMatching.js +102 -14
- package/dist/analyzer/patternMatching.js.map +1 -1
- package/dist/analyzer/program.d.ts +27 -26
- package/dist/analyzer/program.js +162 -156
- package/dist/analyzer/program.js.map +1 -1
- package/dist/analyzer/properties.js +6 -3
- package/dist/analyzer/properties.js.map +1 -1
- package/dist/analyzer/pyTypedUtils.d.ts +3 -2
- package/dist/analyzer/pyTypedUtils.js +4 -5
- package/dist/analyzer/pyTypedUtils.js.map +1 -1
- package/dist/analyzer/pythonPathUtils.d.ts +7 -6
- package/dist/analyzer/pythonPathUtils.js +21 -23
- package/dist/analyzer/pythonPathUtils.js.map +1 -1
- package/dist/analyzer/service.d.ts +24 -23
- package/dist/analyzer/service.js +190 -184
- package/dist/analyzer/service.js.map +1 -1
- package/dist/analyzer/sourceFile.d.ts +4 -5
- package/dist/analyzer/sourceFile.js +68 -56
- package/dist/analyzer/sourceFile.js.map +1 -1
- package/dist/analyzer/sourceFileInfoUtils.js +3 -3
- package/dist/analyzer/sourceFileInfoUtils.js.map +1 -1
- package/dist/analyzer/sourceMapper.d.ts +11 -10
- package/dist/analyzer/sourceMapper.js +61 -63
- package/dist/analyzer/sourceMapper.js.map +1 -1
- package/dist/analyzer/sourceMapperUtils.d.ts +2 -1
- package/dist/analyzer/sourceMapperUtils.js +2 -2
- package/dist/analyzer/sourceMapperUtils.js.map +1 -1
- package/dist/analyzer/tracePrinter.d.ts +3 -2
- package/dist/analyzer/tracePrinter.js +21 -23
- package/dist/analyzer/tracePrinter.js.map +1 -1
- package/dist/analyzer/typeDocStringUtils.d.ts +2 -1
- package/dist/analyzer/typeDocStringUtils.js +14 -17
- package/dist/analyzer/typeDocStringUtils.js.map +1 -1
- package/dist/analyzer/typeEvaluator.js +259 -152
- package/dist/analyzer/typeEvaluator.js.map +1 -1
- package/dist/analyzer/typeGuards.d.ts +1 -0
- package/dist/analyzer/typeGuards.js +5 -4
- package/dist/analyzer/typeGuards.js.map +1 -1
- package/dist/analyzer/typePrinter.d.ts +2 -0
- package/dist/analyzer/typePrinter.js +48 -8
- package/dist/analyzer/typePrinter.js.map +1 -1
- package/dist/analyzer/typeStubWriter.d.ts +2 -1
- package/dist/analyzer/typeStubWriter.js +2 -2
- package/dist/analyzer/typeStubWriter.js.map +1 -1
- package/dist/analyzer/typeUtils.d.ts +5 -2
- package/dist/analyzer/typeUtils.js +37 -10
- package/dist/analyzer/typeUtils.js.map +1 -1
- package/dist/analyzer/typedDicts.js +4 -4
- package/dist/analyzer/typedDicts.js.map +1 -1
- package/dist/analyzer/types.d.ts +10 -6
- package/dist/analyzer/types.js +7 -5
- package/dist/analyzer/types.js.map +1 -1
- package/dist/backgroundAnalysis.d.ts +1 -2
- package/dist/backgroundAnalysis.js +6 -4
- package/dist/backgroundAnalysis.js.map +1 -1
- package/dist/backgroundAnalysisBase.d.ts +22 -20
- package/dist/backgroundAnalysisBase.js +76 -55
- package/dist/backgroundAnalysisBase.js.map +1 -1
- package/dist/backgroundThreadBase.d.ts +1 -1
- package/dist/backgroundThreadBase.js +20 -11
- package/dist/backgroundThreadBase.js.map +1 -1
- package/dist/commands/createTypeStub.js +3 -2
- package/dist/commands/createTypeStub.js.map +1 -1
- package/dist/commands/dumpFileDebugInfoCommand.js +21 -20
- package/dist/commands/dumpFileDebugInfoCommand.js.map +1 -1
- package/dist/commands/quickActionCommand.js +5 -5
- package/dist/commands/quickActionCommand.js.map +1 -1
- package/dist/common/configOptions.d.ts +14 -13
- package/dist/common/configOptions.js +29 -27
- package/dist/common/configOptions.js.map +1 -1
- package/dist/common/diagnostic.d.ts +6 -5
- package/dist/common/diagnostic.js +2 -2
- package/dist/common/diagnostic.js.map +1 -1
- package/dist/common/diagnosticSink.d.ts +2 -1
- package/dist/common/diagnosticSink.js.map +1 -1
- package/dist/common/editAction.d.ts +6 -5
- package/dist/common/editAction.js +2 -2
- package/dist/common/editAction.js.map +1 -1
- package/dist/common/envVarUtils.d.ts +2 -1
- package/dist/common/envVarUtils.js +20 -28
- package/dist/common/envVarUtils.js.map +1 -1
- package/dist/common/extensibility.d.ts +19 -19
- package/dist/common/extensibility.js.map +1 -1
- package/dist/common/fileSystem.d.ts +29 -28
- package/dist/common/fileWatcher.d.ts +2 -1
- package/dist/common/fileWatcher.js.map +1 -1
- package/dist/common/fullAccessHost.d.ts +8 -7
- package/dist/common/fullAccessHost.js +21 -16
- package/dist/common/fullAccessHost.js.map +1 -1
- package/dist/common/host.d.ts +7 -6
- package/dist/common/host.js +1 -1
- package/dist/common/host.js.map +1 -1
- package/dist/common/logTracker.d.ts +2 -1
- package/dist/common/logTracker.js +4 -4
- package/dist/common/logTracker.js.map +1 -1
- package/dist/common/pathUtils.d.ts +1 -28
- package/dist/common/pathUtils.js +17 -366
- package/dist/common/pathUtils.js.map +1 -1
- package/dist/common/realFileSystem.d.ts +7 -3
- package/dist/common/realFileSystem.js +78 -60
- package/dist/common/realFileSystem.js.map +1 -1
- package/dist/common/serviceProviderExtensions.d.ts +2 -1
- package/dist/common/serviceProviderExtensions.js +5 -2
- package/dist/common/serviceProviderExtensions.js.map +1 -1
- package/dist/common/textEditTracker.d.ts +2 -1
- package/dist/common/textEditTracker.js +28 -28
- package/dist/common/textEditTracker.js.map +1 -1
- package/dist/common/textRange.d.ts +2 -1
- package/dist/common/textRange.js.map +1 -1
- package/dist/common/uri/baseUri.d.ts +51 -0
- package/dist/common/uri/baseUri.js +194 -0
- package/dist/common/uri/baseUri.js.map +1 -0
- package/dist/common/uri/emptyUri.d.ts +32 -0
- package/dist/common/uri/emptyUri.js +98 -0
- package/dist/common/uri/emptyUri.js.map +1 -0
- package/dist/common/uri/fileUri.d.ts +36 -0
- package/dist/common/uri/fileUri.js +180 -0
- package/dist/common/uri/fileUri.js.map +1 -0
- package/dist/common/uri/memoization.d.ts +3 -0
- package/dist/common/uri/memoization.js +72 -0
- package/dist/common/uri/memoization.js.map +1 -0
- package/dist/common/uri/uri.d.ts +50 -0
- package/dist/common/uri/uri.js +104 -0
- package/dist/common/uri/uri.js.map +1 -0
- package/dist/common/uri/uriUtils.d.ts +39 -0
- package/dist/common/uri/uriUtils.js +362 -0
- package/dist/common/uri/uriUtils.js.map +1 -0
- package/dist/common/uri/webUri.d.ts +36 -0
- package/dist/common/uri/webUri.js +207 -0
- package/dist/common/uri/webUri.js.map +1 -0
- package/dist/common/workspaceEditUtils.d.ts +8 -8
- package/dist/common/workspaceEditUtils.js +35 -38
- package/dist/common/workspaceEditUtils.js.map +1 -1
- package/dist/languageServerBase.d.ts +19 -22
- package/dist/languageServerBase.js +91 -95
- package/dist/languageServerBase.js.map +1 -1
- package/dist/languageService/analyzerServiceExecutor.d.ts +2 -1
- package/dist/languageService/analyzerServiceExecutor.js +14 -16
- package/dist/languageService/analyzerServiceExecutor.js.map +1 -1
- package/dist/languageService/autoImporter.d.ts +11 -9
- package/dist/languageService/autoImporter.js +45 -44
- package/dist/languageService/autoImporter.js.map +1 -1
- package/dist/languageService/callHierarchyProvider.d.ts +3 -2
- package/dist/languageService/callHierarchyProvider.js +23 -35
- package/dist/languageService/callHierarchyProvider.js.map +1 -1
- package/dist/languageService/codeActionProvider.d.ts +2 -1
- package/dist/languageService/codeActionProvider.js +8 -10
- package/dist/languageService/codeActionProvider.js.map +1 -1
- package/dist/languageService/completionProvider.d.ts +7 -6
- package/dist/languageService/completionProvider.js +32 -30
- package/dist/languageService/completionProvider.js.map +1 -1
- package/dist/languageService/completionProviderUtils.d.ts +2 -1
- package/dist/languageService/completionProviderUtils.js +1 -1
- package/dist/languageService/completionProviderUtils.js.map +1 -1
- package/dist/languageService/definitionProvider.d.ts +4 -3
- package/dist/languageService/definitionProvider.js +26 -24
- package/dist/languageService/definitionProvider.js.map +1 -1
- package/dist/languageService/documentHighlightProvider.d.ts +3 -2
- package/dist/languageService/documentHighlightProvider.js +3 -3
- package/dist/languageService/documentHighlightProvider.js.map +1 -1
- package/dist/languageService/documentSymbolCollector.js +8 -7
- package/dist/languageService/documentSymbolCollector.js.map +1 -1
- package/dist/languageService/documentSymbolProvider.d.ts +5 -4
- package/dist/languageService/documentSymbolProvider.js +9 -11
- package/dist/languageService/documentSymbolProvider.js.map +1 -1
- package/dist/languageService/hoverProvider.d.ts +4 -3
- package/dist/languageService/hoverProvider.js +6 -5
- package/dist/languageService/hoverProvider.js.map +1 -1
- package/dist/languageService/navigationUtils.d.ts +2 -1
- package/dist/languageService/navigationUtils.js +2 -3
- package/dist/languageService/navigationUtils.js.map +1 -1
- package/dist/languageService/quickActions.d.ts +2 -1
- package/dist/languageService/quickActions.js +3 -3
- package/dist/languageService/quickActions.js.map +1 -1
- package/dist/languageService/referencesProvider.d.ts +10 -9
- package/dist/languageService/referencesProvider.js +28 -28
- package/dist/languageService/referencesProvider.js.map +1 -1
- package/dist/languageService/renameProvider.d.ts +4 -3
- package/dist/languageService/renameProvider.js +17 -18
- package/dist/languageService/renameProvider.js.map +1 -1
- package/dist/languageService/signatureHelpProvider.d.ts +3 -2
- package/dist/languageService/signatureHelpProvider.js +4 -4
- package/dist/languageService/signatureHelpProvider.js.map +1 -1
- package/dist/languageService/symbolIndexer.d.ts +2 -1
- package/dist/languageService/symbolIndexer.js +11 -3
- package/dist/languageService/symbolIndexer.js.map +1 -1
- package/dist/languageService/tooltipUtils.js +10 -4
- package/dist/languageService/tooltipUtils.js.map +1 -1
- package/dist/languageService/workspaceSymbolProvider.d.ts +4 -3
- package/dist/languageService/workspaceSymbolProvider.js +10 -11
- package/dist/languageService/workspaceSymbolProvider.js.map +1 -1
- package/dist/localization/localize.d.ts +2 -0
- package/dist/localization/localize.js +2 -0
- package/dist/localization/localize.js.map +1 -1
- package/dist/localization/package.nls.en-us.json +3 -1
- package/dist/parser/parseNodes.d.ts +1 -0
- package/dist/parser/parseNodes.js +1 -0
- package/dist/parser/parseNodes.js.map +1 -1
- package/dist/parser/parser.js +18 -15
- package/dist/parser/parser.js.map +1 -1
- package/dist/pyright.js +16 -15
- package/dist/pyright.js.map +1 -1
- package/dist/pyrightFileSystem.d.ts +13 -13
- package/dist/pyrightFileSystem.js +38 -43
- package/dist/pyrightFileSystem.js.map +1 -1
- package/dist/readonlyAugmentedFileSystem.d.ts +29 -28
- package/dist/readonlyAugmentedFileSystem.js +62 -65
- package/dist/readonlyAugmentedFileSystem.js.map +1 -1
- package/dist/server.js +21 -20
- package/dist/server.js.map +1 -1
- package/dist/tests/chainedSourceFiles.test.js +39 -30
- package/dist/tests/chainedSourceFiles.test.js.map +1 -1
- package/dist/tests/checker.test.js +31 -30
- package/dist/tests/checker.test.js.map +1 -1
- package/dist/tests/classDeclaration.test.d.ts +1 -0
- package/dist/tests/classDeclaration.test.js +166 -0
- package/dist/tests/classDeclaration.test.js.map +1 -0
- package/dist/tests/completions.test.js +7 -3
- package/dist/tests/completions.test.js.map +1 -1
- package/dist/tests/config.test.js +24 -22
- package/dist/tests/config.test.js.map +1 -1
- package/dist/tests/documentSymbolCollector.test.js +3 -2
- package/dist/tests/documentSymbolCollector.test.js.map +1 -1
- package/dist/tests/filesystem.test.js +37 -35
- package/dist/tests/filesystem.test.js.map +1 -1
- package/dist/tests/fourSlashParser.test.js +4 -4
- package/dist/tests/fourSlashParser.test.js.map +1 -1
- package/dist/tests/fourslash/hover.docstring.alias.fourslash.js +27 -11
- package/dist/tests/fourslash/hover.docstring.alias.fourslash.js.map +1 -1
- package/dist/tests/harness/fourslash/fourSlashParser.js +2 -2
- package/dist/tests/harness/fourslash/fourSlashParser.js.map +1 -1
- package/dist/tests/harness/fourslash/testLanguageService.d.ts +4 -5
- package/dist/tests/harness/fourslash/testLanguageService.js +9 -15
- package/dist/tests/harness/fourslash/testLanguageService.js.map +1 -1
- package/dist/tests/harness/fourslash/testState.d.ts +4 -4
- package/dist/tests/harness/fourslash/testState.js +91 -51
- package/dist/tests/harness/fourslash/testState.js.map +1 -1
- package/dist/tests/harness/fourslash/workspaceEditTestUtils.js +4 -0
- package/dist/tests/harness/fourslash/workspaceEditTestUtils.js.map +1 -1
- package/dist/tests/harness/testAccessHost.d.ts +3 -2
- package/dist/tests/harness/testAccessHost.js +2 -1
- package/dist/tests/harness/testAccessHost.js.map +1 -1
- package/dist/tests/harness/testHost.js +13 -11
- package/dist/tests/harness/testHost.js.map +1 -1
- package/dist/tests/harness/vfs/factory.d.ts +3 -2
- package/dist/tests/harness/vfs/factory.js +5 -4
- package/dist/tests/harness/vfs/factory.js.map +1 -1
- package/dist/tests/harness/vfs/filesystem.d.ts +32 -31
- package/dist/tests/harness/vfs/filesystem.js +47 -49
- package/dist/tests/harness/vfs/filesystem.js.map +1 -1
- package/dist/tests/harness/vfs/pathValidation.js +1 -10
- package/dist/tests/harness/vfs/pathValidation.js.map +1 -1
- package/dist/tests/importResolver.test.js +106 -58
- package/dist/tests/importResolver.test.js.map +1 -1
- package/dist/tests/importStatementUtils.test.js +10 -9
- package/dist/tests/importStatementUtils.test.js.map +1 -1
- package/dist/tests/ipythonMode.test.js +12 -11
- package/dist/tests/ipythonMode.test.js.map +1 -1
- package/dist/tests/logger.test.js +2 -1
- package/dist/tests/logger.test.js.map +1 -1
- package/dist/tests/parseTreeUtils.test.js +2 -1
- package/dist/tests/parseTreeUtils.test.js.map +1 -1
- package/dist/tests/pathUtils.test.js +3 -138
- package/dist/tests/pathUtils.test.js.map +1 -1
- package/dist/tests/pyrightFileSystem.test.js +38 -34
- package/dist/tests/pyrightFileSystem.test.js.map +1 -1
- package/dist/tests/service.test.js +37 -42
- package/dist/tests/service.test.js.map +1 -1
- package/dist/tests/signatureHelp.test.js +3 -2
- package/dist/tests/signatureHelp.test.js.map +1 -1
- package/dist/tests/sourceFile.test.js +8 -7
- package/dist/tests/sourceFile.test.js.map +1 -1
- package/dist/tests/sourceMapperUtils.test.js +73 -35
- package/dist/tests/sourceMapperUtils.test.js.map +1 -1
- package/dist/tests/testState.test.js +13 -9
- package/dist/tests/testState.test.js.map +1 -1
- package/dist/tests/testStateUtils.d.ts +2 -5
- package/dist/tests/testStateUtils.js +27 -64
- package/dist/tests/testStateUtils.js.map +1 -1
- package/dist/tests/testUtils.d.ts +3 -5
- package/dist/tests/testUtils.js +15 -64
- package/dist/tests/testUtils.js.map +1 -1
- package/dist/tests/textEditUtil.test.js +4 -3
- package/dist/tests/textEditUtil.test.js.map +1 -1
- package/dist/tests/typeEvaluator1.test.js +16 -15
- package/dist/tests/typeEvaluator1.test.js.map +1 -1
- package/dist/tests/typeEvaluator2.test.js +22 -9
- package/dist/tests/typeEvaluator2.test.js.map +1 -1
- package/dist/tests/typeEvaluator3.test.js +86 -63
- package/dist/tests/typeEvaluator3.test.js.map +1 -1
- package/dist/tests/typeEvaluator4.test.js +29 -20
- package/dist/tests/typeEvaluator4.test.js.map +1 -1
- package/dist/tests/typeEvaluator5.test.js +28 -27
- package/dist/tests/typeEvaluator5.test.js.map +1 -1
- package/dist/tests/typePrinter.test.js +4 -3
- package/dist/tests/typePrinter.test.js.map +1 -1
- package/dist/tests/uri.test.d.ts +1 -0
- package/dist/tests/uri.test.js +695 -0
- package/dist/tests/uri.test.js.map +1 -0
- package/dist/tests/workspaceEditUtils.test.js +28 -28
- package/dist/tests/workspaceEditUtils.test.js.map +1 -1
- package/dist/tests/zipfs.test.js +11 -11
- package/dist/tests/zipfs.test.js.map +1 -1
- package/dist/workspaceFactory.d.ts +13 -14
- package/dist/workspaceFactory.js +54 -55
- package/dist/workspaceFactory.js.map +1 -1
- package/package.json +2 -2
- package/dist/common/uriParser.d.ts +0 -24
- package/dist/common/uriParser.js +0 -45
- package/dist/common/uriParser.js.map +0 -1
package/dist/workspaceFactory.js
CHANGED
@@ -7,6 +7,7 @@
|
|
7
7
|
Object.defineProperty(exports, "__esModule", { value: true });
|
8
8
|
exports.WorkspaceFactory = exports.createInitStatus = exports.WorkspacePythonPathKind = exports.WellKnownWorkspaceKinds = void 0;
|
9
9
|
const deferred_1 = require("./common/deferred");
|
10
|
+
const uri_1 = require("./common/uri/uri");
|
10
11
|
let WorkspaceFactoryIdCounter = 0;
|
11
12
|
var WellKnownWorkspaceKinds;
|
12
13
|
(function (WellKnownWorkspaceKinds) {
|
@@ -54,14 +55,14 @@ function createInitStatus() {
|
|
54
55
|
}
|
55
56
|
exports.createInitStatus = createInitStatus;
|
56
57
|
class WorkspaceFactory {
|
57
|
-
constructor(_console,
|
58
|
+
constructor(_console, _isWeb, _createService, _isPythonPathImmutable, _onWorkspaceCreated, _onWorkspaceRemoved, _isCaseSensitive) {
|
58
59
|
this._console = _console;
|
59
|
-
this._uriParser = _uriParser;
|
60
60
|
this._isWeb = _isWeb;
|
61
61
|
this._createService = _createService;
|
62
62
|
this._isPythonPathImmutable = _isPythonPathImmutable;
|
63
63
|
this._onWorkspaceCreated = _onWorkspaceCreated;
|
64
64
|
this._onWorkspaceRemoved = _onWorkspaceRemoved;
|
65
|
+
this._isCaseSensitive = _isCaseSensitive;
|
65
66
|
this._defaultWorkspacePath = '<default>';
|
66
67
|
this._map = new Map();
|
67
68
|
this._id = WorkspaceFactoryIdCounter++;
|
@@ -71,37 +72,34 @@ class WorkspaceFactory {
|
|
71
72
|
// Create a service instance for each of the workspace folders.
|
72
73
|
if (params.workspaceFolders) {
|
73
74
|
params.workspaceFolders.forEach((folder) => {
|
74
|
-
|
75
|
-
this._add(folder.uri, path, folder.name, undefined, WorkspacePythonPathKind.Mutable, [
|
76
|
-
WellKnownWorkspaceKinds.Regular,
|
77
|
-
]);
|
75
|
+
this._add(uri_1.Uri.parse(folder.uri, this._isCaseSensitive), folder.name, undefined, WorkspacePythonPathKind.Mutable, [WellKnownWorkspaceKinds.Regular]);
|
78
76
|
});
|
79
77
|
}
|
80
78
|
else if (params.rootPath) {
|
81
|
-
this._add(params.
|
82
|
-
WellKnownWorkspaceKinds.Regular,
|
83
|
-
]);
|
79
|
+
this._add(uri_1.Uri.file(params.rootPath, this._isCaseSensitive), '', undefined, WorkspacePythonPathKind.Mutable, [WellKnownWorkspaceKinds.Regular]);
|
84
80
|
}
|
85
81
|
}
|
86
82
|
handleWorkspaceFoldersChanged(params) {
|
87
83
|
params.removed.forEach((workspaceInfo) => {
|
88
|
-
const
|
84
|
+
const uri = uri_1.Uri.parse(workspaceInfo.uri, this._isCaseSensitive);
|
89
85
|
// Delete all workspaces for this folder. Even the ones generated for notebook kernels.
|
90
|
-
const workspaces = this.getNonDefaultWorkspaces().filter((w) => w.
|
86
|
+
const workspaces = this.getNonDefaultWorkspaces().filter((w) => w.rootUri.equals(uri));
|
91
87
|
workspaces.forEach((w) => {
|
92
88
|
this._remove(w);
|
93
89
|
});
|
94
90
|
});
|
95
91
|
params.added.forEach((workspaceInfo) => {
|
96
|
-
const
|
92
|
+
const uri = uri_1.Uri.parse(workspaceInfo.uri, this._isCaseSensitive);
|
97
93
|
// If there's a workspace that contains this folder, we need to mimic files from this workspace to
|
98
94
|
// to the new one. Otherwise the subfolder won't have the changes for the files in it.
|
99
|
-
const containing = this.items().filter((w) =>
|
95
|
+
const containing = this.items().filter((w) => uri.startsWith(w.rootUri))[0];
|
100
96
|
// Add the new workspace.
|
101
|
-
const newWorkspace = this._add(
|
97
|
+
const newWorkspace = this._add(uri, workspaceInfo.name, undefined, WorkspacePythonPathKind.Mutable, [
|
98
|
+
WellKnownWorkspaceKinds.Regular,
|
99
|
+
]);
|
102
100
|
// Move files from the containing workspace to the new one that are in the new folder.
|
103
101
|
if (containing) {
|
104
|
-
this._mimicOpenFiles(containing, newWorkspace, (f) => f.startsWith(
|
102
|
+
this._mimicOpenFiles(containing, newWorkspace, (f) => f.startsWith(uri));
|
105
103
|
}
|
106
104
|
});
|
107
105
|
}
|
@@ -122,7 +120,7 @@ class WorkspaceFactory {
|
|
122
120
|
workspaceInMap.pythonPath = newPythonPath;
|
123
121
|
}
|
124
122
|
// If the python path has changed, we may need to move the immutable files to the correct workspace.
|
125
|
-
if (originalPythonPath && newPythonPath
|
123
|
+
if (originalPythonPath && !newPythonPath.equals(originalPythonPath) && workspaceInMap) {
|
126
124
|
// Potentially move immutable files from one workspace to another.
|
127
125
|
this._moveImmutableFilesToCorrectWorkspace(originalPythonPath, workspaceInMap);
|
128
126
|
}
|
@@ -154,7 +152,7 @@ class WorkspaceFactory {
|
|
154
152
|
return false;
|
155
153
|
}
|
156
154
|
getContainingWorkspace(filePath, pythonPath) {
|
157
|
-
return this._getBestRegularWorkspace(this.getNonDefaultWorkspaces(WellKnownWorkspaceKinds.Regular).filter((w) => filePath.startsWith(w.
|
155
|
+
return this._getBestRegularWorkspace(this.getNonDefaultWorkspaces(WellKnownWorkspaceKinds.Regular).filter((w) => filePath.startsWith(w.rootUri)), pythonPath);
|
158
156
|
}
|
159
157
|
moveFiles(filePaths, fromWorkspace, toWorkspace) {
|
160
158
|
if (fromWorkspace === toWorkspace) {
|
@@ -169,12 +167,11 @@ class WorkspaceFactory {
|
|
169
167
|
const version = (_a = fileInfo.sourceFile.getClientVersion()) !== null && _a !== void 0 ? _a : null;
|
170
168
|
const content = fileInfo.sourceFile.getFileContent() || '';
|
171
169
|
const ipythonMode = fileInfo.sourceFile.getIPythonMode();
|
172
|
-
const chainedSourceFile = (_b = fileInfo.chainedSourceFile) === null || _b === void 0 ? void 0 : _b.sourceFile.
|
173
|
-
const realFilePath = fileInfo.sourceFile.getRealFilePath();
|
170
|
+
const chainedSourceFile = (_b = fileInfo.chainedSourceFile) === null || _b === void 0 ? void 0 : _b.sourceFile.getUri();
|
174
171
|
// Remove the file from the old workspace first (closing will propagate to the toWorkspace automatically).
|
175
172
|
fromWorkspace.service.setFileClosed(f, /* isTracked */ false);
|
176
173
|
// Then open it in the toWorkspace so that it is marked tracked there.
|
177
|
-
toWorkspace.service.setFileOpened(f, version, content, ipythonMode, chainedSourceFile
|
174
|
+
toWorkspace.service.setFileOpened(f, version, content, ipythonMode, chainedSourceFile);
|
178
175
|
}
|
179
176
|
});
|
180
177
|
// If the fromWorkspace has no more files in it (and it's an immutable pythonPath), then remove it.
|
@@ -187,7 +184,7 @@ class WorkspaceFactory {
|
|
187
184
|
getNonDefaultWorkspaces(kind) {
|
188
185
|
const workspaces = [];
|
189
186
|
this._map.forEach((workspace) => {
|
190
|
-
if (!workspace.
|
187
|
+
if (!workspace.rootUri) {
|
191
188
|
return;
|
192
189
|
}
|
193
190
|
if (kind && !workspace.kinds.some((k) => k === kind)) {
|
@@ -199,12 +196,12 @@ class WorkspaceFactory {
|
|
199
196
|
}
|
200
197
|
// Returns the best workspace for a file. Waits for the workspace to be finished handling other events before
|
201
198
|
// returning the appropriate workspace.
|
202
|
-
async getWorkspaceForFile(
|
199
|
+
async getWorkspaceForFile(uri, pythonPath) {
|
203
200
|
// Wait for all workspaces to be initialized before attempting to find the best workspace. Otherwise
|
204
201
|
// the list of files won't be complete and the `contains` check might fail.
|
205
202
|
await Promise.all(this.items().map((w) => w.isInitialized.promise));
|
206
203
|
// Find or create best match.
|
207
|
-
const workspace = await this._getOrCreateBestWorkspaceForFile(
|
204
|
+
const workspace = await this._getOrCreateBestWorkspaceForFile(uri, pythonPath);
|
208
205
|
// The workspace may have just been created. Wait for it to be initialized before returning it.
|
209
206
|
await workspace.isInitialized.promise;
|
210
207
|
return workspace;
|
@@ -223,15 +220,15 @@ class WorkspaceFactory {
|
|
223
220
|
await Promise.all(workspaces.map((w) => w.isInitialized.promise));
|
224
221
|
return workspaces;
|
225
222
|
}
|
226
|
-
getContainingWorkspacesForFileSync(
|
223
|
+
getContainingWorkspacesForFileSync(fileUri) {
|
227
224
|
// All workspaces that track the file should be considered.
|
228
|
-
let workspaces = this.items().filter((w) => w.service.isTracked(
|
225
|
+
let workspaces = this.items().filter((w) => w.service.isTracked(fileUri));
|
229
226
|
// If that list is empty, get the best workspace
|
230
227
|
if (workspaces.length === 0) {
|
231
|
-
workspaces.push(this._getOrCreateBestWorkspaceFileSync(
|
228
|
+
workspaces.push(this._getOrCreateBestWorkspaceFileSync(fileUri, undefined));
|
232
229
|
}
|
233
230
|
// If the file is immutable, then only return that workspace.
|
234
|
-
if (this._isPythonPathImmutable(
|
231
|
+
if (this._isPythonPathImmutable(fileUri)) {
|
235
232
|
workspaces = workspaces.filter((w) => w.pythonPathKind === WorkspacePythonPathKind.Immutable);
|
236
233
|
}
|
237
234
|
return workspaces;
|
@@ -245,14 +242,15 @@ class WorkspaceFactory {
|
|
245
242
|
}
|
246
243
|
}
|
247
244
|
async _moveImmutableFilesToCorrectWorkspace(oldPythonPath, mutableWorkspace) {
|
245
|
+
var _a;
|
248
246
|
// If the python path changes we may need to move some immutable files around.
|
249
247
|
// For example, if a notebook had the old python path, we need to create a new workspace
|
250
248
|
// for the notebook.
|
251
249
|
// If a notebook has the new python path but is currently in a workspace with the path hardcoded, we need to move it to
|
252
250
|
// this workspace.
|
253
|
-
const oldPathFiles =
|
251
|
+
const oldPathFiles = mutableWorkspace.service.getOpenFiles().filter((f) => this._isPythonPathImmutable(f));
|
254
252
|
const exitingWorkspaceWithSamePath = this.items().find((w) => w.pythonPath === mutableWorkspace.pythonPath && w !== mutableWorkspace);
|
255
|
-
const newPathFiles =
|
253
|
+
const newPathFiles = (_a = exitingWorkspaceWithSamePath === null || exitingWorkspaceWithSamePath === void 0 ? void 0 : exitingWorkspaceWithSamePath.service.getOpenFiles().filter((f) => this._isPythonPathImmutable(f))) !== null && _a !== void 0 ? _a : [];
|
256
254
|
// Immutable files that were in this mutableWorkspace have to be moved
|
257
255
|
// to a (potentially) new workspace (with the old path).
|
258
256
|
if (oldPathFiles.length > 0) {
|
@@ -266,30 +264,29 @@ class WorkspaceFactory {
|
|
266
264
|
// Immutable files from a different workspace (with the same path as the new path)
|
267
265
|
// have to be moved to the mutable workspace (which now has the new path)
|
268
266
|
if (exitingWorkspaceWithSamePath) {
|
269
|
-
this.moveFiles(
|
267
|
+
this.moveFiles(newPathFiles, exitingWorkspaceWithSamePath, mutableWorkspace);
|
270
268
|
this.removeUnused(exitingWorkspaceWithSamePath);
|
271
269
|
}
|
272
270
|
}
|
273
|
-
_add(rootUri,
|
271
|
+
_add(rootUri, name, pythonPath, pythonPathKind, kinds) {
|
274
272
|
// Update the kind based if the uri is local or not
|
275
|
-
if (!kinds.includes(WellKnownWorkspaceKinds.Default) && (!
|
273
|
+
if (!kinds.includes(WellKnownWorkspaceKinds.Default) && (!rootUri.isLocal() || this._isWeb)) {
|
276
274
|
// Web based workspace should be limited.
|
277
275
|
kinds = [...kinds, WellKnownWorkspaceKinds.Limited];
|
278
276
|
}
|
279
277
|
const result = {
|
280
278
|
workspaceName: name,
|
281
|
-
|
282
|
-
uri: rootUri,
|
279
|
+
rootUri,
|
283
280
|
kinds,
|
284
281
|
pythonPath,
|
285
282
|
pythonPathKind,
|
286
|
-
service: this._createService(name,
|
283
|
+
service: this._createService(name, rootUri, kinds),
|
287
284
|
disableLanguageServices: false,
|
288
285
|
disableOrganizeImports: false,
|
289
286
|
disableWorkspaceSymbol: false,
|
290
287
|
isInitialized: createInitStatus(),
|
291
288
|
searchPathsToWatch: [],
|
292
|
-
pythonEnvironmentName: pythonPath,
|
289
|
+
pythonEnvironmentName: pythonPath === null || pythonPath === void 0 ? void 0 : pythonPath.toString(),
|
293
290
|
};
|
294
291
|
// Stick in our map
|
295
292
|
const key = this._getWorkspaceKey(result);
|
@@ -322,27 +319,29 @@ class WorkspaceFactory {
|
|
322
319
|
// without a root path
|
323
320
|
const rootPath = value.kinds.includes(WellKnownWorkspaceKinds.Default)
|
324
321
|
? this._defaultWorkspacePath
|
325
|
-
: value.
|
322
|
+
: value.rootUri;
|
326
323
|
// Key is defined by the rootPath and the pythonPath. We might include platform in this, but for now
|
327
324
|
// platform is only used by the import resolver.
|
328
325
|
return `${rootPath}:${value.pythonPathKind === WorkspacePythonPathKind.Mutable ? value.pythonPathKind : value.pythonPath}`;
|
329
326
|
}
|
330
|
-
async _getOrCreateBestWorkspaceForFile(
|
327
|
+
async _getOrCreateBestWorkspaceForFile(uri, pythonPath) {
|
328
|
+
var _a;
|
331
329
|
// Find the current best workspace (without creating a new one)
|
332
|
-
let bestInstance = this._getBestWorkspaceForFile(
|
330
|
+
let bestInstance = this._getBestWorkspaceForFile(uri, pythonPath);
|
333
331
|
// Make sure the best instance is initialized so that it has its pythonPath.
|
334
332
|
await bestInstance.isInitialized.promise;
|
335
333
|
// If this best instance doesn't match the pythonPath, then we need to create a new one.
|
336
|
-
if (pythonPath !== undefined && bestInstance.pythonPath
|
334
|
+
if (pythonPath !== undefined && !((_a = bestInstance.pythonPath) === null || _a === void 0 ? void 0 : _a.equals(pythonPath))) {
|
337
335
|
bestInstance = this._createImmutableCopy(bestInstance, pythonPath);
|
338
336
|
}
|
339
337
|
return bestInstance;
|
340
338
|
}
|
341
|
-
_getOrCreateBestWorkspaceFileSync(
|
339
|
+
_getOrCreateBestWorkspaceFileSync(uri, pythonPath) {
|
340
|
+
var _a;
|
342
341
|
// Find the current best workspace (without creating a new one)
|
343
|
-
let bestInstance = this._getBestWorkspaceForFile(
|
342
|
+
let bestInstance = this._getBestWorkspaceForFile(uri, pythonPath);
|
344
343
|
// If this best instance doesn't match the pythonPath, then we need to create a new one.
|
345
|
-
if (pythonPath !== undefined && bestInstance.pythonPath
|
344
|
+
if (pythonPath !== undefined && !((_a = bestInstance.pythonPath) === null || _a === void 0 ? void 0 : _a.equals(pythonPath))) {
|
346
345
|
bestInstance = this._createImmutableCopy(bestInstance, pythonPath);
|
347
346
|
}
|
348
347
|
return bestInstance;
|
@@ -357,17 +356,17 @@ class WorkspaceFactory {
|
|
357
356
|
if (sourceFileInfo && predicate(file)) {
|
358
357
|
const sourceFile = sourceFileInfo.sourceFile;
|
359
358
|
const fileContents = sourceFile.getFileContent();
|
360
|
-
dest.service.setFileOpened(file, sourceFile.getClientVersion() || null, fileContents || '', sourceFile.getIPythonMode(), (_a = sourceFileInfo.chainedSourceFile) === null || _a === void 0 ? void 0 : _a.sourceFile.
|
359
|
+
dest.service.setFileOpened(file, sourceFile.getClientVersion() || null, fileContents || '', sourceFile.getIPythonMode(), (_a = sourceFileInfo.chainedSourceFile) === null || _a === void 0 ? void 0 : _a.sourceFile.getUri());
|
361
360
|
}
|
362
361
|
}
|
363
362
|
}
|
364
363
|
_createImmutableCopy(workspace, pythonPath) {
|
365
|
-
const result = this._add(workspace.
|
364
|
+
const result = this._add(workspace.rootUri, workspace.workspaceName, pythonPath, WorkspacePythonPathKind.Immutable, workspace.kinds);
|
366
365
|
// Copy over the open files
|
367
366
|
this._mimicOpenFiles(workspace, result, () => true);
|
368
367
|
return result;
|
369
368
|
}
|
370
|
-
_getBestWorkspaceForFile(
|
369
|
+
_getBestWorkspaceForFile(uri, pythonPath) {
|
371
370
|
let bestInstance;
|
372
371
|
// The order of how we find the best matching workspace for the given file is
|
373
372
|
// 1. The given file is the workspace itself (ex, a file being a virtual workspace itself).
|
@@ -380,20 +379,20 @@ class WorkspaceFactory {
|
|
380
379
|
// 5. If none of the above works, then it matches the default workspace.
|
381
380
|
// First find the workspaces that are tracking the file
|
382
381
|
const regularWorkspaces = this.getNonDefaultWorkspaces(WellKnownWorkspaceKinds.Regular);
|
383
|
-
const trackingWorkspaces = this.items().filter((w) => w.service.isTracked(
|
382
|
+
const trackingWorkspaces = this.items().filter((w) => w.service.isTracked(uri));
|
384
383
|
// Then find the best in all of those that actually matches the pythonPath.
|
385
384
|
bestInstance = this._getBestRegularWorkspace(trackingWorkspaces, pythonPath);
|
386
385
|
// If it's not in a tracked workspace, see if we only have regular workspaces with the same
|
387
386
|
// length root path
|
388
387
|
if (bestInstance === undefined &&
|
389
|
-
regularWorkspaces.every((w) => w.
|
388
|
+
regularWorkspaces.every((w) => w.rootUri.getRootPathLength() === regularWorkspaces[0].rootUri.getRootPathLength())) {
|
390
389
|
bestInstance = this._getBestRegularWorkspace(regularWorkspaces, pythonPath);
|
391
390
|
}
|
392
391
|
// If the regular workspaces don't all have the same length or they don't
|
393
392
|
// actually match on the python path, then try the workspaces that already have the file open or scanned.
|
394
393
|
if (bestInstance === undefined || bestInstance.pythonPath !== pythonPath) {
|
395
394
|
bestInstance =
|
396
|
-
this._getBestRegularWorkspace(regularWorkspaces.filter((w) => w.service.hasSourceFile(
|
395
|
+
this._getBestRegularWorkspace(regularWorkspaces.filter((w) => w.service.hasSourceFile(uri)), pythonPath) || bestInstance;
|
397
396
|
}
|
398
397
|
// If that still didn't work, that must mean we don't have a workspace. Create a default one.
|
399
398
|
if (bestInstance === undefined) {
|
@@ -407,21 +406,21 @@ class WorkspaceFactory {
|
|
407
406
|
if (!defaultWorkspace) {
|
408
407
|
// Create a default workspace for files that are outside
|
409
408
|
// of all workspaces.
|
410
|
-
defaultWorkspace = this._add(
|
409
|
+
defaultWorkspace = this._add(uri_1.Uri.empty(), this._defaultWorkspacePath, pythonPath, pythonPath !== undefined ? WorkspacePythonPathKind.Immutable : WorkspacePythonPathKind.Mutable, [WellKnownWorkspaceKinds.Default]);
|
411
410
|
}
|
412
411
|
return defaultWorkspace;
|
413
412
|
}
|
414
413
|
_getLongestPathWorkspace(workspaces) {
|
415
414
|
const longestPath = workspaces.reduce((previousPath, currentWorkspace) => {
|
416
415
|
if (!previousPath) {
|
417
|
-
return currentWorkspace.
|
416
|
+
return currentWorkspace.rootUri;
|
418
417
|
}
|
419
|
-
if (currentWorkspace.
|
420
|
-
return currentWorkspace.
|
418
|
+
if (currentWorkspace.rootUri.getPathLength() > previousPath.getPathLength()) {
|
419
|
+
return currentWorkspace.rootUri;
|
421
420
|
}
|
422
421
|
return previousPath;
|
423
|
-
},
|
424
|
-
return workspaces.find((w) => w.
|
422
|
+
}, uri_1.Uri.empty());
|
423
|
+
return workspaces.find((w) => w.rootUri === longestPath);
|
425
424
|
}
|
426
425
|
_getBestRegularWorkspace(workspaces, pythonPath) {
|
427
426
|
if (workspaces.length === 0) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"workspaceFactory.js","sourceRoot":"","sources":["../../src/workspaceFactory.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAMH,gDAAmD;AAGnD,IAAI,yBAAyB,GAAG,CAAC,CAAC;AAElC,IAAY,uBAMX;AAND,WAAY,uBAAuB;IAC/B,8CAAmB,CAAA;IACnB,8CAAmB,CAAA;IACnB,8CAAmB,CAAA;IACnB,4CAAiB,CAAA;IACjB,wCAAa,CAAA;AACjB,CAAC,EANW,uBAAuB,uCAAvB,uBAAuB,QAMlC;AAED,IAAY,uBAGX;AAHD,WAAY,uBAAuB;IAC/B,kDAAuB,CAAA;IACvB,8CAAmB,CAAA;AACvB,CAAC,EAHW,uBAAuB,uCAAvB,uBAAuB,QAGlC;AAUD,SAAgB,gBAAgB;IAC5B,gGAAgG;IAChG,kHAAkH;IAClH,2GAA2G;IAC3G,mDAAmD;IACnD,4GAA4G;IAC5G,sFAAsF;IACtF,qGAAqG;IACrG,IAAI,MAAM,GAAG,KAAK,CAAC;IAEnB,MAAM,QAAQ,GAAG,IAAA,yBAAc,GAAQ,CAAC;IACxC,MAAM,IAAI,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,OAAO;QACzB,OAAO,EAAE,GAAG,EAAE;YACV,MAAM,GAAG,IAAI,CAAC;YACd,QAAQ,CAAC,OAAO,EAAE,CAAC;QACvB,CAAC;QACD,UAAU,EAAE,GAAG,EAAE;YACb,MAAM,GAAG,IAAI,CAAC;QAClB,CAAC;QACD,KAAK,EAAE,GAAG,EAAE;YACR,IAAI,CAAC,MAAM,EAAE;gBACT,OAAO,IAAI,CAAC;aACf;YAED,OAAO,gBAAgB,EAAE,CAAC;QAC9B,CAAC;QACD,QAAQ,EAAE,GAAG,EAAE;YACX,OAAO,QAAQ,CAAC,QAAQ,CAAC;QAC7B,CAAC;KACJ,CAAC;IAEF,OAAO,IAAI,CAAC;AAChB,CAAC;AAjCD,4CAiCC;AAsBD,MAAa,gBAAgB;IAKzB,YACqB,QAA0B,EAC1B,UAAqB,EACrB,MAAe,EACf,cAKG,EACH,sBAAiD,EACjD,mBAAmD,EACnD,mBAAmD;QAXnD,aAAQ,GAAR,QAAQ,CAAkB;QAC1B,eAAU,GAAV,UAAU,CAAW;QACrB,WAAM,GAAN,MAAM,CAAS;QACf,mBAAc,GAAd,cAAc,CAKX;QACH,2BAAsB,GAAtB,sBAAsB,CAA2B;QACjD,wBAAmB,GAAnB,mBAAmB,CAAgC;QACnD,wBAAmB,GAAnB,mBAAmB,CAAgC;QAhBhE,0BAAqB,GAAG,WAAW,CAAC;QACpC,SAAI,GAAG,IAAI,GAAG,EAAqB,CAAC;QACpC,QAAG,GAAG,yBAAyB,EAAE,CAAC;QAgBtC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,oBAAoB,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;IAC9D,CAAC;IAED,gBAAgB,CAAC,MAAwB;QACrC,+DAA+D;QAC/D,IAAI,MAAM,CAAC,gBAAgB,EAAE;YACzB,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;gBACvC,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAC/D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,SAAS,EAAE,uBAAuB,CAAC,OAAO,EAAE;oBACjF,uBAAuB,CAAC,OAAO;iBAClC,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;SACN;aAAM,IAAI,MAAM,CAAC,QAAQ,EAAE;YACxB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,EAAE,MAAM,CAAC,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,uBAAuB,CAAC,OAAO,EAAE;gBAC7F,uBAAuB,CAAC,OAAO;aAClC,CAAC,CAAC;SACN;IACL,CAAC;IAED,6BAA6B,CAAC,MAAmC;QAC7D,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE;YACrC,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;YAC1E,uFAAuF;YACvF,MAAM,UAAU,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;YACzF,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACrB,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACpB,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE;YACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,qBAAqB,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;YAE1E,kGAAkG;YAClG,sFAAsF;YACtF,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAElF,yBAAyB;YACzB,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAC1B,aAAa,CAAC,GAAG,EACjB,QAAQ,EACR,aAAa,CAAC,IAAI,EAClB,SAAS,EACT,uBAAuB,CAAC,OAAO,EAC/B,CAAC,uBAAuB,CAAC,OAAO,CAAC,CACpC,CAAC;YAEF,sFAAsF;YACtF,IAAI,UAAU,EAAE;gBACZ,IAAI,CAAC,eAAe,CAAC,UAAU,EAAE,YAAY,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;aACjF;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK;QACD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IAC1C,CAAC;IAED,eAAe,CAAC,SAAoB,EAAE,aAAiC;QACnE,mDAAmD;QACnD,IAAI,SAAS,CAAC,cAAc,KAAK,uBAAuB,CAAC,OAAO,IAAI,aAAa,EAAE;YAC/E,MAAM,kBAAkB,GAAG,SAAS,CAAC,UAAU,CAAC;YAChD,SAAS,CAAC,UAAU,GAAG,aAAa,CAAC;YAErC,iFAAiF;YACjF,kFAAkF;YAClF,iDAAiD;YACjD,MAAM,GAAG,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;YAC7C,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC1C,IAAI,cAAc,EAAE;gBAChB,cAAc,CAAC,UAAU,GAAG,aAAa,CAAC;aAC7C;YAED,oGAAoG;YACpG,IAAI,kBAAkB,IAAI,aAAa,KAAK,kBAAkB,IAAI,cAAc,EAAE;gBAC9E,kEAAkE;gBAClE,IAAI,CAAC,qCAAqC,CAAC,kBAAkB,EAAE,cAAc,CAAC,CAAC;aAClF;SACJ;QAED,+EAA+E;QAC/E,OAAO,SAAS,CAAC,UAAU,CAAC;IAChC,CAAC;IAED,KAAK;QACD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAC5B,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;YAClC,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QAChC,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QAClB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,oBAAoB,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;IAC5D,CAAC;IAED,qBAAqB,CAAC,IAAa;QAC/B,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,EAAE;YAC9C,OAAO,KAAK,CAAC;SAChB;QAED,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE;YACxB,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,EAAE;gBAC9C,KAAK,EAAE,CAAC;aACX;YAED,IAAI,KAAK,GAAG,CAAC,EAAE;gBACX,OAAO,IAAI,CAAC;aACf;SACJ;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,sBAAsB,CAAC,QAAgB,EAAE,UAAmB;QACxD,OAAO,IAAI,CAAC,wBAAwB,CAChC,IAAI,CAAC,uBAAuB,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CACvE,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAClC,EACD,UAAU,CACb,CAAC;IACN,CAAC;IAED,SAAS,CAAC,SAAmB,EAAE,aAAwB,EAAE,WAAsB;QAC3E,IAAI,aAAa,KAAK,WAAW,EAAE;YAC/B,OAAO;SACV;QAED,IAAI;YACA,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;;gBACpB,MAAM,QAAQ,GAAG,aAAa,CAAC,OAAO,CAAC,yBAAyB,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;gBAC9F,IAAI,QAAQ,EAAE;oBACV,iEAAiE;oBACjE,MAAM,OAAO,GAAG,MAAA,QAAQ,CAAC,UAAU,CAAC,gBAAgB,EAAE,mCAAI,IAAI,CAAC;oBAC/D,MAAM,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC;oBAC3D,MAAM,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;oBACzD,MAAM,iBAAiB,GAAG,MAAA,QAAQ,CAAC,iBAAiB,0CAAE,UAAU,CAAC,WAAW,EAAE,CAAC;oBAC/E,MAAM,YAAY,GAAG,QAAQ,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC;oBAE3D,0GAA0G;oBAC1G,aAAa,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;oBAE9D,sEAAsE;oBACtE,WAAW,CAAC,OAAO,CAAC,aAAa,CAC7B,CAAC,EACD,OAAO,EACP,OAAO,EACP,WAAW,EACX,iBAAiB,EACjB,YAAY,CACf,CAAC;iBACL;YACL,CAAC,CAAC,CAAC;YAEH,mGAAmG;YACnG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;SACpC;QAAC,OAAO,CAAM,EAAE;YACb,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;SACrC;IACL,CAAC;IAED,uBAAuB,CAAC,IAAa;QACjC,MAAM,UAAU,GAAgB,EAAE,CAAC;QACnC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAC5B,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE;gBACrB,OAAO;aACV;YAED,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,EAAE;gBAClD,OAAO;aACV;YAED,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;QAEH,OAAO,UAAU,CAAC;IACtB,CAAC;IAED,6GAA6G;IAC7G,uCAAuC;IACvC,KAAK,CAAC,mBAAmB,CAAC,QAAgB,EAAE,UAA8B;QACtE,oGAAoG;QACpG,2EAA2E;QAC3E,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC;QAEpE,6BAA6B;QAC7B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gCAAgC,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAEpF,+FAA+F;QAC/F,MAAM,SAAS,CAAC,aAAa,CAAC,OAAO,CAAC;QAEtC,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,uBAAuB,CAAC,QAAgB,EAAE,UAA8B;QACpE,6BAA6B;QAC7B,OAAO,IAAI,CAAC,iCAAiC,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,8BAA8B,CAAC,QAAgB;QACjD,oGAAoG;QACpG,2EAA2E;QAC3E,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC;QAEpE,6BAA6B;QAC7B,MAAM,UAAU,GAAG,IAAI,CAAC,kCAAkC,CAAC,QAAQ,CAAC,CAAC;QAErE,iFAAiF;QACjF,MAAM,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC;QAElE,OAAO,UAAU,CAAC;IACtB,CAAC;IAED,kCAAkC,CAAC,QAAgB;QAC/C,2DAA2D;QAC3D,IAAI,UAAU,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;QAE3E,gDAAgD;QAChD,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YACzB,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,iCAAiC,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;SAChF;QAED,6DAA6D;QAC7D,IAAI,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,EAAE;YACvC,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,cAAc,KAAK,uBAAuB,CAAC,SAAS,CAAC,CAAC;SACjG;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;IAED,YAAY,CAAC,SAAoB;QAC7B,yGAAyG;QACzG,IACI,SAAS,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC;YAC3F,SAAS,CAAC,cAAc,KAAK,uBAAuB,CAAC,SAAS,EAChE;YACE,iEAAiE;YACjE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SAC3B;IACL,CAAC;IAEO,KAAK,CAAC,qCAAqC,CAAC,aAAqB,EAAE,gBAA2B;QAClG,8EAA8E;QAC9E,wFAAwF;QACxF,oBAAoB;QACpB,uHAAuH;QACvH,kBAAkB;QAClB,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAC3B,IAAI,GAAG,CAAS,gBAAgB,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CACzG,CAAC;QACF,MAAM,4BAA4B,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC,IAAI,CAClD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,gBAAgB,CAAC,UAAU,IAAI,CAAC,KAAK,gBAAgB,CAChF,CAAC;QACF,MAAM,YAAY,GAAG,IAAI,GAAG,CACxB,4BAA4B,aAA5B,4BAA4B,uBAA5B,4BAA4B,CAAE,OAAO,CAAC,YAAY,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CACrG,CAAC;QAEF,sEAAsE;QACtE,wDAAwD;QACxD,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;YACzB,iFAAiF;YACjF,8EAA8E;YAC9E,MAAM,SAAS,GAAG,IAAI,CAAC,iCAAiC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;YACzF,IAAI,SAAS,KAAK,gBAAgB,EAAE;gBAChC,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,gBAAgB,EAAE,SAAS,CAAC,CAAC;aAC7D;SACJ;QAED,kFAAkF;QAClF,yEAAyE;QACzE,IAAI,4BAA4B,EAAE;YAC9B,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,4BAA6B,EAAE,gBAAgB,CAAC,CAAC;YAC1F,IAAI,CAAC,YAAY,CAAC,4BAA4B,CAAC,CAAC;SACnD;IACL,CAAC;IAEO,IAAI,CACR,OAAe,EACf,QAAgB,EAChB,IAAY,EACZ,UAA8B,EAC9B,cAAuC,EACvC,KAAe;QAEf,mDAAmD;QACnD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,uBAAuB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE;YACxG,yCAAyC;YACzC,KAAK,GAAG,CAAC,GAAG,KAAK,EAAE,uBAAuB,CAAC,OAAO,CAAC,CAAC;SACvD;QAED,MAAM,MAAM,GAAc;YACtB,aAAa,EAAE,IAAI;YACnB,QAAQ;YACR,GAAG,EAAE,OAAO;YACZ,KAAK;YACL,UAAU;YACV,cAAc;YACd,OAAO,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,CAAC;YAC5D,uBAAuB,EAAE,KAAK;YAC9B,sBAAsB,EAAE,KAAK;YAC7B,sBAAsB,EAAE,KAAK;YAC7B,aAAa,EAAE,gBAAgB,EAAE;YACjC,kBAAkB,EAAE,EAAE;YACtB,qBAAqB,EAAE,UAAU;SACpC,CAAC;QAEF,mBAAmB;QACnB,MAAM,GAAG,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAE1C,4DAA4D;QAC5D,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACrB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,oBAAoB,IAAI,CAAC,GAAG,QAAQ,GAAG,EAAE,CAAC,CAAC;QAC7D,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAE3B,8DAA8D;QAC9D,sEAAsE;QACtE,iCAAiC;QACjC,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QAEjC,OAAO,MAAM,CAAC;IAClB,CAAC;IAEO,OAAO,CAAC,KAAgB;QAC5B,MAAM,GAAG,GAAG,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACzC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACrC,IAAI,SAAS,EAAE;YACX,SAAS,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;YAElC,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;YAEpC,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YAC5B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,oBAAoB,IAAI,CAAC,GAAG,WAAW,GAAG,EAAE,CAAC,CAAC;YAChE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;SACzB;IACL,CAAC;IAEO,uBAAuB,CAAC,UAA8B;QAC1D,OAAO,GAAG,IAAI,CAAC,qBAAqB,IAChC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,uBAAuB,CAAC,OACpE,EAAE,CAAC;IACP,CAAC;IAEO,gBAAgB,CAAC,KAAgB;QACrC,sEAAsE;QACtE,sBAAsB;QACtB,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,uBAAuB,CAAC,OAAO,CAAC;YAClE,CAAC,CAAC,IAAI,CAAC,qBAAqB;YAC5B,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC;QAErB,oGAAoG;QACpG,gDAAgD;QAChD,OAAO,GAAG,QAAQ,IACd,KAAK,CAAC,cAAc,KAAK,uBAAuB,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,UAC5F,EAAE,CAAC;IACP,CAAC;IAEO,KAAK,CAAC,gCAAgC,CAC1C,QAAgB,EAChB,UAA8B;QAE9B,+DAA+D;QAC/D,IAAI,YAAY,GAAG,IAAI,CAAC,wBAAwB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAEvE,4EAA4E;QAC5E,MAAM,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC;QAEzC,wFAAwF;QACxF,IAAI,UAAU,KAAK,SAAS,IAAI,YAAY,CAAC,UAAU,KAAK,UAAU,EAAE;YACpE,YAAY,GAAG,IAAI,CAAC,oBAAoB,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;SACtE;QAED,OAAO,YAAY,CAAC;IACxB,CAAC;IAEO,iCAAiC,CAAC,QAAgB,EAAE,UAA8B;QACtF,+DAA+D;QAC/D,IAAI,YAAY,GAAG,IAAI,CAAC,wBAAwB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAEvE,wFAAwF;QACxF,IAAI,UAAU,KAAK,SAAS,IAAI,YAAY,CAAC,UAAU,KAAK,UAAU,EAAE;YACpE,YAAY,GAAG,IAAI,CAAC,oBAAoB,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;SACtE;QAED,OAAO,YAAY,CAAC;IACxB,CAAC;IAEO,eAAe,CAAC,MAAiB,EAAE,IAAe,EAAE,SAAiC;;QACzF,uFAAuF;QACvF,yFAAyF;QACzF,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3F,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACtB,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,yBAAyB,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAChG,IAAI,cAAc,IAAI,SAAS,CAAC,IAAI,CAAC,EAAE;gBACnC,MAAM,UAAU,GAAG,cAAc,CAAC,UAAU,CAAC;gBAC7C,MAAM,YAAY,GAAG,UAAU,CAAC,cAAc,EAAE,CAAC;gBACjD,IAAI,CAAC,OAAO,CAAC,aAAa,CACtB,IAAI,EACJ,UAAU,CAAC,gBAAgB,EAAE,IAAI,IAAI,EACrC,YAAY,IAAI,EAAE,EAClB,UAAU,CAAC,cAAc,EAAE,EAC3B,MAAA,cAAc,CAAC,iBAAiB,0CAAE,UAAU,CAAC,WAAW,EAAE,EAC1D,UAAU,CAAC,eAAe,EAAE,CAC/B,CAAC;aACL;SACJ;IACL,CAAC;IAEO,oBAAoB,CAAC,SAAoB,EAAE,UAAkB;QACjE,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CACpB,SAAS,CAAC,GAAG,EACb,SAAS,CAAC,QAAQ,EAClB,SAAS,CAAC,aAAa,EACvB,UAAU,EACV,uBAAuB,CAAC,SAAS,EACjC,SAAS,CAAC,KAAK,CAClB,CAAC;QAEF,2BAA2B;QAC3B,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QAEpD,OAAO,MAAM,CAAC;IAClB,CAAC;IAEO,wBAAwB,CAAC,QAAgB,EAAE,UAA8B;QAC7E,IAAI,YAAmC,CAAC;QAExC,6EAA6E;QAC7E,2FAA2F;QAC3F,4EAA4E;QAC5E,uEAAuE;QACvE,gFAAgF;QAChF,mDAAmD;QACnD,mGAAmG;QACnG,kFAAkF;QAClF,wEAAwE;QAExE,uDAAuD;QACvD,MAAM,iBAAiB,GAAG,IAAI,CAAC,uBAAuB,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;QACxF,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;QAErF,2EAA2E;QAC3E,YAAY,GAAG,IAAI,CAAC,wBAAwB,CAAC,kBAAkB,EAAE,UAAU,CAAC,CAAC;QAE7E,2FAA2F;QAC3F,mBAAmB;QACnB,IACI,YAAY,KAAK,SAAS;YAC1B,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,iBAAiB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAC5F;YACE,YAAY,GAAG,IAAI,CAAC,wBAAwB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;SAC/E;QAED,yEAAyE;QACzE,yGAAyG;QACzG,IAAI,YAAY,KAAK,SAAS,IAAI,YAAY,CAAC,UAAU,KAAK,UAAU,EAAE;YACtE,YAAY;gBACR,IAAI,CAAC,wBAAwB,CACzB,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,EAClE,UAAU,CACb,IAAI,YAAY,CAAC;SACzB;QAED,6FAA6F;QAC7F,IAAI,YAAY,KAAK,SAAS,EAAE;YAC5B,YAAY,GAAG,IAAI,CAAC,4BAA4B,CAAC,UAAU,CAAC,CAAC;SAChE;QAED,OAAO,YAAY,CAAC;IACxB,CAAC;IAEO,4BAA4B,CAAC,UAA8B;QAC/D,0CAA0C;QAC1C,IAAI,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,uBAAuB,CAAC,UAAU,CAAC,CAAC,CAAC;QAC/E,IAAI,CAAC,gBAAgB,EAAE;YACnB,wDAAwD;YACxD,qBAAqB;YACrB,gBAAgB,GAAG,IAAI,CAAC,IAAI,CACxB,EAAE,EACF,EAAE,EACF,IAAI,CAAC,qBAAqB,EAC1B,UAAU,EACV,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC,CAAC,uBAAuB,CAAC,OAAO,EAC9F,CAAC,uBAAuB,CAAC,OAAO,CAAC,CACpC,CAAC;SACL;QAED,OAAO,gBAAgB,CAAC;IAC5B,CAAC;IAEO,wBAAwB,CAAC,UAAuB;QACpD,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,YAAY,EAAE,gBAAgB,EAAE,EAAE;YACrE,IAAI,CAAC,YAAY,EAAE;gBACf,OAAO,gBAAgB,CAAC,QAAQ,CAAC;aACpC;YACD,IAAI,gBAAgB,CAAC,QAAQ,CAAC,MAAM,GAAG,YAAY,CAAC,MAAM,EAAE;gBACxD,OAAO,gBAAgB,CAAC,QAAQ,CAAC;aACpC;YAED,OAAO,YAAY,CAAC;QACxB,CAAC,EAAE,EAAE,CAAC,CAAC;QACP,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,WAAW,CAAE,CAAC;IAC/D,CAAC;IAEO,wBAAwB,CAAC,UAAuB,EAAE,UAAmB;QACzE,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YACzB,OAAO,SAAS,CAAC;SACpB;QAED,2CAA2C;QAC3C,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;YACzB,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC;SACxB;QAED,4FAA4F;QAC5F,IAAI,UAAU,KAAK,SAAS,EAAE;YAC1B,MAAM,kBAAkB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC;YACjF,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC/B,OAAO,IAAI,CAAC,wBAAwB,CAAC,kBAAkB,CAAC,CAAC;aAC5D;SACJ;QAED,yCAAyC;QACzC,OAAO,IAAI,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;IACrD,CAAC;CACJ;AA5hBD,4CA4hBC"}
|
1
|
+
{"version":3,"file":"workspaceFactory.js","sourceRoot":"","sources":["../../src/workspaceFactory.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
"name": "@zzzen/pyright-internal",
|
3
3
|
"displayName": "pyright",
|
4
4
|
"description": "Type checker for the Python language",
|
5
|
-
"version": "1.2.0-dev.
|
5
|
+
"version": "1.2.0-dev.20231217",
|
6
6
|
"license": "MIT",
|
7
7
|
"private": false,
|
8
8
|
"files": [
|
@@ -30,7 +30,7 @@
|
|
30
30
|
"vscode-languageserver": "8.1.0",
|
31
31
|
"vscode-languageserver-textdocument": "1.0.10",
|
32
32
|
"vscode-languageserver-types": "3.17.3",
|
33
|
-
"vscode-uri": "^3.0.
|
33
|
+
"vscode-uri": "^3.0.8"
|
34
34
|
},
|
35
35
|
"devDependencies": {
|
36
36
|
"@types/command-line-args": "^5.2.0",
|
@@ -1,24 +0,0 @@
|
|
1
|
-
import { Position } from 'vscode-languageserver';
|
2
|
-
import { TextDocumentIdentifier } from 'vscode-languageserver-protocol';
|
3
|
-
import { URI } from 'vscode-uri';
|
4
|
-
import { FileSystem } from './fileSystem';
|
5
|
-
export interface IUriParser {
|
6
|
-
decodeTextDocumentPosition(textDocument: TextDocumentIdentifier, position: Position): {
|
7
|
-
filePath: string;
|
8
|
-
position: Position;
|
9
|
-
};
|
10
|
-
decodeTextDocumentUri(uriString: string): string;
|
11
|
-
isUntitled(uri: URI | string | undefined): boolean;
|
12
|
-
isLocal(uri: URI | string | undefined): boolean;
|
13
|
-
}
|
14
|
-
export declare class UriParser implements IUriParser {
|
15
|
-
protected readonly fs: FileSystem;
|
16
|
-
constructor(fs: FileSystem);
|
17
|
-
decodeTextDocumentPosition(textDocument: TextDocumentIdentifier, position: Position): {
|
18
|
-
filePath: string;
|
19
|
-
position: Position;
|
20
|
-
};
|
21
|
-
decodeTextDocumentUri(uriString: string): string;
|
22
|
-
isUntitled(uri: URI | string | undefined): boolean;
|
23
|
-
isLocal(uri: URI | string | undefined): boolean;
|
24
|
-
}
|
package/dist/common/uriParser.js
DELETED
@@ -1,45 +0,0 @@
|
|
1
|
-
"use strict";
|
2
|
-
/*
|
3
|
-
* uriParser.ts
|
4
|
-
* Copyright (c) Microsoft Corporation.
|
5
|
-
* Licensed under the MIT license.
|
6
|
-
*
|
7
|
-
* URI utility functions.
|
8
|
-
*/
|
9
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
10
|
-
exports.UriParser = void 0;
|
11
|
-
const vscode_uri_1 = require("vscode-uri");
|
12
|
-
const core_1 = require("./core");
|
13
|
-
const pathUtils_1 = require("./pathUtils");
|
14
|
-
class UriParser {
|
15
|
-
constructor(fs) {
|
16
|
-
this.fs = fs;
|
17
|
-
}
|
18
|
-
decodeTextDocumentPosition(textDocument, position) {
|
19
|
-
const filePath = this.decodeTextDocumentUri(textDocument.uri);
|
20
|
-
return { filePath, position };
|
21
|
-
}
|
22
|
-
decodeTextDocumentUri(uriString) {
|
23
|
-
return (0, pathUtils_1.convertUriToPath)(this.fs, uriString);
|
24
|
-
}
|
25
|
-
isUntitled(uri) {
|
26
|
-
if (!uri) {
|
27
|
-
return false;
|
28
|
-
}
|
29
|
-
if ((0, core_1.isString)(uri)) {
|
30
|
-
uri = vscode_uri_1.URI.parse(uri);
|
31
|
-
}
|
32
|
-
return uri.scheme === 'untitled';
|
33
|
-
}
|
34
|
-
isLocal(uri) {
|
35
|
-
if (!uri) {
|
36
|
-
return false;
|
37
|
-
}
|
38
|
-
if ((0, core_1.isString)(uri)) {
|
39
|
-
uri = vscode_uri_1.URI.parse(uri);
|
40
|
-
}
|
41
|
-
return uri.scheme === 'file';
|
42
|
-
}
|
43
|
-
}
|
44
|
-
exports.UriParser = UriParser;
|
45
|
-
//# sourceMappingURL=uriParser.js.map
|
@@ -1 +0,0 @@
|
|
1
|
-
{"version":3,"file":"uriParser.js","sourceRoot":"","sources":["../../../src/common/uriParser.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAIH,2CAAiC;AAEjC,iCAAkC;AAElC,2CAA+C;AAY/C,MAAa,SAAS;IAClB,YAA+B,EAAc;QAAd,OAAE,GAAF,EAAE,CAAY;IAAG,CAAC;IAEjD,0BAA0B,CAAC,YAAoC,EAAE,QAAkB;QAC/E,MAAM,QAAQ,GAAG,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAC9D,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;IAClC,CAAC;IAED,qBAAqB,CAAC,SAAiB;QACnC,OAAO,IAAA,4BAAgB,EAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;IAChD,CAAC;IAED,UAAU,CAAC,GAA6B;QACpC,IAAI,CAAC,GAAG,EAAE;YACN,OAAO,KAAK,CAAC;SAChB;QAED,IAAI,IAAA,eAAQ,EAAC,GAAG,CAAC,EAAE;YACf,GAAG,GAAG,gBAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACxB;QAED,OAAO,GAAG,CAAC,MAAM,KAAK,UAAU,CAAC;IACrC,CAAC;IAED,OAAO,CAAC,GAA6B;QACjC,IAAI,CAAC,GAAG,EAAE;YACN,OAAO,KAAK,CAAC;SAChB;QAED,IAAI,IAAA,eAAQ,EAAC,GAAG,CAAC,EAAE;YACf,GAAG,GAAG,gBAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACxB;QAED,OAAO,GAAG,CAAC,MAAM,KAAK,MAAM,CAAC;IACjC,CAAC;CACJ;AAnCD,8BAmCC"}
|