@microsoft/powerquery-language-services 0.3.9 → 0.3.12
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 +25 -14
- package/lib/powerquery-language-services/analysis/analysisBase.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.js +3 -2
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.js +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.js +2 -2
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompletePrimitiveType.js +2 -2
- package/lib/powerquery-language-services/inspection/autocomplete/autocompletePrimitiveType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/task.js +6 -5
- package/lib/powerquery-language-services/inspection/autocomplete/task.js.map +1 -1
- package/lib/powerquery-language-services/inspection/commonTypes.d.ts +3 -1
- package/lib/powerquery-language-services/inspection/expectedType.js +5 -1
- package/lib/powerquery-language-services/inspection/expectedType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/invokeExpression/currentInvokeExpression.js +13 -5
- package/lib/powerquery-language-services/inspection/invokeExpression/currentInvokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.js +17 -6
- package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/scope/scopeInspection.js +57 -42
- package/lib/powerquery-language-services/inspection/scope/scopeInspection.js.map +1 -1
- package/lib/powerquery-language-services/inspection/scope/scopeUtils.js +1 -2
- package/lib/powerquery-language-services/inspection/scope/scopeUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/task.d.ts +21 -0
- package/lib/powerquery-language-services/inspection/task.js +41 -20
- package/lib/powerquery-language-services/inspection/task.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/common.d.ts +7 -7
- package/lib/powerquery-language-services/inspection/type/inspectType/common.js +78 -55
- package/lib/powerquery-language-services/inspection/type/inspectType/common.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/examineFieldSpecificationList.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/examineFieldSpecificationList.js +3 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/examineFieldSpecificationList.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeEachExpression.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeEachExpression.js +4 -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 +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.js +5 -5
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/common.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/common.js +4 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/common.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldProjection.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldProjection.js +3 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldProjection.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldSelector.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldSelector.js +3 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldSelector.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSpecification.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSpecification.js +4 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSpecification.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.js +3 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.js +3 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifier.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifier.js +4 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifier.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifierExpression.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifierExpression.js +4 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifierExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.js +12 -9
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.js +13 -9
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.js +4 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.js +4 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeLiteralExpression.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeLiteralExpression.js +2 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeLiteralExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeNullCoalescingExpression.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeNullCoalescingExpression.js +5 -5
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeNullCoalescingExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeParameter.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeParameter.js +4 -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 +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypePrimitiveType.js +2 -2
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypePrimitiveType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.js +4 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.js +4 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.js +3 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecursivePrimaryExpression.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecursivePrimaryExpression.js +4 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecursivePrimaryExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTBinOpExpression.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTBinOpExpression.js +7 -7
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTBinOpExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.js +5 -5
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeUnaryExpression.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeUnaryExpression.js +4 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeUnaryExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/task.js +10 -6
- package/lib/powerquery-language-services/inspection/type/task.js.map +1 -1
- package/lib/powerquery-language-services/trace.d.ts +16 -8
- 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.js +13 -6
- package/lib/powerquery-language-services/validate/validateDuplicateIdentifiers.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateFunctionExpression.js +6 -2
- package/lib/powerquery-language-services/validate/validateFunctionExpression.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateInvokeExpression.js +7 -2
- package/lib/powerquery-language-services/validate/validateInvokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateLexAndParse.js +10 -4
- package/lib/powerquery-language-services/validate/validateLexAndParse.js.map +1 -1
- package/package.json +7 -4
|
@@ -105,19 +105,18 @@ class AnalysisBase {
|
|
|
105
105
|
const maybeInspected = yield this.promiseMaybeInspected;
|
|
106
106
|
const activeNode = yield this.getMaybeActiveNode();
|
|
107
107
|
const scopeById = maybeInspected === null || maybeInspected === void 0 ? void 0 : maybeInspected.typeCache.scopeById;
|
|
108
|
-
const
|
|
109
|
-
if (maybeInspected === undefined ||
|
|
108
|
+
const maybeInclusiveIdentifierUnderPosition = activeNode === null || activeNode === void 0 ? void 0 : activeNode.maybeInclusiveIdentifierUnderPosition;
|
|
109
|
+
if (maybeInspected === undefined || maybeInclusiveIdentifierUnderPosition === undefined) {
|
|
110
110
|
return [];
|
|
111
111
|
}
|
|
112
112
|
const identifiersToBeEdited = [];
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
113
|
+
let valueCreator = undefined;
|
|
114
|
+
if (maybeInclusiveIdentifierUnderPosition.kind === "GeneralizedIdentifier" /* GeneralizedIdentifier */) {
|
|
115
|
+
valueCreator = maybeInclusiveIdentifierUnderPosition;
|
|
116
116
|
}
|
|
117
|
-
else if (
|
|
117
|
+
else if (maybeInclusiveIdentifierUnderPosition.kind === "Identifier" /* Identifier */ && scopeById) {
|
|
118
118
|
// need to find this key value and modify all referring it
|
|
119
|
-
const theIdentifierNode =
|
|
120
|
-
let valueCreator = undefined;
|
|
119
|
+
const theIdentifierNode = maybeInclusiveIdentifierUnderPosition;
|
|
121
120
|
switch (theIdentifierNode.identifierContextKind) {
|
|
122
121
|
case "Key" /* Key */:
|
|
123
122
|
case "Parameter" /* Parameter */:
|
|
@@ -126,8 +125,13 @@ class AnalysisBase {
|
|
|
126
125
|
break;
|
|
127
126
|
case "Value" /* Value */: {
|
|
128
127
|
// it is the identifier referring the value
|
|
129
|
-
|
|
130
|
-
|
|
128
|
+
let nodeScope = maybeInspected.typeCache.scopeById.get(theIdentifierNode.id);
|
|
129
|
+
// there might be a chance that its scope did not get populated yet, do another try
|
|
130
|
+
if (!nodeScope) {
|
|
131
|
+
yield maybeInspected.tryNodeScope(theIdentifierNode.id);
|
|
132
|
+
nodeScope = maybeInspected.typeCache.scopeById.get(theIdentifierNode.id);
|
|
133
|
+
}
|
|
134
|
+
const scopeItem = (0, scopeUtils_1.findScopeItemByLiteral)(nodeScope, maybeInclusiveIdentifierUnderPosition.literal);
|
|
131
135
|
if (scopeItem) {
|
|
132
136
|
const maybeValueCreator = (0, scopeUtils_1.findTheCreatorIdentifierOfOneScopeItem)(scopeItem);
|
|
133
137
|
if ((maybeValueCreator === null || maybeValueCreator === void 0 ? void 0 : maybeValueCreator.kind) === "Identifier" /* Identifier */) {
|
|
@@ -139,6 +143,9 @@ class AnalysisBase {
|
|
|
139
143
|
identifiersToBeEdited.push(maybeValueCreator);
|
|
140
144
|
}
|
|
141
145
|
}
|
|
146
|
+
else if ((maybeValueCreator === null || maybeValueCreator === void 0 ? void 0 : maybeValueCreator.kind) === "GeneralizedIdentifier" /* GeneralizedIdentifier */) {
|
|
147
|
+
valueCreator = maybeValueCreator;
|
|
148
|
+
}
|
|
142
149
|
else if (maybeValueCreator) {
|
|
143
150
|
identifiersToBeEdited.push(maybeValueCreator);
|
|
144
151
|
}
|
|
@@ -151,10 +158,14 @@ class AnalysisBase {
|
|
|
151
158
|
identifiersToBeEdited.push(theIdentifierNode);
|
|
152
159
|
break;
|
|
153
160
|
}
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
161
|
+
}
|
|
162
|
+
if (valueCreator) {
|
|
163
|
+
// need to populate the other identifiers referring it
|
|
164
|
+
identifiersToBeEdited.push(...(yield maybeInspected.collectAllIdentifiersBeneath(valueCreator)));
|
|
165
|
+
}
|
|
166
|
+
// if none found, directly put maybeInclusiveIdentifierUnderPosition in if it exists
|
|
167
|
+
if (identifiersToBeEdited.length === 0 && maybeInclusiveIdentifierUnderPosition) {
|
|
168
|
+
identifiersToBeEdited.push(maybeInclusiveIdentifierUnderPosition);
|
|
158
169
|
}
|
|
159
170
|
return identifiersToBeEdited.map((one) => ({
|
|
160
171
|
range: PositionUtils.createRangeFromTokenRange(one.tokenRange),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analysisBase.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/analysis/analysisBase.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"analysisBase.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/analysis/analysisBase.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,13 +21,14 @@ const __1 = require("../..");
|
|
|
21
21
|
const type_1 = require("../type");
|
|
22
22
|
function tryAutocompleteFieldAccess(settings, parseState, maybeActiveNode, typeCache) {
|
|
23
23
|
return __awaiter(this, void 0, void 0, function* () {
|
|
24
|
-
const trace = settings.traceManager.entry("FieldAccess" /*
|
|
24
|
+
const trace = settings.traceManager.entry("FieldAccess" /* AutocompleteFieldAccess */, tryAutocompleteFieldAccess.name, settings.maybeInitialCorrelationId);
|
|
25
|
+
const updatedSettings = Object.assign(Object.assign({}, settings), { maybeInitialCorrelationId: trace.id });
|
|
25
26
|
let result;
|
|
26
27
|
if (!activeNode_1.ActiveNodeUtils.isPositionInBounds(maybeActiveNode)) {
|
|
27
28
|
result = powerquery_parser_1.ResultUtils.boxOk(undefined);
|
|
28
29
|
}
|
|
29
30
|
else {
|
|
30
|
-
result = yield powerquery_parser_1.ResultUtils.ensureResultAsync(
|
|
31
|
+
result = yield powerquery_parser_1.ResultUtils.ensureResultAsync(() => autocompleteFieldAccess(updatedSettings, parseState, maybeActiveNode, typeCache), updatedSettings.locale);
|
|
31
32
|
}
|
|
32
33
|
trace.exit({ ["IsError" /* IsError */]: powerquery_parser_1.ResultUtils.isError(result) });
|
|
33
34
|
return result;
|
package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autocompleteFieldAccess.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AACpD,sFAQmE;AACnE,oEAAmE;AAKnE,8CAA8E;AAE9E,yDAA6E;AAC7E,6BAAiE;AACjE,kCAA6C;AAI7C,SAAsB,0BAA0B,CAC5C,QAA4B,EAC5B,UAAiC,EACjC,eAAiC,EACjC,SAAoB;;QAEpB,MAAM,KAAK,GAAU,QAAQ,CAAC,YAAY,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"autocompleteFieldAccess.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AACpD,sFAQmE;AACnE,oEAAmE;AAKnE,8CAA8E;AAE9E,yDAA6E;AAC7E,6BAAiE;AACjE,kCAA6C;AAI7C,SAAsB,0BAA0B,CAC5C,QAA4B,EAC5B,UAAiC,EACjC,eAAiC,EACjC,SAAoB;;QAEpB,MAAM,KAAK,GAAU,QAAQ,CAAC,YAAY,CAAC,KAAK,8CAE5C,0BAA0B,CAAC,IAAI,EAC/B,QAAQ,CAAC,yBAAyB,CACrC,CAAC;QAEF,MAAM,eAAe,mCACd,QAAQ,KACX,yBAAyB,EAAE,KAAK,CAAC,EAAE,GACtC,CAAC;QAEF,IAAI,MAAoC,CAAC;QAEzC,IAAI,CAAC,4BAAe,CAAC,kBAAkB,CAAC,eAAe,CAAC,EAAE;YACtD,MAAM,GAAG,+BAAW,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;SACzC;aAAM;YACH,MAAM,GAAG,MAAM,+BAAW,CAAC,iBAAiB,CACxC,GAAG,EAAE,CAAC,uBAAuB,CAAC,eAAe,EAAE,UAAU,EAAE,eAAe,EAAE,SAAS,CAAC,EACtF,eAAe,CAAC,MAAM,CACzB,CAAC;SACL;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,yBAAuB,EAAE,+BAAW,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAErE,OAAO,MAAM,CAAC;IAClB,CAAC;CAAA;AA/BD,gEA+BC;AAED,MAAM,uCAAuC,GAAyC;;;;CAIrF,CAAC;AAEF,SAAe,uBAAuB,CAClC,QAA4B,EAC5B,UAAiC,EACjC,UAAsB,EACtB,SAAoB;;QAEpB,IAAI,yBAAyB,GAAqC,SAAS,CAAC;QAE5E,sDAAsD;QACtD,IAAI,wBAAsF,CAAC;QAE3F,KAAK,MAAM,QAAQ,IAAI,UAAU,CAAC,QAAQ,EAAE;YACxC,IACI,qBAAY,CAAC,UAAU,CAA0C,QAAQ,EAAE;;;aAG1E,CAAC,EACJ;gBACE,wBAAwB,GAAG,QAAQ,CAAC;aACvC;SACJ;QAED,IAAI,wBAAwB,KAAK,SAAS,EAAE;YACxC,yBAAyB,GAAG,kBAAkB,CAC1C,UAAU,CAAC,aAAa,EACxB,UAAU,CAAC,YAAY,CAAC,mBAAmB,EAC3C,UAAU,CAAC,QAAQ,EACnB,wBAAwB,CAC3B,CAAC;SACL;QAED,sFAAsF;QACtF,qBAAqB;QACrB,IAAI,yBAAyB,KAAK,SAAS,IAAI,yBAAyB,CAAC,qBAAqB,KAAK,KAAK,EAAE;YACtG,OAAO,SAAS,CAAC;SACpB;QAED,MAAM,oBAAoB,GAAyB,yBAAyB,CAAC;QAE7E,wDAAwD;QACxD,2DAA2D;QAC3D,IAAI,oBAAoB,CAAC,qBAAqB,KAAK,KAAK,EAAE;YACtD,OAAO,SAAS,CAAC;SACpB;QAED,kGAAkG;QAClG,0FAA0F;QAC1F,mCAAmC;QACnC,MAAM,mBAAmB,GAAyB,UAAU,CAAC,YAAY,CAAC,mBAAmB,CAAC;QAC9F,MAAM,UAAU,GAAyB,6BAA6B,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;QAExG,IAAI,UAAU,KAAK,SAAS,EAAE;YAC1B,OAAO,SAAS,CAAC;SACpB;QAED,MAAM,KAAK,GAAa,UAAU,CAAC;QAEnC,MAAM,cAAc,GAAc,MAAM,IAAA,cAAO,EAAC,QAAQ,EAAE,mBAAmB,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;QAEzG,IAAI,+BAAW,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;YACrC,MAAM,cAAc,CAAC,KAAK,CAAC;SAC9B;QAED,MAAM,SAAS,GAAyB,cAAc,CAAC,KAAK,CAAC;QAE7D,8EAA8E;QAC9E,MAAM,YAAY,GAAkD,yBAAyB,CAAC,SAAS,CAAC,CAAC;QAEzG,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;YAC3B,OAAO,SAAS,CAAC;SACpB;QAED,OAAO;YACH,KAAK;YACL,SAAS;YACT,oBAAoB;YACpB,iBAAiB,EAAE,uBAAuB,CAAC,YAAY,EAAE,oBAAoB,CAAC;SACjF,CAAC;IACN,CAAC;CAAA;AAED,SAAS,yBAAyB,CAAC,IAA0B;IACzD,QAAQ,IAAI,CAAC,iBAAiB,EAAE;QAC5B,8BAAmC,CAAC,CAAC;YACjC,IAAI,MAAM,GAAqC,EAAE,CAAC;YAElD,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,gBAAgB,EAAE;gBACvC,IACI,KAAK,CAAC,iBAAiB;oBACvB,uCAAuC,CAAC,QAAQ,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAC3E;oBACE,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC,CAAC;iBAC5D;aACJ;YAED,OAAO,MAAM,CAAC;SACjB;QAED,yCAAyC;QACzC;YACI,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QAEtC;YACI,OAAO,EAAE,CAAC;KACjB;AACL,CAAC;AAED,SAAS,kBAAkB,CACvB,aAAsC,EACtC,mBAAyC,EACzC,QAAkB,EAClB,WAA6D;IAE7D,QAAQ,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE;QAC3B;YACI,OAAO,sBAAsB,CAAC,aAAa,EAAE,mBAAmB,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;QAE7F;YACI,OAAO,oBAAoB,CAAC,aAAa,EAAE,mBAAmB,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;QAE3F;YACI,MAAM,0BAAM,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;KAC9C;AACL,CAAC;AAED,SAAS,sBAAsB,CAC3B,aAAsC,EACtC,mBAAyC,EACzC,QAAkB,EAClB,eAAyB;IAEzB,IAAI,qBAAqB,GAAY,KAAK,CAAC;IAC3C,IAAI,4BAAmE,CAAC;IACxE,MAAM,UAAU,GAAa,EAAE,CAAC;IAEhC,KAAK,MAAM,aAAa,IAAI,0BAAiB,CAAC,mBAAmB,CAAC,mBAAmB,EAAE,eAAe,CAAC,EAAE;QACrG,MAAM,sBAAsB,GAAyB,oBAAoB,CACrE,aAAa,EACb,mBAAmB,EACnB,QAAQ,EACR,aAAa,CAChB,CAAC;QAEF,IAAI,sBAAsB,CAAC,qBAAqB,IAAI,sBAAsB,CAAC,4BAA4B,EAAE;YACrG,qBAAqB,GAAG,IAAI,CAAC;YAC7B,4BAA4B,GAAG,sBAAsB,CAAC,4BAA4B,CAAC;SACtF;QAED,UAAU,CAAC,IAAI,CAAC,GAAG,sBAAsB,CAAC,UAAU,CAAC,CAAC;KACzD;IAED,OAAO;QACH,qBAAqB;QACrB,4BAA4B;QAC5B,UAAU;KACb,CAAC;AACN,CAAC;AAED,SAAS,0BAA0B,CAAC,qBAA8B;IAC9D,OAAO;QACH,qBAAqB;QACrB,4BAA4B,EAAE,SAAS;QACvC,UAAU,EAAE,EAAE;KACjB,CAAC;AACN,CAAC;AAED,SAAS,oBAAoB,CACzB,aAAsC,EACtC,mBAAyC,EACzC,QAAkB,EAClB,aAAuB;;IAEvB,MAAM,QAAQ,GAAsC,mBAAmB,CAAC,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAEhH,IAAI,QAAQ,KAAK,SAAS,EAAE;QACxB,OAAO,0BAA0B,CAAC,KAAK,CAAC,CAAC;KAC5C;SAAM,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;QAC9B,OAAO,0BAA0B,CAAC,mBAAmB,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;KACvF;IAED,MAAM,uBAAuB,GAAW,QAAQ,CAAC,CAAC,CAAC,CAAC;IAEpD,MAAM,wBAAwB,GAC1B,uBAAc,CAAC,mBAAmB,CAC9B,mBAAmB,EACnB,uBAAuB,sDAE1B,CAAC;IAEN,QAAQ,wBAAwB,CAAC,IAAI,EAAE;QACnC,oBAA+B,CAAC,CAAC;YAC7B,MAAM,qBAAqB,GAA8B,wBAAwB,CAAC,IAAI,CAAC;YACvF,MAAM,sBAAsB,GAAY,iBAAa,CAAC,OAAO,CAAC,QAAQ,EAAE,qBAAqB,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YAE3G,OAAO;gBACH,qBAAqB,EAAE,sBAAsB;gBAC7C,4BAA4B,EAAE,sBAAsB,KAAK,IAAI,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,SAAS;gBACjG,UAAU,EAAE,CAAC,qBAAqB,CAAC,OAAO,CAAC;aAC9C,CAAC;SACL;QAED,4BAAmC,CAAC,CAAC;YACjC,uBAAuB;YACvB,2FAA2F;YAC3F,0CAA0C;YAC1C,MAAM,mBAAmB,GAAkB,uBAAc,CAAC,+BAA+B,CACrF,mBAAmB,EACnB,aAAa,CAAC,IAAI,CAAC,EAAE,EACrB,CAAC,4BAEJ,CAAC;YAEF,MAAM,sBAAsB,GACxB,MAAA,aAAa,CAAC,MAAM,CAAC,mBAAmB,CAAC,UAAU,CAAC,aAAa,GAAG,CAAC,CAAC,0CAAE,aAAa,CAAC;YAE1F,MAAM,qBAAqB,GACvB,iBAAa,CAAC,UAAU,CAAC,QAAQ,EAAE,mBAAmB,EAAE,KAAK,CAAC;gBAC9D,CAAC,sBAAsB,KAAK,SAAS;oBACjC,iBAAa,CAAC,iBAAiB,CAAC,QAAQ,EAAE,sBAAsB,CAAC;oBACjE,iBAAa,CAAC,qBAAqB,CAAC,QAAQ,EAAE,sBAAsB,EAAE,IAAI,CAAC,CAAC,CAAC;YAErF,OAAO;gBACH,qBAAqB;gBACrB,4BAA4B,EAAE,SAAS;gBACvC,UAAU,EAAE,EAAE;aACjB,CAAC;SACL;QAED;YACI,MAAM,0BAAM,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC;KACtD;AACL,CAAC;AAED,SAAS,uBAAuB,CAC5B,YAA2D,EAC3D,oBAA0C;;IAE1C,MAAM,gBAAgB,GAA0B,oBAAoB,CAAC,UAAU,CAAC;IAChF,MAAM,iBAAiB,GAAuB,EAAE,CAAC;IAEjD,MAAM,mCAAmC,GACrC,MAAA,oBAAoB,CAAC,4BAA4B,0CAAE,OAAO,CAAC;IAE/D,KAAK,MAAM,CAAC,KAAK,EAAE,cAAc,CAAC,IAAI,YAAY,EAAE;QAChD,IAAI,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,mCAAmC,EAAE;YACnF,SAAS;SACZ;QAED,iBAAiB,CAAC,IAAI,CAClB,wCAAqB,CAAC,qBAAqB,CAAC,KAAK,EAAE,cAAc,EAAE,mCAAmC,CAAC,CAC1G,CAAC;KACL;IAED,OAAO,iBAAiB,CAAC;AAC7B,CAAC;AAED,SAAS,6BAA6B,CAClC,mBAAyC,EACzC,UAAsB;IAEtB,MAAM,QAAQ,GAA4B,UAAU,CAAC,QAAQ,CAAC;IAC9D,MAAM,YAAY,GAAW,QAAQ,CAAC,MAAM,CAAC;IAE7C,IAAI,gCAAsD,CAAC;IAC3D,IAAI,mCAAmC,GAAY,IAAI,CAAC;IAExD,KAAK,IAAI,KAAK,GAAW,CAAC,EAAE,KAAK,GAAG,YAAY,EAAE,KAAK,IAAI,CAAC,EAAE;QAC1D,MAAM,OAAO,GAAa,QAAQ,CAAC,KAAK,CAAC,CAAC;QAE1C,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,kEAA4C,EAAE;YAC/D,gGAAgG;YAChG,MAAM,gBAAgB,GAAa,sBAAa,CAAC,uBAAuB,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YAE1F,sCAAsC;YACtC,sEAAsE;YACtE,IAAI,gBAAgB,CAAC,IAAI,CAAC,mBAAmB,KAAK,CAAC,EAAE;gBACjD,OAAO,SAAS,CAAC;aACpB;YACD,8CAA8C;YAC9C,kCAAkC;iBAC7B,IAAI,gBAAgB,CAAC,IAAI,CAAC,mBAAmB,KAAK,CAAC,EAAE;gBACtD,MAAM,QAAQ,GAAa,sBAAa,CAAC,uBAAuB,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;gBAErF,OAAO,uBAAc,CAAC,2CAA2C,CAC7D,mBAAmB,EACnB,QAAQ,CAAC,IAAI,CAAC,EAAE,CACnB,CAAC;aACL;iBAAM;gBACH,MAAM,IAAI,GAAG,CAAC,WAAW,CAAC,cAAc,CACpC,kBAAkB,6DAAuC,kDAAkD,EAC3G;oBACI,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE;oBACzB,OAAO,EAAE,gBAAgB,CAAC,IAAI,CAAC,EAAE;iBACpC,CACJ,CAAC;aACL;SACJ;aAAM,IAAI,mCAAmC,IAAI,qBAAY,CAAC,oBAAoB,CAAC,OAAO,CAAC,EAAE;YAC1F,gCAAgC,GAAG,OAAO,CAAC;SAC9C;aAAM;YACH,mCAAmC,GAAG,KAAK,CAAC;SAC/C;KACJ;IAED,OAAO,gCAAgC,CAAC;AAC5C,CAAC"}
|
|
@@ -33,7 +33,7 @@ function tryAutocompleteKeyword(settings, nodeIdMapCollection, maybeActiveNode,
|
|
|
33
33
|
autocompleteItem_1.AutocompleteItemUtils.createFromKeywordKind("section" /* Section */),
|
|
34
34
|
]));
|
|
35
35
|
}
|
|
36
|
-
return powerquery_parser_1.ResultUtils.ensureResultAsync(
|
|
36
|
+
return powerquery_parser_1.ResultUtils.ensureResultAsync(() => autocompleteKeyword(nodeIdMapCollection, maybeActiveNode, maybeTrailingToken), settings.locale);
|
|
37
37
|
}
|
|
38
38
|
exports.tryAutocompleteKeyword = tryAutocompleteKeyword;
|
|
39
39
|
function autocompleteKeyword(nodeIdMapCollection, activeNode, maybeTrailingToken) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autocompleteKeyword.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AACpD,0FAA2F;AAC3F,sFAA8G;AAC9G,oEAA2D;AAE3D,iDAAqG;AACrG,0DAA8E;AAE9E,6EAA0E;AAC1E,6GAA0G;AAC1G,mHAAgH;AAChH,yFAAsF;AACtF,2FAAwF;AACxF,yFAAsF;AACtF,uFAAoF;AAEpF,gCAAyC;AAEzC,SAAgB,sBAAsB,CAClC,QAA4B,EAC5B,mBAAyC,EACzC,eAAiC,EACjC,kBAA6C;IAE7C,IAAI,CAAC,4BAAe,CAAC,kBAAkB,CAAC,eAAe,CAAC,EAAE;QACtD,OAAO,OAAO,CAAC,OAAO,CAClB,+BAAW,CAAC,KAAK,CAAC;YACd,GAAG,kBAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC,WAAgC,EAAE,EAAE,CACvE,wCAAqB,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAC3D;YACD,wCAAqB,CAAC,qBAAqB,yBAA6B;SAC3E,CAAC,CACL,CAAC;KACL;IAED,OAAO,+BAAW,CAAC,iBAAiB,
|
|
1
|
+
{"version":3,"file":"autocompleteKeyword.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.ts"],"names":[],"mappings":"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"}
|
package/lib/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.js
CHANGED
|
@@ -10,8 +10,8 @@ const activeNode_1 = require("../activeNode");
|
|
|
10
10
|
const autocompleteItem_1 = require("./autocompleteItem");
|
|
11
11
|
const __1 = require("../..");
|
|
12
12
|
function tryAutocompleteLanguageConstant(settings, maybeActiveNode) {
|
|
13
|
-
const trace = settings.traceManager.entry("LanguageConstant" /*
|
|
14
|
-
const result = powerquery_parser_1.ResultUtils.ensureResult(
|
|
13
|
+
const trace = settings.traceManager.entry("LanguageConstant" /* AutocompleteLanguageConstant */, tryAutocompleteLanguageConstant.name, settings.maybeInitialCorrelationId);
|
|
14
|
+
const result = powerquery_parser_1.ResultUtils.ensureResult(() => autocompleteLanguageConstant(maybeActiveNode), settings.locale);
|
|
15
15
|
trace.exit({ ["IsError" /* IsError */]: powerquery_parser_1.ResultUtils.isError(result) });
|
|
16
16
|
return result;
|
|
17
17
|
}
|
package/lib/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autocompleteLanguageConstant.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,oDAAoD;AACpD,sFAKmE;AACnE,oEAAmE;AAKnE,8CAA8E;AAC9E,yDAA6E;AAC7E,6BAAiE;AAGjE,SAAgB,+BAA+B,CAC3C,QAA4B,EAC5B,eAAiC;IAEjC,MAAM,KAAK,GAAU,QAAQ,CAAC,YAAY,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"autocompleteLanguageConstant.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.ts"],"names":[],"mappings":"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"}
|
package/lib/powerquery-language-services/inspection/autocomplete/autocompletePrimitiveType.js
CHANGED
|
@@ -10,13 +10,13 @@ const activeNode_1 = require("../activeNode");
|
|
|
10
10
|
const autocompleteItem_1 = require("./autocompleteItem");
|
|
11
11
|
const __1 = require("../..");
|
|
12
12
|
function tryAutocompletePrimitiveType(settings, maybeActiveNode, maybeTrailingToken) {
|
|
13
|
-
const trace = settings.traceManager.entry("PrimitiveType" /*
|
|
13
|
+
const trace = settings.traceManager.entry("PrimitiveType" /* AutocompletePrimitiveType */, tryAutocompletePrimitiveType.name, settings.maybeInitialCorrelationId);
|
|
14
14
|
let result;
|
|
15
15
|
if (!activeNode_1.ActiveNodeUtils.isPositionInBounds(maybeActiveNode)) {
|
|
16
16
|
result = powerquery_parser_1.ResultUtils.boxOk([]);
|
|
17
17
|
}
|
|
18
18
|
else {
|
|
19
|
-
result = powerquery_parser_1.ResultUtils.ensureResult(
|
|
19
|
+
result = powerquery_parser_1.ResultUtils.ensureResult(() => autocompletePrimitiveType(maybeActiveNode, maybeTrailingToken === null || maybeTrailingToken === void 0 ? void 0 : maybeTrailingToken.data), settings.locale);
|
|
20
20
|
}
|
|
21
21
|
trace.exit();
|
|
22
22
|
return result;
|
package/lib/powerquery-language-services/inspection/autocomplete/autocompletePrimitiveType.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"autocompletePrimitiveType.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/autocomplete/autocompletePrimitiveType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,sFAAkH;AAClH,0FAA4F;AAC5F,oEAA2D;AAG3D,8CAA8E;AAC9E,yDAA6E;AAC7E,6BAAiE;AAGjE,SAAgB,4BAA4B,CACxC,QAA4B,EAC5B,eAAiC,EACjC,kBAA6C;IAE7C,MAAM,KAAK,GAAU,QAAQ,CAAC,YAAY,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"autocompletePrimitiveType.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/autocomplete/autocompletePrimitiveType.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,8 @@ const autocompletePrimitiveType_1 = require("./autocompletePrimitiveType");
|
|
|
21
21
|
// Given some Position and ParseState, return autocomplete suggestions.
|
|
22
22
|
function autocomplete(settings, parseState, typeCache, maybeActiveNode, maybeParseError) {
|
|
23
23
|
return __awaiter(this, void 0, void 0, function* () {
|
|
24
|
-
const trace = settings.traceManager.entry("Autocomplete" /* Autocomplete */, autocomplete.name);
|
|
24
|
+
const trace = settings.traceManager.entry("Autocomplete" /* Autocomplete */, autocomplete.name, settings.maybeInitialCorrelationId);
|
|
25
|
+
const updatedSettings = Object.assign(Object.assign({}, settings), { maybeInitialCorrelationId: trace.id });
|
|
25
26
|
const nodeIdMapCollection = parseState.contextState.nodeIdMapCollection;
|
|
26
27
|
let maybeTrailingToken;
|
|
27
28
|
if (maybeParseError !== undefined) {
|
|
@@ -30,10 +31,10 @@ function autocomplete(settings, parseState, typeCache, maybeActiveNode, maybePar
|
|
|
30
31
|
maybeTrailingToken = (0, common_1.createTrailingToken)(maybeActiveNode.position, maybeParseErrorToken);
|
|
31
32
|
}
|
|
32
33
|
}
|
|
33
|
-
const triedFieldAccess = yield (0, autocompleteFieldAccess_1.tryAutocompleteFieldAccess)(
|
|
34
|
-
const triedKeyword = yield (0, autocompleteKeyword_1.tryAutocompleteKeyword)(
|
|
35
|
-
const triedLanguageConstant = (0, autocompleteLanguageConstant_1.tryAutocompleteLanguageConstant)(
|
|
36
|
-
const triedPrimitiveType = (0, autocompletePrimitiveType_1.tryAutocompletePrimitiveType)(
|
|
34
|
+
const triedFieldAccess = yield (0, autocompleteFieldAccess_1.tryAutocompleteFieldAccess)(updatedSettings, parseState, maybeActiveNode, typeCache);
|
|
35
|
+
const triedKeyword = yield (0, autocompleteKeyword_1.tryAutocompleteKeyword)(updatedSettings, nodeIdMapCollection, maybeActiveNode, maybeTrailingToken);
|
|
36
|
+
const triedLanguageConstant = (0, autocompleteLanguageConstant_1.tryAutocompleteLanguageConstant)(updatedSettings, maybeActiveNode);
|
|
37
|
+
const triedPrimitiveType = (0, autocompletePrimitiveType_1.tryAutocompletePrimitiveType)(updatedSettings, maybeActiveNode, maybeTrailingToken);
|
|
37
38
|
trace.exit();
|
|
38
39
|
return {
|
|
39
40
|
triedFieldAccess,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/autocomplete/task.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AAapD,qCAA+C;AAG/C,uEAAuE;AACvE,mFAAmF;AACnF,iFAAiF;AACjF,2EAA2E;AAG3E,uEAAuE;AACvE,SAAsB,YAAY,CAC9B,QAA4B,EAC5B,UAAiC,EACjC,SAAoB,EACpB,eAAiC,EACjC,eAA6D;;QAE7D,MAAM,KAAK,GAAU,QAAQ,CAAC,YAAY,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"task.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/autocomplete/task.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AAapD,qCAA+C;AAG/C,uEAAuE;AACvE,mFAAmF;AACnF,iFAAiF;AACjF,2EAA2E;AAG3E,uEAAuE;AACvE,SAAsB,YAAY,CAC9B,QAA4B,EAC5B,UAAiC,EACjC,SAAoB,EACpB,eAAiC,EACjC,eAA6D;;QAE7D,MAAM,KAAK,GAAU,QAAQ,CAAC,YAAY,CAAC,KAAK,oCAE5C,YAAY,CAAC,IAAI,EACjB,QAAQ,CAAC,yBAAyB,CACrC,CAAC;QAEF,MAAM,eAAe,mCACd,QAAQ,KACX,yBAAyB,EAAE,KAAK,CAAC,EAAE,GACtC,CAAC;QAEF,MAAM,mBAAmB,GAAyB,UAAU,CAAC,YAAY,CAAC,mBAAmB,CAAC;QAE9F,IAAI,kBAA6C,CAAC;QAElD,IAAI,eAAe,KAAK,SAAS,EAAE;YAC/B,MAAM,oBAAoB,GAAyC,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,cAAc,CACnG,eAAe,CAAC,UAAU,CAC7B,CAAC;YAEF,IAAI,oBAAoB,KAAK,SAAS,EAAE;gBACpC,kBAAkB,GAAG,IAAA,4BAAmB,EAAC,eAAe,CAAC,QAAQ,EAAE,oBAAoB,CAAC,CAAC;aAC5F;SACJ;QAED,MAAM,gBAAgB,GAAiC,MAAM,IAAA,oDAA0B,EACnF,eAAe,EACf,UAAU,EACV,eAAe,EACf,SAAS,CACZ,CAAC;QAEF,MAAM,YAAY,GAA6B,MAAM,IAAA,4CAAsB,EACvE,eAAe,EACf,mBAAmB,EACnB,eAAe,EACf,kBAAkB,CACrB,CAAC;QAEF,MAAM,qBAAqB,GAAsC,IAAA,8DAA+B,EAC5F,eAAe,EACf,eAAe,CAClB,CAAC;QAEF,MAAM,kBAAkB,GAAmC,IAAA,wDAA4B,EACnF,eAAe,EACf,eAAe,EACf,kBAAkB,CACrB,CAAC;QAEF,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO;YACH,gBAAgB;YAChB,YAAY;YACZ,qBAAqB;YACrB,kBAAkB;SACrB,CAAC;IACN,CAAC;CAAA;AAjED,oCAiEC"}
|
|
@@ -3,6 +3,7 @@ import { Ast } from "@microsoft/powerquery-parser/lib/powerquery-parser/language
|
|
|
3
3
|
import { Inspection } from "..";
|
|
4
4
|
import { TMaybeActiveNode } from "./activeNode";
|
|
5
5
|
import { TriedExpectedType } from "./expectedType";
|
|
6
|
+
import { TriedNodeScope } from "./scope";
|
|
6
7
|
import { TypeCache } from "./typeCache";
|
|
7
8
|
export declare type TriedInspection = PQP.Result<Inspected, PQP.CommonError.CommonError>;
|
|
8
9
|
export interface Inspected {
|
|
@@ -14,5 +15,6 @@ export interface Inspected {
|
|
|
14
15
|
readonly triedExpectedType: TriedExpectedType;
|
|
15
16
|
readonly typeCache: TypeCache;
|
|
16
17
|
readonly parseState: PQP.Parser.ParseState;
|
|
17
|
-
readonly
|
|
18
|
+
readonly tryNodeScope: (id: number) => Promise<TriedNodeScope>;
|
|
19
|
+
readonly collectAllIdentifiersBeneath: (entryNodeId: Ast.Identifier | Ast.GeneralizedIdentifier) => Promise<Array<Ast.Identifier | Ast.GeneralizedIdentifier>>;
|
|
18
20
|
}
|
|
@@ -9,10 +9,14 @@ const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/l
|
|
|
9
9
|
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
10
10
|
const activeNode_1 = require("./activeNode");
|
|
11
11
|
function tryExpectedType(settings, maybeActiveNode) {
|
|
12
|
+
const trace = settings.traceManager.entry("Inspection.ExpectedType" /* InspectExpectedType */, tryExpectedType.name, settings.maybeInitialCorrelationId);
|
|
12
13
|
if (!activeNode_1.ActiveNodeUtils.isPositionInBounds(maybeActiveNode)) {
|
|
14
|
+
trace.exit();
|
|
13
15
|
return powerquery_parser_1.ResultUtils.boxOk(undefined);
|
|
14
16
|
}
|
|
15
|
-
|
|
17
|
+
const result = powerquery_parser_1.ResultUtils.ensureResult(() => maybeExpectedType(maybeActiveNode), settings.locale);
|
|
18
|
+
trace.exit();
|
|
19
|
+
return result;
|
|
16
20
|
}
|
|
17
21
|
exports.tryExpectedType = tryExpectedType;
|
|
18
22
|
// Traverse up the ancestry and find what type is expected as the nth child of a node's kind.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"expectedType.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/inspection/expectedType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,oDAAoD;AACpD,oEAAmE;AACnE,0FAAwF;AACxF,sFAAmG;
|
|
1
|
+
{"version":3,"file":"expectedType.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/inspection/expectedType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,oDAAoD;AACpD,oEAAmE;AACnE,0FAAwF;AACxF,sFAAmG;AAGnG,6CAAiG;AAKjG,SAAgB,eAAe,CAAC,QAA4B,EAAE,eAAiC;IAC3F,MAAM,KAAK,GAAU,QAAQ,CAAC,YAAY,CAAC,KAAK,sDAE5C,eAAe,CAAC,IAAI,EACpB,QAAQ,CAAC,yBAAyB,CACrC,CAAC;IAEF,IAAI,CAAC,4BAAe,CAAC,kBAAkB,CAAC,eAAe,CAAC,EAAE;QACtD,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO,+BAAW,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;KACvC;IAED,MAAM,MAAM,GAA8E,+BAAW,CAAC,YAAY,CAC9G,GAAG,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC,EACxC,QAAQ,CAAC,MAAM,CAClB,CAAC;IAEF,KAAK,CAAC,IAAI,EAAE,CAAC;IAEb,OAAO,MAAM,CAAC;AAClB,CAAC;AArBD,0CAqBC;AAED,6FAA6F;AAC7F,kEAAkE;AAClE,2CAA2C;AAC3C,SAAgB,iBAAiB,CAAC,UAAsB;IACpD,MAAM,QAAQ,GAA4B,UAAU,CAAC,QAAQ,CAAC;IAC9D,MAAM,UAAU,GAAW,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;IAC/C,IAAI,SAA2C,CAAC;IAEhD,KAAK,IAAI,KAAK,GAAW,CAAC,EAAE,KAAK,GAAG,UAAU,EAAE,KAAK,IAAI,CAAC,EAAE;QACxD,MAAM,MAAM,GAAa,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;QAC7C,MAAM,KAAK,GAAa,QAAQ,CAAC,KAAK,CAAC,CAAC;QAExC,MAAM,mBAAmB,GAAW,0BAAM,CAAC,SAAS,CAChD,KAAK,CAAC,IAAI,CAAC,mBAAmB,EAC9B,4CAA4C,EAC5C,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,CAC7B,CAAC;QAEF,MAAM,cAAc,GAChB,qBAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,UAAU,CAAC,QAAQ,sCAAoC;YACpF,CAAC,CAAC,mBAAmB,GAAG,CAAC;YACzB,CAAC,CAAC,mBAAmB,CAAC;QAE9B,MAAM,WAAW,GAAyB,YAAY,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;QAE/E,IAAI,WAAW,CAAC,IAAI,wCAAgC,EAAE;YAClD,SAAS,GAAG,WAAW,CAAC;SAC3B;KACJ;IAED,OAAO,SAAS,CAAC;AACrB,CAAC;AA5BD,8CA4BC;AAED,mFAAmF;AACnF,SAAgB,YAAY,CAAC,aAAuB,EAAE,UAAkB;IACpE,QAAQ,aAAa,CAAC,IAAI,CAAC,IAAI,EAAE;QAC7B,uCAA+B;QAC/B,+BAA2B;QAC3B,qBAAsB;QACtB,yDAAwC;QACxC,mCAA6B;QAC7B,uDAAuC;QACvC,+CAAmC;QACnC,6CAAkC;QAClC,yCAAgC;QAChC,2DAAyC;QACzC,2CAAiC;QACjC,qCAA8B;QAC9B,iDAAoC;QACpC,yCAAgC;QAChC,mCAA6B;QAC7B,iCAA4B;QAC5B,yCAAgC;QAChC,yCAAgC;QAChC,+CAAmC;QACnC;YACI,OAAO,eAAI,CAAC,qBAAqB,CAAC;QAEtC,uDAAuC;QACvC,mDAAqC;QACrC,iDAAoC;QACpC;YACI,OAAO,yBAAyB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QAEhE,uCAA+B;QAC/B;YACI,OAAO,0BAA0B,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QAEjE,yFAAwD;QACxD;YACI,OAAO,oCAAoC,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QAE3E,6BAA0B;QAC1B;YACI,OAAO,gCAAgC,CAAC,UAAU,CAAC,CAAC;QAExD;YACI,QAAQ,UAAU,EAAE;gBAChB,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,qBAAqB,CAAC;gBAEtC,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,sBAAsB,CAAC;gBAEvC;oBACI,MAAM,sBAAsB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;aAC/D;QAEL;YACI,QAAQ,UAAU,EAAE;gBAChB,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,qBAAqB,CAAC;gBAEtC,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,yBAAyB,CAAC;gBAE1C;oBACI,MAAM,sBAAsB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;aAC/D;QAEL;YACI,QAAQ,UAAU,EAAE;gBAChB,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,qBAAqB,CAAC;gBAEtC,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,kBAAkB,CAAC;gBAEnC;oBACI,MAAM,sBAAsB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;aAC/D;QAEL;YACI,QAAQ,UAAU,EAAE;gBAChB,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,qBAAqB,CAAC;gBAEtC,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,kBAAkB,CAAC;gBAEnC,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,qBAAqB,CAAC;gBAEtC;oBACI,MAAM,sBAAsB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;aAC/D;QAEL,2CAA2C;QAC3C;YACI,OAAO,eAAI,CAAC,qBAAqB,CAAC;QAEtC;YACI,QAAQ,UAAU,EAAE;gBAChB,KAAK,CAAC,CAAC;gBACP,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,qBAAqB,CAAC;gBAEtC,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,kBAAkB,CAAC;gBAEnC;oBACI,MAAM,sBAAsB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;aAC/D;QAEL;YACI,QAAQ,UAAU,EAAE;gBAChB,KAAK,CAAC,CAAC;gBACP,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,qBAAqB,CAAC;gBAEtC,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,sBAAsB,CAAC;gBAEvC;oBACI,MAAM,sBAAsB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;aAC/D;QAEL;YACI,QAAQ,UAAU,EAAE;gBAChB,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,qBAAqB,CAAC;gBAEtC,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,sBAAsB,CAAC;gBAEvC;oBACI,MAAM,sBAAsB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;aAC/D;QAEL;YACI,QAAQ,UAAU,EAAE;gBAChB,KAAK,CAAC,CAAC;gBACP,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,qBAAqB,CAAC;gBAEtC,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,yBAAyB,CAAC;gBAE1C,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,kBAAkB,CAAC;gBAEnC;oBACI,MAAM,sBAAsB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;aAC/D;QAEL;YACI,QAAQ,UAAU,EAAE;gBAChB,KAAK,CAAC,CAAC;gBACP,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,qBAAqB,CAAC;gBAEtC,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,yBAAyB,CAAC;gBAE1C;oBACI,MAAM,sBAAsB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;aAC/D;QAEL;YACI,QAAQ,UAAU,EAAE;gBAChB,KAAK,CAAC,CAAC;gBACP,KAAK,CAAC,CAAC;gBACP,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,qBAAqB,CAAC;gBAEtC,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,eAAe,CAAC;gBAEhC,KAAK,CAAC,CAAC;gBACP,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,kBAAkB,CAAC;gBAEnC;oBACI,MAAM,sBAAsB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;aAC/D;QAEL;YACI,QAAQ,UAAU,EAAE;gBAChB,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,qBAAqB,CAAC;gBAEtC,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,yBAAyB,CAAC;gBAE1C;oBACI,MAAM,sBAAsB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;aAC/D;QAEL;YACI,QAAQ,UAAU,EAAE;gBAChB,KAAK,CAAC,CAAC;gBACP,KAAK,CAAC,CAAC;gBACP,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,qBAAqB,CAAC;gBAEtC,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,kBAAkB,CAAC;gBAEnC;oBACI,MAAM,sBAAsB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;aAC/D;QAEL;YACI,QAAQ,UAAU,EAAE;gBAChB,KAAK,CAAC,CAAC;gBACP,KAAK,CAAC,CAAC;gBACP,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,qBAAqB,CAAC;gBAEtC,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,kBAAkB,CAAC;gBAEnC;oBACI,MAAM,sBAAsB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;aAC/D;QAEL;YACI,QAAQ,UAAU,EAAE;gBAChB,KAAK,CAAC,CAAC;gBACP,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,qBAAqB,CAAC;gBAEtC,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,sBAAsB,CAAC;gBAEvC;oBACI,MAAM,sBAAsB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;aAC/D;QAEL;YACI,QAAQ,UAAU,EAAE;gBAChB,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,qBAAqB,CAAC;gBAEtC,KAAK,CAAC,CAAC;gBACP,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,sBAAsB,CAAC;gBAEvC;oBACI,MAAM,sBAAsB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;aAC/D;QAEL;YACI,QAAQ,UAAU,EAAE;gBAChB,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,qBAAqB,CAAC;gBAEtC;oBACI,MAAM,sBAAsB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;aAC/D;QAEL;YACI,QAAQ,UAAU,EAAE;gBAChB,KAAK,CAAC,CAAC;gBACP,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,kBAAkB,CAAC;gBAEnC,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,qBAAqB,CAAC;gBAEtC;oBACI,MAAM,sBAAsB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;aAC/D;QAEL;YACI,QAAQ,UAAU,EAAE;gBAChB,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,qBAAqB,CAAC;gBAEtC,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,iBAAiB,CAAC;gBAElC;oBACI,MAAM,sBAAsB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;aAC/D;QAEL;YACI,QAAQ,UAAU,EAAE;gBAChB,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,qBAAqB,CAAC;gBAEtC,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,sBAAsB,CAAC;gBAEvC;oBACI,MAAM,sBAAsB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;aAC/D;QAEL;YACI,QAAQ,UAAU,EAAE;gBAChB,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,qBAAqB,CAAC;gBAEtC,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,kBAAkB,CAAC;gBAEnC;oBACI,MAAM,sBAAsB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;aAC/D;QAEL;YACI,QAAQ,UAAU,EAAE;gBAChB,KAAK,CAAC,CAAC;gBACP,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,qBAAqB,CAAC;gBAEtC,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,kBAAkB,CAAC;gBAEnC;oBACI,MAAM,sBAAsB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;aAC/D;QAEL;YACI,QAAQ,UAAU,EAAE;gBAChB,KAAK,CAAC,CAAC;gBACP,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,kBAAkB,CAAC;gBAEnC,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,qBAAqB,CAAC;gBAEtC;oBACI,MAAM,sBAAsB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;aAC/D;QAEL;YACI,QAAQ,UAAU,EAAE;gBAChB,KAAK,CAAC,CAAC;gBACP,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,yBAAyB,CAAC;gBAE1C;oBACI,MAAM,sBAAsB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;aAC/D;QAEL;YACI,QAAQ,UAAU,EAAE;gBAChB,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,qBAAqB,CAAC;gBAEtC,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,mBAAmB,CAAC;gBAEpC;oBACI,MAAM,sBAAsB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;aAC/D;QAEL;YACI,QAAQ,UAAU,EAAE;gBAChB,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,qBAAqB,CAAC;gBAEtC,KAAK,CAAC;oBACF,OAAO,eAAI,CAAC,sBAAsB,CAAC;gBAEvC;oBACI,MAAM,sBAAsB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;aAC/D;QAEL;YACI,MAAM,0BAAM,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;KAChD;AACL,CAAC;AAjXD,oCAiXC;AAED,SAAS,0BAA0B,CAAC,aAAuB,EAAE,UAAkB;IAC3E,QAAQ,UAAU,EAAE;QAChB,KAAK,CAAC;YACF,OAAO,eAAI,CAAC,sBAAsB,CAAC;QAEvC,KAAK,CAAC;YACF,OAAO,eAAI,CAAC,qBAAqB,CAAC;QAEtC,KAAK,CAAC;YACF,OAAO,eAAI,CAAC,yBAAyB,CAAC;QAE1C;YACI,MAAM,sBAAsB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;KAC/D;AACL,CAAC;AAED,SAAS,yBAAyB,CAAC,aAAuB,EAAE,UAAkB;IAC1E,QAAQ,UAAU,EAAE;QAChB,KAAK,CAAC,CAAC;QACP,KAAK,CAAC;YACF,OAAO,eAAI,CAAC,sBAAsB,CAAC;QAEvC,KAAK,CAAC;YACF,OAAO,eAAI,CAAC,qBAAqB,CAAC;QAEtC;YACI,MAAM,sBAAsB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;KAC/D;AACL,CAAC;AAED,SAAS,oCAAoC,CAAC,aAAuB,EAAE,UAAkB;IACrF,QAAQ,UAAU,EAAE;QAChB,KAAK,CAAC,CAAC;QACP,KAAK,CAAC;YACF,OAAO,eAAI,CAAC,qBAAqB,CAAC;QAEtC,KAAK,CAAC;YACF,OAAO,eAAI,CAAC,kBAAkB,CAAC;QAEnC;YACI,MAAM,sBAAsB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;KAC/D;AACL,CAAC;AAED,SAAS,gCAAgC,CAAC,UAAkB;IACxD,QAAQ,UAAU,EAAE;QAChB,KAAK,CAAC;YACF,OAAO,eAAI,CAAC,cAAc,CAAC;QAE/B;YACI,OAAO,eAAI,CAAC,qBAAqB,CAAC;KACzC;AACL,CAAC;AAED,SAAS,sBAAsB,CAAC,MAAgB,EAAE,UAAkB;IAChE,MAAM,OAAO,GAAW;QACpB,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI;QAC1B,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI;QAChC,UAAU;KACb,CAAC;IAEF,OAAO,IAAI,GAAG,CAAC,WAAW,CAAC,cAAc,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;AAC7E,CAAC"}
|
package/lib/powerquery-language-services/inspection/invokeExpression/currentInvokeExpression.js
CHANGED
|
@@ -29,26 +29,32 @@ function tryCurrentInvokeExpression(settings, nodeIdMapCollection, maybeActiveNo
|
|
|
29
29
|
// Else create a new TypeCache and include it in the return.
|
|
30
30
|
typeCache = typeCache_1.TypeCacheUtils.createEmptyCache()) {
|
|
31
31
|
return __awaiter(this, void 0, void 0, function* () {
|
|
32
|
-
const trace = settings.traceManager.entry("CurrentInvokeExpression" /*
|
|
32
|
+
const trace = settings.traceManager.entry("Inspection.CurrentInvokeExpression" /* InspectCurrentInvokeExpression */, tryCurrentInvokeExpression.name, settings.maybeInitialCorrelationId);
|
|
33
|
+
const updatedSettings = Object.assign(Object.assign({}, settings), { maybeInitialCorrelationId: trace.id });
|
|
33
34
|
if (!activeNode_1.ActiveNodeUtils.isPositionInBounds(maybeActiveNode)) {
|
|
35
|
+
trace.exit();
|
|
34
36
|
return Promise.resolve(powerquery_parser_1.ResultUtils.boxOk(undefined));
|
|
35
37
|
}
|
|
36
|
-
const result = yield powerquery_parser_1.ResultUtils.ensureResultAsync(
|
|
38
|
+
const result = yield powerquery_parser_1.ResultUtils.ensureResultAsync(() => inspectInvokeExpression(updatedSettings, nodeIdMapCollection, maybeActiveNode, typeCache, trace.id), updatedSettings.locale);
|
|
37
39
|
trace.exit();
|
|
38
40
|
return result;
|
|
39
41
|
});
|
|
40
42
|
}
|
|
41
43
|
exports.tryCurrentInvokeExpression = tryCurrentInvokeExpression;
|
|
42
|
-
function inspectInvokeExpression(settings, nodeIdMapCollection, activeNode, typeCache) {
|
|
44
|
+
function inspectInvokeExpression(settings, nodeIdMapCollection, activeNode, typeCache, maybeCorrelationId) {
|
|
43
45
|
return __awaiter(this, void 0, void 0, function* () {
|
|
46
|
+
const trace = settings.traceManager.entry("Inspection.CurrentInvokeExpression" /* InspectCurrentInvokeExpression */, inspectInvokeExpression.name, maybeCorrelationId);
|
|
47
|
+
const updatedSettings = Object.assign(Object.assign({}, settings), { maybeInitialCorrelationId: trace.id });
|
|
44
48
|
const ancestry = activeNode.ancestry;
|
|
45
49
|
const maybeInvokeExpression = parser_1.AncestryUtils.maybeFirstXorAndIndexOfNodeKind(ancestry, "InvokeExpression" /* InvokeExpression */);
|
|
46
50
|
if (!maybeInvokeExpression) {
|
|
51
|
+
trace.exit();
|
|
47
52
|
return undefined;
|
|
48
53
|
}
|
|
49
54
|
const [invokeExpressionXorNode, ancestryIndex] = maybeInvokeExpression;
|
|
50
|
-
const triedInvokeExpression = yield (0, invokeExpression_1.tryInvokeExpression)(
|
|
55
|
+
const triedInvokeExpression = yield (0, invokeExpression_1.tryInvokeExpression)(updatedSettings, nodeIdMapCollection, invokeExpressionXorNode.node.id, typeCache);
|
|
51
56
|
if (powerquery_parser_1.ResultUtils.isError(triedInvokeExpression)) {
|
|
57
|
+
trace.exit({ ["IsThrowing" /* IsThrowing */]: true });
|
|
52
58
|
throw triedInvokeExpression;
|
|
53
59
|
}
|
|
54
60
|
const invokeExpression = triedInvokeExpression.value;
|
|
@@ -57,7 +63,9 @@ function inspectInvokeExpression(settings, nodeIdMapCollection, activeNode, type
|
|
|
57
63
|
if (maybeArguments !== undefined) {
|
|
58
64
|
maybeWithArgumentOrdinal = Object.assign(Object.assign({}, maybeArguments), { argumentOrdinal: getArgumentOrdinal(nodeIdMapCollection, activeNode, ancestryIndex, invokeExpressionXorNode) });
|
|
59
65
|
}
|
|
60
|
-
|
|
66
|
+
const result = Object.assign(Object.assign({}, invokeExpression), { maybeArguments: maybeWithArgumentOrdinal });
|
|
67
|
+
trace.exit();
|
|
68
|
+
return result;
|
|
61
69
|
});
|
|
62
70
|
}
|
|
63
71
|
function getArgumentOrdinal(nodeIdMapCollection, activeNode, ancestryIndex, invokeExpressionXorNode) {
|
package/lib/powerquery-language-services/inspection/invokeExpression/currentInvokeExpression.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"currentInvokeExpression.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/invokeExpression/currentInvokeExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AACpD,sFAKmE;
|
|
1
|
+
{"version":3,"file":"currentInvokeExpression.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/invokeExpression/currentInvokeExpression.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,15 +23,20 @@ function tryInvokeExpression(settings, nodeIdMapCollection, invokeExpressionId,
|
|
|
23
23
|
// If a TypeCache is given, then potentially add to its values and include it as part of the return,
|
|
24
24
|
// Else create a new TypeCache and include it in the return.
|
|
25
25
|
typeCache = typeCache_1.TypeCacheUtils.createEmptyCache()) {
|
|
26
|
-
|
|
26
|
+
const trace = settings.traceManager.entry("Inspection.InvokeExpression" /* InspectInvokeExpression */, tryInvokeExpression.name, settings.maybeInitialCorrelationId);
|
|
27
|
+
const updatedSettings = Object.assign(Object.assign({}, settings), { maybeInitialCorrelationId: trace.id });
|
|
28
|
+
const result = powerquery_parser_1.ResultUtils.ensureResultAsync(() => inspectInvokeExpression(updatedSettings, nodeIdMapCollection, invokeExpressionId, typeCache, trace.id), settings.locale);
|
|
29
|
+
return result;
|
|
27
30
|
}
|
|
28
31
|
exports.tryInvokeExpression = tryInvokeExpression;
|
|
29
|
-
function inspectInvokeExpression(settings, nodeIdMapCollection, invokeExpressionId, typeCache) {
|
|
32
|
+
function inspectInvokeExpression(settings, nodeIdMapCollection, invokeExpressionId, typeCache, correlationId) {
|
|
30
33
|
var _a;
|
|
31
34
|
return __awaiter(this, void 0, void 0, function* () {
|
|
35
|
+
const trace = settings.traceManager.entry("Inspection.InvokeExpression" /* InspectInvokeExpression */, inspectInvokeExpression.name, correlationId);
|
|
32
36
|
(_a = settings.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
|
|
33
37
|
const maybeInvokeExpressionXorNode = parser_1.NodeIdMapUtils.maybeXor(nodeIdMapCollection, invokeExpressionId);
|
|
34
38
|
if (maybeInvokeExpressionXorNode === undefined) {
|
|
39
|
+
trace.exit({ ["IsThrowing" /* IsThrowing */]: true });
|
|
35
40
|
throw new PQP.CommonError.InvariantError(`expected invokeExpressionId to be present in nodeIdMapCollection`, {
|
|
36
41
|
invokeExpressionId,
|
|
37
42
|
});
|
|
@@ -55,25 +60,31 @@ function inspectInvokeExpression(settings, nodeIdMapCollection, invokeExpression
|
|
|
55
60
|
typeChecked: language_1.TypeUtils.typeCheckInvocation(givenArgumentTypes, functionType),
|
|
56
61
|
};
|
|
57
62
|
}
|
|
58
|
-
|
|
63
|
+
const result = {
|
|
59
64
|
invokeExpressionXorNode,
|
|
60
65
|
functionType,
|
|
61
|
-
isNameInLocalScope: yield getIsNameInLocalScope(settings, nodeIdMapCollection, typeCache, invokeExpressionXorNode, maybeName),
|
|
66
|
+
isNameInLocalScope: yield getIsNameInLocalScope(settings, nodeIdMapCollection, typeCache, invokeExpressionXorNode, maybeName, trace.id),
|
|
62
67
|
maybeName,
|
|
63
68
|
maybeArguments: maybeInvokeExpressionArgs,
|
|
64
69
|
};
|
|
70
|
+
trace.exit();
|
|
71
|
+
return result;
|
|
65
72
|
});
|
|
66
73
|
}
|
|
67
|
-
function getIsNameInLocalScope(settings, nodeIdMapCollection, typeCache, invokeExpressionXorNode, maybeName) {
|
|
74
|
+
function getIsNameInLocalScope(settings, nodeIdMapCollection, typeCache, invokeExpressionXorNode, maybeName, correlationId) {
|
|
68
75
|
return __awaiter(this, void 0, void 0, function* () {
|
|
76
|
+
const trace = settings.traceManager.entry("Inspection.InvokeExpression" /* InspectInvokeExpression */, getIsNameInLocalScope.name, correlationId);
|
|
77
|
+
const updatedSettings = Object.assign(Object.assign({}, settings), { maybeInitialCorrelationId: trace.id });
|
|
69
78
|
// Try to find out if the identifier is a local or external name.
|
|
70
79
|
if (maybeName !== undefined) {
|
|
71
80
|
// Seed local scope
|
|
72
|
-
const scope = powerquery_parser_1.Assert.unboxOk(yield (0, scope_1.assertGetOrCreateNodeScope)(
|
|
81
|
+
const scope = powerquery_parser_1.Assert.unboxOk(yield (0, scope_1.assertGetOrCreateNodeScope)(updatedSettings, nodeIdMapCollection, invokeExpressionXorNode.node.id, typeCache.scopeById));
|
|
73
82
|
const maybeNameScopeItem = scope.get(maybeName);
|
|
83
|
+
trace.exit();
|
|
74
84
|
return maybeNameScopeItem !== undefined && maybeNameScopeItem.kind !== "Undefined" /* Undefined */;
|
|
75
85
|
}
|
|
76
86
|
else {
|
|
87
|
+
trace.exit();
|
|
77
88
|
return false;
|
|
78
89
|
}
|
|
79
90
|
});
|
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":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AACpD,oEAAmE;AACnE,sFAMmE;AAEnE,0FAA8F;AAE9F,oCAA4F;AAE5F,kCAA6C;AAC7C,4CAAyD;AASzD,SAAgB,mBAAmB,CAC/B,QAA4B,EAC5B,mBAAyC,EACzC,kBAA0B;AAC1B,oGAAoG;AACpG,4DAA4D;AAC5D,YAAuB,0BAAc,CAAC,gBAAgB,EAAE;IAExD,MAAM,KAAK,GAAU,QAAQ,CAAC,YAAY,CAAC,KAAK,8DAE5C,mBAAmB,CAAC,IAAI,EACxB,QAAQ,CAAC,yBAAyB,CACrC,CAAC;IAEF,MAAM,eAAe,mCACd,QAAQ,KACX,yBAAyB,EAAE,KAAK,CAAC,EAAE,GACtC,CAAC;IAEF,MAAM,MAAM,GAAmC,+BAAW,CAAC,iBAAiB,CACxE,GAAG,EAAE,CAAC,uBAAuB,CAAC,eAAe,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,EAC5G,QAAQ,CAAC,MAAM,CAClB,CAAC;IAEF,OAAO,MAAM,CAAC;AAClB,CAAC;AAzBD,kDAyBC;AAED,SAAe,uBAAuB,CAClC,QAA4B,EAC5B,mBAAyC,EACzC,kBAA0B,EAC1B,SAAoB,EACpB,aAAqB;;;QAErB,MAAM,KAAK,GAAU,QAAQ,CAAC,YAAY,CAAC,KAAK,8DAE5C,uBAAuB,CAAC,IAAI,EAC5B,aAAa,CAChB,CAAC;QAEF,MAAA,QAAQ,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QAEpD,MAAM,4BAA4B,GAAyB,uBAAc,CAAC,QAAQ,CAC9E,mBAAmB,EACnB,kBAAkB,CACrB,CAAC;QAEF,IAAI,4BAA4B,KAAK,SAAS,EAAE;YAC5C,KAAK,CAAC,IAAI,CAAC,EAAE,+BAA0B,EAAE,IAAI,EAAE,CAAC,CAAC;YAEjD,MAAM,IAAI,GAAG,CAAC,WAAW,CAAC,cAAc,CAAC,kEAAkE,EAAE;gBACzG,kBAAkB;aACrB,CAAC,CAAC;SACN;QAED,MAAM,uBAAuB,GAAa,4BAA4B,CAAC;QAEvE,qBAAY,CAAC,wBAAwB,CAAC,uBAAuB,CAAC,CAAC;QAE/D,MAAM,YAAY,GAAa,uBAAc,CAAC,2CAA2C,CACrF,mBAAmB,EACnB,kBAAkB,CACrB,CAAC;QAEF,MAAM,YAAY,GAAyB,0BAAM,CAAC,OAAO,CACrD,MAAM,IAAA,cAAO,EAAC,QAAQ,EAAE,mBAAmB,EAAE,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,CAChF,CAAC;QAEF,MAAM,SAAS,GAAuB,uBAAc,CAAC,sCAAsC,CACvF,mBAAmB,EACnB,kBAAkB,CACrB,CAAC;QAEF,IAAI,yBAAgE,CAAC;QAErE,IAAI,oBAAS,CAAC,iBAAiB,CAAC,YAAY,CAAC,EAAE;YAC3C,MAAM,iBAAiB,GAA4B,0BAAiB,CAAC,oBAAoB,CACrF,mBAAmB,EACnB,uBAAuB,CAC1B,CAAC;YAEF,MAAM,kBAAkB,GAAwC,MAAM,gBAAgB,CAClF,QAAQ,EACR,mBAAmB,EACnB,SAAS,EACT,iBAAiB,CACpB,CAAC;YAEF,MAAM,cAAc,GAA4B,iBAAiB,CAAC,KAAK,CAAC,CAAC,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC;YAEtG,MAAM,CAAC,uBAAuB,EAAE,uBAAuB,CAAC,GACpD,uBAAuB,CAAC,YAAY,CAAC,CAAC;YAE1C,yBAAyB,GAAG;gBACxB,cAAc;gBACd,kBAAkB;gBAClB,uBAAuB;gBACvB,uBAAuB;gBACvB,WAAW,EAAE,oBAAS,CAAC,mBAAmB,CAAC,kBAAkB,EAAE,YAAY,CAAC;aAC/E,CAAC;SACL;QAED,MAAM,MAAM,GAAqB;YAC7B,uBAAuB;YACvB,YAAY;YACZ,kBAAkB,EAAE,MAAM,qBAAqB,CAC3C,QAAQ,EACR,mBAAmB,EACnB,SAAS,EACT,uBAAuB,EACvB,SAAS,EACT,KAAK,CAAC,EAAE,CACX;YACD,SAAS;YACT,cAAc,EAAE,yBAAyB;SAC5C,CAAC;QAEF,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO,MAAM,CAAC;;CACjB;AAED,SAAe,qBAAqB,CAChC,QAA4B,EAC5B,mBAAyC,EACzC,SAAoB,EACpB,uBAAiC,EACjC,SAA6B,EAC7B,aAAqB;;QAErB,MAAM,KAAK,GAAU,QAAQ,CAAC,YAAY,CAAC,KAAK,8DAE5C,qBAAqB,CAAC,IAAI,EAC1B,aAAa,CAChB,CAAC;QAEF,MAAM,eAAe,mCACd,QAAQ,KACX,yBAAyB,EAAE,KAAK,CAAC,EAAE,GACtC,CAAC;QAEF,iEAAiE;QACjE,IAAI,SAAS,KAAK,SAAS,EAAE;YACzB,mBAAmB;YACnB,MAAM,KAAK,GAAc,0BAAM,CAAC,OAAO,CACnC,MAAM,IAAA,kCAA0B,EAC5B,eAAe,EACf,mBAAmB,EACnB,uBAAuB,CAAC,IAAI,CAAC,EAAE,EAC/B,SAAS,CAAC,SAAS,CACtB,CACJ,CAAC;YAEF,MAAM,kBAAkB,GAA2B,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YAExE,KAAK,CAAC,IAAI,EAAE,CAAC;YAEb,OAAO,kBAAkB,KAAK,SAAS,IAAI,kBAAkB,CAAC,IAAI,gCAA4B,CAAC;SAClG;aAAM;YACH,KAAK,CAAC,IAAI,EAAE,CAAC;YAEb,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;CAAA;AAED,SAAS,uBAAuB,CAAC,YAAkC;IAC/D,MAAM,oBAAoB,GAA0C,YAAY,CAAC,UAAU,CAAC,MAAM,CAC9F,CAAC,SAAiC,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,UAAU,CAC/D,CAAC;IAEF,MAAM,uBAAuB,GAAW,oBAAoB,CAAC,MAAM,CAAC;IACpE,MAAM,uBAAuB,GAAW,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC;IAEvE,OAAO,CAAC,uBAAuB,EAAE,uBAAuB,CAAC,CAAC;AAC9D,CAAC;AAED,SAAe,gBAAgB,CAC3B,QAA4B,EAC5B,mBAAyC,EACzC,SAAoB,EACpB,WAAoC;;QAEpC,MAAM,MAAM,GAA2B,EAAE,CAAC;QAE1C,KAAK,MAAM,OAAO,IAAI,WAAW,EAAE;YAC/B,4CAA4C;YAC5C,MAAM,YAAY,GAAc,MAAM,IAAA,cAAO,EAAC,QAAQ,EAAE,mBAAmB,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;YAEzG,IAAI,+BAAW,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;gBACnC,MAAM,YAAY,CAAC;aACtB;YAED,MAAM,OAAO,GAAyB,YAAY,CAAC,KAAK,CAAC;YAEzD,0EAA0E;YAC1E,0GAA0G;YAC1G,IAAI,oBAAS,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,uBAAc,CAAC,cAAc,CAAC,mBAAmB,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;gBACtG,0BAAM,CAAC,MAAM,CAAC,OAAO,KAAK,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;gBAE/D,OAAO,MAAM,CAAC;aACjB;YAED,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACxB;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CAAA"}
|