@zzzen/pyright-internal 1.2.0-dev.20260809 → 1.2.0-dev.20260823
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/analyzerNodeInfo.d.ts +119 -24
- package/dist/analyzer/analyzerNodeInfo.js +408 -89
- package/dist/analyzer/analyzerNodeInfo.js.map +1 -1
- package/dist/analyzer/binder.d.ts +6 -3
- package/dist/analyzer/binder.js +157 -70
- package/dist/analyzer/binder.js.map +1 -1
- package/dist/analyzer/checker.d.ts +5 -2
- package/dist/analyzer/checker.js +92 -34
- package/dist/analyzer/checker.js.map +1 -1
- package/dist/analyzer/codeFlowEngine.d.ts +2 -1
- package/dist/analyzer/codeFlowEngine.js +12 -10
- package/dist/analyzer/codeFlowEngine.js.map +1 -1
- package/dist/analyzer/codeFlowUtils.d.ts +2 -1
- package/dist/analyzer/codeFlowUtils.js +2 -3
- package/dist/analyzer/codeFlowUtils.js.map +1 -1
- package/dist/analyzer/constraintSolver.js +47 -7
- package/dist/analyzer/constraintSolver.js.map +1 -1
- package/dist/analyzer/constructors.js +18 -8
- package/dist/analyzer/constructors.js.map +1 -1
- package/dist/analyzer/dataClasses.d.ts +6 -4
- package/dist/analyzer/dataClasses.js +119 -75
- package/dist/analyzer/dataClasses.js.map +1 -1
- package/dist/analyzer/declarationUtils.d.ts +2 -1
- package/dist/analyzer/declarationUtils.js +2 -2
- package/dist/analyzer/declarationUtils.js.map +1 -1
- package/dist/analyzer/decorators.d.ts +5 -4
- package/dist/analyzer/decorators.js +38 -21
- package/dist/analyzer/decorators.js.map +1 -1
- package/dist/analyzer/enums.d.ts +5 -4
- package/dist/analyzer/enums.js +11 -10
- package/dist/analyzer/enums.js.map +1 -1
- package/dist/analyzer/importResolver.d.ts +1 -1
- package/dist/analyzer/importResolver.js +5 -3
- package/dist/analyzer/importResolver.js.map +1 -1
- package/dist/analyzer/importStatementUtils.d.ts +3 -1
- package/dist/analyzer/importStatementUtils.js +14 -7
- package/dist/analyzer/importStatementUtils.js.map +1 -1
- package/dist/analyzer/namedTuples.d.ts +2 -1
- package/dist/analyzer/namedTuples.js +3 -4
- package/dist/analyzer/namedTuples.js.map +1 -1
- package/dist/analyzer/operations.d.ts +3 -2
- package/dist/analyzer/operations.js +8 -8
- package/dist/analyzer/operations.js.map +1 -1
- package/dist/analyzer/packageTypeVerifier.js +2 -2
- package/dist/analyzer/packageTypeVerifier.js.map +1 -1
- package/dist/analyzer/parseTreeUtils.d.ts +13 -11
- package/dist/analyzer/parseTreeUtils.js +62 -36
- package/dist/analyzer/parseTreeUtils.js.map +1 -1
- package/dist/analyzer/parseTreeWalker.d.ts +7 -2
- package/dist/analyzer/parseTreeWalker.js +29 -175
- package/dist/analyzer/parseTreeWalker.js.map +1 -1
- package/dist/analyzer/patternMatching.d.ts +4 -3
- package/dist/analyzer/patternMatching.js +47 -43
- package/dist/analyzer/patternMatching.js.map +1 -1
- package/dist/analyzer/program.d.ts +12 -0
- package/dist/analyzer/program.js +235 -29
- package/dist/analyzer/program.js.map +1 -1
- package/dist/analyzer/properties.d.ts +4 -3
- package/dist/analyzer/properties.js +7 -8
- package/dist/analyzer/properties.js.map +1 -1
- package/dist/analyzer/protocols.js +14 -2
- package/dist/analyzer/protocols.js.map +1 -1
- package/dist/analyzer/scope.d.ts +3 -0
- package/dist/analyzer/scope.js +10 -0
- package/dist/analyzer/scope.js.map +1 -1
- package/dist/analyzer/scopeUtils.d.ts +4 -3
- package/dist/analyzer/scopeUtils.js +8 -8
- package/dist/analyzer/scopeUtils.js.map +1 -1
- package/dist/analyzer/sentinel.d.ts +2 -1
- package/dist/analyzer/sentinel.js +2 -3
- package/dist/analyzer/sentinel.js.map +1 -1
- package/dist/analyzer/service.js +28 -10
- package/dist/analyzer/service.js.map +1 -1
- package/dist/analyzer/sourceEnumerator.d.ts +5 -0
- package/dist/analyzer/sourceEnumerator.js +57 -3
- package/dist/analyzer/sourceEnumerator.js.map +1 -1
- package/dist/analyzer/sourceFile.d.ts +12 -6
- package/dist/analyzer/sourceFile.js +73 -50
- package/dist/analyzer/sourceFile.js.map +1 -1
- package/dist/analyzer/sourceFileInfoUtils.d.ts +1 -0
- package/dist/analyzer/sourceFileInfoUtils.js +8 -0
- package/dist/analyzer/sourceFileInfoUtils.js.map +1 -1
- package/dist/analyzer/sourceMapper.d.ts +4 -1
- package/dist/analyzer/sourceMapper.js +14 -8
- package/dist/analyzer/sourceMapper.js.map +1 -1
- package/dist/analyzer/symbol.d.ts +4 -1
- package/dist/analyzer/symbol.js +8 -0
- package/dist/analyzer/symbol.js.map +1 -1
- package/dist/analyzer/testWalker.js +2 -1
- package/dist/analyzer/testWalker.js.map +1 -1
- package/dist/analyzer/tracePrinter.d.ts +2 -1
- package/dist/analyzer/tracePrinter.js +2 -2
- package/dist/analyzer/tracePrinter.js.map +1 -1
- package/dist/analyzer/tuples.d.ts +3 -2
- package/dist/analyzer/tuples.js +5 -5
- package/dist/analyzer/tuples.js.map +1 -1
- package/dist/analyzer/typeCacheUtils.d.ts +6 -2
- package/dist/analyzer/typeCacheUtils.js +16 -37
- package/dist/analyzer/typeCacheUtils.js.map +1 -1
- package/dist/analyzer/typeDocStringUtils.d.ts +5 -7
- package/dist/analyzer/typeDocStringUtils.js +229 -132
- package/dist/analyzer/typeDocStringUtils.js.map +1 -1
- package/dist/analyzer/typeEvaluator.d.ts +2 -0
- package/dist/analyzer/typeEvaluator.js +1280 -302
- package/dist/analyzer/typeEvaluator.js.map +1 -1
- package/dist/analyzer/typeEvaluatorTypes.d.ts +2 -0
- package/dist/analyzer/typeEvaluatorTypes.js.map +1 -1
- package/dist/analyzer/typeGuards.d.ts +3 -2
- package/dist/analyzer/typeGuards.js +37 -33
- package/dist/analyzer/typeGuards.js.map +1 -1
- package/dist/analyzer/typeStubWriter.js +12 -9
- package/dist/analyzer/typeStubWriter.js.map +1 -1
- package/dist/analyzer/typeUtils.js +3 -1
- package/dist/analyzer/typeUtils.js.map +1 -1
- package/dist/analyzer/typedDicts.d.ts +4 -3
- package/dist/analyzer/typedDicts.js +15 -14
- package/dist/analyzer/typedDicts.js.map +1 -1
- package/dist/analyzer/types.d.ts +11 -1
- package/dist/analyzer/types.js +48 -0
- package/dist/analyzer/types.js.map +1 -1
- package/dist/commands/dumpFileDebugInfoCommand.js +1 -1
- package/dist/commands/dumpFileDebugInfoCommand.js.map +1 -1
- package/dist/common/collectionUtils.js +15 -6
- package/dist/common/collectionUtils.js.map +1 -1
- package/dist/common/commandLineOptions.d.ts +1 -0
- package/dist/common/commandLineOptions.js.map +1 -1
- package/dist/common/configOptions.d.ts +4 -1
- package/dist/common/configOptions.js +68 -12
- package/dist/common/configOptions.js.map +1 -1
- package/dist/common/envVarUtils.d.ts +1 -0
- package/dist/common/envVarUtils.js +41 -10
- package/dist/common/envVarUtils.js.map +1 -1
- package/dist/common/extensibility.d.ts +3 -1
- package/dist/common/extensibility.js.map +1 -1
- package/dist/common/extraPathGlob.d.ts +12 -0
- package/dist/common/extraPathGlob.js +315 -0
- package/dist/common/extraPathGlob.js.map +1 -0
- package/dist/common/host.d.ts +2 -0
- package/dist/common/host.js.map +1 -1
- package/dist/common/languageServerInterface.d.ts +2 -1
- package/dist/common/languageServerInterface.js.map +1 -1
- package/dist/common/pathConsts.d.ts +1 -0
- package/dist/common/pathConsts.js +11 -1
- package/dist/common/pathConsts.js.map +1 -1
- package/dist/common/processUtils.d.ts +4 -2
- package/dist/common/processUtils.js +3 -0
- package/dist/common/processUtils.js.map +1 -1
- package/dist/common/stringUtils.d.ts +6 -0
- package/dist/common/stringUtils.js +87 -5
- package/dist/common/stringUtils.js.map +1 -1
- package/dist/common/textEditTracker.d.ts +3 -1
- package/dist/common/textEditTracker.js +8 -6
- package/dist/common/textEditTracker.js.map +1 -1
- package/dist/common/textRangeCollection.d.ts +1 -0
- package/dist/common/textRangeCollection.js +32 -1
- package/dist/common/textRangeCollection.js.map +1 -1
- package/dist/common/uri/uriUtils.d.ts +3 -0
- package/dist/common/uri/uriUtils.js +65 -15
- package/dist/common/uri/uriUtils.js.map +1 -1
- package/dist/fileSystemMapping.d.ts +10 -0
- package/dist/fileSystemMapping.js +176 -0
- package/dist/fileSystemMapping.js.map +1 -0
- package/dist/languageService/analyzerServiceExecutor.js +2 -1
- package/dist/languageService/analyzerServiceExecutor.js.map +1 -1
- package/dist/languageService/autoImporter.d.ts +1 -0
- package/dist/languageService/autoImporter.js +32 -5
- package/dist/languageService/autoImporter.js.map +1 -1
- package/dist/languageService/callHierarchyProvider.d.ts +7 -0
- package/dist/languageService/callHierarchyProvider.js +97 -11
- package/dist/languageService/callHierarchyProvider.js.map +1 -1
- package/dist/languageService/completionProvider.d.ts +30 -8
- package/dist/languageService/completionProvider.js +298 -93
- package/dist/languageService/completionProvider.js.map +1 -1
- package/dist/languageService/definitionProvider.js +7 -6
- package/dist/languageService/definitionProvider.js.map +1 -1
- package/dist/languageService/documentHighlightProvider.js +2 -1
- package/dist/languageService/documentHighlightProvider.js.map +1 -1
- package/dist/languageService/documentSymbolCollector.d.ts +3 -1
- package/dist/languageService/documentSymbolCollector.js +78 -14
- package/dist/languageService/documentSymbolCollector.js.map +1 -1
- package/dist/languageService/documentSymbolProvider.js +3 -2
- package/dist/languageService/documentSymbolProvider.js.map +1 -1
- package/dist/languageService/fileWatcherDynamicFeature.js +28 -1
- package/dist/languageService/fileWatcherDynamicFeature.js.map +1 -1
- package/dist/languageService/hoverProvider.d.ts +2 -1
- package/dist/languageService/hoverProvider.js +48 -16
- package/dist/languageService/hoverProvider.js.map +1 -1
- package/dist/languageService/importSorter.d.ts +3 -1
- package/dist/languageService/importSorter.js +4 -2
- package/dist/languageService/importSorter.js.map +1 -1
- package/dist/languageService/importStatementCandidates.js +4 -2
- package/dist/languageService/importStatementCandidates.js.map +1 -1
- package/dist/languageService/quickActions.js +2 -1
- package/dist/languageService/quickActions.js.map +1 -1
- package/dist/languageService/referencesProvider.js +12 -5
- package/dist/languageService/referencesProvider.js.map +1 -1
- package/dist/languageService/signatureHelpProvider.d.ts +3 -0
- package/dist/languageService/signatureHelpProvider.js +56 -18
- package/dist/languageService/signatureHelpProvider.js.map +1 -1
- package/dist/languageService/symbolIndexer.d.ts +2 -1
- package/dist/languageService/symbolIndexer.js +7 -7
- package/dist/languageService/symbolIndexer.js.map +1 -1
- package/dist/languageService/tooltipUtils.d.ts +1 -1
- package/dist/languageService/tooltipUtils.js +103 -35
- package/dist/languageService/tooltipUtils.js.map +1 -1
- package/dist/languageService/workspaceSymbolProvider.js +3 -2
- package/dist/languageService/workspaceSymbolProvider.js.map +1 -1
- package/dist/localization/localize.d.ts +12 -0
- package/dist/localization/localize.js +14 -0
- package/dist/localization/localize.js.map +1 -1
- package/dist/localization/package.nls.cs.json +11 -0
- package/dist/localization/package.nls.de.json +11 -0
- package/dist/localization/package.nls.en-us.json +18 -0
- package/dist/localization/package.nls.es.json +11 -0
- package/dist/localization/package.nls.fr.json +11 -0
- package/dist/localization/package.nls.it.json +11 -0
- package/dist/localization/package.nls.ja.json +11 -0
- package/dist/localization/package.nls.ko.json +11 -0
- package/dist/localization/package.nls.pl.json +11 -0
- package/dist/localization/package.nls.pt-br.json +11 -0
- package/dist/localization/package.nls.qps-ploc.json +11 -0
- package/dist/localization/package.nls.ru.json +11 -0
- package/dist/localization/package.nls.tr.json +11 -0
- package/dist/localization/package.nls.zh-cn.json +12 -1
- package/dist/localization/package.nls.zh-tw.json +13 -2
- package/dist/parser/parseNodes.d.ts +85 -80
- package/dist/parser/parseNodes.js +182 -159
- package/dist/parser/parseNodes.js.map +1 -1
- package/dist/parser/parseTreeUtils.d.ts +3 -0
- package/dist/parser/parseTreeUtils.js +209 -0
- package/dist/parser/parseTreeUtils.js.map +1 -0
- package/dist/parser/parser.d.ts +16 -6
- package/dist/parser/parser.js +210 -144
- package/dist/parser/parser.js.map +1 -1
- package/dist/parser/stringAnnotationInfo.d.ts +16 -0
- package/dist/parser/stringAnnotationInfo.js +26 -0
- package/dist/parser/stringAnnotationInfo.js.map +1 -0
- package/dist/readonlyAugmentedFileSystem.d.ts +2 -9
- package/dist/readonlyAugmentedFileSystem.js +17 -144
- package/dist/readonlyAugmentedFileSystem.js.map +1 -1
- package/dist/server.js +2 -2
- package/dist/server.js.map +1 -1
- package/dist/tests/analyzerNodeInfo.test.d.ts +1 -0
- package/dist/tests/analyzerNodeInfo.test.js +113 -0
- package/dist/tests/analyzerNodeInfo.test.js.map +1 -0
- package/dist/tests/collectionUtils.test.js +46 -0
- package/dist/tests/collectionUtils.test.js.map +1 -1
- package/dist/tests/completions.test.js +34 -0
- package/dist/tests/completions.test.js.map +1 -1
- package/dist/tests/config.test.js +131 -6
- package/dist/tests/config.test.js.map +1 -1
- package/dist/tests/extraPathGlob.test.d.ts +1 -0
- package/dist/tests/extraPathGlob.test.js +434 -0
- package/dist/tests/extraPathGlob.test.js.map +1 -0
- package/dist/tests/fileSystemMapping.test.d.ts +1 -0
- package/dist/tests/fileSystemMapping.test.js +458 -0
- package/dist/tests/fileSystemMapping.test.js.map +1 -0
- package/dist/tests/fourslash/completions.call.typedDict.fourslash.js +23 -0
- package/dist/tests/fourslash/completions.call.typedDict.fourslash.js.map +1 -1
- package/dist/tests/fourslash/completions.call.typedDict.list.fourslash.js +14 -0
- package/dist/tests/fourslash/completions.call.typedDict.list.fourslash.js.map +1 -1
- package/dist/tests/fourslash/completions.call.typedDict.states.fourslash.js +7 -0
- package/dist/tests/fourslash/completions.call.typedDict.states.fourslash.js.map +1 -1
- package/dist/tests/fourslash/completions.callSite.isinstanceNarrowing.fourslash.d.ts +1 -0
- package/dist/tests/fourslash/completions.callSite.isinstanceNarrowing.fourslash.js +41 -0
- package/dist/tests/fourslash/completions.callSite.isinstanceNarrowing.fourslash.js.map +1 -0
- package/dist/tests/fourslash/completions.dictionary.keys.literalTypes.fourslash.js +2 -0
- package/dist/tests/fourslash/completions.dictionary.keys.literalTypes.fourslash.js.map +1 -1
- package/dist/tests/fourslash/completions.fstring.stringLiteral.fourslash.js +5 -0
- package/dist/tests/fourslash/completions.fstring.stringLiteral.fourslash.js.map +1 -1
- package/dist/tests/fourslash/completions.stringLiteral.fourslash.js +4 -0
- package/dist/tests/fourslash/completions.stringLiteral.fourslash.js.map +1 -1
- package/dist/tests/fourslash/findallreferences.protocolMemberVariable.fourslash.d.ts +1 -0
- package/dist/tests/fourslash/findallreferences.protocolMemberVariable.fourslash.js +48 -0
- package/dist/tests/fourslash/findallreferences.protocolMemberVariable.fourslash.js.map +1 -0
- package/dist/tests/fourslash/hover.inherited.docFromSrc.fourslash.js +8 -2
- package/dist/tests/fourslash/hover.inherited.docFromSrc.fourslash.js.map +1 -1
- package/dist/tests/fourslash/hover.inherited.docFromStub.fourslash.js +5 -2
- package/dist/tests/fourslash/hover.inherited.docFromStub.fourslash.js.map +1 -1
- package/dist/tests/fourslash/signature.docstrings.overloaded.fourslash.js +2 -2
- package/dist/tests/fourslash/signature.docstrings.overloaded.fourslash.js.map +1 -1
- package/dist/tests/harness/fourslash/testState.js +1 -1
- package/dist/tests/harness/fourslash/testState.js.map +1 -1
- package/dist/tests/hoverProvider.test.js +38 -0
- package/dist/tests/hoverProvider.test.js.map +1 -1
- package/dist/tests/importStatementUtils.test.js +6 -3
- package/dist/tests/importStatementUtils.test.js.map +1 -1
- package/dist/tests/ipythonMode.test.js +38 -0
- package/dist/tests/ipythonMode.test.js.map +1 -1
- package/dist/tests/parseTreeUtils.test.js +88 -0
- package/dist/tests/parseTreeUtils.test.js.map +1 -1
- package/dist/tests/parser.test.js +60 -3
- package/dist/tests/parser.test.js.map +1 -1
- package/dist/tests/positionUtils.test.js +23 -0
- package/dist/tests/positionUtils.test.js.map +1 -1
- package/dist/tests/pyrightFileSystem.test.js +41 -0
- package/dist/tests/pyrightFileSystem.test.js.map +1 -1
- package/dist/tests/service.test.js +77 -0
- package/dist/tests/service.test.js.map +1 -1
- package/dist/tests/sourceEnumeratorSymlink.test.d.ts +1 -0
- package/dist/tests/sourceEnumeratorSymlink.test.js +203 -0
- package/dist/tests/sourceEnumeratorSymlink.test.js.map +1 -0
- package/dist/tests/stringUtils.test.js +84 -0
- package/dist/tests/stringUtils.test.js.map +1 -1
- package/dist/tests/symlinkAliasInvalidation.test.d.ts +1 -0
- package/dist/tests/symlinkAliasInvalidation.test.js +471 -0
- package/dist/tests/symlinkAliasInvalidation.test.js.map +1 -0
- package/dist/tests/testUtils.d.ts +2 -0
- package/dist/tests/testUtils.js +7 -1
- package/dist/tests/testUtils.js.map +1 -1
- package/dist/tests/textEditUtil.test.js +2 -2
- package/dist/tests/textEditUtil.test.js.map +1 -1
- package/dist/tests/textRangeCollection.test.d.ts +1 -0
- package/dist/tests/textRangeCollection.test.js +137 -0
- package/dist/tests/textRangeCollection.test.js.map +1 -0
- package/dist/tests/typeCacheUtils.test.d.ts +1 -0
- package/dist/tests/typeCacheUtils.test.js +69 -0
- package/dist/tests/typeCacheUtils.test.js.map +1 -0
- package/dist/tests/typeEvaluator1.test.js +24 -3
- package/dist/tests/typeEvaluator1.test.js.map +1 -1
- package/dist/tests/typeEvaluator3.test.js +8 -0
- package/dist/tests/typeEvaluator3.test.js.map +1 -1
- package/dist/tests/typeEvaluator4.test.js +4 -0
- package/dist/tests/typeEvaluator4.test.js.map +1 -1
- package/dist/tests/typeEvaluator5.test.js +12 -0
- package/dist/tests/typeEvaluator5.test.js.map +1 -1
- package/dist/tests/typeEvaluator6.test.js +33 -1
- package/dist/tests/typeEvaluator6.test.js.map +1 -1
- package/dist/tests/typeEvaluator7.test.js +29 -0
- package/dist/tests/typeEvaluator7.test.js.map +1 -1
- package/dist/tests/typeEvaluator8.test.js +318 -4
- package/dist/tests/typeEvaluator8.test.js.map +1 -1
- package/dist/tests/typeServer/typeCache.test.d.ts +1 -0
- package/dist/tests/typeServer/typeCache.test.js +69 -0
- package/dist/tests/typeServer/typeCache.test.js.map +1 -0
- package/dist/tests/typeServer/typeServer.virtualFileRedirect.test.js +18 -0
- package/dist/tests/typeServer/typeServer.virtualFileRedirect.test.js.map +1 -1
- package/dist/tests/types.test.d.ts +1 -0
- package/dist/{analyzer/parseTreeCleaner.js → tests/types.test.js} +23 -25
- package/dist/tests/types.test.js.map +1 -0
- package/dist/tests/uri.test.js +51 -0
- package/dist/tests/uri.test.js.map +1 -1
- package/dist/typeServer/notebookDocumentHandler.d.ts +9 -2
- package/dist/typeServer/notebookDocumentHandler.js +16 -6
- package/dist/typeServer/notebookDocumentHandler.js.map +1 -1
- package/dist/typeServer/programWrapper.d.ts +1 -0
- package/dist/typeServer/programWrapper.js +28 -15
- package/dist/typeServer/programWrapper.js.map +1 -1
- package/dist/typeServer/protocol/tspSupplemental.d.ts +1 -1
- package/dist/typeServer/protocol/tspSupplemental.js +2 -2
- package/dist/typeServer/server.d.ts +13 -2
- package/dist/typeServer/server.js +36 -23
- package/dist/typeServer/server.js.map +1 -1
- package/dist/typeServer/typeCache.d.ts +8 -4
- package/dist/typeServer/typeCache.js +33 -5
- package/dist/typeServer/typeCache.js.map +1 -1
- package/dist/typeServer/typeEvalUtils.d.ts +2 -1
- package/dist/typeServer/typeEvalUtils.js +7 -3
- package/dist/typeServer/typeEvalUtils.js.map +1 -1
- package/dist/typeServer/typeServerFileSystem.d.ts +10 -9
- package/dist/typeServer/typeServerFileSystem.js +16 -12
- package/dist/typeServer/typeServerFileSystem.js.map +1 -1
- package/package.json +7 -5
- package/dist/analyzer/parseTreeCleaner.d.ts +0 -8
- package/dist/analyzer/parseTreeCleaner.js.map +0 -1
|
@@ -51,7 +51,8 @@ const positionUtils_1 = require("./positionUtils");
|
|
|
51
51
|
const textRange_1 = require("./textRange");
|
|
52
52
|
const uri_1 = require("./uri/uri");
|
|
53
53
|
class TextEditTracker {
|
|
54
|
-
constructor(_mergeOnlyDuplications = true) {
|
|
54
|
+
constructor(_nodeInfo, _mergeOnlyDuplications = true) {
|
|
55
|
+
this._nodeInfo = _nodeInfo;
|
|
55
56
|
this._mergeOnlyDuplications = _mergeOnlyDuplications;
|
|
56
57
|
this._nodesRemoved = new Map();
|
|
57
58
|
this._results = new Map();
|
|
@@ -79,7 +80,7 @@ class TextEditTracker {
|
|
|
79
80
|
edits.push({ fileUri: fileUri, range, replacementText });
|
|
80
81
|
}
|
|
81
82
|
addEditWithTextRange(parseFileResults, range, replacementText) {
|
|
82
|
-
const filePath = (0, analyzerNodeInfo_1.getFileInfo)(parseFileResults.parserOutput.parseTree).fileUri;
|
|
83
|
+
const filePath = (0, analyzerNodeInfo_1.getFileInfo)(parseFileResults.parserOutput.parseTree, this._nodeInfo).fileUri;
|
|
83
84
|
const existing = parseFileResults.text.substr(range.start, range.length);
|
|
84
85
|
if (existing === replacementText) {
|
|
85
86
|
// No change. Return as it is.
|
|
@@ -93,7 +94,7 @@ class TextEditTracker {
|
|
|
93
94
|
const imports = importToDelete.nodeType === 24 /* ParseNodeType.ImportAs */
|
|
94
95
|
? importToDelete.parent.d.list
|
|
95
96
|
: importToDelete.parent.d.imports;
|
|
96
|
-
const filePath = (0, analyzerNodeInfo_1.getFileInfo)(parseFileResults.parserOutput.parseTree).fileUri;
|
|
97
|
+
const filePath = (0, analyzerNodeInfo_1.getFileInfo)(parseFileResults.parserOutput.parseTree, this._nodeInfo).fileUri;
|
|
97
98
|
const ranges = (0, importStatementUtils_1.getTextRangeForImportNameDeletion)(parseFileResults, imports, imports.findIndex((v) => v === importToDelete));
|
|
98
99
|
ranges.forEach((r) => this.addEditWithTextRange(parseFileResults, r, ''));
|
|
99
100
|
this._markNodeRemoved(importToDelete, parseFileResults);
|
|
@@ -146,7 +147,7 @@ class TextEditTracker {
|
|
|
146
147
|
return edits;
|
|
147
148
|
}
|
|
148
149
|
_addImport(parseFileResults, importStatements, moduleNameInfo, importGroup, importNameInfo) {
|
|
149
|
-
const fileUri = (0, analyzerNodeInfo_1.getFileInfo)(parseFileResults.parserOutput.parseTree).fileUri;
|
|
150
|
+
const fileUri = (0, analyzerNodeInfo_1.getFileInfo)(parseFileResults.parserOutput.parseTree, this._nodeInfo).fileUri;
|
|
150
151
|
this.addEdits(...(0, importStatementUtils_1.getTextEditsForAutoImportInsertion)(importNameInfo ?? [], moduleNameInfo, importStatements, importGroup, parseFileResults, (0, positionUtils_1.convertOffsetToPosition)(parseFileResults.parserOutput.parseTree.length, parseFileResults.tokenizerOutput.lines)).map((e) => ({ fileUri, range: e.range, replacementText: e.replacementText })));
|
|
151
152
|
}
|
|
152
153
|
_tryUpdateImport(parseFileResults, importStatements, moduleNameInfo, importNameInfo, updateOptions) {
|
|
@@ -160,7 +161,7 @@ class TextEditTracker {
|
|
|
160
161
|
if (!imported || imported.node.nodeType !== 25 /* ParseNodeType.ImportFrom */ || imported.node.d.isWildcardImport) {
|
|
161
162
|
return false;
|
|
162
163
|
}
|
|
163
|
-
const fileUri = (0, analyzerNodeInfo_1.getFileInfo)(parseFileResults.parserOutput.parseTree).fileUri;
|
|
164
|
+
const fileUri = (0, analyzerNodeInfo_1.getFileInfo)(parseFileResults.parserOutput.parseTree, this._nodeInfo).fileUri;
|
|
164
165
|
const edits = (0, importStatementUtils_1.getTextEditsForAutoImportSymbolAddition)(importNameInfo, imported, parseFileResults);
|
|
165
166
|
if (imported.node !== updateOptions.currentFromImport) {
|
|
166
167
|
// Add what we want to the existing "import from" statement as long as it is not the same import
|
|
@@ -296,7 +297,8 @@ class TextEditTracker {
|
|
|
296
297
|
// external type-server snapshot must provide it, because the per-snapshot `AnalyzerFileInfo`
|
|
297
298
|
// is not stored on the parse tree node (parse trees are shared across snapshots and cannot
|
|
298
299
|
// be mutated). Fall back to the parse-tree-attached info for the sync/in-proc paths.
|
|
299
|
-
return nodeToRemove.fileUri ??
|
|
300
|
+
return (nodeToRemove.fileUri ??
|
|
301
|
+
(0, analyzerNodeInfo_1.getFileInfo)(nodeToRemove.parseFileResults.parserOutput.parseTree, this._nodeInfo).fileUri);
|
|
300
302
|
}
|
|
301
303
|
_removeNodesHandled(nodesRemoved) {
|
|
302
304
|
nodesRemoved.forEach((n) => this._markNodeRemoved(n.node, n.parseFileResults));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"textEditTracker.js","sourceRoot":"","sources":["../../../../../src/common/textEditTracker.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"textEditTracker.js","sourceRoot":"","sources":["../../../../../src/common/textEditTracker.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,12 @@ const debug_1 = require("./debug");
|
|
|
18
18
|
const textRange_1 = require("./textRange");
|
|
19
19
|
class TextRangeCollection {
|
|
20
20
|
constructor(items) {
|
|
21
|
+
// Index most recently returned by getItemContaining. Offsets converted in
|
|
22
|
+
// bulk (e.g. one per completion item or reference) cluster on the same or an
|
|
23
|
+
// adjacent line, so remembering the last hit lets consecutive lookups skip the
|
|
24
|
+
// binary search. It is only ever used as a hint that is re-validated on each
|
|
25
|
+
// call, so it never changes the returned result.
|
|
26
|
+
this._lastHitIndex = 0;
|
|
21
27
|
this._items = items;
|
|
22
28
|
}
|
|
23
29
|
get start() {
|
|
@@ -85,7 +91,32 @@ class TextRangeCollection {
|
|
|
85
91
|
if (position > this.end) {
|
|
86
92
|
return -1;
|
|
87
93
|
}
|
|
88
|
-
|
|
94
|
+
// Fast path: check the last returned index and its forward neighbor before
|
|
95
|
+
// falling back to the binary search. Because the items are immutable, sorted
|
|
96
|
+
// and non-overlapping, an item that contains the position is unique, so any
|
|
97
|
+
// index returned here is exactly what getIndexContaining would return. The
|
|
98
|
+
// memo is re-validated with the same containment predicate on every call, so
|
|
99
|
+
// a stale hint can only miss (and fall through), never return a wrong result.
|
|
100
|
+
const lastHit = this._lastHitIndex;
|
|
101
|
+
if (lastHit >= 0 && lastHit < this._items.length) {
|
|
102
|
+
const item = this._items[lastHit];
|
|
103
|
+
if (item !== undefined && textRange_1.TextRange.contains(item, position)) {
|
|
104
|
+
return lastHit;
|
|
105
|
+
}
|
|
106
|
+
const nextIndex = lastHit + 1;
|
|
107
|
+
if (nextIndex < this._items.length) {
|
|
108
|
+
const nextItem = this._items[nextIndex];
|
|
109
|
+
if (nextItem !== undefined && textRange_1.TextRange.contains(nextItem, position)) {
|
|
110
|
+
this._lastHitIndex = nextIndex;
|
|
111
|
+
return nextIndex;
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
const index = getIndexContaining(this._items, position);
|
|
116
|
+
if (index >= 0) {
|
|
117
|
+
this._lastHitIndex = index;
|
|
118
|
+
}
|
|
119
|
+
return index;
|
|
89
120
|
}
|
|
90
121
|
}
|
|
91
122
|
exports.TextRangeCollection = TextRangeCollection;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"textRangeCollection.js","sourceRoot":"","sources":["../../../../../src/common/textRangeCollection.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;GAWG;;;
|
|
1
|
+
{"version":3,"file":"textRangeCollection.js","sourceRoot":"","sources":["../../../../../src/common/textRangeCollection.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,6 +35,8 @@ export declare function tryRealpath(fs: ReadOnlyFileSystem, uri: Uri): Uri | und
|
|
|
35
35
|
export declare function getFileSystemEntries(fs: ReadOnlyFileSystem, uri: Uri): FileSystemEntries;
|
|
36
36
|
export declare function getFileSystemEntriesWithSymlinkedDirectories(fs: ReadOnlyFileSystem, uri: Uri): FileSystemEntriesWithSymlinkedDirectories;
|
|
37
37
|
export declare function getFileSystemEntriesFromDirEntries(dirEntries: Iterable<Dirent>, fs: ReadOnlyFileSystem, uri: Uri): FileSystemEntries;
|
|
38
|
+
export declare function containsWildcardCharacter(text: string): boolean;
|
|
39
|
+
export declare function getWildcardSegmentRegexFragment(segment: string): string;
|
|
38
40
|
export declare function getWildcardRegexPattern(root: Uri, fileSpec: string): string;
|
|
39
41
|
export declare function getWildcardRoot(root: Uri, fileSpec: string): Uri;
|
|
40
42
|
export declare function hasPythonExtension(uri: Uri): boolean;
|
|
@@ -44,6 +46,7 @@ export declare function deduplicateFolders(listOfFolders: Uri[][], excludes?: Ur
|
|
|
44
46
|
export declare function getRootUri(serviceProvider: ServiceProvider): Uri | undefined;
|
|
45
47
|
export declare function getRootUri(caseDetector: CaseSensitivityDetector): Uri | undefined;
|
|
46
48
|
export declare function convertUriToLspUriString(fs: ReadOnlyFileSystem, uri: Uri): string;
|
|
49
|
+
export declare function isSameUriFile(uriA: Uri, uriB: Uri): boolean;
|
|
47
50
|
export declare namespace UriEx {
|
|
48
51
|
function file(path: string): Uri;
|
|
49
52
|
function file(path: string, isCaseSensitive: boolean, checkRelative?: boolean): Uri;
|
|
@@ -22,6 +22,8 @@ exports.tryRealpath = tryRealpath;
|
|
|
22
22
|
exports.getFileSystemEntries = getFileSystemEntries;
|
|
23
23
|
exports.getFileSystemEntriesWithSymlinkedDirectories = getFileSystemEntriesWithSymlinkedDirectories;
|
|
24
24
|
exports.getFileSystemEntriesFromDirEntries = getFileSystemEntriesFromDirEntries;
|
|
25
|
+
exports.containsWildcardCharacter = containsWildcardCharacter;
|
|
26
|
+
exports.getWildcardSegmentRegexFragment = getWildcardSegmentRegexFragment;
|
|
25
27
|
exports.getWildcardRegexPattern = getWildcardRegexPattern;
|
|
26
28
|
exports.getWildcardRoot = getWildcardRoot;
|
|
27
29
|
exports.hasPythonExtension = hasPythonExtension;
|
|
@@ -30,6 +32,7 @@ exports.getDirectoryChangeKind = getDirectoryChangeKind;
|
|
|
30
32
|
exports.deduplicateFolders = deduplicateFolders;
|
|
31
33
|
exports.getRootUri = getRootUri;
|
|
32
34
|
exports.convertUriToLspUriString = convertUriToLspUriString;
|
|
35
|
+
exports.isSameUriFile = isSameUriFile;
|
|
33
36
|
const caseSensitivityDetector_1 = require("../caseSensitivityDetector");
|
|
34
37
|
const pathUtils_1 = require("../pathUtils");
|
|
35
38
|
const serviceKeys_1 = require("../serviceKeys");
|
|
@@ -221,38 +224,51 @@ function getFileSystemEntriesWithSymlinkedDirectoriesFromDirEntries(dirEntries,
|
|
|
221
224
|
// Transforms a relative file spec (one that potentially contains
|
|
222
225
|
// escape characters **, * or ?) and returns a regular expression
|
|
223
226
|
// that can be used for matching against.
|
|
227
|
+
// Returns true if the given text contains a glob wildcard character (`*` or `?`).
|
|
228
|
+
function containsWildcardCharacter(text) {
|
|
229
|
+
return _wildcardRegex.test(text);
|
|
230
|
+
}
|
|
231
|
+
// Translates a single glob path segment (which may contain `*` or `?`, but not
|
|
232
|
+
// the `**` directory wildcard) into a regex fragment that matches a single path
|
|
233
|
+
// segment. This is the canonical per-segment translation used by both
|
|
234
|
+
// `getWildcardRegexPattern` (for `include`/`exclude`) and `extraPaths` glob
|
|
235
|
+
// expansion so the two stay in sync.
|
|
236
|
+
function getWildcardSegmentRegexFragment(segment) {
|
|
237
|
+
const escapedSeparator = (0, pathUtils_1.getRegexEscapedSeparator)('/');
|
|
238
|
+
const reservedCharacterPattern = new RegExp(`[^\\w\\s${escapedSeparator}]`, 'g');
|
|
239
|
+
return segment.replace(reservedCharacterPattern, (match) => {
|
|
240
|
+
if (match === '*') {
|
|
241
|
+
return `[^${escapedSeparator}]*`;
|
|
242
|
+
}
|
|
243
|
+
else if (match === '?') {
|
|
244
|
+
return `[^${escapedSeparator}]`;
|
|
245
|
+
}
|
|
246
|
+
else {
|
|
247
|
+
// escaping anything that is not reserved characters - word/space/separator
|
|
248
|
+
return '\\' + match;
|
|
249
|
+
}
|
|
250
|
+
});
|
|
251
|
+
}
|
|
224
252
|
function getWildcardRegexPattern(root, fileSpec) {
|
|
225
253
|
const absolutePath = root.resolvePaths(fileSpec);
|
|
226
254
|
const pathComponents = Array.from(absolutePath.getPathComponents());
|
|
227
255
|
const escapedSeparator = (0, pathUtils_1.getRegexEscapedSeparator)('/');
|
|
228
256
|
const doubleAsteriskRegexFragment = `(${escapedSeparator}[^${escapedSeparator}][^${escapedSeparator}]*)*?`;
|
|
229
|
-
const reservedCharacterPattern = new RegExp(`[^\\w\\s${escapedSeparator}]`, 'g');
|
|
230
257
|
// Strip the directory separator from the root component.
|
|
231
258
|
if (pathComponents.length > 0) {
|
|
232
259
|
pathComponents[0] = (0, pathUtils_1.stripTrailingDirectorySeparator)(pathComponents[0]);
|
|
233
260
|
}
|
|
234
261
|
let regExPattern = '';
|
|
235
262
|
let firstComponent = true;
|
|
236
|
-
for (
|
|
263
|
+
for (const component of pathComponents) {
|
|
237
264
|
if (component === '**') {
|
|
238
265
|
regExPattern += doubleAsteriskRegexFragment;
|
|
239
266
|
}
|
|
240
267
|
else {
|
|
241
268
|
if (!firstComponent) {
|
|
242
|
-
|
|
269
|
+
regExPattern += escapedSeparator;
|
|
243
270
|
}
|
|
244
|
-
regExPattern += component
|
|
245
|
-
if (match === '*') {
|
|
246
|
-
return `[^${escapedSeparator}]*`;
|
|
247
|
-
}
|
|
248
|
-
else if (match === '?') {
|
|
249
|
-
return `[^${escapedSeparator}]`;
|
|
250
|
-
}
|
|
251
|
-
else {
|
|
252
|
-
// escaping anything that is not reserved characters - word/space/separator
|
|
253
|
-
return '\\' + match;
|
|
254
|
-
}
|
|
255
|
-
});
|
|
271
|
+
regExPattern += getWildcardSegmentRegexFragment(component);
|
|
256
272
|
firstComponent = false;
|
|
257
273
|
}
|
|
258
274
|
}
|
|
@@ -372,6 +388,40 @@ function convertUriToLspUriString(fs, uri) {
|
|
|
372
388
|
// Convert to a URI string that the LSP client understands (mapped files are only local to the server).
|
|
373
389
|
return fs.getOriginalUri(uri).toString();
|
|
374
390
|
}
|
|
391
|
+
// Determines whether two parsed URIs refer to the same logical file.
|
|
392
|
+
//
|
|
393
|
+
// In virtual workspaces the same physical file can be tracked under more than one
|
|
394
|
+
// URI (for example two `vscode-vfs://` URIs that differ only by authority). Comparing
|
|
395
|
+
// the raw URI strings treats these as distinct files and produces duplicate results
|
|
396
|
+
// (e.g. duplicated call hierarchy entries). This helper only merges the two shapes it
|
|
397
|
+
// can safely reconcile:
|
|
398
|
+
// - Two `file://` URIs are compared by their file-system path (`getFilePath`).
|
|
399
|
+
// - Two virtual URIs (whose file path is empty) are compared by their scheme, URI
|
|
400
|
+
// path (`getPath`), query, and fragment. Only the authority is ignored, so virtual
|
|
401
|
+
// URIs that differ only by authority merge, while URIs that differ by scheme or by
|
|
402
|
+
// query/fragment (for example notebook cell URIs that carry a `#cellName` fragment)
|
|
403
|
+
// stay distinct.
|
|
404
|
+
// Any other combination (including a `file://` URI paired with a virtual URI, whose
|
|
405
|
+
// paths are not directly comparable) returns false, so callers should apply an exact
|
|
406
|
+
// string comparison first and only consult this helper when the strings differ.
|
|
407
|
+
function isSameUriFile(uriA, uriB) {
|
|
408
|
+
const filePathA = uriA.getFilePath();
|
|
409
|
+
const filePathB = uriB.getFilePath();
|
|
410
|
+
if (filePathA && filePathB) {
|
|
411
|
+
return filePathA === filePathB;
|
|
412
|
+
}
|
|
413
|
+
if (!filePathA && !filePathB) {
|
|
414
|
+
const pathA = uriA.getPath();
|
|
415
|
+
const pathB = uriB.getPath();
|
|
416
|
+
if (pathA && pathB) {
|
|
417
|
+
return (uriA.scheme === uriB.scheme &&
|
|
418
|
+
pathA === pathB &&
|
|
419
|
+
uriA.query === uriB.query &&
|
|
420
|
+
uriA.fragment === uriB.fragment);
|
|
421
|
+
}
|
|
422
|
+
}
|
|
423
|
+
return false;
|
|
424
|
+
}
|
|
375
425
|
var UriEx;
|
|
376
426
|
(function (UriEx) {
|
|
377
427
|
function file(path, arg, checkRelative) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uriUtils.js","sourceRoot":"","sources":["../../../../../../src/common/uri/uriUtils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"uriUtils.js","sourceRoot":"","sources":["../../../../../../src/common/uri/uriUtils.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAmEH,4DAiBC;AAGD,0CAeC;AAED,kCAMC;AAED,gCAEC;AAED,0CAEC;AAED,kCAEC;AAKD,8CAEC;AAMD,4CAWC;AAED,wBAWC;AAED,0BASC;AAED,kCAMC;AAED,oDAWC;AAED,oGASC;AAGD,gFAOC;AAkDD,8DAEC;AAOD,0EAcC;AAED,0DA4BC;AAGD,0CAwBC;AAED,gDAEC;AAED,kCAcC;AAuBD,wDAiBC;AAED,gDAqCC;AAID,gCAQC;AAED,4DAGC;AAkBD,sCAqBC;AA7eD,wEAAqE;AAErE,4CAIsB;AACtB,gDAA6C;AAE7C,+BAA4B;AAkB5B,MAAM,iBAAiB,GAAG,SAAS,CAAC;AACpC,MAAM,cAAc,GAAG,MAAM,CAAC;AAE9B,IAAiB,QAAQ,CAsBxB;AAtBD,WAAiB,QAAQ;IACrB,SAAgB,EAAE,CAAC,KAAU;QACzB,MAAM,SAAS,GAAa,KAAiB,CAAC;QAC9C,OAAO,SAAS,IAAI,CAAC,CAAC,SAAS,CAAC,YAAY,IAAI,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC;IACvE,CAAC;IAHe,WAAE,KAGjB,CAAA;IACD,SAAgB,QAAQ,CAAC,GAAQ,EAAE,KAAiB;QAChD,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3D,CAAC;IAFe,iBAAQ,WAEvB,CAAA;IAED,SAAgB,uBAAuB,CAAC,GAAQ,EAAE,MAAM,GAAG,IAAI;QAC3D,OAAO,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC/D,CAAC;IAFe,gCAAuB,0BAEtC,CAAA;IAED,SAAgB,oBAAoB,CAAC,aAAqB,EAAE,OAAmB,EAAE,GAAQ,EAAE,MAAM,GAAG,IAAI;QACpG,IAAI,GAAG,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,CAAC;YAClC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,QAAQ,CAAC,uBAAuB,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,CAAC;gBACpF,OAAO,IAAI,CAAC;YAChB,CAAC;QACL,CAAC;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IARe,6BAAoB,uBAQnC,CAAA;AACL,CAAC,EAtBgB,QAAQ,wBAAR,QAAQ,QAsBxB;AAWD,SAAgB,wBAAwB,CACpC,SAAc,EACd,QAA6C;IAE7C,OAAO,IAAI,EAAE,CAAC;QACV,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;QACnC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACvB,OAAO,MAAM,CAAC;QAClB,CAAC;QAED,MAAM,UAAU,GAAG,SAAS,CAAC,YAAY,EAAE,CAAC;QAC5C,IAAI,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;YAC/B,OAAO,SAAS,CAAC;QACrB,CAAC;QAED,SAAS,GAAG,UAAU,CAAC;IAC3B,CAAC;AACL,CAAC;AAED,8EAA8E;AAC9E,SAAgB,eAAe,CAAC,EAAc,EAAE,GAAQ,EAAE,YAAiB;IACvE,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QAChC,OAAO;IACX,CAAC;IAED,MAAM,cAAc,GAAG,GAAG,CAAC,iBAAiB,EAAE,CAAC;IAC/C,MAAM,oBAAoB,GAAG,YAAY,CAAC,iBAAiB,EAAE,CAAC;IAC9D,IAAI,OAAO,GAAG,YAAY,CAAC;IAE3B,KAAK,IAAI,CAAC,GAAG,oBAAoB,CAAC,MAAM,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACvE,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;QAClD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YAC1B,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/C,CAAC;IACL,CAAC;AACL,CAAC;AAED,SAAgB,WAAW,CAAC,EAAsB,EAAE,GAAQ;IACxD,MAAM,IAAI,GAAG,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IAC9B,IAAI,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC;QACjB,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;IACD,OAAO,CAAC,CAAC;AACb,CAAC;AAED,SAAgB,UAAU,CAAC,EAAsB,EAAE,GAAQ;IACvD,OAAO,qBAAqB,CAAC,EAAE,EAAE,GAAG,mCAA2B,CAAC;AACpE,CAAC;AAED,SAAgB,eAAe,CAAC,EAAsB,EAAE,GAAQ;IAC5D,OAAO,qBAAqB,CAAC,EAAE,EAAE,GAAG,wCAAgC,CAAC;AACzE,CAAC;AAED,SAAgB,WAAW,CAAC,EAAsB,EAAE,GAAQ;IACxD,OAAO,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,WAAW,EAAE,IAAI,KAAK,CAAC;AACpD,CAAC;AAED,kGAAkG;AAClG,kGAAkG;AAClG,kGAAkG;AAClG,SAAgB,iBAAiB,CAAC,EAAsB,EAAE,GAAQ;IAC9D,OAAO,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,WAAW,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;AACtD,CAAC;AAED,6FAA6F;AAC7F,+FAA+F;AAC/F,gGAAgG;AAChG,2CAA2C;AAC3C,SAAgB,gBAAgB,CAAC,EAAsB,EAAE,GAAoB;IACzE,IAAI,CAAC,GAAG,EAAE,CAAC;QACP,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,MAAM,OAAO,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;IAClC,IAAI,CAAC,OAAO,EAAE,CAAC;QACX,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO,iBAAiB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;AAC5D,CAAC;AAED,SAAgB,MAAM,CAAC,EAAsB,EAAE,GAAQ,EAAE,uBAAuB,GAAG,KAAK;IACpF,MAAM,KAAK,GAAG,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IAC/B,IAAI,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC3B,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,OAAO,KAAK,EAAE,cAAc,EAAE,EAAE,IAAI,KAAK,CAAC;AAC9C,CAAC;AAED,SAAgB,OAAO,CAAC,EAAsB,EAAE,GAAQ;IACpD,IAAI,CAAC;QACD,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACrB,OAAO,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC5B,CAAC;IACL,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QACd,OAAO,SAAS,CAAC;IACrB,CAAC;IACD,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,SAAgB,WAAW,CAAC,EAAsB,EAAE,GAAQ;IACxD,IAAI,CAAC;QACD,OAAO,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QACd,OAAO,SAAS,CAAC;IACrB,CAAC;AACL,CAAC;AAED,SAAgB,oBAAoB,CAAC,EAAsB,EAAE,GAAQ;IACjE,IAAI,CAAC;QACD,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,0DAA0D,CACrF,EAAE,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAC1B,EAAE,EACF,GAAG,CACN,CAAC;QACF,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;IAClC,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QACd,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;IAC1C,CAAC;AACL,CAAC;AAED,SAAgB,4CAA4C,CACxD,EAAsB,EACtB,GAAQ;IAER,IAAI,CAAC;QACD,OAAO,0DAA0D,CAAC,EAAE,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;IAC3G,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QACd,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,oBAAoB,EAAE,EAAE,EAAE,CAAC;IACpE,CAAC;AACL,CAAC;AAED,8EAA8E;AAC9E,SAAgB,kCAAkC,CAC9C,UAA4B,EAC5B,EAAsB,EACtB,GAAQ;IAER,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,0DAA0D,CAAC,UAAU,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;IAC/G,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;AAClC,CAAC;AAED,SAAS,0DAA0D,CAC/D,UAA4B,EAC5B,EAAsB,EACtB,GAAQ;IAER,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACxF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAClB,IAAI,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YAClB,OAAO,CAAC,CAAC,CAAC;QACd,CAAC;aAAM,IAAI,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YACzB,OAAO,CAAC,CAAC;QACb,CAAC;aAAM,CAAC;YACJ,OAAO,CAAC,CAAC;QACb,CAAC;IACL,CAAC,CAAC,CAAC;IACH,MAAM,KAAK,GAAU,EAAE,CAAC;IACxB,MAAM,WAAW,GAAU,EAAE,CAAC;IAC9B,MAAM,oBAAoB,GAAU,EAAE,CAAC;IACvC,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC1B,sEAAsE;QACtE,+DAA+D;QAC/D,IAAI,KAAK,CAAC,IAAI,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;YAC5C,SAAS;QACb,CAAC;QAED,MAAM,QAAQ,GAAG,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC9C,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;YACjB,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACzB,CAAC;aAAM,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;YAC7B,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC/B,CAAC;aAAM,IAAI,KAAK,CAAC,cAAc,EAAE,EAAE,CAAC;YAChC,MAAM,IAAI,GAAG,OAAO,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;YACnC,IAAI,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC;gBACjB,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACzB,CAAC;iBAAM,IAAI,IAAI,EAAE,WAAW,EAAE,EAAE,CAAC;gBAC7B,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC3B,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACxC,CAAC;QACL,CAAC;IACL,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;AACxD,CAAC;AAED,iEAAiE;AACjE,iEAAiE;AACjE,yCAAyC;AACzC,kFAAkF;AAClF,SAAgB,yBAAyB,CAAC,IAAY;IAClD,OAAO,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACrC,CAAC;AAED,+EAA+E;AAC/E,gFAAgF;AAChF,sEAAsE;AACtE,4EAA4E;AAC5E,qCAAqC;AACrC,SAAgB,+BAA+B,CAAC,OAAe;IAC3D,MAAM,gBAAgB,GAAG,IAAA,oCAAwB,EAAC,GAAG,CAAC,CAAC;IACvD,MAAM,wBAAwB,GAAG,IAAI,MAAM,CAAC,WAAW,gBAAgB,GAAG,EAAE,GAAG,CAAC,CAAC;IAEjF,OAAO,OAAO,CAAC,OAAO,CAAC,wBAAwB,EAAE,CAAC,KAAK,EAAE,EAAE;QACvD,IAAI,KAAK,KAAK,GAAG,EAAE,CAAC;YAChB,OAAO,KAAK,gBAAgB,IAAI,CAAC;QACrC,CAAC;aAAM,IAAI,KAAK,KAAK,GAAG,EAAE,CAAC;YACvB,OAAO,KAAK,gBAAgB,GAAG,CAAC;QACpC,CAAC;aAAM,CAAC;YACJ,2EAA2E;YAC3E,OAAO,IAAI,GAAG,KAAK,CAAC;QACxB,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAgB,uBAAuB,CAAC,IAAS,EAAE,QAAgB;IAC/D,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IACjD,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,iBAAiB,EAAE,CAAC,CAAC;IACpE,MAAM,gBAAgB,GAAG,IAAA,oCAAwB,EAAC,GAAG,CAAC,CAAC;IACvD,MAAM,2BAA2B,GAAG,IAAI,gBAAgB,KAAK,gBAAgB,MAAM,gBAAgB,OAAO,CAAC;IAE3G,yDAAyD;IACzD,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5B,cAAc,CAAC,CAAC,CAAC,GAAG,IAAA,2CAA+B,EAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3E,CAAC;IAED,IAAI,YAAY,GAAG,EAAE,CAAC;IACtB,IAAI,cAAc,GAAG,IAAI,CAAC;IAE1B,KAAK,MAAM,SAAS,IAAI,cAAc,EAAE,CAAC;QACrC,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;YACrB,YAAY,IAAI,2BAA2B,CAAC;QAChD,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,cAAc,EAAE,CAAC;gBAClB,YAAY,IAAI,gBAAgB,CAAC;YACrC,CAAC;YAED,YAAY,IAAI,+BAA+B,CAAC,SAAS,CAAC,CAAC;YAC3D,cAAc,GAAG,KAAK,CAAC;QAC3B,CAAC;IACL,CAAC;IAED,OAAO,YAAY,CAAC;AACxB,CAAC;AAED,iEAAiE;AACjE,SAAgB,eAAe,CAAC,IAAS,EAAE,QAAgB;IACvD,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IACjD,4DAA4D;IAC5D,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,iBAAiB,EAAE,CAAC,CAAC;IACpE,IAAI,YAAY,GAAG,YAAY,CAAC,IAAI,CAAC;IAErC,6BAA6B;IAC7B,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5B,cAAc,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IAED,KAAK,MAAM,SAAS,IAAI,cAAc,EAAE,CAAC;QACrC,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;YACrB,MAAM;QACV,CAAC;aAAM,CAAC;YACJ,IAAI,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;gBACjC,MAAM;YACV,CAAC;YAED,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QACxD,CAAC;IACL,CAAC;IAED,OAAO,YAAY,CAAC;AACxB,CAAC;AAED,SAAgB,kBAAkB,CAAC,GAAQ;IACvC,OAAO,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;AAC/D,CAAC;AAED,SAAgB,WAAW,CAAC,IAAS,EAAE,QAAgB;IACnD,IAAI,YAAY,GAAG,uBAAuB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC3D,MAAM,gBAAgB,GAAG,IAAA,oCAAwB,EAAC,GAAG,CAAC,CAAC;IACvD,YAAY,GAAG,KAAK,YAAY,OAAO,gBAAgB,GAAG,CAAC;IAE3D,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAChF,MAAM,YAAY,GAAG,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACrD,MAAM,oBAAoB,GAAG,IAAA,6CAAiC,EAAC,QAAQ,CAAC,CAAC;IAEzE,OAAO;QACH,YAAY;QACZ,MAAM;QACN,oBAAoB;KACvB,CAAC;AACN,CAAC;AAED,IAAW,mBAGV;AAHD,WAAW,mBAAmB;IAC1B,6DAAI,CAAA;IACJ,uEAAS,CAAA;AACb,CAAC,EAHU,mBAAmB,KAAnB,mBAAmB,QAG7B;AAED,SAAS,qBAAqB,CAAC,EAAsB,EAAE,GAAQ,EAAE,SAA8B;IAC3F,IAAI,CAAC;QACD,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC9B,QAAQ,SAAS,EAAE,CAAC;YAChB;gBACI,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;YACzB;gBACI,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;YAC9B;gBACI,OAAO,KAAK,CAAC;QACrB,CAAC;IACL,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QACd,OAAO,KAAK,CAAC;IACjB,CAAC;AACL,CAAC;AAED,SAAgB,sBAAsB,CAClC,EAAsB,EACtB,YAAiB,EACjB,YAAiB;IAEjB,IAAI,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;QACpC,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,MAAM,aAAa,GAAG,YAAY,CAAC,yBAAyB,CAAC,YAAY,CAAC,CAAC;IAE3E,6CAA6C;IAC7C,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,aAAa,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACvF,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OAAO,OAAO,CAAC;AACnB,CAAC;AAED,SAAgB,kBAAkB,CAAC,aAAsB,EAAE,WAAkB,EAAE;IAC3E,MAAM,cAAc,GAAG,IAAI,GAAG,EAAe,CAAC;IAE9C,aAAa,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC9B,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAClB,IAAI,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC5B,2BAA2B;gBAC3B,OAAO;YACX,CAAC;YAED,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;gBAC7B,IAAI,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;oBACxB,OAAO;gBACX,CAAC;YACL,CAAC;YAED,KAAK,MAAM,QAAQ,IAAI,cAAc,EAAE,CAAC;gBACpC,wCAAwC;gBACxC,IAAI,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC5B,sDAAsD;oBACtD,OAAO;gBACX,CAAC;gBAED,6CAA6C;gBAC7C,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC5B,yCAAyC;oBACzC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;oBACnC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;oBAC7B,OAAO;gBACX,CAAC;YACL,CAAC;YAED,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC;AACxC,CAAC;AAID,SAAgB,UAAU,CAAC,OAAkD;IACzE,OAAO,GAAG,iDAAuB,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,yBAAW,CAAC,uBAAuB,CAAC,CAAC;IAE3G,IAAK,MAAc,CAAC,eAAe,EAAE,CAAC;QAClC,OAAO,SAAG,CAAC,IAAI,CAAE,MAAc,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IAC9D,CAAC;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AAED,SAAgB,wBAAwB,CAAC,EAAsB,EAAE,GAAQ;IACrE,uGAAuG;IACvG,OAAO,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;AAC7C,CAAC;AAED,qEAAqE;AACrE,EAAE;AACF,kFAAkF;AAClF,sFAAsF;AACtF,oFAAoF;AACpF,sFAAsF;AACtF,wBAAwB;AACxB,iFAAiF;AACjF,oFAAoF;AACpF,uFAAuF;AACvF,uFAAuF;AACvF,wFAAwF;AACxF,qBAAqB;AACrB,oFAAoF;AACpF,qFAAqF;AACrF,gFAAgF;AAChF,SAAgB,aAAa,CAAC,IAAS,EAAE,IAAS;IAC9C,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IACrC,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IACrC,IAAI,SAAS,IAAI,SAAS,EAAE,CAAC;QACzB,OAAO,SAAS,KAAK,SAAS,CAAC;IACnC,CAAC;IAED,IAAI,CAAC,SAAS,IAAI,CAAC,SAAS,EAAE,CAAC;QAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC7B,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC7B,IAAI,KAAK,IAAI,KAAK,EAAE,CAAC;YACjB,OAAO,CACH,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM;gBAC3B,KAAK,KAAK,KAAK;gBACf,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK;gBACzB,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,QAAQ,CAClC,CAAC;QACN,CAAC;IACL,CAAC;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAED,IAAiB,KAAK,CA8BrB;AA9BD,WAAiB,KAAK;IAGlB,SAAgB,IAAI,CAAC,IAAY,EAAE,GAAa,EAAE,aAAuB;QACrE,MAAM,YAAY,GAAG,2BAA2B,CAAC,GAAG,CAAC,CAAC;QACtD,OAAO,SAAG,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;IACvD,CAAC;IAHe,UAAI,OAGnB,CAAA;IAID,SAAgB,KAAK,CAAC,KAAyB,EAAE,GAAa;QAC1D,MAAM,YAAY,GAAG,2BAA2B,CAAC,GAAG,CAAC,CAAC;QACtD,OAAO,SAAG,CAAC,KAAK,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IAC1C,CAAC;IAHe,WAAK,QAGpB,CAAA;IAED,MAAM,uBAAuB,GAA4B;QACrD,eAAe,EAAE,GAAG,EAAE,CAAC,IAAI;KAC9B,CAAC;IAEF,MAAM,yBAAyB,GAA4B;QACvD,eAAe,EAAE,GAAG,EAAE,CAAC,KAAK;KAC/B,CAAC;IAEF,SAAS,2BAA2B,CAAC,GAAwB;QACzD,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACpB,OAAO,uBAAuB,CAAC;QACnC,CAAC;QAED,OAAO,GAAG,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,yBAAyB,CAAC;IACrE,CAAC;AACL,CAAC,EA9BgB,KAAK,qBAAL,KAAK,QA8BrB"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { FileSystem } from './common/fileSystem';
|
|
2
|
+
type FileSystemMappingMethodName = 'existsSync' | 'readdirEntriesSync' | 'readFileSync' | 'statSync' | 'realpathSync' | 'createReadStream' | 'readFile' | 'readFileText' | 'isMappedUri' | 'getOriginalUri' | 'getMappedUri' | 'mapDirectory';
|
|
3
|
+
export interface FileSystemMapping extends Pick<FileSystem, FileSystemMappingMethodName> {
|
|
4
|
+
}
|
|
5
|
+
export interface FileSystemMappingState {
|
|
6
|
+
bind(fileSystem: FileSystem): FileSystemMapping;
|
|
7
|
+
}
|
|
8
|
+
export declare function createFileSystemMapping(realFS: FileSystem): FileSystemMapping;
|
|
9
|
+
export declare function createFileSystemMappingState(): FileSystemMappingState;
|
|
10
|
+
export {};
|
|
@@ -0,0 +1,176 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/*
|
|
3
|
+
* fileSystemMapping.ts
|
|
4
|
+
* Copyright (c) Microsoft Corporation.
|
|
5
|
+
* Licensed under the MIT license.
|
|
6
|
+
*/
|
|
7
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
|
+
exports.createFileSystemMapping = createFileSystemMapping;
|
|
9
|
+
exports.createFileSystemMappingState = createFileSystemMappingState;
|
|
10
|
+
const fileSystem_1 = require("./common/fileSystem");
|
|
11
|
+
const uriMap_1 = require("./common/uri/uriMap");
|
|
12
|
+
const uriUtils_1 = require("./common/uri/uriUtils");
|
|
13
|
+
function createFileSystemMapping(realFS) {
|
|
14
|
+
return createFileSystemMappingState().bind(realFS);
|
|
15
|
+
}
|
|
16
|
+
function createFileSystemMappingState() {
|
|
17
|
+
return new FileSystemMappingStateImpl();
|
|
18
|
+
}
|
|
19
|
+
const noOriginalUriResolution = Symbol();
|
|
20
|
+
class FileSystemMappingStateImpl {
|
|
21
|
+
constructor() {
|
|
22
|
+
this._data = {
|
|
23
|
+
entryMap: new uriMap_1.UriMap(),
|
|
24
|
+
reverseEntryMap: new uriMap_1.UriMap(),
|
|
25
|
+
originalUriCache: new WeakMap(),
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
bind(fileSystem) {
|
|
29
|
+
return new FileSystemMappingImpl(this._data, fileSystem);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
class FileSystemMappingImpl {
|
|
33
|
+
constructor(_data, _realFS) {
|
|
34
|
+
this._data = _data;
|
|
35
|
+
this._realFS = _realFS;
|
|
36
|
+
}
|
|
37
|
+
existsSync(uri) {
|
|
38
|
+
if (this._isOriginalPath(uri)) {
|
|
39
|
+
return false;
|
|
40
|
+
}
|
|
41
|
+
return this._realFS.existsSync(this._getInternalOriginalUri(uri));
|
|
42
|
+
}
|
|
43
|
+
readdirEntriesSync(uri) {
|
|
44
|
+
const entries = new Map();
|
|
45
|
+
for (const [key] of this._data.entryMap.entries()) {
|
|
46
|
+
if (key.isChild(uri) && key.getRelativePathComponents(uri).length === 1) {
|
|
47
|
+
entries.set(key.fileName, new fileSystem_1.VirtualDirent(key.fileName, false, uri.getFilePath()));
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
const mappedEntry = this._getOriginalEntry(uri);
|
|
51
|
+
if (mappedEntry) {
|
|
52
|
+
const originalUri = this._getInternalOriginalUri(uri);
|
|
53
|
+
for (const entry of this._realFS.readdirEntriesSync(originalUri)) {
|
|
54
|
+
const originalEntryUri = originalUri.combinePaths(entry.name);
|
|
55
|
+
if (!mappedEntry.filter(originalEntryUri, this._realFS)) {
|
|
56
|
+
continue;
|
|
57
|
+
}
|
|
58
|
+
const target = entry.isFile() || entry.isDirectory() ? entry : (0, uriUtils_1.tryStat)(this._realFS, originalEntryUri);
|
|
59
|
+
if (!target || (!target.isFile() && !target.isDirectory())) {
|
|
60
|
+
continue;
|
|
61
|
+
}
|
|
62
|
+
entries.set(entry.name, new fileSystem_1.VirtualDirent(entry.name, target.isFile(), uri.getFilePath()));
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
if (this._realFS.existsSync(uri)) {
|
|
66
|
+
const filteredEntries = this._realFS
|
|
67
|
+
.readdirEntriesSync(uri)
|
|
68
|
+
.filter((entry) => !this._isOriginalPath(uri.combinePaths(entry.name)));
|
|
69
|
+
for (const entry of filteredEntries) {
|
|
70
|
+
entries.set(entry.name, entry);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
return [...entries.values()];
|
|
74
|
+
}
|
|
75
|
+
readFileSync(uri, encoding) {
|
|
76
|
+
return this._realFS.readFileSync(this._getInternalOriginalUri(uri), encoding);
|
|
77
|
+
}
|
|
78
|
+
statSync(uri) {
|
|
79
|
+
if (this._isOriginalPath(uri)) {
|
|
80
|
+
throw new Error('ENOENT: path does not exist');
|
|
81
|
+
}
|
|
82
|
+
return this._realFS.statSync(this._getInternalOriginalUri(uri));
|
|
83
|
+
}
|
|
84
|
+
realpathSync(uri) {
|
|
85
|
+
if (this._data.entryMap.has(uri)) {
|
|
86
|
+
return uri;
|
|
87
|
+
}
|
|
88
|
+
return this._realFS.realpathSync(uri);
|
|
89
|
+
}
|
|
90
|
+
createReadStream(uri) {
|
|
91
|
+
return this._realFS.createReadStream(this._getInternalOriginalUri(uri));
|
|
92
|
+
}
|
|
93
|
+
readFile(uri) {
|
|
94
|
+
return this._realFS.readFile(this._getInternalOriginalUri(uri));
|
|
95
|
+
}
|
|
96
|
+
readFileText(uri, encoding) {
|
|
97
|
+
return this._realFS.readFileText(this._getInternalOriginalUri(uri), encoding);
|
|
98
|
+
}
|
|
99
|
+
isMappedUri(uri) {
|
|
100
|
+
if (this._getOriginalEntry(uri) !== undefined) {
|
|
101
|
+
return true;
|
|
102
|
+
}
|
|
103
|
+
return this._realFS.isMappedUri(uri);
|
|
104
|
+
}
|
|
105
|
+
getOriginalUri(mappedUri) {
|
|
106
|
+
return this._realFS.getOriginalUri(this._getInternalOriginalUri(mappedUri));
|
|
107
|
+
}
|
|
108
|
+
getMappedUri(originalUri) {
|
|
109
|
+
const entry = this._getMappedEntry(originalUri);
|
|
110
|
+
if (!entry) {
|
|
111
|
+
return this._realFS.getMappedUri(originalUri);
|
|
112
|
+
}
|
|
113
|
+
const relative = entry.originalUri.getRelativePathComponents(originalUri);
|
|
114
|
+
return entry.mappedUri.combinePaths(...relative);
|
|
115
|
+
}
|
|
116
|
+
mapDirectory(mappedUri, originalUri, filter) {
|
|
117
|
+
const entry = { originalUri, mappedUri, filter: filter ?? (() => true) };
|
|
118
|
+
this._data.entryMap.set(mappedUri, entry);
|
|
119
|
+
this._data.reverseEntryMap.set(originalUri, entry);
|
|
120
|
+
this._data.originalUriCache = new WeakMap();
|
|
121
|
+
return {
|
|
122
|
+
dispose: () => {
|
|
123
|
+
this._data.entryMap.delete(mappedUri);
|
|
124
|
+
this._data.reverseEntryMap.delete(originalUri);
|
|
125
|
+
this._data.originalUriCache = new WeakMap();
|
|
126
|
+
},
|
|
127
|
+
};
|
|
128
|
+
}
|
|
129
|
+
_findClosestMatch(uri, map) {
|
|
130
|
+
while (true) {
|
|
131
|
+
const entry = map.get(uri);
|
|
132
|
+
if (entry) {
|
|
133
|
+
return entry;
|
|
134
|
+
}
|
|
135
|
+
const parent = uri.getDirectory();
|
|
136
|
+
if (parent.equals(uri)) {
|
|
137
|
+
return undefined;
|
|
138
|
+
}
|
|
139
|
+
uri = parent;
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
_getOriginalEntry(uri) {
|
|
143
|
+
return this._findClosestMatch(uri, this._data.entryMap);
|
|
144
|
+
}
|
|
145
|
+
_getInternalOriginalUri(uri) {
|
|
146
|
+
let resolution = this._data.originalUriCache.get(uri);
|
|
147
|
+
if (resolution === undefined) {
|
|
148
|
+
const entry = this._getOriginalEntry(uri);
|
|
149
|
+
if (!entry) {
|
|
150
|
+
this._data.originalUriCache.set(uri, noOriginalUriResolution);
|
|
151
|
+
return uri;
|
|
152
|
+
}
|
|
153
|
+
const relative = entry.mappedUri.getRelativePathComponents(uri);
|
|
154
|
+
resolution = { entry, originalUri: entry.originalUri.combinePaths(...relative) };
|
|
155
|
+
this._data.originalUriCache.set(uri, resolution);
|
|
156
|
+
}
|
|
157
|
+
if (resolution === noOriginalUriResolution) {
|
|
158
|
+
return uri;
|
|
159
|
+
}
|
|
160
|
+
if (resolution.entry.filter(resolution.originalUri, this._realFS)) {
|
|
161
|
+
return resolution.originalUri;
|
|
162
|
+
}
|
|
163
|
+
return uri;
|
|
164
|
+
}
|
|
165
|
+
_getMappedEntry(uri) {
|
|
166
|
+
const reverseMatch = this._findClosestMatch(uri, this._data.reverseEntryMap);
|
|
167
|
+
if (reverseMatch && reverseMatch.filter(uri, this._realFS)) {
|
|
168
|
+
return reverseMatch;
|
|
169
|
+
}
|
|
170
|
+
return undefined;
|
|
171
|
+
}
|
|
172
|
+
_isOriginalPath(uri) {
|
|
173
|
+
return this._getMappedEntry(uri) !== undefined;
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
//# sourceMappingURL=fileSystemMapping.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fileSystemMapping.js","sourceRoot":"","sources":["../../../../src/fileSystemMapping.ts"],"names":[],"mappings":"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"}
|
|
@@ -105,7 +105,8 @@ function getEffectiveCommandLineOptions(workspaceRootUri, serverSettings, trackF
|
|
|
105
105
|
commandLineOptions.languageServerSettings.typeStubTargetImportName = typeStubTargetImportName;
|
|
106
106
|
}
|
|
107
107
|
commandLineOptions.configSettings.autoSearchPaths = serverSettings.autoSearchPaths;
|
|
108
|
-
commandLineOptions.configSettings.
|
|
108
|
+
commandLineOptions.configSettings.useDefaultExcludes = serverSettings.useDefaultExcludes;
|
|
109
|
+
commandLineOptions.configSettings.extraPaths = serverSettings.extraPathFileSpecs ?? [];
|
|
109
110
|
commandLineOptions.configSettings.diagnosticSeverityOverrides = serverSettings.diagnosticSeverityOverrides;
|
|
110
111
|
commandLineOptions.configSettings.diagnosticBooleanOverrides = serverSettings.diagnosticBooleanOverrides;
|
|
111
112
|
commandLineOptions.configSettings.includeFileSpecs = serverSettings.includeFileSpecs ?? [];
|