@microsoft/powerquery-language-services 0.6.12 → 0.9.6
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/analysis.d.ts +12 -11
- package/lib/powerquery-language-services/analysis/analysisBase.d.ts +31 -25
- package/lib/powerquery-language-services/analysis/analysisBase.js +239 -195
- package/lib/powerquery-language-services/analysis/analysisBase.js.map +1 -1
- package/lib/powerquery-language-services/analysis/analysisUtils.d.ts +1 -1
- package/lib/powerquery-language-services/analysis/analysisUtils.js +3 -3
- package/lib/powerquery-language-services/analysis/analysisUtils.js.map +1 -1
- package/lib/powerquery-language-services/analysis/memoizedAnalysis.d.ts +6 -6
- package/lib/powerquery-language-services/analysis/memoizedAnalysis.js.map +1 -1
- package/lib/powerquery-language-services/documentSymbols.js +8 -7
- package/lib/powerquery-language-services/documentSymbols.js.map +1 -1
- package/lib/powerquery-language-services/externalType/externalType.d.ts +1 -1
- package/lib/powerquery-language-services/externalType/externalType.js.map +1 -1
- package/lib/powerquery-language-services/externalType/externalTypeUtils.d.ts +2 -2
- package/lib/powerquery-language-services/externalType/externalTypeUtils.js +8 -7
- package/lib/powerquery-language-services/externalType/externalTypeUtils.js.map +1 -1
- package/lib/powerquery-language-services/index.d.ts +2 -1
- package/lib/powerquery-language-services/index.js +4 -3
- package/lib/powerquery-language-services/index.js.map +1 -1
- package/lib/powerquery-language-services/inspection/activeNode/activeNode.d.ts +7 -8
- package/lib/powerquery-language-services/inspection/activeNode/activeNode.js +3 -4
- package/lib/powerquery-language-services/inspection/activeNode/activeNode.js.map +1 -1
- package/lib/powerquery-language-services/inspection/activeNode/activeNodeUtils.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/activeNode/activeNodeUtils.js +227 -193
- package/lib/powerquery-language-services/inspection/activeNode/activeNodeUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.d.ts +4 -2
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.js +121 -98
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItemUtils.d.ts +3 -6
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItemUtils.js +13 -46
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItemUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.d.ts +2 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.js +42 -43
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordDefault.js +24 -23
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordDefault.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordErrorHandlingExpression.js +7 -7
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordErrorHandlingExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordIdentifierPairedExpression.js +2 -2
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordIdentifierPairedExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordLetExpression.js +8 -8
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordLetExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordListExpression.js +4 -4
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordListExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordSectionMember.js +8 -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 +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordTrailingText.js +6 -5
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordTrailingText.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/common.js +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/common.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/commonTypes.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.d.ts +4 -3
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.js +126 -82
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompletePrimitiveType.d.ts +5 -3
- package/lib/powerquery-language-services/inspection/autocomplete/autocompletePrimitiveType.js +305 -53
- package/lib/powerquery-language-services/inspection/autocomplete/autocompletePrimitiveType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/commonTypes.d.ts +6 -7
- package/lib/powerquery-language-services/inspection/autocomplete/task.js +8 -11
- package/lib/powerquery-language-services/inspection/autocomplete/task.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/trailingToken.d.ts +7 -0
- package/lib/powerquery-language-services/inspection/autocomplete/trailingToken.js +5 -0
- package/lib/powerquery-language-services/inspection/autocomplete/trailingToken.js.map +1 -0
- package/lib/powerquery-language-services/inspection/autocomplete/{common.d.ts → trailingTokenUtils.d.ts} +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/trailingTokenUtils.js +19 -0
- package/lib/powerquery-language-services/inspection/autocomplete/trailingTokenUtils.js.map +1 -0
- package/lib/powerquery-language-services/inspection/deferenceIdentifier.js +23 -20
- package/lib/powerquery-language-services/inspection/deferenceIdentifier.js.map +1 -1
- package/lib/powerquery-language-services/inspection/expectedType.js +62 -61
- package/lib/powerquery-language-services/inspection/expectedType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/invokeExpression/currentInvokeExpression.js +20 -15
- package/lib/powerquery-language-services/inspection/invokeExpression/currentInvokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.js +12 -10
- package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/pseudoFunctionExpressionType.js +7 -7
- package/lib/powerquery-language-services/inspection/pseudoFunctionExpressionType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/scope/scope.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/scope/scope.js.map +1 -1
- package/lib/powerquery-language-services/inspection/scope/scopeInspection.js +38 -36
- package/lib/powerquery-language-services/inspection/scope/scopeInspection.js.map +1 -1
- package/lib/powerquery-language-services/inspection/scope/scopeUtils.js +20 -18
- package/lib/powerquery-language-services/inspection/scope/scopeUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/task.js +24 -21
- package/lib/powerquery-language-services/inspection/task.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/common.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/common.js +85 -84
- package/lib/powerquery-language-services/inspection/type/inspectType/common.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/examineFieldSpecificationList.js +4 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/examineFieldSpecificationList.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeConstant.js +38 -38
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeConstant.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeEachExpression.js +6 -5
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeEachExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.js +10 -9
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/common.js +6 -5
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/common.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldProjection.js +25 -24
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldProjection.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldSelector.js +11 -10
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldSelector.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSpecification.js +5 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSpecification.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.js +15 -13
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.js +14 -12
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifier.js +5 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifier.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifierExpression.js +5 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifierExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.js +11 -10
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.js +11 -10
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.js +8 -6
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.js +10 -8
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeLiteralExpression.js +11 -10
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeLiteralExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeNullCoalescingExpression.js +10 -6
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeNullCoalescingExpression.js.map +1 -1
- 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.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.js +10 -8
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.js +8 -6
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.js +9 -7
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.js.map +1 -1
- 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.js +89 -88
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTBinOpExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.js +12 -10
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeUnaryExpression.js +14 -13
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeUnaryExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/task.js +9 -7
- package/lib/powerquery-language-services/inspection/type/task.js.map +1 -1
- package/lib/powerquery-language-services/inspection/typeCache/typeCacheUtils.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/typeCache/typeCacheUtils.js +3 -3
- package/lib/powerquery-language-services/inspection/typeCache/typeCacheUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspectionSettings.d.ts +1 -1
- package/lib/powerquery-language-services/inspectionSettings.js.map +1 -1
- package/lib/powerquery-language-services/inspectionUtils.d.ts +3 -3
- package/lib/powerquery-language-services/inspectionUtils.js +51 -52
- package/lib/powerquery-language-services/inspectionUtils.js.map +1 -1
- package/lib/powerquery-language-services/library/library.d.ts +1 -1
- package/lib/powerquery-language-services/library/library.js.map +1 -1
- package/lib/powerquery-language-services/library/librarySymbolUtils.d.ts +10 -2
- package/lib/powerquery-language-services/library/librarySymbolUtils.js +27 -21
- package/lib/powerquery-language-services/library/librarySymbolUtils.js.map +1 -1
- package/lib/powerquery-language-services/library/libraryUtils.d.ts +5 -5
- package/lib/powerquery-language-services/library/libraryUtils.js +24 -23
- package/lib/powerquery-language-services/library/libraryUtils.js.map +1 -1
- package/lib/powerquery-language-services/localization/templates.js +42 -42
- package/lib/powerquery-language-services/localization/templates.js.map +1 -1
- package/lib/powerquery-language-services/positionUtils.d.ts +9 -4
- package/lib/powerquery-language-services/positionUtils.js +55 -23
- package/lib/powerquery-language-services/positionUtils.js.map +1 -1
- package/lib/powerquery-language-services/providers/languageCompletionItemProvider.js +15 -15
- package/lib/powerquery-language-services/providers/languageCompletionItemProvider.js.map +1 -1
- package/lib/powerquery-language-services/providers/libraryProvider.js +9 -8
- package/lib/powerquery-language-services/providers/libraryProvider.js.map +1 -1
- package/lib/powerquery-language-services/providers/localDocumentProvider/foldingRanges.js +16 -14
- package/lib/powerquery-language-services/providers/localDocumentProvider/foldingRanges.js.map +1 -1
- package/lib/powerquery-language-services/providers/localDocumentProvider/localDocumentProvider.js +24 -23
- package/lib/powerquery-language-services/providers/localDocumentProvider/localDocumentProvider.js.map +1 -1
- package/lib/powerquery-language-services/providers/localDocumentProvider/partialSemanticToken.js +73 -71
- package/lib/powerquery-language-services/providers/localDocumentProvider/partialSemanticToken.js.map +1 -1
- package/lib/powerquery-language-services/providers/nullSymbolProvider.js +6 -6
- package/lib/powerquery-language-services/providers/nullSymbolProvider.js.map +1 -1
- package/lib/powerquery-language-services/tokenPositionComparison.d.ts +5 -0
- package/lib/powerquery-language-services/tokenPositionComparison.js +13 -0
- package/lib/powerquery-language-services/tokenPositionComparison.js.map +1 -0
- package/lib/powerquery-language-services/trace.d.ts +4 -4
- package/lib/powerquery-language-services/trace.js.map +1 -1
- package/lib/powerquery-language-services/traceUtils.d.ts +2 -2
- package/lib/powerquery-language-services/traceUtils.js +5 -5
- package/lib/powerquery-language-services/traceUtils.js.map +1 -1
- package/lib/powerquery-language-services/validate/validate.js +6 -5
- package/lib/powerquery-language-services/validate/validate.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateDuplicateIdentifiers.js +16 -14
- package/lib/powerquery-language-services/validate/validateDuplicateIdentifiers.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateFunctionExpression.js +6 -4
- package/lib/powerquery-language-services/validate/validateFunctionExpression.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateInvokeExpression.js +7 -5
- package/lib/powerquery-language-services/validate/validateInvokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateUnknownIdentifiers.js +10 -7
- package/lib/powerquery-language-services/validate/validateUnknownIdentifiers.js.map +1 -1
- package/package.json +10 -8
- package/lib/powerquery-language-services/inspection/autocomplete/common.js +0 -11
- package/lib/powerquery-language-services/inspection/autocomplete/common.js.map +0 -1
|
@@ -14,16 +14,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
14
14
|
exports.tryInvokeExpression = void 0;
|
|
15
15
|
const PQP = require("@microsoft/powerquery-parser");
|
|
16
16
|
const powerquery_parser_1 = require("@microsoft/powerquery-parser");
|
|
17
|
-
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
18
17
|
const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
|
|
18
|
+
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
19
|
+
const trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
|
|
19
20
|
const scope_1 = require("../scope");
|
|
20
21
|
const type_1 = require("../type");
|
|
21
22
|
const typeCache_1 = require("../typeCache");
|
|
23
|
+
const trace_2 = require("../../trace");
|
|
22
24
|
function tryInvokeExpression(settings, nodeIdMapCollection, invokeExpressionId,
|
|
23
25
|
// If a TypeCache is given, then potentially add to its values and include it as part of the return,
|
|
24
26
|
// Else create a new TypeCache and include it in the return.
|
|
25
|
-
typeCache = typeCache_1.TypeCacheUtils.
|
|
26
|
-
const trace = settings.traceManager.entry(
|
|
27
|
+
typeCache = typeCache_1.TypeCacheUtils.emptyCache()) {
|
|
28
|
+
const trace = settings.traceManager.entry(trace_2.InspectionTraceConstant.InspectInvokeExpression, tryInvokeExpression.name, settings.initialCorrelationId);
|
|
27
29
|
const updatedSettings = Object.assign(Object.assign({}, settings), { initialCorrelationId: trace.id });
|
|
28
30
|
const result = powerquery_parser_1.ResultUtils.ensureResultAsync(() => inspectInvokeExpression(updatedSettings, nodeIdMapCollection, invokeExpressionId, typeCache, trace.id), settings.locale);
|
|
29
31
|
return result;
|
|
@@ -32,18 +34,18 @@ exports.tryInvokeExpression = tryInvokeExpression;
|
|
|
32
34
|
function inspectInvokeExpression(settings, nodeIdMapCollection, invokeExpressionId, typeCache, correlationId) {
|
|
33
35
|
var _a;
|
|
34
36
|
return __awaiter(this, void 0, void 0, function* () {
|
|
35
|
-
const trace = settings.traceManager.entry(
|
|
37
|
+
const trace = settings.traceManager.entry(trace_2.InspectionTraceConstant.InspectInvokeExpression, inspectInvokeExpression.name, correlationId);
|
|
36
38
|
(_a = settings.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
|
|
37
39
|
const invokeExpressionXorNode = parser_1.NodeIdMapUtils.xor(nodeIdMapCollection, invokeExpressionId);
|
|
38
40
|
if (invokeExpressionXorNode === undefined) {
|
|
39
|
-
trace.exit({ [
|
|
41
|
+
trace.exit({ [trace_1.TraceConstant.IsThrowing]: true });
|
|
40
42
|
throw new PQP.CommonError.InvariantError(`expected invokeExpressionId to be present in nodeIdMapCollection`, {
|
|
41
43
|
invokeExpressionId,
|
|
42
44
|
});
|
|
43
45
|
}
|
|
44
|
-
parser_1.XorNodeUtils.
|
|
46
|
+
parser_1.XorNodeUtils.assertIsNodeKind(invokeExpressionXorNode, language_1.Ast.NodeKind.InvokeExpression);
|
|
45
47
|
const previousNode = parser_1.NodeIdMapUtils.assertRecursiveExpressionPreviousSibling(nodeIdMapCollection, invokeExpressionId);
|
|
46
|
-
const functionType = powerquery_parser_1.
|
|
48
|
+
const functionType = powerquery_parser_1.ResultUtils.assertOk(yield (0, type_1.tryType)(settings, nodeIdMapCollection, previousNode.node.id, typeCache));
|
|
47
49
|
const name = parser_1.NodeIdMapUtils.invokeExpressionIdentifierLiteral(nodeIdMapCollection, invokeExpressionId);
|
|
48
50
|
let invokeExpressionArgs;
|
|
49
51
|
if (language_1.TypeUtils.isDefinedFunction(functionType)) {
|
|
@@ -72,15 +74,15 @@ function inspectInvokeExpression(settings, nodeIdMapCollection, invokeExpression
|
|
|
72
74
|
}
|
|
73
75
|
function getIsNameInLocalScope(settings, nodeIdMapCollection, typeCache, invokeExpressionXorNode, name, correlationId) {
|
|
74
76
|
return __awaiter(this, void 0, void 0, function* () {
|
|
75
|
-
const trace = settings.traceManager.entry(
|
|
77
|
+
const trace = settings.traceManager.entry(trace_2.InspectionTraceConstant.InspectInvokeExpression, getIsNameInLocalScope.name, correlationId);
|
|
76
78
|
const updatedSettings = Object.assign(Object.assign({}, settings), { initialCorrelationId: trace.id });
|
|
77
79
|
// Try to find out if the identifier is a local or external name.
|
|
78
80
|
if (name !== undefined) {
|
|
79
81
|
// Seed local scope
|
|
80
|
-
const scope = powerquery_parser_1.
|
|
82
|
+
const scope = powerquery_parser_1.ResultUtils.assertOk(yield (0, scope_1.assertGetOrCreateNodeScope)(updatedSettings, nodeIdMapCollection, invokeExpressionXorNode.node.id, typeCache.scopeById));
|
|
81
83
|
const nameScopeItem = scope.get(name);
|
|
82
84
|
trace.exit();
|
|
83
|
-
return nameScopeItem !== undefined && nameScopeItem.kind !==
|
|
85
|
+
return nameScopeItem !== undefined && nameScopeItem.kind !== scope_1.ScopeItemKind.Undefined;
|
|
84
86
|
}
|
|
85
87
|
else {
|
|
86
88
|
trace.exit();
|
package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invokeExpression.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/invokeExpression/invokeExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AACpD,oEAAmE;AACnE,sFAMmE;
|
|
1
|
+
{"version":3,"file":"invokeExpression.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/invokeExpression/invokeExpression.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,16 +6,16 @@ exports.pseudoFunctionExpressionType = void 0;
|
|
|
6
6
|
const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
|
|
7
7
|
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
8
8
|
function pseudoFunctionExpressionType(nodeIdMapCollection, fnExpr) {
|
|
9
|
-
parser_1.XorNodeUtils.assertIsNodeKind(fnExpr,
|
|
9
|
+
parser_1.XorNodeUtils.assertIsNodeKind(fnExpr, language_1.Ast.NodeKind.FunctionExpression);
|
|
10
10
|
const examinedParameters = [];
|
|
11
11
|
// Iterates all parameters as TXorNodes if they exist, otherwise early exists from an empty list.
|
|
12
12
|
for (const parameter of functionParameterXorNodes(nodeIdMapCollection, fnExpr)) {
|
|
13
13
|
// A parameter isn't examinable if it doesn't have an Ast.Identifier for its name.
|
|
14
|
-
const name = parser_1.NodeIdMapUtils.
|
|
14
|
+
const name = parser_1.NodeIdMapUtils.nthChildAstChecked(nodeIdMapCollection, parameter.node.id, 1, language_1.Ast.NodeKind.Identifier);
|
|
15
15
|
if (name === undefined) {
|
|
16
16
|
break;
|
|
17
17
|
}
|
|
18
|
-
const examinable = language_1.TypeUtils.inspectParameter(nodeIdMapCollection, parser_1.XorNodeUtils.
|
|
18
|
+
const examinable = language_1.TypeUtils.inspectParameter(nodeIdMapCollection, parser_1.XorNodeUtils.assertAsNodeKind(parameter, language_1.Ast.NodeKind.Parameter));
|
|
19
19
|
if (examinable !== undefined) {
|
|
20
20
|
examinedParameters.push({
|
|
21
21
|
id: parameter.node.id,
|
|
@@ -26,7 +26,7 @@ function pseudoFunctionExpressionType(nodeIdMapCollection, fnExpr) {
|
|
|
26
26
|
});
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
|
-
const returnType = parser_1.NodeIdMapUtils.
|
|
29
|
+
const returnType = parser_1.NodeIdMapUtils.nthChildAstChecked(nodeIdMapCollection, fnExpr.node.id, 1, language_1.Ast.NodeKind.AsNullablePrimitiveType);
|
|
30
30
|
let isReturnNullable;
|
|
31
31
|
let returnTypeKind;
|
|
32
32
|
if (returnType !== undefined) {
|
|
@@ -36,7 +36,7 @@ function pseudoFunctionExpressionType(nodeIdMapCollection, fnExpr) {
|
|
|
36
36
|
}
|
|
37
37
|
else {
|
|
38
38
|
isReturnNullable = true;
|
|
39
|
-
returnTypeKind =
|
|
39
|
+
returnTypeKind = language_1.Type.TypeKind.Any;
|
|
40
40
|
}
|
|
41
41
|
return {
|
|
42
42
|
parameters: examinedParameters,
|
|
@@ -49,11 +49,11 @@ function pseudoFunctionExpressionType(nodeIdMapCollection, fnExpr) {
|
|
|
49
49
|
}
|
|
50
50
|
exports.pseudoFunctionExpressionType = pseudoFunctionExpressionType;
|
|
51
51
|
function functionParameterXorNodes(nodeIdMapCollection, fnExpr) {
|
|
52
|
-
const parametersList = parser_1.NodeIdMapUtils.
|
|
52
|
+
const parametersList = parser_1.NodeIdMapUtils.nthChildXorChecked(nodeIdMapCollection, fnExpr.node.id, 0, language_1.Ast.NodeKind.ParameterList);
|
|
53
53
|
if (parametersList === undefined) {
|
|
54
54
|
return [];
|
|
55
55
|
}
|
|
56
|
-
const wrappedContent = parser_1.NodeIdMapUtils.
|
|
56
|
+
const wrappedContent = parser_1.NodeIdMapUtils.wrappedContentXor(nodeIdMapCollection, parametersList.node.id);
|
|
57
57
|
return wrappedContent === undefined ? [] : parser_1.NodeIdMapIterator.iterArrayWrapper(nodeIdMapCollection, wrappedContent);
|
|
58
58
|
}
|
|
59
59
|
//# sourceMappingURL=pseudoFunctionExpressionType.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pseudoFunctionExpressionType.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/inspection/pseudoFunctionExpressionType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,0FAA6G;AAC7G,sFAOmE;AAcnE,SAAgB,4BAA4B,CACxC,mBAAyC,EACzC,MAAgB;IAEhB,qBAAY,CAAC,gBAAgB,CAAyB,MAAM,
|
|
1
|
+
{"version":3,"file":"pseudoFunctionExpressionType.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/inspection/pseudoFunctionExpressionType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,0FAA6G;AAC7G,sFAOmE;AAcnE,SAAgB,4BAA4B,CACxC,mBAAyC,EACzC,MAAgB;IAEhB,qBAAY,CAAC,gBAAgB,CAAyB,MAAM,EAAE,cAAG,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;IAE/F,MAAM,kBAAkB,GAAkC,EAAE,CAAC;IAE7D,iGAAiG;IACjG,KAAK,MAAM,SAAS,IAAI,yBAAyB,CAAC,mBAAmB,EAAE,MAAM,CAAC,EAAE;QAC5E,kFAAkF;QAClF,MAAM,IAAI,GAA+B,uBAAc,CAAC,kBAAkB,CACtE,mBAAmB,EACnB,SAAS,CAAC,IAAI,CAAC,EAAE,EACjB,CAAC,EACD,cAAG,CAAC,QAAQ,CAAC,UAAU,CAC1B,CAAC;QAEF,IAAI,IAAI,KAAK,SAAS,EAAE;YACpB,MAAM;SACT;QAED,MAAM,UAAU,GAAuC,oBAAS,CAAC,gBAAgB,CAC7E,mBAAmB,EACnB,qBAAY,CAAC,gBAAgB,CAAiB,SAAS,EAAE,cAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CACnF,CAAC;QAEF,IAAI,UAAU,KAAK,SAAS,EAAE;YAC1B,kBAAkB,CAAC,IAAI,CAAC;gBACpB,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,EAAE;gBACrB,UAAU,EAAE,UAAU,CAAC,UAAU;gBACjC,UAAU,EAAE,UAAU,CAAC,UAAU;gBACjC,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,IAAI;aACP,CAAC,CAAC;SACN;KACJ;IAED,MAAM,UAAU,GACZ,uBAAc,CAAC,kBAAkB,CAC7B,mBAAmB,EACnB,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,CAAC,EACD,cAAG,CAAC,QAAQ,CAAC,uBAAuB,CACvC,CAAC;IAEN,IAAI,gBAAyB,CAAC;IAC9B,IAAI,cAA6B,CAAC;IAElC,IAAI,UAAU,KAAK,SAAS,EAAE;QAC1B,MAAM,UAAU,GAA4B,mBAAQ,CAAC,+BAA+B,CAAC,UAAU,CAAC,CAAC;QACjG,gBAAgB,GAAG,UAAU,CAAC,UAAU,CAAC;QACzC,cAAc,GAAG,oBAAS,CAAC,qCAAqC,CAAC,UAAU,CAAC,yBAAyB,CAAC,CAAC;KAC1G;SAAM;QACH,gBAAgB,GAAG,IAAI,CAAC;QACxB,cAAc,GAAG,eAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;KACtC;IAED,OAAO;QACH,UAAU,EAAE,kBAAkB;QAC9B,UAAU,EAAE;YACR,IAAI,EAAE,cAAc;YACpB,YAAY,EAAE,SAAS;YACvB,UAAU,EAAE,gBAAgB;SAC/B;KACJ,CAAC;AACN,CAAC;AAlED,oEAkEC;AAED,SAAS,yBAAyB,CAC9B,mBAAyC,EACzC,MAAgB;IAEhB,MAAM,cAAc,GAChB,uBAAc,CAAC,kBAAkB,CAC7B,mBAAmB,EACnB,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,CAAC,EACD,cAAG,CAAC,QAAQ,CAAC,aAAa,CAC7B,CAAC;IAEN,IAAI,cAAc,KAAK,SAAS,EAAE;QAC9B,OAAO,EAAE,CAAC;KACb;IAED,MAAM,cAAc,GAAyB,uBAAc,CAAC,iBAAiB,CACzE,mBAAmB,EACnB,cAAc,CAAC,IAAI,CAAC,EAAE,CACzB,CAAC;IAEF,OAAO,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,0BAAiB,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,cAAc,CAAC,CAAC;AACvH,CAAC"}
|
|
@@ -7,7 +7,7 @@ export declare type ScopeById = Map<number, NodeScope>;
|
|
|
7
7
|
export declare type NodeScope = Map<string, TScopeItem>;
|
|
8
8
|
export declare type TScopeItem = EachScopeItem | LetVariableScopeItem | ParameterScopeItem | RecordFieldScopeItem | SectionMemberScopeItem | UndefinedScopeItem;
|
|
9
9
|
export declare type TKeyValuePairScopeItem = LetVariableScopeItem | RecordFieldScopeItem | SectionMemberScopeItem;
|
|
10
|
-
export declare
|
|
10
|
+
export declare enum ScopeItemKind {
|
|
11
11
|
Each = "Each",
|
|
12
12
|
LetVariable = "LetVariable",
|
|
13
13
|
Parameter = "Parameter",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scope.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/scope/scope.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AA+BlC,
|
|
1
|
+
{"version":3,"file":"scope.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/scope/scope.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AA+BlC,IAAY,aAOX;AAPD,WAAY,aAAa;IACrB,8BAAa,CAAA;IACb,4CAA2B,CAAA;IAC3B,wCAAuB,CAAA;IACvB,4CAA2B,CAAA;IAC3B,gDAA+B,CAAA;IAC/B,wCAAuB,CAAA;AAC3B,CAAC,EAPW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAOxB"}
|
|
@@ -16,16 +16,18 @@ const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/par
|
|
|
16
16
|
const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
|
|
17
17
|
const powerquery_parser_1 = require("@microsoft/powerquery-parser");
|
|
18
18
|
const __1 = require("../..");
|
|
19
|
+
const scope_1 = require("./scope");
|
|
19
20
|
const pseudoFunctionExpressionType_1 = require("../pseudoFunctionExpressionType");
|
|
21
|
+
const trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
|
|
20
22
|
// Builds a scope for the given node.
|
|
21
23
|
function tryNodeScope(settings, nodeIdMapCollection, nodeId,
|
|
22
24
|
// scopeById may get mutated by adding new entries.
|
|
23
25
|
scopeById) {
|
|
24
26
|
return __awaiter(this, void 0, void 0, function* () {
|
|
25
|
-
const trace = settings.traceManager.entry(
|
|
27
|
+
const trace = settings.traceManager.entry(__1.InspectionTraceConstant.InspectScope, tryNodeScope.name, settings.initialCorrelationId);
|
|
26
28
|
const updatedSettings = Object.assign(Object.assign({}, settings), { initialCorrelationId: trace.id });
|
|
27
29
|
const result = yield powerquery_parser_1.ResultUtils.ensureResultAsync(() => __awaiter(this, void 0, void 0, function* () {
|
|
28
|
-
const ancestry = parser_1.AncestryUtils.
|
|
30
|
+
const ancestry = parser_1.AncestryUtils.assertAncestry(nodeIdMapCollection, nodeId);
|
|
29
31
|
if (ancestry.length === 0) {
|
|
30
32
|
return new Map();
|
|
31
33
|
}
|
|
@@ -44,19 +46,19 @@ function assertGetOrCreateNodeScope(settings, nodeIdMapCollection, nodeId,
|
|
|
44
46
|
// scopeById may get mutated by adding new entries.
|
|
45
47
|
scopeById) {
|
|
46
48
|
return __awaiter(this, void 0, void 0, function* () {
|
|
47
|
-
const trace = settings.traceManager.entry(
|
|
49
|
+
const trace = settings.traceManager.entry(__1.InspectionTraceConstant.InspectScope, assertGetOrCreateNodeScope.name, settings.initialCorrelationId);
|
|
48
50
|
const updatedSettings = Object.assign(Object.assign({}, settings), { initialCorrelationId: trace.id });
|
|
49
51
|
const nodeScope = scopeById.get(nodeId);
|
|
50
52
|
if (nodeScope !== undefined) {
|
|
51
|
-
trace.exit({ [
|
|
52
|
-
return powerquery_parser_1.ResultUtils.
|
|
53
|
+
trace.exit({ [trace_1.TraceConstant.IsThrowing]: false });
|
|
54
|
+
return powerquery_parser_1.ResultUtils.ok(nodeScope);
|
|
53
55
|
}
|
|
54
56
|
const triedNodeScope = yield tryNodeScope(updatedSettings, nodeIdMapCollection, nodeId, scopeById);
|
|
55
57
|
if (powerquery_parser_1.ResultUtils.isError(triedNodeScope)) {
|
|
56
|
-
trace.exit({ [
|
|
58
|
+
trace.exit({ [trace_1.TraceConstant.IsThrowing]: true });
|
|
57
59
|
throw triedNodeScope;
|
|
58
60
|
}
|
|
59
|
-
trace.exit({ [
|
|
61
|
+
trace.exit({ [trace_1.TraceConstant.IsThrowing]: false });
|
|
60
62
|
return triedNodeScope;
|
|
61
63
|
});
|
|
62
64
|
}
|
|
@@ -65,7 +67,7 @@ function inspectScope(settings, nodeIdMapCollection, ancestry,
|
|
|
65
67
|
// scopeById may get mutated by adding new entries.
|
|
66
68
|
scopeById, correlationId) {
|
|
67
69
|
return __awaiter(this, void 0, void 0, function* () {
|
|
68
|
-
const trace = settings.traceManager.entry(
|
|
70
|
+
const trace = settings.traceManager.entry(__1.InspectionTraceConstant.InspectScope, inspectScope.name, correlationId);
|
|
69
71
|
const rootId = ancestry[0].node.id;
|
|
70
72
|
// A scope for the given ancestry has already been generated.
|
|
71
73
|
const cached = scopeById.get(rootId);
|
|
@@ -96,23 +98,23 @@ scopeById, correlationId) {
|
|
|
96
98
|
function inspectNode(state, xorNode, correlationId) {
|
|
97
99
|
var _a;
|
|
98
100
|
return __awaiter(this, void 0, void 0, function* () {
|
|
99
|
-
const trace = state.traceManager.entry(
|
|
101
|
+
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectScope, inspectNode.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
|
|
100
102
|
(_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
|
|
101
103
|
switch (xorNode.node.kind) {
|
|
102
|
-
case
|
|
104
|
+
case language_1.Ast.NodeKind.EachExpression:
|
|
103
105
|
inspectEachExpression(state, xorNode, trace.id);
|
|
104
106
|
break;
|
|
105
|
-
case
|
|
107
|
+
case language_1.Ast.NodeKind.FunctionExpression:
|
|
106
108
|
inspectFunctionExpression(state, xorNode, trace.id);
|
|
107
109
|
break;
|
|
108
|
-
case
|
|
110
|
+
case language_1.Ast.NodeKind.LetExpression:
|
|
109
111
|
inspectLetExpression(state, xorNode, trace.id);
|
|
110
112
|
break;
|
|
111
|
-
case
|
|
112
|
-
case
|
|
113
|
+
case language_1.Ast.NodeKind.RecordExpression:
|
|
114
|
+
case language_1.Ast.NodeKind.RecordLiteral:
|
|
113
115
|
inspectRecordExpressionOrRecordLiteral(state, xorNode, trace.id);
|
|
114
116
|
break;
|
|
115
|
-
case
|
|
117
|
+
case language_1.Ast.NodeKind.Section:
|
|
116
118
|
inspectSection(state, xorNode, trace.id);
|
|
117
119
|
break;
|
|
118
120
|
default:
|
|
@@ -122,13 +124,13 @@ function inspectNode(state, xorNode, correlationId) {
|
|
|
122
124
|
});
|
|
123
125
|
}
|
|
124
126
|
function inspectEachExpression(state, eachExpr, correlationId) {
|
|
125
|
-
const trace = state.traceManager.entry(
|
|
126
|
-
parser_1.XorNodeUtils.assertIsNodeKind(eachExpr,
|
|
127
|
+
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectScope, inspectEachExpression.name, correlationId);
|
|
128
|
+
parser_1.XorNodeUtils.assertIsNodeKind(eachExpr, language_1.Ast.NodeKind.EachExpression);
|
|
127
129
|
expandChildScope(state, eachExpr, [1], [
|
|
128
130
|
[
|
|
129
131
|
"_",
|
|
130
132
|
{
|
|
131
|
-
kind:
|
|
133
|
+
kind: scope_1.ScopeItemKind.Each,
|
|
132
134
|
id: eachExpr.node.id,
|
|
133
135
|
isRecursive: false,
|
|
134
136
|
eachExpression: eachExpr,
|
|
@@ -138,15 +140,15 @@ function inspectEachExpression(state, eachExpr, correlationId) {
|
|
|
138
140
|
trace.exit();
|
|
139
141
|
}
|
|
140
142
|
function inspectFunctionExpression(state, fnExpr, correlationId) {
|
|
141
|
-
const trace = state.traceManager.entry(
|
|
142
|
-
parser_1.XorNodeUtils.assertIsNodeKind(fnExpr,
|
|
143
|
+
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectScope, inspectFunctionExpression.name, correlationId);
|
|
144
|
+
parser_1.XorNodeUtils.assertIsNodeKind(fnExpr, language_1.Ast.NodeKind.FunctionExpression);
|
|
143
145
|
// Propegates the parent's scope.
|
|
144
146
|
const nodeScope = localGetOrCreateNodeScope(state, fnExpr.node.id, undefined, trace.id);
|
|
145
147
|
const pseudoType = (0, pseudoFunctionExpressionType_1.pseudoFunctionExpressionType)(state.nodeIdMapCollection, fnExpr);
|
|
146
148
|
const newEntries = pseudoType.parameters.map((parameter) => [
|
|
147
149
|
parameter.name.literal,
|
|
148
150
|
{
|
|
149
|
-
kind:
|
|
151
|
+
kind: scope_1.ScopeItemKind.Parameter,
|
|
150
152
|
id: parameter.id,
|
|
151
153
|
isRecursive: false,
|
|
152
154
|
name: parameter.name,
|
|
@@ -159,8 +161,8 @@ function inspectFunctionExpression(state, fnExpr, correlationId) {
|
|
|
159
161
|
trace.exit();
|
|
160
162
|
}
|
|
161
163
|
function inspectLetExpression(state, letExpr, correlationId) {
|
|
162
|
-
const trace = state.traceManager.entry(
|
|
163
|
-
parser_1.XorNodeUtils.assertIsNodeKind(letExpr,
|
|
164
|
+
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectScope, inspectLetExpression.name, correlationId);
|
|
165
|
+
parser_1.XorNodeUtils.assertIsNodeKind(letExpr, language_1.Ast.NodeKind.LetExpression);
|
|
164
166
|
// Propegates the parent's scope.
|
|
165
167
|
const nodeScope = localGetOrCreateNodeScope(state, letExpr.node.id, undefined, trace.id);
|
|
166
168
|
const keyValuePairs = parser_1.NodeIdMapIterator.iterLetExpression(state.nodeIdMapCollection, letExpr);
|
|
@@ -171,7 +173,7 @@ function inspectLetExpression(state, letExpr, correlationId) {
|
|
|
171
173
|
trace.exit();
|
|
172
174
|
}
|
|
173
175
|
function inspectRecordExpressionOrRecordLiteral(state, record, correlationId) {
|
|
174
|
-
const trace = state.traceManager.entry(
|
|
176
|
+
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectScope, inspectRecordExpressionOrRecordLiteral.name, correlationId);
|
|
175
177
|
parser_1.XorNodeUtils.assertIsRecord(record);
|
|
176
178
|
// Propegates the parent's scope.
|
|
177
179
|
const nodeScope = localGetOrCreateNodeScope(state, record.node.id, undefined, trace.id);
|
|
@@ -181,8 +183,8 @@ function inspectRecordExpressionOrRecordLiteral(state, record, correlationId) {
|
|
|
181
183
|
}
|
|
182
184
|
function inspectSection(state, section, correlationId) {
|
|
183
185
|
var _a;
|
|
184
|
-
const trace = state.traceManager.entry(
|
|
185
|
-
parser_1.XorNodeUtils.assertIsNodeKind(section,
|
|
186
|
+
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectScope, inspectSection.name, correlationId);
|
|
187
|
+
parser_1.XorNodeUtils.assertIsNodeKind(section, language_1.Ast.NodeKind.Section);
|
|
186
188
|
const keyValuePairs = parser_1.NodeIdMapIterator.iterSection(state.nodeIdMapCollection, section);
|
|
187
189
|
for (const kvp of keyValuePairs) {
|
|
188
190
|
(_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
|
|
@@ -199,7 +201,7 @@ function inspectSection(state, section, correlationId) {
|
|
|
199
201
|
// Expands the scope on the value part of the key value pair.
|
|
200
202
|
function inspectKeyValuePairs(state, parentScope, keyValuePairs, createFn, correlationId) {
|
|
201
203
|
var _a;
|
|
202
|
-
const trace = state.traceManager.entry(
|
|
204
|
+
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectScope, inspectKeyValuePairs.name, correlationId);
|
|
203
205
|
for (const kvp of keyValuePairs) {
|
|
204
206
|
(_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
|
|
205
207
|
if (kvp.value === undefined) {
|
|
@@ -223,7 +225,7 @@ function expandChildScope(state, parent, childAttributeIds, newEntries, defaultS
|
|
|
223
225
|
const parentId = parent.node.id;
|
|
224
226
|
// TODO: optimize this
|
|
225
227
|
for (const attributeId of childAttributeIds) {
|
|
226
|
-
const child = parser_1.NodeIdMapUtils.
|
|
228
|
+
const child = parser_1.NodeIdMapUtils.nthChildXor(nodeIdMapCollection, parentId, attributeId);
|
|
227
229
|
if (child !== undefined) {
|
|
228
230
|
expandScope(state, child, newEntries, defaultScope, correlationId);
|
|
229
231
|
}
|
|
@@ -231,19 +233,19 @@ function expandChildScope(state, parent, childAttributeIds, newEntries, defaultS
|
|
|
231
233
|
}
|
|
232
234
|
// Any operation done on a scope should first invoke `scopeFor` for data integrity.
|
|
233
235
|
function localGetOrCreateNodeScope(state, nodeId, defaultScope, correlationId) {
|
|
234
|
-
const trace = state.traceManager.entry(
|
|
236
|
+
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectScope, localGetOrCreateNodeScope.name, correlationId, {
|
|
235
237
|
nodeId,
|
|
236
238
|
});
|
|
237
239
|
// If scopeFor has already been called then there should be a nodeId in the givenScope.
|
|
238
240
|
const givenScope = state.givenScope.get(nodeId);
|
|
239
241
|
if (givenScope !== undefined) {
|
|
240
|
-
trace.exit({ [
|
|
242
|
+
trace.exit({ [trace_1.TraceConstant.Result]: "givenScope cache hit" });
|
|
241
243
|
return givenScope;
|
|
242
244
|
}
|
|
243
245
|
if (defaultScope !== undefined) {
|
|
244
246
|
const shallowCopy = new Map(defaultScope.entries());
|
|
245
247
|
state.givenScope.set(nodeId, shallowCopy);
|
|
246
|
-
trace.exit({ [
|
|
248
|
+
trace.exit({ [trace_1.TraceConstant.Result]: "defaultScope entry" });
|
|
247
249
|
return shallowCopy;
|
|
248
250
|
}
|
|
249
251
|
// Default to a parent's scope if the node has a parent.
|
|
@@ -254,14 +256,14 @@ function localGetOrCreateNodeScope(state, nodeId, defaultScope, correlationId) {
|
|
|
254
256
|
if (parentGivenScope !== undefined) {
|
|
255
257
|
const shallowCopy = new Map(parentGivenScope.entries());
|
|
256
258
|
state.givenScope.set(nodeId, shallowCopy);
|
|
257
|
-
trace.exit({ [
|
|
259
|
+
trace.exit({ [trace_1.TraceConstant.Result]: "parent givenScope hit" });
|
|
258
260
|
return parentGivenScope;
|
|
259
261
|
}
|
|
260
262
|
}
|
|
261
263
|
// The node has no parent or it hasn't been visited.
|
|
262
264
|
const newScope = new Map();
|
|
263
265
|
state.givenScope.set(nodeId, newScope);
|
|
264
|
-
trace.exit({ [
|
|
266
|
+
trace.exit({ [trace_1.TraceConstant.Result]: "set new entry" });
|
|
265
267
|
return newScope;
|
|
266
268
|
}
|
|
267
269
|
function scopeItemsFromKeyValuePairs(keyValuePairs, ancestorKeyNodeId, scopeItemFactory) {
|
|
@@ -278,7 +280,7 @@ function scopeItemsFromKeyValuePairs(keyValuePairs, ancestorKeyNodeId, scopeItem
|
|
|
278
280
|
}
|
|
279
281
|
function createSectionMemberScopeItem(keyValuePair, isRecursive) {
|
|
280
282
|
return {
|
|
281
|
-
kind:
|
|
283
|
+
kind: scope_1.ScopeItemKind.SectionMember,
|
|
282
284
|
id: keyValuePair.source.node.id,
|
|
283
285
|
isRecursive,
|
|
284
286
|
key: keyValuePair.key,
|
|
@@ -287,7 +289,7 @@ function createSectionMemberScopeItem(keyValuePair, isRecursive) {
|
|
|
287
289
|
}
|
|
288
290
|
function createLetVariableScopeItem(keyValuePair, isRecursive) {
|
|
289
291
|
return {
|
|
290
|
-
kind:
|
|
292
|
+
kind: scope_1.ScopeItemKind.LetVariable,
|
|
291
293
|
id: keyValuePair.source.node.id,
|
|
292
294
|
isRecursive,
|
|
293
295
|
key: keyValuePair.key,
|
|
@@ -296,7 +298,7 @@ function createLetVariableScopeItem(keyValuePair, isRecursive) {
|
|
|
296
298
|
}
|
|
297
299
|
function createRecordMemberScopeItem(keyValuePair, isRecursive) {
|
|
298
300
|
return {
|
|
299
|
-
kind:
|
|
301
|
+
kind: scope_1.ScopeItemKind.RecordField,
|
|
300
302
|
id: keyValuePair.source.node.id,
|
|
301
303
|
isRecursive,
|
|
302
304
|
key: keyValuePair.key,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scopeInspection.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/scope/scopeInspection.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAGlC,sFAOmE;AACnE,0FAA6F;AAC7F,oEAAyF;AAEzF,6BAAwE;AAYxE,kFAIyC;AAGzC,qCAAqC;AACrC,SAAsB,YAAY,CAC9B,QAA4B,EAC5B,mBAAyC,EACzC,MAAc;AACd,mDAAmD;AACnD,SAAoB;;QAEpB,MAAM,KAAK,GAAU,QAAQ,CAAC,YAAY,CAAC,KAAK,wCAE5C,YAAY,CAAC,IAAI,EACjB,QAAQ,CAAC,oBAAoB,CAChC,CAAC;QAEF,MAAM,eAAe,mCACd,QAAQ,KACX,oBAAoB,EAAE,KAAK,CAAC,EAAE,GACjC,CAAC;QAEF,MAAM,MAAM,GAAmB,MAAM,+BAAW,CAAC,iBAAiB,CAAC,GAAS,EAAE;YAC1E,MAAM,QAAQ,GAA4B,sBAAa,CAAC,iBAAiB,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;YAEvG,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;gBACvB,OAAO,IAAI,GAAG,EAAE,CAAC;aACpB;YAED,MAAM,YAAY,CAAC,eAAe,EAAE,mBAAmB,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;YAExF,MAAM,MAAM,GAAc,4BAAQ,CAAC,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,iCAAiC,EAAE;gBAC/F,MAAM;aACT,CAAC,CAAC;YAEH,OAAO,MAAM,CAAC;QAClB,CAAC,CAAA,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;QAE3B,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO,MAAM,CAAC;IAClB,CAAC;CAAA;AArCD,oCAqCC;AAED,SAAsB,0BAA0B,CAC5C,QAA4B,EAC5B,mBAAyC,EACzC,MAAc;AACd,mDAAmD;AACnD,SAAoB;;QAEpB,MAAM,KAAK,GAAU,QAAQ,CAAC,YAAY,CAAC,KAAK,wCAE5C,0BAA0B,CAAC,IAAI,EAC/B,QAAQ,CAAC,oBAAoB,CAChC,CAAC;QAEF,MAAM,eAAe,mCACd,QAAQ,KACX,oBAAoB,EAAE,KAAK,CAAC,EAAE,GACjC,CAAC;QAEF,MAAM,SAAS,GAA0B,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAE/D,IAAI,SAAS,KAAK,SAAS,EAAE;YACzB,KAAK,CAAC,IAAI,CAAC,EAAE,+BAA0B,EAAE,KAAK,EAAE,CAAC,CAAC;YAElD,OAAO,+BAAW,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;SACvC;QAED,MAAM,cAAc,GAAmB,MAAM,YAAY,CAAC,eAAe,EAAE,mBAAmB,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAEnH,IAAI,+BAAW,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;YACrC,KAAK,CAAC,IAAI,CAAC,EAAE,+BAA0B,EAAE,IAAI,EAAE,CAAC,CAAC;YAEjD,MAAM,cAAc,CAAC;SACxB;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,+BAA0B,EAAE,KAAK,EAAE,CAAC,CAAC;QAElD,OAAO,cAAc,CAAC;IAC1B,CAAC;CAAA;AArCD,gEAqCC;AAUD,SAAe,YAAY,CACvB,QAA4B,EAC5B,mBAAyC,EACzC,QAAiC;AACjC,mDAAmD;AACnD,SAAoB,EACpB,aAAqB;;QAErB,MAAM,KAAK,GAAU,QAAQ,CAAC,YAAY,CAAC,KAAK,wCAE5C,YAAY,CAAC,IAAI,EACjB,aAAa,CAChB,CAAC;QAEF,MAAM,MAAM,GAAW,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;QAE3C,6DAA6D;QAC7D,MAAM,MAAM,GAA0B,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAE5D,IAAI,MAAM,KAAK,SAAS,EAAE;YACtB,KAAK,CAAC,IAAI,EAAE,CAAC;YAEb,OAAO;SACV;QAED,MAAM,KAAK,GAAyB;YAChC,YAAY,EAAE,QAAQ,CAAC,YAAY;YACnC,UAAU,EAAE,SAAS;YACrB,QAAQ;YACR,iBAAiB,EAAE,QAAQ,CAAC,iBAAiB;YAC7C,mBAAmB;YACnB,aAAa,EAAE,CAAC;SACnB,CAAC;QAEF,oDAAoD;QACpD,MAAM,QAAQ,GAAW,QAAQ,CAAC,MAAM,CAAC;QAEzC,KAAK,IAAI,aAAa,GAAW,QAAQ,GAAG,CAAC,EAAE,aAAa,IAAI,CAAC,EAAE,aAAa,IAAI,CAAC,EAAE;YACnF,KAAK,CAAC,aAAa,GAAG,aAAa,CAAC;YACpC,MAAM,OAAO,GAAa,QAAQ,CAAC,aAAa,CAAC,CAAC;YAElD,4CAA4C;YAC5C,MAAM,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SAC/C;QAED,KAAK,CAAC,IAAI,EAAE,CAAC;IACjB,CAAC;CAAA;AAED,yCAAyC;AACzC,SAAe,WAAW,CAAC,KAA2B,EAAE,OAAiB,EAAE,aAAqB;;;QAC5F,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,wCAEzC,WAAW,CAAC,IAAI,EAChB,aAAa,EACb,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAE5C,QAAQ,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE;YACvB;gBACI,qBAAqB,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;gBAChD,MAAM;YAEV;gBACI,yBAAyB,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;gBACpD,MAAM;YAEV;gBACI,oBAAoB,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;gBAC/C,MAAM;YAEV,+CAAmC;YACnC;gBACI,sCAAsC,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;gBACjE,MAAM;YAEV;gBACI,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;gBACzC,MAAM;YAEV;gBACI,yBAAyB,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SAC9E;QAED,KAAK,CAAC,IAAI,EAAE,CAAC;;CAChB;AAED,SAAS,qBAAqB,CAAC,KAA2B,EAAE,QAAkB,EAAE,aAAqB;IACjG,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,wCAEzC,qBAAqB,CAAC,IAAI,EAC1B,aAAa,CAChB,CAAC;IAEF,qBAAY,CAAC,gBAAgB,CAAqB,QAAQ,wCAA8B,CAAC;IAEzF,gBAAgB,CACZ,KAAK,EACL,QAAQ,EACR,CAAC,CAAC,CAAC,EACH;QACI;YACI,GAAG;YACH;gBACI,IAAI,mBAAoB;gBACxB,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE;gBACpB,WAAW,EAAE,KAAK;gBAClB,cAAc,EAAE,QAAQ;aAC3B;SACJ;KACJ,EACD,yBAAyB,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,EACvE,KAAK,CAAC,EAAE,CACX,CAAC;IAEF,KAAK,CAAC,IAAI,EAAE,CAAC;AACjB,CAAC;AAED,SAAS,yBAAyB,CAAC,KAA2B,EAAE,MAAgB,EAAE,aAAqB;IACnG,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,wCAEzC,yBAAyB,CAAC,IAAI,EAC9B,aAAa,CAChB,CAAC;IAEF,qBAAY,CAAC,gBAAgB,CAAyB,MAAM,gDAAkC,CAAC;IAE/F,iCAAiC;IACjC,MAAM,SAAS,GAAc,yBAAyB,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;IACnG,MAAM,UAAU,GAAiC,IAAA,2DAA4B,EAAC,KAAK,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;IAEjH,MAAM,UAAU,GAAgD,UAAU,CAAC,UAAU,CAAC,GAAG,CACrF,CAAC,SAAsC,EAAE,EAAE,CAAC;QACxC,SAAS,CAAC,IAAI,CAAC,OAAO;QACtB;YACI,IAAI,6BAAyB;YAC7B,EAAE,EAAE,SAAS,CAAC,EAAE;YAChB,WAAW,EAAE,KAAK;YAClB,IAAI,EAAE,SAAS,CAAC,IAAI;YACpB,UAAU,EAAE,SAAS,CAAC,UAAU;YAChC,UAAU,EAAE,SAAS,CAAC,UAAU;YAChC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,oBAAS,CAAC,qCAAqC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;SACrG;KACJ,CACJ,CAAC;IAEF,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;IACtE,KAAK,CAAC,IAAI,EAAE,CAAC;AACjB,CAAC;AAED,SAAS,oBAAoB,CAAC,KAA2B,EAAE,OAAiB,EAAE,aAAqB;IAC/F,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,wCAEzC,oBAAoB,CAAC,IAAI,EACzB,aAAa,CAChB,CAAC;IAEF,qBAAY,CAAC,gBAAgB,CAAoB,OAAO,sCAA6B,CAAC;IAEtF,iCAAiC;IACjC,MAAM,SAAS,GAAc,yBAAyB,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;IAEpG,MAAM,aAAa,GAAqD,0BAAiB,CAAC,iBAAiB,CACvG,KAAK,CAAC,mBAAmB,EACzB,OAAO,CACV,CAAC;IAEF,oBAAoB,CAAC,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,0BAA0B,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;IAE5F,sEAAsE;IACtE,MAAM,UAAU,GAAkD,2BAA2B,CACzF,aAAa,EACb,CAAC,CAAC,EACF,0BAA0B,CAC7B,CAAC;IAEF,gBAAgB,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;IACvE,KAAK,CAAC,IAAI,EAAE,CAAC;AACjB,CAAC;AAED,SAAS,sCAAsC,CAC3C,KAA2B,EAC3B,MAAgB,EAChB,aAAqB;IAErB,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,wCAEzC,sCAAsC,CAAC,IAAI,EAC3C,aAAa,CAChB,CAAC;IAEF,qBAAY,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAEpC,iCAAiC;IACjC,MAAM,SAAS,GAAc,yBAAyB,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;IAEnG,MAAM,aAAa,GAAwD,0BAAiB,CAAC,UAAU,CACnG,KAAK,CAAC,mBAAmB,EACzB,MAAM,CACT,CAAC;IAEF,oBAAoB,CAAC,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,2BAA2B,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;IAC7F,KAAK,CAAC,IAAI,EAAE,CAAC;AACjB,CAAC;AAED,SAAS,cAAc,CAAC,KAA2B,EAAE,OAAiB,EAAE,aAAqB;;IACzF,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,wCAEzC,cAAc,CAAC,IAAI,EACnB,aAAa,CAChB,CAAC;IAEF,qBAAY,CAAC,gBAAgB,CAAc,OAAO,0BAAuB,CAAC;IAE1E,MAAM,aAAa,GAAyD,0BAAiB,CAAC,WAAW,CACrG,KAAK,CAAC,mBAAmB,EACzB,OAAO,CACV,CAAC;IAEF,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE;QAC7B,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAE5C,IAAI,GAAG,CAAC,KAAK,KAAK,SAAS,EAAE;YACzB,SAAS;SACZ;QAED,MAAM,aAAa,GAAoD,2BAA2B,CAC9F,aAAa,EACb,GAAG,CAAC,GAAG,CAAC,EAAE,EACV,4BAA4B,CAC/B,CAAC;QAEF,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5B,WAAW,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,aAAa,EAAE,IAAI,GAAG,EAAE,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SACrE;KACJ;IAED,KAAK,CAAC,IAAI,EAAE,CAAC;AACjB,CAAC;AAED,6DAA6D;AAC7D,SAAS,oBAAoB,CACzB,KAA2B,EAC3B,WAAsB,EACtB,aAAiC,EACjC,QAAsD,EACtD,aAAqB;;IAErB,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,wCAEzC,oBAAoB,CAAC,IAAI,EACzB,aAAa,CAChB,CAAC;IAEF,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE;QAC7B,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAE5C,IAAI,GAAG,CAAC,KAAK,KAAK,SAAS,EAAE;YACzB,SAAS;SACZ;QAED,MAAM,aAAa,GAA+B,2BAA2B,CACzE,aAAa,EACb,GAAG,CAAC,GAAG,CAAC,EAAE,EACV,QAAQ,CACX,CAAC;QAEF,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5B,WAAW,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SACvE;KACJ;IAED,KAAK,CAAC,IAAI,EAAE,CAAC;AACjB,CAAC;AAED,SAAS,WAAW,CAChB,KAA2B,EAC3B,OAAiB,EACjB,UAA+C,EAC/C,YAAmC,EACnC,aAAqB;IAErB,MAAM,SAAS,GAAc,yBAAyB,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;IAE5G,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,UAAU,EAAE;QACnC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;KAC7D;AACL,CAAC;AAED,SAAS,gBAAgB,CACrB,KAA2B,EAC3B,MAAgB,EAChB,iBAAwC,EACxC,UAA+C,EAC/C,YAAmC,EACnC,aAAqB;IAErB,MAAM,mBAAmB,GAAyB,KAAK,CAAC,mBAAmB,CAAC;IAC5E,MAAM,QAAQ,GAAW,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;IAExC,sBAAsB;IACtB,KAAK,MAAM,WAAW,IAAI,iBAAiB,EAAE;QACzC,MAAM,KAAK,GAAyB,uBAAc,CAAC,QAAQ,CAAC,mBAAmB,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;QAExG,IAAI,KAAK,KAAK,SAAS,EAAE;YACrB,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;SACtE;KACJ;AACL,CAAC;AAED,mFAAmF;AACnF,SAAS,yBAAyB,CAC9B,KAA2B,EAC3B,MAAc,EACd,YAAmC,EACnC,aAAqB;IAErB,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,wCAEzC,yBAAyB,CAAC,IAAI,EAC9B,aAAa,EACb;QACI,MAAM;KACT,CACJ,CAAC;IAEF,uFAAuF;IACvF,MAAM,UAAU,GAA0B,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAEvE,IAAI,UAAU,KAAK,SAAS,EAAE;QAC1B,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,sBAAsB,EAAE,CAAC,CAAC;QAE/D,OAAO,UAAU,CAAC;KACrB;IAED,IAAI,YAAY,KAAK,SAAS,EAAE;QAC5B,MAAM,WAAW,GAAc,IAAI,GAAG,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC;QAC/D,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAC1C,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,oBAAoB,EAAE,CAAC,CAAC;QAE7D,OAAO,WAAW,CAAC;KACtB;IAED,wDAAwD;IACxD,MAAM,MAAM,GAAyB,uBAAc,CAAC,SAAS,CAAC,KAAK,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;IAEjG,IAAI,MAAM,KAAK,SAAS,EAAE;QACtB,MAAM,YAAY,GAAW,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5C,MAAM,gBAAgB,GAA0B,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAEnF,IAAI,gBAAgB,KAAK,SAAS,EAAE;YAChC,MAAM,WAAW,GAAc,IAAI,GAAG,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC;YACnE,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;YAC1C,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,uBAAuB,EAAE,CAAC,CAAC;YAEhE,OAAO,gBAAgB,CAAC;SAC3B;KACJ;IAED,oDAAoD;IACpD,MAAM,QAAQ,GAAc,IAAI,GAAG,EAAE,CAAC;IACtC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACvC,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,eAAe,EAAE,CAAC,CAAC;IAExD,OAAO,QAAQ,CAAC;AACpB,CAAC;AAED,SAAS,2BAA2B,CAChC,aAAiC,EACjC,iBAAyB,EACzB,gBAAgE;IAEhE,MAAM,MAAM,GAAkB,EAAE,CAAC;IAEjC,+DAA+D;IAC/D,mDAAmD;IACnD,KAAK,MAAM,GAAG,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC,YAAiB,EAAE,EAAE,CAAC,YAAY,CAAC,KAAK,KAAK,SAAS,CAAC,EAAE;QAC7F,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,oBAAoB,EAAE,gBAAgB,CAAC,GAAG,EAAE,iBAAiB,KAAK,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAEjG,IAAI,GAAG,CAAC,UAAU,KAAK,GAAG,CAAC,oBAAoB,EAAE;YAC7C,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,gBAAgB,CAAC,GAAG,EAAE,iBAAiB,KAAK,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;SAC1F;KACJ;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,4BAA4B,CACjC,YAAmD,EACnD,WAAoB;IAEpB,OAAO;QACH,IAAI,qCAA6B;QACjC,EAAE,EAAE,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QAC/B,WAAW;QACX,GAAG,EAAE,YAAY,CAAC,GAAG;QACrB,KAAK,EAAE,YAAY,CAAC,KAAK;KAC5B,CAAC;AACN,CAAC;AAED,SAAS,0BAA0B,CAC/B,YAA+C,EAC/C,WAAoB;IAEpB,OAAO;QACH,IAAI,iCAA2B;QAC/B,EAAE,EAAE,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QAC/B,WAAW;QACX,GAAG,EAAE,YAAY,CAAC,GAAG;QACrB,KAAK,EAAE,YAAY,CAAC,KAAK;KAC5B,CAAC;AACN,CAAC;AAED,SAAS,2BAA2B,CAChC,YAAkD,EAClD,WAAoB;IAEpB,OAAO;QACH,IAAI,iCAA2B;QAC/B,EAAE,EAAE,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QAC/B,WAAW;QACX,GAAG,EAAE,YAAY,CAAC,GAAG;QACrB,KAAK,EAAE,YAAY,CAAC,KAAK;KAC5B,CAAC;AACN,CAAC"}
|
|
1
|
+
{"version":3,"file":"scopeInspection.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/scope/scopeInspection.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAGlC,sFAOmE;AACnE,0FAA6F;AAC7F,oEAAyF;AAEzF,6BAAwE;AACxE,mCAUiB;AACjB,kFAIyC;AACzC,2FAAuG;AAEvG,qCAAqC;AACrC,SAAsB,YAAY,CAC9B,QAA4B,EAC5B,mBAAyC,EACzC,MAAc;AACd,mDAAmD;AACnD,SAAoB;;QAEpB,MAAM,KAAK,GAAU,QAAQ,CAAC,YAAY,CAAC,KAAK,CAC5C,2BAAuB,CAAC,YAAY,EACpC,YAAY,CAAC,IAAI,EACjB,QAAQ,CAAC,oBAAoB,CAChC,CAAC;QAEF,MAAM,eAAe,mCACd,QAAQ,KACX,oBAAoB,EAAE,KAAK,CAAC,EAAE,GACjC,CAAC;QAEF,MAAM,MAAM,GAAmB,MAAM,+BAAW,CAAC,iBAAiB,CAAC,GAAS,EAAE;YAC1E,MAAM,QAAQ,GAA4B,sBAAa,CAAC,cAAc,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;YAEpG,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;gBACvB,OAAO,IAAI,GAAG,EAAE,CAAC;aACpB;YAED,MAAM,YAAY,CAAC,eAAe,EAAE,mBAAmB,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;YAExF,MAAM,MAAM,GAAc,4BAAQ,CAAC,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,iCAAiC,EAAE;gBAC/F,MAAM;aACT,CAAC,CAAC;YAEH,OAAO,MAAM,CAAC;QAClB,CAAC,CAAA,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;QAE3B,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO,MAAM,CAAC;IAClB,CAAC;CAAA;AArCD,oCAqCC;AAED,SAAsB,0BAA0B,CAC5C,QAA4B,EAC5B,mBAAyC,EACzC,MAAc;AACd,mDAAmD;AACnD,SAAoB;;QAEpB,MAAM,KAAK,GAAU,QAAQ,CAAC,YAAY,CAAC,KAAK,CAC5C,2BAAuB,CAAC,YAAY,EACpC,0BAA0B,CAAC,IAAI,EAC/B,QAAQ,CAAC,oBAAoB,CAChC,CAAC;QAEF,MAAM,eAAe,mCACd,QAAQ,KACX,oBAAoB,EAAE,KAAK,CAAC,EAAE,GACjC,CAAC;QAEF,MAAM,SAAS,GAA0B,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAE/D,IAAI,SAAS,KAAK,SAAS,EAAE;YACzB,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;YAElD,OAAO,+BAAW,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;SACpC;QAED,MAAM,cAAc,GAAmB,MAAM,YAAY,CAAC,eAAe,EAAE,mBAAmB,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;QAEnH,IAAI,+BAAW,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;YACrC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;YAEjD,MAAM,cAAc,CAAC;SACxB;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QAElD,OAAO,cAAc,CAAC;IAC1B,CAAC;CAAA;AArCD,gEAqCC;AAUD,SAAe,YAAY,CACvB,QAA4B,EAC5B,mBAAyC,EACzC,QAAiC;AACjC,mDAAmD;AACnD,SAAoB,EACpB,aAAqB;;QAErB,MAAM,KAAK,GAAU,QAAQ,CAAC,YAAY,CAAC,KAAK,CAC5C,2BAAuB,CAAC,YAAY,EACpC,YAAY,CAAC,IAAI,EACjB,aAAa,CAChB,CAAC;QAEF,MAAM,MAAM,GAAW,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;QAE3C,6DAA6D;QAC7D,MAAM,MAAM,GAA0B,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAE5D,IAAI,MAAM,KAAK,SAAS,EAAE;YACtB,KAAK,CAAC,IAAI,EAAE,CAAC;YAEb,OAAO;SACV;QAED,MAAM,KAAK,GAAyB;YAChC,YAAY,EAAE,QAAQ,CAAC,YAAY;YACnC,UAAU,EAAE,SAAS;YACrB,QAAQ;YACR,iBAAiB,EAAE,QAAQ,CAAC,iBAAiB;YAC7C,mBAAmB;YACnB,aAAa,EAAE,CAAC;SACnB,CAAC;QAEF,oDAAoD;QACpD,MAAM,QAAQ,GAAW,QAAQ,CAAC,MAAM,CAAC;QAEzC,KAAK,IAAI,aAAa,GAAW,QAAQ,GAAG,CAAC,EAAE,aAAa,IAAI,CAAC,EAAE,aAAa,IAAI,CAAC,EAAE;YACnF,KAAK,CAAC,aAAa,GAAG,aAAa,CAAC;YACpC,MAAM,OAAO,GAAa,QAAQ,CAAC,aAAa,CAAC,CAAC;YAElD,4CAA4C;YAC5C,MAAM,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SAC/C;QAED,KAAK,CAAC,IAAI,EAAE,CAAC;IACjB,CAAC;CAAA;AAED,yCAAyC;AACzC,SAAe,WAAW,CAAC,KAA2B,EAAE,OAAiB,EAAE,aAAqB;;;QAC5F,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,YAAY,EACpC,WAAW,CAAC,IAAI,EAChB,aAAa,EACb,cAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CACrC,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAE5C,QAAQ,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE;YACvB,KAAK,cAAG,CAAC,QAAQ,CAAC,cAAc;gBAC5B,qBAAqB,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;gBAChD,MAAM;YAEV,KAAK,cAAG,CAAC,QAAQ,CAAC,kBAAkB;gBAChC,yBAAyB,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;gBACpD,MAAM;YAEV,KAAK,cAAG,CAAC,QAAQ,CAAC,aAAa;gBAC3B,oBAAoB,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;gBAC/C,MAAM;YAEV,KAAK,cAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC;YACnC,KAAK,cAAG,CAAC,QAAQ,CAAC,aAAa;gBAC3B,sCAAsC,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;gBACjE,MAAM;YAEV,KAAK,cAAG,CAAC,QAAQ,CAAC,OAAO;gBACrB,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;gBACzC,MAAM;YAEV;gBACI,yBAAyB,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SAC9E;QAED,KAAK,CAAC,IAAI,EAAE,CAAC;;CAChB;AAED,SAAS,qBAAqB,CAAC,KAA2B,EAAE,QAAkB,EAAE,aAAqB;IACjG,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,YAAY,EACpC,qBAAqB,CAAC,IAAI,EAC1B,aAAa,CAChB,CAAC;IAEF,qBAAY,CAAC,gBAAgB,CAAqB,QAAQ,EAAE,cAAG,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IAEzF,gBAAgB,CACZ,KAAK,EACL,QAAQ,EACR,CAAC,CAAC,CAAC,EACH;QACI;YACI,GAAG;YACH;gBACI,IAAI,EAAE,qBAAa,CAAC,IAAI;gBACxB,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE;gBACpB,WAAW,EAAE,KAAK;gBAClB,cAAc,EAAE,QAAQ;aAC3B;SACJ;KACJ,EACD,yBAAyB,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,EACvE,KAAK,CAAC,EAAE,CACX,CAAC;IAEF,KAAK,CAAC,IAAI,EAAE,CAAC;AACjB,CAAC;AAED,SAAS,yBAAyB,CAAC,KAA2B,EAAE,MAAgB,EAAE,aAAqB;IACnG,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,YAAY,EACpC,yBAAyB,CAAC,IAAI,EAC9B,aAAa,CAChB,CAAC;IAEF,qBAAY,CAAC,gBAAgB,CAAyB,MAAM,EAAE,cAAG,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;IAE/F,iCAAiC;IACjC,MAAM,SAAS,GAAc,yBAAyB,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;IACnG,MAAM,UAAU,GAAiC,IAAA,2DAA4B,EAAC,KAAK,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;IAEjH,MAAM,UAAU,GAAgD,UAAU,CAAC,UAAU,CAAC,GAAG,CACrF,CAAC,SAAsC,EAAE,EAAE,CAAC;QACxC,SAAS,CAAC,IAAI,CAAC,OAAO;QACtB;YACI,IAAI,EAAE,qBAAa,CAAC,SAAS;YAC7B,EAAE,EAAE,SAAS,CAAC,EAAE;YAChB,WAAW,EAAE,KAAK;YAClB,IAAI,EAAE,SAAS,CAAC,IAAI;YACpB,UAAU,EAAE,SAAS,CAAC,UAAU;YAChC,UAAU,EAAE,SAAS,CAAC,UAAU;YAChC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,oBAAS,CAAC,qCAAqC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;SACrG;KACJ,CACJ,CAAC;IAEF,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;IACtE,KAAK,CAAC,IAAI,EAAE,CAAC;AACjB,CAAC;AAED,SAAS,oBAAoB,CAAC,KAA2B,EAAE,OAAiB,EAAE,aAAqB;IAC/F,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,YAAY,EACpC,oBAAoB,CAAC,IAAI,EACzB,aAAa,CAChB,CAAC;IAEF,qBAAY,CAAC,gBAAgB,CAAoB,OAAO,EAAE,cAAG,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IAEtF,iCAAiC;IACjC,MAAM,SAAS,GAAc,yBAAyB,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;IAEpG,MAAM,aAAa,GAAqD,0BAAiB,CAAC,iBAAiB,CACvG,KAAK,CAAC,mBAAmB,EACzB,OAAO,CACV,CAAC;IAEF,oBAAoB,CAAC,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,0BAA0B,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;IAE5F,sEAAsE;IACtE,MAAM,UAAU,GAAkD,2BAA2B,CACzF,aAAa,EACb,CAAC,CAAC,EACF,0BAA0B,CAC7B,CAAC;IAEF,gBAAgB,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;IACvE,KAAK,CAAC,IAAI,EAAE,CAAC;AACjB,CAAC;AAED,SAAS,sCAAsC,CAC3C,KAA2B,EAC3B,MAAgB,EAChB,aAAqB;IAErB,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,YAAY,EACpC,sCAAsC,CAAC,IAAI,EAC3C,aAAa,CAChB,CAAC;IAEF,qBAAY,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAEpC,iCAAiC;IACjC,MAAM,SAAS,GAAc,yBAAyB,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;IAEnG,MAAM,aAAa,GAAwD,0BAAiB,CAAC,UAAU,CACnG,KAAK,CAAC,mBAAmB,EACzB,MAAM,CACT,CAAC;IAEF,oBAAoB,CAAC,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,2BAA2B,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;IAC7F,KAAK,CAAC,IAAI,EAAE,CAAC;AACjB,CAAC;AAED,SAAS,cAAc,CAAC,KAA2B,EAAE,OAAiB,EAAE,aAAqB;;IACzF,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,YAAY,EACpC,cAAc,CAAC,IAAI,EACnB,aAAa,CAChB,CAAC;IAEF,qBAAY,CAAC,gBAAgB,CAAc,OAAO,EAAE,cAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAE1E,MAAM,aAAa,GAAyD,0BAAiB,CAAC,WAAW,CACrG,KAAK,CAAC,mBAAmB,EACzB,OAAO,CACV,CAAC;IAEF,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE;QAC7B,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAE5C,IAAI,GAAG,CAAC,KAAK,KAAK,SAAS,EAAE;YACzB,SAAS;SACZ;QAED,MAAM,aAAa,GAAoD,2BAA2B,CAC9F,aAAa,EACb,GAAG,CAAC,GAAG,CAAC,EAAE,EACV,4BAA4B,CAC/B,CAAC;QAEF,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5B,WAAW,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,aAAa,EAAE,IAAI,GAAG,EAAE,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SACrE;KACJ;IAED,KAAK,CAAC,IAAI,EAAE,CAAC;AACjB,CAAC;AAED,6DAA6D;AAC7D,SAAS,oBAAoB,CACzB,KAA2B,EAC3B,WAAsB,EACtB,aAAiC,EACjC,QAAsD,EACtD,aAAqB;;IAErB,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,YAAY,EACpC,oBAAoB,CAAC,IAAI,EACzB,aAAa,CAChB,CAAC;IAEF,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE;QAC7B,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAE5C,IAAI,GAAG,CAAC,KAAK,KAAK,SAAS,EAAE;YACzB,SAAS;SACZ;QAED,MAAM,aAAa,GAA+B,2BAA2B,CACzE,aAAa,EACb,GAAG,CAAC,GAAG,CAAC,EAAE,EACV,QAAQ,CACX,CAAC;QAEF,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5B,WAAW,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SACvE;KACJ;IAED,KAAK,CAAC,IAAI,EAAE,CAAC;AACjB,CAAC;AAED,SAAS,WAAW,CAChB,KAA2B,EAC3B,OAAiB,EACjB,UAA+C,EAC/C,YAAmC,EACnC,aAAqB;IAErB,MAAM,SAAS,GAAc,yBAAyB,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;IAE5G,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,UAAU,EAAE;QACnC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;KAC7D;AACL,CAAC;AAED,SAAS,gBAAgB,CACrB,KAA2B,EAC3B,MAAgB,EAChB,iBAAwC,EACxC,UAA+C,EAC/C,YAAmC,EACnC,aAAqB;IAErB,MAAM,mBAAmB,GAAyB,KAAK,CAAC,mBAAmB,CAAC;IAC5E,MAAM,QAAQ,GAAW,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;IAExC,sBAAsB;IACtB,KAAK,MAAM,WAAW,IAAI,iBAAiB,EAAE;QACzC,MAAM,KAAK,GAAyB,uBAAc,CAAC,WAAW,CAAC,mBAAmB,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;QAE3G,IAAI,KAAK,KAAK,SAAS,EAAE;YACrB,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;SACtE;KACJ;AACL,CAAC;AAED,mFAAmF;AACnF,SAAS,yBAAyB,CAC9B,KAA2B,EAC3B,MAAc,EACd,YAAmC,EACnC,aAAqB;IAErB,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,YAAY,EACpC,yBAAyB,CAAC,IAAI,EAC9B,aAAa,EACb;QACI,MAAM;KACT,CACJ,CAAC;IAEF,uFAAuF;IACvF,MAAM,UAAU,GAA0B,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAEvE,IAAI,UAAU,KAAK,SAAS,EAAE;QAC1B,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,MAAM,CAAC,EAAE,sBAAsB,EAAE,CAAC,CAAC;QAE/D,OAAO,UAAU,CAAC;KACrB;IAED,IAAI,YAAY,KAAK,SAAS,EAAE;QAC5B,MAAM,WAAW,GAAc,IAAI,GAAG,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC;QAC/D,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAC1C,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,MAAM,CAAC,EAAE,oBAAoB,EAAE,CAAC,CAAC;QAE7D,OAAO,WAAW,CAAC;KACtB;IAED,wDAAwD;IACxD,MAAM,MAAM,GAAyB,uBAAc,CAAC,SAAS,CAAC,KAAK,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;IAEjG,IAAI,MAAM,KAAK,SAAS,EAAE;QACtB,MAAM,YAAY,GAAW,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5C,MAAM,gBAAgB,GAA0B,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAEnF,IAAI,gBAAgB,KAAK,SAAS,EAAE;YAChC,MAAM,WAAW,GAAc,IAAI,GAAG,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC;YACnE,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;YAC1C,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,MAAM,CAAC,EAAE,uBAAuB,EAAE,CAAC,CAAC;YAEhE,OAAO,gBAAgB,CAAC;SAC3B;KACJ;IAED,oDAAoD;IACpD,MAAM,QAAQ,GAAc,IAAI,GAAG,EAAE,CAAC;IACtC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACvC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,MAAM,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC;IAExD,OAAO,QAAQ,CAAC;AACpB,CAAC;AAED,SAAS,2BAA2B,CAChC,aAAiC,EACjC,iBAAyB,EACzB,gBAAgE;IAEhE,MAAM,MAAM,GAAkB,EAAE,CAAC;IAEjC,+DAA+D;IAC/D,mDAAmD;IACnD,KAAK,MAAM,GAAG,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC,YAAiB,EAAE,EAAE,CAAC,YAAY,CAAC,KAAK,KAAK,SAAS,CAAC,EAAE;QAC7F,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,oBAAoB,EAAE,gBAAgB,CAAC,GAAG,EAAE,iBAAiB,KAAK,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAEjG,IAAI,GAAG,CAAC,UAAU,KAAK,GAAG,CAAC,oBAAoB,EAAE;YAC7C,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,gBAAgB,CAAC,GAAG,EAAE,iBAAiB,KAAK,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;SAC1F;KACJ;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAS,4BAA4B,CACjC,YAAmD,EACnD,WAAoB;IAEpB,OAAO;QACH,IAAI,EAAE,qBAAa,CAAC,aAAa;QACjC,EAAE,EAAE,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QAC/B,WAAW;QACX,GAAG,EAAE,YAAY,CAAC,GAAG;QACrB,KAAK,EAAE,YAAY,CAAC,KAAK;KAC5B,CAAC;AACN,CAAC;AAED,SAAS,0BAA0B,CAC/B,YAA+C,EAC/C,WAAoB;IAEpB,OAAO;QACH,IAAI,EAAE,qBAAa,CAAC,WAAW;QAC/B,EAAE,EAAE,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QAC/B,WAAW;QACX,GAAG,EAAE,YAAY,CAAC,GAAG;QACrB,KAAK,EAAE,YAAY,CAAC,KAAK;KAC5B,CAAC;AACN,CAAC;AAED,SAAS,2BAA2B,CAChC,YAAkD,EAClD,WAAoB;IAEpB,OAAO;QACH,IAAI,EAAE,qBAAa,CAAC,WAAW;QAC/B,EAAE,EAAE,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QAC/B,WAAW;QACX,GAAG,EAAE,YAAY,CAAC,GAAG;QACrB,KAAK,EAAE,YAAY,CAAC,KAAK;KAC5B,CAAC;AACN,CAAC"}
|
|
@@ -18,30 +18,32 @@ exports.findDirectUpperScopeExpression = exports.scopeCreatorIdentifier = export
|
|
|
18
18
|
// Copyright (c) Microsoft Corporation.
|
|
19
19
|
// Licensed under the MIT license.
|
|
20
20
|
const PQP = require("@microsoft/powerquery-parser");
|
|
21
|
+
const scope_1 = require("./scope");
|
|
22
|
+
const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
|
|
21
23
|
__exportStar(require("./scope"), exports);
|
|
22
24
|
__exportStar(require("./scopeInspection"), exports);
|
|
23
25
|
function isEach(value) {
|
|
24
|
-
return (value === null || value === void 0 ? void 0 : value.kind) ===
|
|
26
|
+
return (value === null || value === void 0 ? void 0 : value.kind) === scope_1.ScopeItemKind.Each;
|
|
25
27
|
}
|
|
26
28
|
exports.isEach = isEach;
|
|
27
29
|
function isLetVariable(value) {
|
|
28
|
-
return (value === null || value === void 0 ? void 0 : value.kind) ===
|
|
30
|
+
return (value === null || value === void 0 ? void 0 : value.kind) === scope_1.ScopeItemKind.LetVariable;
|
|
29
31
|
}
|
|
30
32
|
exports.isLetVariable = isLetVariable;
|
|
31
33
|
function isParameter(value) {
|
|
32
|
-
return (value === null || value === void 0 ? void 0 : value.kind) ===
|
|
34
|
+
return (value === null || value === void 0 ? void 0 : value.kind) === scope_1.ScopeItemKind.Parameter;
|
|
33
35
|
}
|
|
34
36
|
exports.isParameter = isParameter;
|
|
35
37
|
function isRecordField(value) {
|
|
36
|
-
return (value === null || value === void 0 ? void 0 : value.kind) ===
|
|
38
|
+
return (value === null || value === void 0 ? void 0 : value.kind) === scope_1.ScopeItemKind.RecordField;
|
|
37
39
|
}
|
|
38
40
|
exports.isRecordField = isRecordField;
|
|
39
41
|
function isSectionMember(value) {
|
|
40
|
-
return (value === null || value === void 0 ? void 0 : value.kind) ===
|
|
42
|
+
return (value === null || value === void 0 ? void 0 : value.kind) === scope_1.ScopeItemKind.SectionMember;
|
|
41
43
|
}
|
|
42
44
|
exports.isSectionMember = isSectionMember;
|
|
43
45
|
function isUndefined(value) {
|
|
44
|
-
return (value === null || value === void 0 ? void 0 : value.kind) ===
|
|
46
|
+
return (value === null || value === void 0 ? void 0 : value.kind) === scope_1.ScopeItemKind.Undefined;
|
|
45
47
|
}
|
|
46
48
|
exports.isUndefined = isUndefined;
|
|
47
49
|
function findScopeItemByLiteral(nodeScope, literalString) {
|
|
@@ -53,14 +55,14 @@ function scopeCreatorIdentifier(scopeItem) {
|
|
|
53
55
|
return undefined;
|
|
54
56
|
}
|
|
55
57
|
switch (scopeItem.kind) {
|
|
56
|
-
case
|
|
57
|
-
case
|
|
58
|
+
case scope_1.ScopeItemKind.Each:
|
|
59
|
+
case scope_1.ScopeItemKind.Undefined:
|
|
58
60
|
return undefined;
|
|
59
|
-
case
|
|
60
|
-
case
|
|
61
|
-
case
|
|
61
|
+
case scope_1.ScopeItemKind.LetVariable:
|
|
62
|
+
case scope_1.ScopeItemKind.RecordField:
|
|
63
|
+
case scope_1.ScopeItemKind.SectionMember:
|
|
62
64
|
return scopeItem.key;
|
|
63
|
-
case
|
|
65
|
+
case scope_1.ScopeItemKind.Parameter:
|
|
64
66
|
return scopeItem.name;
|
|
65
67
|
default:
|
|
66
68
|
throw PQP.Assert.isNever(scopeItem);
|
|
@@ -72,12 +74,12 @@ function findDirectUpperScopeExpression(nodeIdMapCollection, nodeId) {
|
|
|
72
74
|
const parentIdById = nodeIdMapCollection.parentIdById;
|
|
73
75
|
let currentNode = astNodeById.get(nodeId);
|
|
74
76
|
while (currentNode &&
|
|
75
|
-
currentNode.kind !==
|
|
76
|
-
currentNode.kind !==
|
|
77
|
-
currentNode.kind !==
|
|
78
|
-
currentNode.kind !==
|
|
79
|
-
currentNode.kind !==
|
|
80
|
-
currentNode.kind !==
|
|
77
|
+
currentNode.kind !== language_1.Ast.NodeKind.EachExpression &&
|
|
78
|
+
currentNode.kind !== language_1.Ast.NodeKind.FunctionExpression &&
|
|
79
|
+
currentNode.kind !== language_1.Ast.NodeKind.LetExpression &&
|
|
80
|
+
currentNode.kind !== language_1.Ast.NodeKind.RecordExpression &&
|
|
81
|
+
currentNode.kind !== language_1.Ast.NodeKind.RecordLiteral &&
|
|
82
|
+
currentNode.kind !== language_1.Ast.NodeKind.SectionMember) {
|
|
81
83
|
const currentParentId = parentIdById.get(currentNode.id) || -1;
|
|
82
84
|
currentNode = astNodeById.get(currentParentId);
|
|
83
85
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scopeUtils.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/scope/scopeUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,oDAAoD;
|
|
1
|
+
{"version":3,"file":"scopeUtils.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/scope/scopeUtils.ts"],"names":[],"mappings":"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"}
|