@microsoft/powerquery-language-services 0.2.10 → 0.2.15
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/lib/powerquery-language-services/analysis/analysisBase.js +3 -3
- package/lib/powerquery-language-services/analysis/analysisBase.js.map +1 -1
- package/lib/powerquery-language-services/commonTypesUtils.js.map +1 -1
- package/lib/powerquery-language-services/documentSymbols.js +21 -16
- package/lib/powerquery-language-services/documentSymbols.js.map +1 -1
- package/lib/powerquery-language-services/formatter.js +2 -1
- package/lib/powerquery-language-services/formatter.js.map +1 -1
- package/lib/powerquery-language-services/inspection/activeNode/activeNode.d.ts +4 -3
- package/lib/powerquery-language-services/inspection/activeNode/activeNodeUtils.d.ts +7 -6
- package/lib/powerquery-language-services/inspection/activeNode/activeNodeUtils.js +29 -28
- package/lib/powerquery-language-services/inspection/activeNode/activeNodeUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.js +29 -30
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItem.d.ts +2 -2
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItemUtils.d.ts +6 -6
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItemUtils.js +19 -16
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItemUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.d.ts +3 -2
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.js +35 -35
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordDefault.d.ts +2 -2
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordDefault.js +6 -6
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordDefault.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordErrorHandlingExpression.d.ts +2 -2
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordErrorHandlingExpression.js +4 -3
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordErrorHandlingExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordIdentifierPairedExpression.d.ts +2 -2
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordIdentifierPairedExpression.js +5 -6
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordIdentifierPairedExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordLetExpression.d.ts +2 -2
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordLetExpression.js +16 -13
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordLetExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordListExpression.d.ts +2 -2
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordListExpression.js +7 -7
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordListExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordSectionMember.d.ts +2 -2
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordSectionMember.js +11 -9
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordSectionMember.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordTrailingText.d.ts +2 -2
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordTrailingText.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/common.d.ts +2 -2
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/common.js +8 -6
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/common.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/commonTypes.d.ts +4 -4
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.js +21 -25
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompletePrimitiveType.js +21 -24
- package/lib/powerquery-language-services/inspection/autocomplete/autocompletePrimitiveType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteUtils.js +4 -4
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/commonTypes.d.ts +5 -3
- package/lib/powerquery-language-services/inspection/autocomplete/task.js +5 -5
- package/lib/powerquery-language-services/inspection/autocomplete/task.js.map +1 -1
- package/lib/powerquery-language-services/inspection/expectedType.d.ts +5 -3
- package/lib/powerquery-language-services/inspection/expectedType.js +70 -67
- package/lib/powerquery-language-services/inspection/expectedType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/externalType/externalType.d.ts +5 -5
- package/lib/powerquery-language-services/inspection/externalType/externalType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/externalType/externalTypeUtils.d.ts +2 -2
- package/lib/powerquery-language-services/inspection/externalType/externalTypeUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/invokeExpression/common.d.ts +7 -6
- package/lib/powerquery-language-services/inspection/invokeExpression/currentInvokeExpression.d.ts +2 -1
- package/lib/powerquery-language-services/inspection/invokeExpression/currentInvokeExpression.js +10 -11
- package/lib/powerquery-language-services/inspection/invokeExpression/currentInvokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.d.ts +2 -1
- package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.js +15 -14
- package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/pseudoFunctionExpressionType.d.ts +6 -5
- package/lib/powerquery-language-services/inspection/pseudoFunctionExpressionType.js +12 -15
- package/lib/powerquery-language-services/inspection/pseudoFunctionExpressionType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/scope/scope.d.ts +12 -10
- package/lib/powerquery-language-services/inspection/scope/scopeInspection.d.ts +4 -3
- package/lib/powerquery-language-services/inspection/scope/scopeInspection.js +26 -25
- package/lib/powerquery-language-services/inspection/scope/scopeInspection.js.map +1 -1
- package/lib/powerquery-language-services/inspection/task.js +8 -8
- package/lib/powerquery-language-services/inspection/task.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/common.d.ts +11 -10
- package/lib/powerquery-language-services/inspection/type/inspectType/common.js +50 -49
- package/lib/powerquery-language-services/inspection/type/inspectType/common.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/examineFieldSpecificationList.d.ts +4 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/examineFieldSpecificationList.js +8 -10
- package/lib/powerquery-language-services/inspection/type/inspectType/examineFieldSpecificationList.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeConstant.d.ts +3 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeConstant.js +25 -24
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeConstant.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeEachExpression.d.ts +3 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeEachExpression.js +5 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeEachExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.d.ts +3 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.js +8 -7
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldProjection.d.ts +3 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldProjection.js +26 -22
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldProjection.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSelector.d.ts +3 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSelector.js +14 -15
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSelector.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSpecification.d.ts +3 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSpecification.js +6 -5
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSpecification.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.d.ts +3 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.js +10 -11
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.d.ts +3 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.js +10 -8
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifier.d.ts +3 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifier.js +7 -6
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifier.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifierExpression.d.ts +3 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifierExpression.js +7 -6
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifierExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.d.ts +3 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.js +11 -12
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.d.ts +3 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.js +14 -12
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.d.ts +3 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.js +3 -5
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.d.ts +3 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.js +6 -5
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeLiteralExpression.d.ts +3 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeLiteralExpression.js +8 -7
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeLiteralExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeNullCoalescingExpression.d.ts +3 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeNullCoalescingExpression.js +9 -9
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeNullCoalescingExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeParameter.d.ts +3 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeParameter.js +5 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeParameter.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypePrimitiveType.d.ts +3 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypePrimitiveType.js +6 -5
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypePrimitiveType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.d.ts +3 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.js +14 -16
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.d.ts +3 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.js +6 -5
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.d.ts +3 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.js +6 -5
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecursivePrimaryExpression.d.ts +3 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecursivePrimaryExpression.js +11 -10
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecursivePrimaryExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTBinOpExpression.d.ts +7 -6
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTBinOpExpression.js +57 -103
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTBinOpExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.d.ts +3 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.js +7 -6
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeUnaryExpression.d.ts +3 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeUnaryExpression.js +25 -22
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeUnaryExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/task.d.ts +5 -3
- package/lib/powerquery-language-services/inspection/type/task.js +6 -6
- package/lib/powerquery-language-services/inspection/type/task.js.map +1 -1
- package/lib/powerquery-language-services/inspection/typeCache/typeCache.d.ts +2 -2
- package/lib/powerquery-language-services/inspectionUtils.d.ts +8 -7
- package/lib/powerquery-language-services/inspectionUtils.js +11 -14
- package/lib/powerquery-language-services/inspectionUtils.js.map +1 -1
- package/lib/powerquery-language-services/library/library.d.ts +3 -3
- package/lib/powerquery-language-services/library/libraryUtils.d.ts +3 -3
- package/lib/powerquery-language-services/library/libraryUtils.js +2 -2
- package/lib/powerquery-language-services/library/libraryUtils.js.map +1 -1
- package/lib/powerquery-language-services/localization/localization.js +7 -7
- package/lib/powerquery-language-services/localization/localization.js.map +1 -1
- package/lib/powerquery-language-services/localization/templates/templates.bg-BG.json +2 -1
- package/lib/powerquery-language-services/localization/templates/templates.ca-ES.json +1 -0
- package/lib/powerquery-language-services/localization/templates/templates.cs-CZ.json +1 -0
- package/lib/powerquery-language-services/localization/templates/templates.da-DK.json +1 -0
- package/lib/powerquery-language-services/localization/templates/templates.de-DE.json +2 -1
- package/lib/powerquery-language-services/localization/templates/templates.el-GR.json +2 -1
- package/lib/powerquery-language-services/localization/templates/templates.es-ES.json +1 -0
- package/lib/powerquery-language-services/localization/templates/templates.et-EE.json +2 -1
- package/lib/powerquery-language-services/localization/templates/templates.eu-ES.json +1 -0
- package/lib/powerquery-language-services/localization/templates/templates.fi-FI.json +2 -1
- package/lib/powerquery-language-services/localization/templates/templates.fr-FR.json +2 -1
- package/lib/powerquery-language-services/localization/templates/templates.gl-ES.json +1 -0
- package/lib/powerquery-language-services/localization/templates/templates.hi-IN.json +2 -1
- package/lib/powerquery-language-services/localization/templates/templates.hr-HR.json +2 -1
- package/lib/powerquery-language-services/localization/templates/templates.hu-HU.json +2 -1
- package/lib/powerquery-language-services/localization/templates/templates.id-ID.json +2 -1
- package/lib/powerquery-language-services/localization/templates/templates.it-IT.json +1 -0
- package/lib/powerquery-language-services/localization/templates/templates.ja-JP.json +1 -0
- package/lib/powerquery-language-services/localization/templates/templates.json +3 -1
- package/lib/powerquery-language-services/localization/templates/templates.kk-KZ.json +2 -1
- package/lib/powerquery-language-services/localization/templates/templates.ko-KR.json +2 -1
- package/lib/powerquery-language-services/localization/templates/templates.lt-LT.json +2 -1
- package/lib/powerquery-language-services/localization/templates/templates.lv-LV.json +1 -0
- package/lib/powerquery-language-services/localization/templates/templates.ms-MY.json +2 -1
- package/lib/powerquery-language-services/localization/templates/templates.nb-NO.json +2 -1
- package/lib/powerquery-language-services/localization/templates/templates.nl-NL.json +1 -0
- package/lib/powerquery-language-services/localization/templates/templates.pl-PL.json +2 -1
- package/lib/powerquery-language-services/localization/templates/templates.pt-BR.json +2 -1
- package/lib/powerquery-language-services/localization/templates/templates.pt-PT.json +2 -1
- package/lib/powerquery-language-services/localization/templates/templates.ro-RO.json +2 -1
- package/lib/powerquery-language-services/localization/templates/templates.ru-RU.json +2 -1
- package/lib/powerquery-language-services/localization/templates/templates.sk-SK.json +2 -1
- package/lib/powerquery-language-services/localization/templates/templates.sl-SI.json +1 -0
- package/lib/powerquery-language-services/localization/templates/templates.sr-Cyrl-RS.json +2 -1
- package/lib/powerquery-language-services/localization/templates/templates.sr-Latn-RS.json +2 -1
- package/lib/powerquery-language-services/localization/templates/templates.sv-SE.json +1 -0
- package/lib/powerquery-language-services/localization/templates/templates.th-TH.json +2 -1
- package/lib/powerquery-language-services/localization/templates/templates.tr-TR.json +2 -1
- package/lib/powerquery-language-services/localization/templates/templates.uk-UA.json +2 -1
- package/lib/powerquery-language-services/localization/templates/templates.vi-VN.json +2 -1
- package/lib/powerquery-language-services/localization/templates/templates.zh-CN.json +2 -1
- package/lib/powerquery-language-services/localization/templates/templates.zh-TW.json +1 -0
- package/lib/powerquery-language-services/positionUtils.d.ts +18 -16
- package/lib/powerquery-language-services/positionUtils.js +11 -10
- package/lib/powerquery-language-services/positionUtils.js.map +1 -1
- package/lib/powerquery-language-services/providers/commonTypes.d.ts +2 -2
- package/lib/powerquery-language-services/providers/languageCompletionItemProvider.js +13 -9
- package/lib/powerquery-language-services/providers/languageCompletionItemProvider.js.map +1 -1
- package/lib/powerquery-language-services/providers/librarySymbolProvider.js +5 -4
- package/lib/powerquery-language-services/providers/librarySymbolProvider.js.map +1 -1
- package/lib/powerquery-language-services/providers/localDocumentSymbolProvider.js +22 -22
- package/lib/powerquery-language-services/providers/localDocumentSymbolProvider.js.map +1 -1
- package/lib/powerquery-language-services/validate/validate.js +12 -7
- package/lib/powerquery-language-services/validate/validate.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateDuplicateIdentifiers.d.ts +1 -1
- package/lib/powerquery-language-services/validate/validateDuplicateIdentifiers.js +18 -13
- package/lib/powerquery-language-services/validate/validateDuplicateIdentifiers.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateFunctionExpression.d.ts +5 -0
- package/lib/powerquery-language-services/validate/validateFunctionExpression.js +149 -0
- package/lib/powerquery-language-services/validate/validateFunctionExpression.js.map +1 -0
- package/lib/powerquery-language-services/validate/validateInvokeExpression.d.ts +2 -2
- package/lib/powerquery-language-services/validate/validateInvokeExpression.js +17 -11
- package/lib/powerquery-language-services/validate/validateInvokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateLexAndParse.js +2 -1
- package/lib/powerquery-language-services/validate/validateLexAndParse.js.map +1 -1
- package/lib/powerquery-language-services/validate/validationSettings/validationSettings.d.ts +1 -0
- package/lib/powerquery-language-services/validate/validationSettings/validationSettingsUtils.d.ts +1 -1
- package/lib/powerquery-language-services/validate/validationSettings/validationSettingsUtils.js +2 -2
- package/lib/powerquery-language-services/validate/validationSettings/validationSettingsUtils.js.map +1 -1
- package/lib/powerquery-language-services/workspaceCache/workspaceCacheUtils.js.map +1 -1
- package/package.json +22 -24
|
@@ -66,7 +66,7 @@ var __values = (this && this.__values) || function(o) {
|
|
|
66
66
|
};
|
|
67
67
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
68
68
|
exports.AnalysisBase = void 0;
|
|
69
|
-
var
|
|
69
|
+
var powerquery_parser_1 = require("@microsoft/powerquery-parser");
|
|
70
70
|
var InspectionUtils = require("../inspectionUtils");
|
|
71
71
|
var __1 = require("..");
|
|
72
72
|
var commonTypes_1 = require("../commonTypes");
|
|
@@ -246,7 +246,7 @@ var AnalysisBase = /** @class */ (function () {
|
|
|
246
246
|
if (ancestry.length <= 1) {
|
|
247
247
|
return true;
|
|
248
248
|
}
|
|
249
|
-
var leaf =
|
|
249
|
+
var leaf = powerquery_parser_1.Assert.asDefined(ancestry[0]);
|
|
250
250
|
var followingNode = ancestry[1];
|
|
251
251
|
if (((_a = followingNode === null || followingNode === void 0 ? void 0 : followingNode.node) === null || _a === void 0 ? void 0 : _a.kind) === "Parameter" /* Parameter */) {
|
|
252
252
|
return false;
|
|
@@ -258,7 +258,7 @@ var AnalysisBase = /** @class */ (function () {
|
|
|
258
258
|
"GeneralizedIdentifierPairedExpression" /* GeneralizedIdentifierPairedExpression */,
|
|
259
259
|
"IdentifierPairedExpression" /* IdentifierPairedExpression */,
|
|
260
260
|
].includes(followingNode.node.kind) &&
|
|
261
|
-
[undefined, 1].includes(
|
|
261
|
+
[undefined, 1].includes(powerquery_parser_1.Assert.asDefined(leaf.node.maybeAttributeIndex))) {
|
|
262
262
|
return false;
|
|
263
263
|
}
|
|
264
264
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analysisBase.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/analysis/analysisBase.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAElC,
|
|
1
|
+
{"version":3,"file":"analysisBase.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/analysis/analysisBase.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commonTypesUtils.js","sourceRoot":"","sources":["../../src/powerquery-language-services/commonTypesUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;
|
|
1
|
+
{"version":3,"file":"commonTypesUtils.js","sourceRoot":"","sources":["../../src/powerquery-language-services/commonTypesUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAMlC,SAAgB,mBAAmB,CAAC,UAAyC;IACzE,OAAO;QACH,KAAK,EAAE,yBAAyB,CAAC,UAAU,CAAC,aAAa,CAAC;QAC1D,GAAG,EAAE,yBAAyB,CAAC,UAAU,CAAC,WAAW,CAAC;KACzD,CAAC;AACN,CAAC;AALD,kDAKC;AAED,SAAgB,yBAAyB,CAAC,aAA+C;IACrF,OAAO;QACH,SAAS,EAAE,aAAa,CAAC,YAAY;QACrC,IAAI,EAAE,aAAa,CAAC,UAAU;KACjC,CAAC;AACN,CAAC;AALD,8DAKC"}
|
|
@@ -17,10 +17,14 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
17
17
|
}
|
|
18
18
|
return ar;
|
|
19
19
|
};
|
|
20
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
21
|
-
for (var i = 0,
|
|
22
|
-
|
|
23
|
-
|
|
20
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
21
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
22
|
+
if (ar || !(i in from)) {
|
|
23
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
24
|
+
ar[i] = from[i];
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
24
28
|
};
|
|
25
29
|
var __values = (this && this.__values) || function(o) {
|
|
26
30
|
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
|
@@ -36,6 +40,7 @@ var __values = (this && this.__values) || function(o) {
|
|
|
36
40
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
37
41
|
exports.getDocumentSymbols = void 0;
|
|
38
42
|
var PQP = require("@microsoft/powerquery-parser");
|
|
43
|
+
var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
39
44
|
var InspectionUtils = require("./inspectionUtils");
|
|
40
45
|
var commonTypes_1 = require("./commonTypes");
|
|
41
46
|
var workspaceCache_1 = require("./workspaceCache");
|
|
@@ -59,17 +64,17 @@ function addIdentifierPairedExpressionSymbols(nodeIdMapCollection, currentSymbol
|
|
|
59
64
|
var e_1, _a;
|
|
60
65
|
var _b;
|
|
61
66
|
var identifierPairedExpressionIds = (_b = nodeIdMapCollection.idsByNodeKind.get("IdentifierPairedExpression" /* IdentifierPairedExpression */)) !== null && _b !== void 0 ? _b : new Set();
|
|
62
|
-
var identifierPairedExpressionsXorNodes =
|
|
67
|
+
var identifierPairedExpressionsXorNodes = parser_1.NodeIdMapIterator.assertIterXor(nodeIdMapCollection, __spreadArray([], __read(identifierPairedExpressionIds.values()), false));
|
|
63
68
|
try {
|
|
64
69
|
for (var identifierPairedExpressionsXorNodes_1 = __values(identifierPairedExpressionsXorNodes), identifierPairedExpressionsXorNodes_1_1 = identifierPairedExpressionsXorNodes_1.next(); !identifierPairedExpressionsXorNodes_1_1.done; identifierPairedExpressionsXorNodes_1_1 = identifierPairedExpressionsXorNodes_1.next()) {
|
|
65
70
|
var xorNode = identifierPairedExpressionsXorNodes_1_1.value;
|
|
66
|
-
if (!
|
|
71
|
+
if (!parser_1.XorNodeUtils.isAstXorChecked(xorNode, "IdentifierPairedExpression" /* IdentifierPairedExpression */)) {
|
|
67
72
|
continue;
|
|
68
73
|
}
|
|
69
|
-
var
|
|
70
|
-
var
|
|
71
|
-
addDocumentSymbols(nodeIdMapCollection, parentSymbolById,
|
|
72
|
-
parentSymbolById.set(
|
|
74
|
+
var nodeId = xorNode.node.id;
|
|
75
|
+
var documentSymbol = InspectionUtils.getSymbolForIdentifierPairedExpression(xorNode.node);
|
|
76
|
+
addDocumentSymbols(nodeIdMapCollection, parentSymbolById, nodeId, currentSymbols, documentSymbol);
|
|
77
|
+
parentSymbolById.set(nodeId, documentSymbol);
|
|
73
78
|
}
|
|
74
79
|
}
|
|
75
80
|
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
@@ -83,12 +88,12 @@ function addIdentifierPairedExpressionSymbols(nodeIdMapCollection, currentSymbol
|
|
|
83
88
|
function addRecordSymbols(nodeIdMapCollection, currentSymbols, parentSymbolById) {
|
|
84
89
|
var e_2, _a;
|
|
85
90
|
var _b, _c;
|
|
86
|
-
var recordIds = __spreadArray(__spreadArray([], __read(((_b = nodeIdMapCollection.idsByNodeKind.get("RecordExpression" /* RecordExpression */)) !== null && _b !== void 0 ? _b : new Set()).values())), __read(((_c = nodeIdMapCollection.idsByNodeKind.get("RecordLiteral" /* RecordLiteral */)) !== null && _c !== void 0 ? _c : new Set()).values()));
|
|
87
|
-
var recordXorNodes =
|
|
91
|
+
var recordIds = __spreadArray(__spreadArray([], __read(((_b = nodeIdMapCollection.idsByNodeKind.get("RecordExpression" /* RecordExpression */)) !== null && _b !== void 0 ? _b : new Set()).values()), false), __read(((_c = nodeIdMapCollection.idsByNodeKind.get("RecordLiteral" /* RecordLiteral */)) !== null && _c !== void 0 ? _c : new Set()).values()), false);
|
|
92
|
+
var recordXorNodes = parser_1.NodeIdMapIterator.assertIterXor(nodeIdMapCollection, recordIds);
|
|
88
93
|
try {
|
|
89
94
|
for (var recordXorNodes_1 = __values(recordXorNodes), recordXorNodes_1_1 = recordXorNodes_1.next(); !recordXorNodes_1_1.done; recordXorNodes_1_1 = recordXorNodes_1.next()) {
|
|
90
95
|
var xorNode = recordXorNodes_1_1.value;
|
|
91
|
-
if (!
|
|
96
|
+
if (!parser_1.XorNodeUtils.isAstXor(xorNode)) {
|
|
92
97
|
continue;
|
|
93
98
|
}
|
|
94
99
|
var asAst = xorNode.node;
|
|
@@ -98,7 +103,7 @@ function addRecordSymbols(nodeIdMapCollection, currentSymbols, parentSymbolById)
|
|
|
98
103
|
if (parentSymbol && parentSymbol.kind === commonTypes_1.SymbolKind.Struct) {
|
|
99
104
|
var fieldSymbols = InspectionUtils.getSymbolsForRecord(asAst);
|
|
100
105
|
if (fieldSymbols.length > 0) {
|
|
101
|
-
addDocumentSymbols.apply(void 0, __spreadArray([nodeIdMapCollection, parentSymbolById, asAst.id, currentSymbols], __read(fieldSymbols)));
|
|
106
|
+
addDocumentSymbols.apply(void 0, __spreadArray([nodeIdMapCollection, parentSymbolById, asAst.id, currentSymbols], __read(fieldSymbols), false));
|
|
102
107
|
}
|
|
103
108
|
}
|
|
104
109
|
}
|
|
@@ -122,11 +127,11 @@ function addDocumentSymbols(nodeIdMapCollection, parentSymbolById, nodeId, curre
|
|
|
122
127
|
if (!parentSymbol.children) {
|
|
123
128
|
parentSymbol.children = [];
|
|
124
129
|
}
|
|
125
|
-
(_a = parentSymbol.children).push.apply(_a, __spreadArray([], __read(newSymbols)));
|
|
130
|
+
(_a = parentSymbol.children).push.apply(_a, __spreadArray([], __read(newSymbols), false));
|
|
126
131
|
return;
|
|
127
132
|
}
|
|
128
133
|
// Add to the top level
|
|
129
|
-
currentSymbols.push.apply(currentSymbols, __spreadArray([], __read(newSymbols)));
|
|
134
|
+
currentSymbols.push.apply(currentSymbols, __spreadArray([], __read(newSymbols), false));
|
|
130
135
|
}
|
|
131
136
|
function findParentSymbol(nodeIdMapCollection, parentSymbolById, nodeId) {
|
|
132
137
|
// Get parent for current node
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"documentSymbols.js","sourceRoot":"","sources":["../../src/powerquery-language-services/documentSymbols.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC
|
|
1
|
+
{"version":3,"file":"documentSymbols.js","sourceRoot":"","sources":["../../src/powerquery-language-services/documentSymbols.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
16
16
|
exports.tryFormat = void 0;
|
|
17
17
|
var PQF = require("@microsoft/powerquery-formatter");
|
|
18
18
|
var PQP = require("@microsoft/powerquery-parser");
|
|
19
|
+
var powerquery_parser_1 = require("@microsoft/powerquery-parser");
|
|
19
20
|
var vscode_languageserver_types_1 = require("vscode-languageserver-types");
|
|
20
21
|
function tryFormat(document, formattingOptions, locale) {
|
|
21
22
|
var indentationLiteral;
|
|
@@ -27,7 +28,7 @@ function tryFormat(document, formattingOptions, locale) {
|
|
|
27
28
|
}
|
|
28
29
|
var formatSettings = __assign(__assign({}, PQF.DefaultSettings), { locale: locale, indentationLiteral: indentationLiteral });
|
|
29
30
|
var triedFormat = PQF.tryFormat(formatSettings, document.getText());
|
|
30
|
-
if (
|
|
31
|
+
if (powerquery_parser_1.ResultUtils.isOk(triedFormat)) {
|
|
31
32
|
return [vscode_languageserver_types_1.TextEdit.replace(fullDocumentRange(document), triedFormat.value)];
|
|
32
33
|
}
|
|
33
34
|
// If an unhandled exception was returned.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formatter.js","sourceRoot":"","sources":["../../src/powerquery-language-services/formatter.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;AAElC,qDAAuD;AACvD,kDAAoD;
|
|
1
|
+
{"version":3,"file":"formatter.js","sourceRoot":"","sources":["../../src/powerquery-language-services/formatter.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;AAElC,qDAAuD;AACvD,kDAAoD;AAEpD,kEAA2D;AAE3D,2EAAiF;AAEjF,SAAgB,SAAS,CAAC,QAAsB,EAAE,iBAAoC,EAAE,MAAc;IAClG,IAAI,kBAA0C,CAAC;IAC/C,IAAI,iBAAiB,CAAC,YAAY,EAAE;QAChC,kBAAkB,uBAAiC,CAAC;KACvD;SAAM;QACH,kBAAkB,iBAA6B,CAAC;KACnD;IAED,IAAM,cAAc,yBACb,GAAG,CAAC,eAAe,KACtB,MAAM,QAAA,EACN,kBAAkB,oBAAA,GACrB,CAAC;IACF,IAAM,WAAW,GAAoB,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;IAEvF,IAAI,+BAAW,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;QAC/B,OAAO,CAAC,sCAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;KAC7E;IACD,0CAA0C;SACrC,IAAI,GAAG,CAAC,WAAW,CAAC,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE;QACvD,MAAM,WAAW,CAAC,KAAK,CAAC;KAC3B;IACD,mEAAmE;SAC9D;QACD,OAAO,EAAE,CAAC;KACb;AACL,CAAC;AA1BD,8BA0BC;AAED,0CAA0C;AAC1C,SAAS,iBAAiB,CAAC,QAAsB;IAC7C,OAAO;QACH,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;QAC7B,GAAG,EAAE;YACD,IAAI,EAAE,QAAQ,CAAC,SAAS,GAAG,CAAC;YAC5B,SAAS,EAAE,MAAM,CAAC,SAAS;SAC9B;KACJ,CAAC;AACN,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { Ast } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
|
|
2
|
+
import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
|
|
2
3
|
import type { Position } from "vscode-languageserver-types";
|
|
3
4
|
export declare type TMaybeActiveNode = ActiveNode | OutOfBoundPosition;
|
|
4
5
|
export interface IActiveNode {
|
|
@@ -8,8 +9,8 @@ export interface IActiveNode {
|
|
|
8
9
|
export interface ActiveNode extends IActiveNode {
|
|
9
10
|
readonly kind: ActiveNodeKind.ActiveNode;
|
|
10
11
|
readonly leafKind: ActiveNodeLeafKind;
|
|
11
|
-
readonly ancestry: ReadonlyArray<
|
|
12
|
-
readonly maybeIdentifierUnderPosition:
|
|
12
|
+
readonly ancestry: ReadonlyArray<TXorNode>;
|
|
13
|
+
readonly maybeIdentifierUnderPosition: Ast.Identifier | Ast.GeneralizedIdentifier | undefined;
|
|
13
14
|
}
|
|
14
15
|
export interface OutOfBoundPosition extends IActiveNode {
|
|
15
16
|
readonly kind: ActiveNodeKind.OutOfBoundPosition;
|
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { Ast } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
|
|
2
|
+
import { NodeIdMap, TXorNode, XorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
|
|
2
3
|
import type { Position } from "vscode-languageserver-types";
|
|
3
4
|
import { ActiveNode, ActiveNodeLeafKind, OutOfBoundPosition, TMaybeActiveNode } from "./activeNode";
|
|
4
|
-
export declare function maybeActiveNode(nodeIdMapCollection:
|
|
5
|
-
export declare function createActiveNode(leafKind: ActiveNodeLeafKind, position: Position, ancestry: ReadonlyArray<
|
|
5
|
+
export declare function maybeActiveNode(nodeIdMapCollection: NodeIdMap.Collection, position: Position): TMaybeActiveNode;
|
|
6
|
+
export declare function createActiveNode(leafKind: ActiveNodeLeafKind, position: Position, ancestry: ReadonlyArray<TXorNode>, maybeIdentifierUnderPosition: Ast.Identifier | Ast.GeneralizedIdentifier | undefined): ActiveNode;
|
|
6
7
|
export declare function createOutOfBoundPosition(position: Position): OutOfBoundPosition;
|
|
7
|
-
export declare function assertActiveNode(nodeIdMapCollection:
|
|
8
|
-
export declare function assertGetLeaf(activeNode: ActiveNode):
|
|
8
|
+
export declare function assertActiveNode(nodeIdMapCollection: NodeIdMap.Collection, position: Position): ActiveNode;
|
|
9
|
+
export declare function assertGetLeaf(activeNode: ActiveNode): TXorNode;
|
|
9
10
|
export declare function assertPositionInBounds(maybeValue: TMaybeActiveNode): asserts maybeValue is ActiveNode;
|
|
10
11
|
export declare function isPositionInBounds(maybeValue: TMaybeActiveNode): maybeValue is ActiveNode;
|
|
11
|
-
export declare function maybeFirstXorOfNodeKind(activeNode: ActiveNode, nodeKind:
|
|
12
|
+
export declare function maybeFirstXorOfNodeKind<T extends Ast.TNode>(activeNode: ActiveNode, nodeKind: T["kind"]): XorNode<T> | undefined;
|
|
@@ -17,10 +17,14 @@ var __read = (this && this.__read) || function (o, n) {
|
|
|
17
17
|
}
|
|
18
18
|
return ar;
|
|
19
19
|
};
|
|
20
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
21
|
-
for (var i = 0,
|
|
22
|
-
|
|
23
|
-
|
|
20
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
21
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
22
|
+
if (ar || !(i in from)) {
|
|
23
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
24
|
+
ar[i] = from[i];
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
24
28
|
};
|
|
25
29
|
var __values = (this && this.__values) || function(o) {
|
|
26
30
|
var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
|
|
@@ -36,8 +40,9 @@ var __values = (this && this.__values) || function(o) {
|
|
|
36
40
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
37
41
|
exports.maybeFirstXorOfNodeKind = exports.isPositionInBounds = exports.assertPositionInBounds = exports.assertGetLeaf = exports.assertActiveNode = exports.createOutOfBoundPosition = exports.createActiveNode = exports.maybeActiveNode = void 0;
|
|
38
42
|
var PQP = require("@microsoft/powerquery-parser");
|
|
43
|
+
var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
39
44
|
var __1 = require("../..");
|
|
40
|
-
// Searches all leaf
|
|
45
|
+
// Searches all leaf Ast.TNodes and all Context nodes to find the "active" node.
|
|
41
46
|
// ' 1 + |' -> the second operand, a Context node, in an ArithmeticExpression.
|
|
42
47
|
// 'let x=|1 in x' -> the value part of the key-value-pair.
|
|
43
48
|
// 'foo(|)' -> the zero length ArrayWrapper of an InvokeExpression
|
|
@@ -46,14 +51,14 @@ var __1 = require("../..");
|
|
|
46
51
|
// This approach breaks under several edge cases.
|
|
47
52
|
//
|
|
48
53
|
// Take a look at the ArithmeticExpression example above,
|
|
49
|
-
// it doesn't make sense for the ActiveNode to be the '+'
|
|
50
|
-
// When the position is on a constant the selected
|
|
54
|
+
// it doesn't make sense for the ActiveNode to be the '+' Constant.
|
|
55
|
+
// When the position is on a constant the selected Ast.TNode might need to be shifted one to the right.
|
|
51
56
|
// This happens with atomic constants such as '+', '=>', '[', '(' etc.
|
|
52
57
|
// However if you shifted right on '(' for 'foo(|)' then the ActiveNode would be ')' instead of the ArrayWrapper.
|
|
53
58
|
//
|
|
54
59
|
// Sometimes we don't want to shift at all.
|
|
55
60
|
// Nodes that prevent shifting are called anchor nodes.
|
|
56
|
-
// '[foo = bar|' should be anchored on the identifier 'bar' and not the context node for the ']'
|
|
61
|
+
// '[foo = bar|' should be anchored on the identifier 'bar' and not the context node for the ']' Constant.
|
|
57
62
|
function maybeActiveNode(nodeIdMapCollection, position) {
|
|
58
63
|
// Search for the closest Ast node on or to the left of Position, as well as the closest shifted right Ast node.
|
|
59
64
|
var astSearch = maybeFindAstNodes(nodeIdMapCollection, position);
|
|
@@ -67,20 +72,20 @@ function maybeActiveNode(nodeIdMapCollection, position) {
|
|
|
67
72
|
// * Context
|
|
68
73
|
// * Ast
|
|
69
74
|
if (astSearch.maybeShiftedRightNode !== undefined) {
|
|
70
|
-
maybeLeaf =
|
|
75
|
+
maybeLeaf = parser_1.XorNodeUtils.boxAst(astSearch.maybeShiftedRightNode);
|
|
71
76
|
leafKind = "ShiftedRight" /* ShiftedRight */;
|
|
72
77
|
}
|
|
73
78
|
else if (astSearch.maybeBestOnOrBeforeNode !== undefined &&
|
|
74
79
|
isAnchorNode(position, astSearch.maybeBestOnOrBeforeNode)) {
|
|
75
|
-
maybeLeaf =
|
|
80
|
+
maybeLeaf = parser_1.XorNodeUtils.boxAst(astSearch.maybeBestOnOrBeforeNode);
|
|
76
81
|
leafKind = "Anchored" /* Anchored */;
|
|
77
82
|
}
|
|
78
83
|
else if (maybeContextNode !== undefined) {
|
|
79
|
-
maybeLeaf =
|
|
84
|
+
maybeLeaf = parser_1.XorNodeUtils.boxContext(maybeContextNode);
|
|
80
85
|
leafKind = "Context" /* ContextNode */;
|
|
81
86
|
}
|
|
82
87
|
else if (astSearch.maybeBestOnOrBeforeNode !== undefined) {
|
|
83
|
-
maybeLeaf =
|
|
88
|
+
maybeLeaf = parser_1.XorNodeUtils.boxAst(astSearch.maybeBestOnOrBeforeNode);
|
|
84
89
|
leafKind = __1.PositionUtils.isAfterAst(position, astSearch.maybeBestOnOrBeforeNode, false)
|
|
85
90
|
? "AfterAstNode" /* AfterAstNode */
|
|
86
91
|
: "OnAstNode" /* OnAstNode */;
|
|
@@ -89,7 +94,7 @@ function maybeActiveNode(nodeIdMapCollection, position) {
|
|
|
89
94
|
return createOutOfBoundPosition(position);
|
|
90
95
|
}
|
|
91
96
|
var leaf = maybeLeaf;
|
|
92
|
-
return createActiveNode(leafKind, position,
|
|
97
|
+
return createActiveNode(leafKind, position, parser_1.AncestryUtils.assertGetAncestry(nodeIdMapCollection, leaf.node.id), findIdentifierUnderPosition(nodeIdMapCollection, position, leaf));
|
|
93
98
|
}
|
|
94
99
|
exports.maybeActiveNode = maybeActiveNode;
|
|
95
100
|
function createActiveNode(leafKind, position, ancestry, maybeIdentifierUnderPosition) {
|
|
@@ -116,7 +121,7 @@ function assertActiveNode(nodeIdMapCollection, position) {
|
|
|
116
121
|
}
|
|
117
122
|
exports.assertActiveNode = assertActiveNode;
|
|
118
123
|
function assertGetLeaf(activeNode) {
|
|
119
|
-
return
|
|
124
|
+
return parser_1.AncestryUtils.assertGetLeaf(activeNode.ancestry);
|
|
120
125
|
}
|
|
121
126
|
exports.assertGetLeaf = assertGetLeaf;
|
|
122
127
|
function assertPositionInBounds(maybeValue) {
|
|
@@ -130,7 +135,7 @@ function isPositionInBounds(maybeValue) {
|
|
|
130
135
|
}
|
|
131
136
|
exports.isPositionInBounds = isPositionInBounds;
|
|
132
137
|
function maybeFirstXorOfNodeKind(activeNode, nodeKind) {
|
|
133
|
-
return
|
|
138
|
+
return parser_1.AncestryUtils.maybeFirstXorOfNodeKind(activeNode.ancestry, nodeKind);
|
|
134
139
|
}
|
|
135
140
|
exports.maybeFirstXorOfNodeKind = maybeFirstXorOfNodeKind;
|
|
136
141
|
var DrilldownConstantKind = [
|
|
@@ -146,17 +151,15 @@ var ShiftRightConstantKinds = __spreadArray([
|
|
|
146
151
|
"]" /* RightBracket */,
|
|
147
152
|
")" /* RightParenthesis */,
|
|
148
153
|
";" /* Semicolon */
|
|
149
|
-
], __read(DrilldownConstantKind));
|
|
154
|
+
], __read(DrilldownConstantKind), false);
|
|
150
155
|
function isAnchorNode(position, astNode) {
|
|
151
156
|
if (!__1.PositionUtils.isInAst(position, astNode, true, true)) {
|
|
152
157
|
return false;
|
|
153
158
|
}
|
|
154
|
-
if (astNode.kind === "Identifier" /* Identifier */ ||
|
|
155
|
-
astNode.kind === "GeneralizedIdentifier" /* GeneralizedIdentifier */) {
|
|
159
|
+
if (astNode.kind === "Identifier" /* Identifier */ || astNode.kind === "GeneralizedIdentifier" /* GeneralizedIdentifier */) {
|
|
156
160
|
return true;
|
|
157
161
|
}
|
|
158
|
-
else if (astNode.kind === "LiteralExpression" /* LiteralExpression */ &&
|
|
159
|
-
astNode.literalKind === "Numeric" /* Numeric */) {
|
|
162
|
+
else if (astNode.kind === "LiteralExpression" /* LiteralExpression */ && astNode.literalKind === "Numeric" /* Numeric */) {
|
|
160
163
|
return true;
|
|
161
164
|
}
|
|
162
165
|
else if (astNode.kind === "Constant" /* Constant */) {
|
|
@@ -243,14 +246,14 @@ function maybeFindAstNodes(nodeIdMapCollection, position) {
|
|
|
243
246
|
if (DrilldownConstantKind.indexOf(maybeBestOnOrBeforeNode.constantKind) !== -1 &&
|
|
244
247
|
(maybeBestAfter === null || maybeBestAfter === void 0 ? void 0 : maybeBestAfter.kind) === "Constant" /* Constant */ &&
|
|
245
248
|
PQP.Language.ConstantUtils.isPairedWrapperConstantKinds(maybeBestOnOrBeforeNode.constantKind, maybeBestAfter.constantKind)) {
|
|
246
|
-
var parent_1 =
|
|
249
|
+
var parent_1 = parser_1.NodeIdMapUtils.assertUnboxParentAstChecked(nodeIdMapCollection, currentOnOrBefore.id, [
|
|
247
250
|
"RecordExpression" /* RecordExpression */,
|
|
248
251
|
"RecordLiteral" /* RecordLiteral */,
|
|
249
252
|
"ListExpression" /* ListExpression */,
|
|
250
253
|
"ListLiteral" /* ListLiteral */,
|
|
251
254
|
"InvokeExpression" /* InvokeExpression */,
|
|
252
255
|
]);
|
|
253
|
-
var arrayWrapper =
|
|
256
|
+
var arrayWrapper = parser_1.NodeIdMapUtils.assertUnboxArrayWrapperAst(nodeIdMapCollection, parent_1.id);
|
|
254
257
|
maybeShiftedRightNode = arrayWrapper;
|
|
255
258
|
}
|
|
256
259
|
// Requires a shift to the right.
|
|
@@ -300,26 +303,24 @@ function maybeFindContext(nodeIdMapCollection, astNodeSearch) {
|
|
|
300
303
|
return maybeCurrent;
|
|
301
304
|
}
|
|
302
305
|
function findIdentifierUnderPosition(nodeIdMapCollection, position, leaf) {
|
|
303
|
-
if (
|
|
306
|
+
if (parser_1.XorNodeUtils.isContextXor(leaf)) {
|
|
304
307
|
return undefined;
|
|
305
308
|
}
|
|
306
309
|
var identifier;
|
|
307
310
|
// If closestLeaf is '@', then check if it's part of an IdentifierExpression.
|
|
308
|
-
if (leaf.node.kind === "Constant" /* Constant */ &&
|
|
309
|
-
leaf.node.constantKind === "@" /* AtSign */) {
|
|
311
|
+
if (leaf.node.kind === "Constant" /* Constant */ && leaf.node.constantKind === "@" /* AtSign */) {
|
|
310
312
|
var maybeParentId = nodeIdMapCollection.parentIdById.get(leaf.node.id);
|
|
311
313
|
if (maybeParentId === undefined) {
|
|
312
314
|
return undefined;
|
|
313
315
|
}
|
|
314
316
|
var parentId = maybeParentId;
|
|
315
|
-
var parent_2 =
|
|
317
|
+
var parent_2 = parser_1.NodeIdMapUtils.assertUnboxAst(nodeIdMapCollection.astNodeById, parentId);
|
|
316
318
|
if (parent_2.kind !== "IdentifierExpression" /* IdentifierExpression */) {
|
|
317
319
|
return undefined;
|
|
318
320
|
}
|
|
319
321
|
identifier = parent_2.identifier;
|
|
320
322
|
}
|
|
321
|
-
else if (leaf.node.kind === "Identifier" /* Identifier */ ||
|
|
322
|
-
leaf.node.kind === "GeneralizedIdentifier" /* GeneralizedIdentifier */) {
|
|
323
|
+
else if (leaf.node.kind === "Identifier" /* Identifier */ || leaf.node.kind === "GeneralizedIdentifier" /* GeneralizedIdentifier */) {
|
|
323
324
|
identifier = leaf.node;
|
|
324
325
|
}
|
|
325
326
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activeNodeUtils.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/activeNode/activeNodeUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC
|
|
1
|
+
{"version":3,"file":"activeNodeUtils.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/activeNode/activeNodeUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAElC,kDAAoD;AAGpD,oFAOmE;AAGnE,2BAAsC;AAGtC,gFAAgF;AAChF,8EAA8E;AAC9E,2DAA2D;AAC3D,kEAAkE;AAClE,EAAE;AACF,6GAA6G;AAC7G,iDAAiD;AACjD,EAAE;AACF,yDAAyD;AACzD,mEAAmE;AACnE,uGAAuG;AACvG,sEAAsE;AACtE,iHAAiH;AACjH,EAAE;AACF,2CAA2C;AAC3C,uDAAuD;AACvD,0GAA0G;AAC1G,SAAgB,eAAe,CAAC,mBAAyC,EAAE,QAAkB;IACzF,gHAAgH;IAChH,IAAM,SAAS,GAAkB,iBAAiB,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;IAClF,kFAAkF;IAClF,IAAM,gBAAgB,GAA8C,gBAAgB,CAChF,mBAAmB,EACnB,SAAS,CACZ,CAAC;IAEF,IAAI,SAA+B,CAAC;IACpC,IAAI,QAA4B,CAAC;IACjC,0BAA0B;IAC1B,aAAa;IACb,YAAY;IACZ,aAAa;IACb,SAAS;IACT,IAAI,SAAS,CAAC,qBAAqB,KAAK,SAAS,EAAE;QAC/C,SAAS,GAAG,qBAAY,CAAC,MAAM,CAAC,SAAS,CAAC,qBAAqB,CAAC,CAAC;QACjE,QAAQ,oCAAkC,CAAC;KAC9C;SAAM,IACH,SAAS,CAAC,uBAAuB,KAAK,SAAS;QAC/C,YAAY,CAAC,QAAQ,EAAE,SAAS,CAAC,uBAAuB,CAAC,EAC3D;QACE,SAAS,GAAG,qBAAY,CAAC,MAAM,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;QACnE,QAAQ,4BAA8B,CAAC;KAC1C;SAAM,IAAI,gBAAgB,KAAK,SAAS,EAAE;QACvC,SAAS,GAAG,qBAAY,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;QACtD,QAAQ,8BAAiC,CAAC;KAC7C;SAAM,IAAI,SAAS,CAAC,uBAAuB,KAAK,SAAS,EAAE;QACxD,SAAS,GAAG,qBAAY,CAAC,MAAM,CAAC,SAAS,CAAC,uBAAuB,CAAC,CAAC;QACnE,QAAQ,GAAG,iBAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,SAAS,CAAC,uBAAuB,EAAE,KAAK,CAAC;YACnF,CAAC;YACD,CAAC,4BAA6B,CAAC;KACtC;SAAM;QACH,OAAO,wBAAwB,CAAC,QAAQ,CAAC,CAAC;KAC7C;IAED,IAAM,IAAI,GAAa,SAAS,CAAC;IAEjC,OAAO,gBAAgB,CACnB,QAAQ,EACR,QAAQ,EACR,sBAAa,CAAC,iBAAiB,CAAC,mBAAmB,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EAClE,2BAA2B,CAAC,mBAAmB,EAAE,QAAQ,EAAE,IAAI,CAAC,CACnE,CAAC;AACN,CAAC;AA7CD,0CA6CC;AAED,SAAgB,gBAAgB,CAC5B,QAA4B,EAC5B,QAAkB,EAClB,QAAiC,EACjC,4BAAoF;IAEpF,OAAO;QACH,IAAI,+BAA2B;QAC/B,QAAQ,UAAA;QACR,QAAQ,UAAA;QACR,QAAQ,UAAA;QACR,4BAA4B,8BAAA;KAC/B,CAAC;AACN,CAAC;AAbD,4CAaC;AAED,SAAgB,wBAAwB,CAAC,QAAkB;IACvD,OAAO;QACH,IAAI,+CAAmC;QACvC,QAAQ,UAAA;KACX,CAAC;AACN,CAAC;AALD,4DAKC;AAED,SAAgB,gBAAgB,CAAC,mBAAyC,EAAE,QAAkB;IAC1F,IAAM,UAAU,GAAqB,eAAe,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;IACpF,sBAAsB,CAAC,UAAU,CAAC,CAAC;IACnC,OAAO,UAAU,CAAC;AACtB,CAAC;AAJD,4CAIC;AAED,SAAgB,aAAa,CAAC,UAAsB;IAChD,OAAO,sBAAa,CAAC,aAAa,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;AAC5D,CAAC;AAFD,sCAEC;AAED,SAAgB,sBAAsB,CAAC,UAA4B;IAC/D,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE;QACjC,MAAM,IAAI,GAAG,CAAC,WAAW,CAAC,cAAc,CAAC,4CAA4C,CAAC,CAAC;KAC1F;AACL,CAAC;AAJD,wDAIC;AAED,SAAgB,kBAAkB,CAAC,UAA4B;IAC3D,OAAO,UAAU,CAAC,IAAI,kCAA8B,CAAC;AACzD,CAAC;AAFD,gDAEC;AAED,SAAgB,uBAAuB,CACnC,UAAsB,EACtB,QAAmB;IAEnB,OAAO,sBAAa,CAAC,uBAAuB,CAAC,UAAU,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;AAChF,CAAC;AALD,0DAKC;AAOD,IAAM,qBAAqB,GAA0B;;;;CAIpD,CAAC;AAEF,IAAM,uBAAuB;;;;;;;;UAQtB,qBAAqB,SAC3B,CAAC;AAEF,SAAS,YAAY,CAAC,QAAkB,EAAE,OAAkB;IACxD,IAAI,CAAC,iBAAa,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE;QACvD,OAAO,KAAK,CAAC;KAChB;IAED,IAAI,OAAO,CAAC,IAAI,kCAA4B,IAAI,OAAO,CAAC,IAAI,wDAAuC,EAAE;QACjG,OAAO,IAAI,CAAC;KACf;SAAM,IAAI,OAAO,CAAC,IAAI,gDAAmC,IAAI,OAAO,CAAC,WAAW,4BAA4B,EAAE;QAC3G,OAAO,IAAI,CAAC;KACf;SAAM,IAAI,OAAO,CAAC,IAAI,8BAA0B,EAAE;QAC/C,QAAQ,OAAO,CAAC,YAAY,EAAE;YAC1B,mBAAiC;YACjC,uBAAmC;YACnC,uBAAmC;YACnC,yBAAoC;YACpC,mBAAiC;YACjC,mBAAiC;YACjC,mBAAiC;YACjC,6BAAsC;YACtC,2BAAqC;YACrC,qBAAkC;YAClC,uBAAmC;YACnC,iCAAwC;YACxC,uBAAmC;YACnC,qBAAkC;YAClC,uBAAmC;YAEnC;gBACI,OAAO,IAAI,CAAC;YAEhB;gBACI,OAAO,KAAK,CAAC;SACpB;KACJ;SAAM;QACH,OAAO,KAAK,CAAC;KAChB;AACL,CAAC;AAED,SAAS,iBAAiB,CAAC,mBAAyC,EAAE,QAAkB;;IACpF,IAAM,WAAW,GAAqC,mBAAmB,CAAC,WAAW,CAAC;IACtF,IAAI,uBAA8C,CAAC;IACnD,IAAI,cAAqC,CAAC;IAC1C,IAAI,qBAA4C,CAAC;;QAEjD,QAAQ;QACR,gDAAgD;QAChD,8CAA8C;QAC9C,KAAqB,IAAA,KAAA,SAAA,mBAAmB,CAAC,OAAO,CAAA,gBAAA,4BAAE;YAA7C,IAAM,MAAM,WAAA;YACb,IAAM,cAAc,GAA0B,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACtE,IAAI,cAAc,KAAK,SAAS,EAAE;gBAC9B,SAAS;aACZ;YACD,IAAM,SAAS,GAAc,cAAc,CAAC;YAE5C,IAAI,eAAe,SAAS,CAAC;YAC7B;YACI,WAAW;YACX,CAAC,SAAS,CAAC,IAAI,8BAA0B;gBACrC,uBAAuB,CAAC,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;gBACnE,WAAW;gBACX,CAAC,CAAA,uBAAuB,aAAvB,uBAAuB,uBAAvB,uBAAuB,CAAE,IAAI,+BAA0B;oBACpD,uBAAuB,CAAC,OAAO,CAAC,uBAAuB,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,EACnF;gBACE,eAAe,GAAG,KAAK,CAAC;aAC3B;iBAAM;gBACH,eAAe,GAAG,IAAI,CAAC;aAC1B;YAED,IAAI,CAAC,iBAAa,CAAC,qBAAqB,CAAC,QAAQ,EAAE,SAAS,CAAC,UAAU,CAAC,aAAa,EAAE,eAAe,CAAC,EAAE;gBACrG,IACI,uBAAuB,KAAK,SAAS;oBACrC,SAAS,CAAC,UAAU,CAAC,eAAe,GAAG,uBAAuB,CAAC,UAAU,CAAC,eAAe,EAC3F;oBACE,uBAAuB,GAAG,SAAS,CAAC;iBACvC;aACJ;YACD,2BAA2B;iBACtB,IACD,cAAc,KAAK,SAAS;gBAC5B,SAAS,CAAC,UAAU,CAAC,eAAe,GAAG,cAAc,CAAC,UAAU,CAAC,eAAe,EAClF;gBACE,cAAc,GAAG,SAAS,CAAC;aAC9B;SACJ;;;;;;;;;IAED,uBAAuB;IACvB,IAAI,CAAA,uBAAuB,aAAvB,uBAAuB,uBAAvB,uBAAuB,CAAE,IAAI,+BAA0B,EAAE;QACzD,IAAM,iBAAiB,GAAkB,uBAAuB,CAAC;QAEjE,+CAA+C;QAC/C,IACI,qBAAqB,CAAC,OAAO,CAAC,uBAAuB,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;YAC1E,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,IAAI,+BAA0B;YAC9C,GAAG,CAAC,QAAQ,CAAC,aAAa,CAAC,4BAA4B,CACnD,uBAAuB,CAAC,YAAY,EACpC,cAAc,CAAC,YAAY,CAC9B,EACH;YACE,IAAM,QAAM,GAKiB,uBAAc,CAAC,2BAA2B,CACnE,mBAAmB,EACnB,iBAAiB,CAAC,EAAE,EACpB;;;;;;aAMC,CACJ,CAAC;YACF,IAAM,YAAY,GAAsB,uBAAc,CAAC,0BAA0B,CAC7E,mBAAmB,EACnB,QAAM,CAAC,EAAE,CACZ,CAAC;YACF,qBAAqB,GAAG,YAAY,CAAC;SACxC;QACD,iCAAiC;aAC5B,IAAI,uBAAuB,CAAC,OAAO,CAAC,iBAAiB,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE;YAC7E,qBAAqB,GAAG,cAAc,CAAC;SAC1C;QACD,eAAe;aACV;YACD,qBAAqB,GAAG,SAAS,CAAC;SACrC;KACJ;SAAM;QACH,qBAAqB,GAAG,SAAS,CAAC;KACrC;IAED,OAAO;QACH,uBAAuB,yBAAA;QACvB,qBAAqB,uBAAA;KACxB,CAAC;AACN,CAAC;AAED,SAAS,gBAAgB,CACrB,mBAAyC,EACzC,aAA4B;;IAE5B,IAAI,aAAa,CAAC,uBAAuB,KAAK,SAAS,EAAE;QACrD,OAAO,SAAS,CAAC;KACpB;IACD,IAAM,kBAAkB,GAAW,aAAa,CAAC,uBAAuB,CAAC,UAAU,CAAC,eAAe,CAAC;IAEpG,IAAI,YAAY,GAA8C,SAAS,CAAC;;QACxE,KAAwB,IAAA,KAAA,SAAA,mBAAmB,CAAC,eAAe,CAAC,MAAM,EAAE,CAAA,gBAAA,4BAAE;YAAjE,IAAM,SAAS,WAAA;YAChB,IAAI,SAAS,CAAC,eAAe,EAAE;gBAC3B,IAAI,SAAS,CAAC,eAAe,GAAG,kBAAkB,EAAE;oBAChD,SAAS;iBACZ;gBAED,IAAI,YAAY,KAAK,SAAS,IAAI,YAAY,CAAC,EAAE,GAAG,SAAS,CAAC,EAAE,EAAE;oBAC9D,YAAY,GAAG,SAAS,CAAC;iBAC5B;aACJ;SACJ;;;;;;;;;IAED,OAAO,YAAY,CAAC;AACxB,CAAC;AAED,SAAS,2BAA2B,CAChC,mBAAyC,EACzC,QAAkB,EAClB,IAAc;IAEd,IAAI,qBAAY,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;QACjC,OAAO,SAAS,CAAC;KACpB;IAED,IAAI,UAAsD,CAAC;IAE3D,6EAA6E;IAC7E,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,8BAA0B,IAAI,IAAI,CAAC,IAAI,CAAC,YAAY,qBAAiC,EAAE;QACrG,IAAM,aAAa,GAAuB,mBAAmB,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7F,IAAI,aAAa,KAAK,SAAS,EAAE;YAC7B,OAAO,SAAS,CAAC;SACpB;QACD,IAAM,QAAQ,GAAW,aAAa,CAAC;QAEvC,IAAM,QAAM,GAAc,uBAAc,CAAC,cAAc,CAAC,mBAAmB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QACnG,IAAI,QAAM,CAAC,IAAI,sDAAsC,EAAE;YACnD,OAAO,SAAS,CAAC;SACpB;QACD,UAAU,GAAG,QAAM,CAAC,UAAU,CAAC;KAClC;SAAM,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,kCAA4B,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,wDAAuC,EAAE;QAC5G,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC;KAC1B;SAAM;QACH,OAAO,SAAS,CAAC;KACpB;IAED,IAAI,iBAAa,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE;QAC1D,OAAO,UAAU,CAAC;KACrB;SAAM;QACH,OAAO,SAAS,CAAC;KACpB;AACL,CAAC"}
|