@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
|
@@ -14,15 +14,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
14
14
|
exports.inspectTypeNullCoalescingExpression = void 0;
|
|
15
15
|
const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
|
|
16
16
|
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
17
|
-
const common_1 = require("./common");
|
|
18
17
|
const __1 = require("../../..");
|
|
19
|
-
|
|
18
|
+
const common_1 = require("./common");
|
|
19
|
+
function inspectTypeNullCoalescingExpression(state, xorNode, maybeCorrelationId) {
|
|
20
20
|
var _a;
|
|
21
21
|
return __awaiter(this, void 0, void 0, function* () {
|
|
22
|
-
const trace = state.traceManager.entry("Type" /*
|
|
22
|
+
const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeNullCoalescingExpression.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
|
|
23
23
|
(_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
|
|
24
24
|
parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "NullCoalescingExpression" /* NullCoalescingExpression */);
|
|
25
|
-
const maybeLeftType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 0);
|
|
25
|
+
const maybeLeftType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 0, trace.id);
|
|
26
26
|
const maybeNullCoalescingOperator = parser_1.NodeIdMapUtils.maybeUnboxNthChildIfAstChecked(state.nodeIdMapCollection, xorNode.node.id, 1, "Constant" /* Constant */);
|
|
27
27
|
let result;
|
|
28
28
|
// '??' isn't present, treat it as an Expression.
|
|
@@ -30,7 +30,7 @@ function inspectTypeNullCoalescingExpression(state, xorNode) {
|
|
|
30
30
|
result = maybeLeftType;
|
|
31
31
|
}
|
|
32
32
|
else {
|
|
33
|
-
const maybeRightType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 2);
|
|
33
|
+
const maybeRightType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 2, trace.id);
|
|
34
34
|
if (maybeLeftType.kind === "None" /* None */ || maybeRightType.kind === "None" /* None */) {
|
|
35
35
|
result = language_1.Type.NoneInstance;
|
|
36
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectTypeNullCoalescingExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeNullCoalescingExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAmG;AACnG,sFAAmH;AAGnH,
|
|
1
|
+
{"version":3,"file":"inspectTypeNullCoalescingExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeNullCoalescingExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAmG;AACnG,sFAAmH;AAGnH,gCAA+D;AAC/D,qCAAgF;AAEhF,SAAsB,mCAAmC,CACrD,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,mCAAmC,CAAC,IAAI,EACxC,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAA+B,OAAO,4DAAwC,CAAC;QAE5G,MAAM,aAAa,GAAyB,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAElH,MAAM,2BAA2B,GAC7B,uBAAc,CAAC,8BAA8B,CACzC,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,4BAEJ,CAAC;QAEN,IAAI,MAA4B,CAAC;QAEjC,iDAAiD;QACjD,IAAI,2BAA2B,KAAK,SAAS,EAAE;YAC3C,MAAM,GAAG,aAAa,CAAC;SAC1B;aAAM;YACH,MAAM,cAAc,GAAyB,MAAM,IAAA,2CAAkC,EACjF,KAAK,EACL,OAAO,EACP,CAAC,EACD,KAAK,CAAC,EAAE,CACX,CAAC;YAEF,IAAI,aAAa,CAAC,IAAI,sBAAuB,IAAI,cAAc,CAAC,IAAI,sBAAuB,EAAE;gBACzF,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;aAC9B;iBAAM;gBACH,MAAM,GAAG,oBAAS,CAAC,cAAc,CAAC,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;aACtE;SACJ;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAhDD,kFAgDC"}
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeParameter.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
|
|
2
2
|
import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
|
|
3
3
|
import { InspectTypeState } from "./common";
|
|
4
|
-
export declare function inspectTypeParameter(state: InspectTypeState, xorNode: TXorNode): Promise<Type.TPowerQueryType>;
|
|
4
|
+
export declare function inspectTypeParameter(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.TPowerQueryType>;
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeParameter.js
CHANGED
|
@@ -14,16 +14,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
14
14
|
exports.inspectTypeParameter = void 0;
|
|
15
15
|
const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
|
|
16
16
|
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
17
|
-
const common_1 = require("./common");
|
|
18
17
|
const __1 = require("../../..");
|
|
19
|
-
|
|
18
|
+
const common_1 = require("./common");
|
|
19
|
+
function inspectTypeParameter(state, xorNode, maybeCorrelationId) {
|
|
20
20
|
var _a;
|
|
21
21
|
return __awaiter(this, void 0, void 0, function* () {
|
|
22
|
-
const trace = state.traceManager.entry("Type" /*
|
|
22
|
+
const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeParameter.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
|
|
23
23
|
(_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
|
|
24
24
|
parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "Parameter" /* Parameter */);
|
|
25
25
|
const maybeOptionalConstant = parser_1.NodeIdMapUtils.maybeUnboxNthChildIfAstChecked(state.nodeIdMapCollection, xorNode.node.id, 0, "Constant" /* Constant */);
|
|
26
|
-
const maybeParameterType = language_1.TypeUtils.assertAsTPrimitiveType(yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 2));
|
|
26
|
+
const maybeParameterType = language_1.TypeUtils.assertAsTPrimitiveType(yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 2, trace.id));
|
|
27
27
|
const result = Object.assign(Object.assign({}, maybeParameterType), { isNullable: maybeOptionalConstant !== undefined || maybeParameterType.isNullable });
|
|
28
28
|
trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
|
|
29
29
|
return result;
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeParameter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectTypeParameter.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeParameter.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAmG;AACnG,sFAAmH;AAGnH,
|
|
1
|
+
{"version":3,"file":"inspectTypeParameter.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeParameter.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAmG;AACnG,sFAAmH;AAGnH,gCAA+D;AAC/D,qCAAgF;AAEhF,SAAsB,oBAAoB,CACtC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,oBAAoB,CAAC,IAAI,EACzB,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAiB,OAAO,8BAAyB,CAAC;QAE/E,MAAM,qBAAqB,GACvB,uBAAc,CAAC,8BAA8B,CACzC,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,4BAEJ,CAAC;QAEN,MAAM,kBAAkB,GAAqC,oBAAS,CAAC,sBAAsB,CACzF,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CACxE,CAAC;QAEF,MAAM,MAAM,mCACL,kBAAkB,KACrB,UAAU,EAAE,qBAAqB,KAAK,SAAS,IAAI,kBAAkB,CAAC,UAAU,GACnF,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAnCD,oDAmCC"}
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypePrimitiveType.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
|
|
2
2
|
import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
|
|
3
3
|
import { InspectTypeState } from ".";
|
|
4
|
-
export declare function inspectTypePrimitiveType(state: InspectTypeState, xorNode: TXorNode): Type.TPowerQueryType;
|
|
4
|
+
export declare function inspectTypePrimitiveType(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Type.TPowerQueryType;
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypePrimitiveType.js
CHANGED
|
@@ -6,8 +6,8 @@ exports.inspectTypePrimitiveType = 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
|
const __1 = require("../../..");
|
|
9
|
-
function inspectTypePrimitiveType(state, xorNode) {
|
|
10
|
-
const trace = state.traceManager.entry("Type" /*
|
|
9
|
+
function inspectTypePrimitiveType(state, xorNode, maybeCorrelationId) {
|
|
10
|
+
const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypePrimitiveType.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
|
|
11
11
|
parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "PrimitiveType" /* PrimitiveType */);
|
|
12
12
|
if (parser_1.XorNodeUtils.isContextXor(xorNode)) {
|
|
13
13
|
trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(language_1.Type.UnknownInstance) });
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypePrimitiveType.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectTypePrimitiveType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypePrimitiveType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,0FAAmG;AAEnG,sFAAmG;AAEnG,
|
|
1
|
+
{"version":3,"file":"inspectTypePrimitiveType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypePrimitiveType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,0FAAmG;AAEnG,sFAAmG;AAEnG,gCAA+D;AAG/D,SAAgB,wBAAwB,CACpC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;IAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,wBAAwB,CAAC,IAAI,EAC7B,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;IAEF,qBAAY,CAAC,gBAAgB,CAAoB,OAAO,sCAA6B,CAAC;IAEtF,IAAI,qBAAY,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE;QACpC,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,eAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;QAE3F,OAAO,eAAI,CAAC,eAAe,CAAC;KAC/B;IAED,MAAM,IAAI,GAAkB,oBAAS,CAAC,qCAAqC,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAE5G,MAAM,MAAM,GAAyB;QACjC,IAAI;QACJ,iBAAiB,EAAE,SAAS;QAC5B,UAAU,EAAE,KAAK;KACpB,CAAC;IAEF,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAE7E,OAAO,MAAM,CAAC;AAClB,CAAC;AA/BD,4DA+BC"}
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
|
|
2
2
|
import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
|
|
3
3
|
import { InspectTypeState } from "./common";
|
|
4
|
-
export declare function inspectTypeRangeExpression(state: InspectTypeState, xorNode: TXorNode): Promise<Type.TPowerQueryType>;
|
|
4
|
+
export declare function inspectTypeRangeExpression(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.TPowerQueryType>;
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.js
CHANGED
|
@@ -16,14 +16,14 @@ const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/l
|
|
|
16
16
|
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
17
17
|
const __1 = require("../../..");
|
|
18
18
|
const common_1 = require("./common");
|
|
19
|
-
function inspectTypeRangeExpression(state, xorNode) {
|
|
19
|
+
function inspectTypeRangeExpression(state, xorNode, maybeCorrelationId) {
|
|
20
20
|
var _a;
|
|
21
21
|
return __awaiter(this, void 0, void 0, function* () {
|
|
22
|
-
const trace = state.traceManager.entry("Type" /*
|
|
22
|
+
const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeRangeExpression.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
|
|
23
23
|
(_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
|
|
24
24
|
parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "RangeExpression" /* RangeExpression */);
|
|
25
|
-
const maybeLeftType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 0);
|
|
26
|
-
const maybeRightType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 2);
|
|
25
|
+
const maybeLeftType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 0, trace.id);
|
|
26
|
+
const maybeRightType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 2, trace.id);
|
|
27
27
|
let result;
|
|
28
28
|
if (maybeLeftType === undefined || maybeRightType === undefined) {
|
|
29
29
|
result = language_1.Type.UnknownInstance;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectTypeRangeExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAmG;AAEnG,sFAAmG;AAEnG,
|
|
1
|
+
{"version":3,"file":"inspectTypeRangeExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAmG;AAEnG,sFAAmG;AAEnG,gCAA+D;AAC/D,qCAAgF;AAEhF,SAAsB,0BAA0B,CAC5C,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,0BAA0B,CAAC,IAAI,EAC/B,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAsB,OAAO,0CAA+B,CAAC;QAE1F,MAAM,aAAa,GAAqC,MAAM,IAAA,2CAAkC,EAC5F,KAAK,EACL,OAAO,EACP,CAAC,EACD,KAAK,CAAC,EAAE,CACX,CAAC;QAEF,MAAM,cAAc,GAAqC,MAAM,IAAA,2CAAkC,EAC7F,KAAK,EACL,OAAO,EACP,CAAC,EACD,KAAK,CAAC,EAAE,CACX,CAAC;QAEF,IAAI,MAA4B,CAAC;QAEjC,IAAI,aAAa,KAAK,SAAS,IAAI,cAAc,KAAK,SAAS,EAAE;YAC7D,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;aAAM,IAAI,aAAa,CAAC,IAAI,0BAAyB,IAAI,cAAc,CAAC,IAAI,0BAAyB,EAAE;YACpG,iCAAiC;YACjC,IAAI,aAAa,CAAC,UAAU,KAAK,IAAI,IAAI,cAAc,CAAC,UAAU,KAAK,IAAI,EAAE;gBACzE,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;aAC9B;iBAAM;gBACH,MAAM,GAAG,oBAAS,CAAC,mBAAmB,CAAC,aAAa,CAAC,UAAU,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;aACxF;SACJ;aAAM,IAAI,aAAa,CAAC,IAAI,sBAAuB,IAAI,cAAc,CAAC,IAAI,sBAAuB,EAAE;YAChG,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;SAC9B;aAAM,IAAI,aAAa,CAAC,IAAI,4BAA0B,IAAI,cAAc,CAAC,IAAI,4BAA0B,EAAE;YACtG,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;aAAM;YACH,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;SAC9B;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAnDD,gEAmDC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
|
|
2
2
|
import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
|
|
3
3
|
import { InspectTypeState } from "./common";
|
|
4
|
-
export declare function inspectTypeRecord(state: InspectTypeState, xorNode: TXorNode): Promise<Type.DefinedRecord>;
|
|
4
|
+
export declare function inspectTypeRecord(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.DefinedRecord>;
|
|
@@ -14,19 +14,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
14
14
|
exports.inspectTypeRecord = void 0;
|
|
15
15
|
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
16
16
|
const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
|
|
17
|
-
const common_1 = require("./common");
|
|
18
17
|
const __1 = require("../../..");
|
|
19
|
-
|
|
18
|
+
const common_1 = require("./common");
|
|
19
|
+
function inspectTypeRecord(state, xorNode, maybeCorrelationId) {
|
|
20
20
|
var _a;
|
|
21
21
|
return __awaiter(this, void 0, void 0, function* () {
|
|
22
|
-
const trace = state.traceManager.entry("Type" /*
|
|
22
|
+
const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeRecord.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
|
|
23
23
|
(_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
|
|
24
24
|
parser_1.XorNodeUtils.assertIsRecord(xorNode);
|
|
25
25
|
const fields = new Map();
|
|
26
26
|
for (const keyValuePair of parser_1.NodeIdMapIterator.iterRecord(state.nodeIdMapCollection, xorNode)) {
|
|
27
27
|
if (keyValuePair.maybeValue) {
|
|
28
28
|
// eslint-disable-next-line no-await-in-loop
|
|
29
|
-
fields.set(keyValuePair.keyLiteral, yield (0, common_1.inspectXor)(state, keyValuePair.maybeValue));
|
|
29
|
+
fields.set(keyValuePair.keyLiteral, yield (0, common_1.inspectXor)(state, keyValuePair.maybeValue, trace.id));
|
|
30
30
|
}
|
|
31
31
|
else {
|
|
32
32
|
fields.set(keyValuePair.keyLiteral, language_1.Type.UnknownInstance);
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectTypeRecord.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,sFAAsH;
|
|
1
|
+
{"version":3,"file":"inspectTypeRecord.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,sFAAsH;AAEtH,0FAAmF;AAEnF,gCAA+D;AAC/D,qCAAwD;AAExD,SAAsB,iBAAiB,CACnC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,iBAAiB,CAAC,IAAI,EACtB,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAErC,MAAM,MAAM,GAAsC,IAAI,GAAG,EAAE,CAAC;QAE5D,KAAK,MAAM,YAAY,IAAI,0BAAiB,CAAC,UAAU,CAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,EAAE;YACzF,IAAI,YAAY,CAAC,UAAU,EAAE;gBACzB,4CAA4C;gBAC5C,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,YAAY,CAAC,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;aACnG;iBAAM;gBACH,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,EAAE,eAAI,CAAC,eAAe,CAAC,CAAC;aAC7D;SACJ;QAED,MAAM,MAAM,GAAyB;YACjC,IAAI,uBAAsB;YAC1B,iBAAiB,qCAAqC;YACtD,UAAU,EAAE,KAAK;YACjB,MAAM;YACN,MAAM,EAAE,KAAK;SAChB,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AArCD,8CAqCC"}
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
|
|
2
2
|
import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
|
|
3
3
|
import { InspectTypeState } from "./common";
|
|
4
|
-
export declare function inspectTypeRecordType(state: InspectTypeState, xorNode: TXorNode): Promise<Type.RecordType | Type.Unknown>;
|
|
4
|
+
export declare function inspectTypeRecordType(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.RecordType | Type.Unknown>;
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.js
CHANGED
|
@@ -16,10 +16,10 @@ const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/l
|
|
|
16
16
|
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
17
17
|
const __1 = require("../../..");
|
|
18
18
|
const examineFieldSpecificationList_1 = require("./examineFieldSpecificationList");
|
|
19
|
-
function inspectTypeRecordType(state, xorNode) {
|
|
19
|
+
function inspectTypeRecordType(state, xorNode, maybeCorrelationId) {
|
|
20
20
|
var _a;
|
|
21
21
|
return __awaiter(this, void 0, void 0, function* () {
|
|
22
|
-
const trace = state.traceManager.entry("Type" /*
|
|
22
|
+
const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeRecordType.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
|
|
23
23
|
(_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
|
|
24
24
|
parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "RecordType" /* RecordType */);
|
|
25
25
|
const maybeFields = parser_1.NodeIdMapUtils.maybeNthChildChecked(state.nodeIdMapCollection, xorNode.node.id, 0, "FieldSpecificationList" /* FieldSpecificationList */);
|
|
@@ -28,7 +28,7 @@ function inspectTypeRecordType(state, xorNode) {
|
|
|
28
28
|
result = language_1.Type.UnknownInstance;
|
|
29
29
|
}
|
|
30
30
|
else {
|
|
31
|
-
result = Object.assign({ kind: "Type" /* Type */, maybeExtendedKind: "RecordType" /* RecordType */, isNullable: false }, (yield (0, examineFieldSpecificationList_1.examineFieldSpecificationList)(state, maybeFields)));
|
|
31
|
+
result = Object.assign({ kind: "Type" /* Type */, maybeExtendedKind: "RecordType" /* RecordType */, isNullable: false }, (yield (0, examineFieldSpecificationList_1.examineFieldSpecificationList)(state, maybeFields, trace.id)));
|
|
32
32
|
}
|
|
33
33
|
trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
|
|
34
34
|
return result;
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectTypeRecordType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAGnH,
|
|
1
|
+
{"version":3,"file":"inspectTypeRecordType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAGnH,gCAA+D;AAC/D,mFAAgF;AAGhF,SAAsB,qBAAqB,CACvC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,qBAAqB,CAAC,IAAI,EAC1B,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAiB,OAAO,gCAA0B,CAAC;QAEhF,MAAM,WAAW,GAAyB,uBAAc,CAAC,oBAAoB,CACzE,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,wDAEJ,CAAC;QAEF,IAAI,MAA4B,CAAC;QAEjC,IAAI,WAAW,KAAK,SAAS,EAAE;YAC3B,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;aAAM;YACH,MAAM,mBACF,IAAI,qBACJ,iBAAiB,iCACjB,UAAU,EAAE,KAAK,IACd,CAAC,MAAM,IAAA,6DAA6B,EAAC,KAAK,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CACzE,CAAC;SACL;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAtCD,sDAsCC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
|
|
2
2
|
import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
|
|
3
3
|
import { InspectTypeState } from "./common";
|
|
4
|
-
export declare function inspectTypeRecursivePrimaryExpression(state: InspectTypeState, xorNode: TXorNode): Promise<Type.TPowerQueryType>;
|
|
4
|
+
export declare function inspectTypeRecursivePrimaryExpression(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.TPowerQueryType>;
|
|
@@ -16,10 +16,10 @@ const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/l
|
|
|
16
16
|
const __1 = require("../../..");
|
|
17
17
|
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
18
18
|
const common_1 = require("./common");
|
|
19
|
-
function inspectTypeRecursivePrimaryExpression(state, xorNode) {
|
|
19
|
+
function inspectTypeRecursivePrimaryExpression(state, xorNode, maybeCorrelationId) {
|
|
20
20
|
var _a;
|
|
21
21
|
return __awaiter(this, void 0, void 0, function* () {
|
|
22
|
-
const trace = state.traceManager.entry("Type" /*
|
|
22
|
+
const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeRecursivePrimaryExpression.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
|
|
23
23
|
(_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
|
|
24
24
|
parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "RecursivePrimaryExpression" /* RecursivePrimaryExpression */);
|
|
25
25
|
const maybeHead = parser_1.NodeIdMapUtils.maybeNthChild(state.nodeIdMapCollection, xorNode.node.id, 0);
|
|
@@ -27,7 +27,7 @@ function inspectTypeRecursivePrimaryExpression(state, xorNode) {
|
|
|
27
27
|
trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(language_1.Type.UnknownInstance) });
|
|
28
28
|
return language_1.Type.UnknownInstance;
|
|
29
29
|
}
|
|
30
|
-
const headType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 0);
|
|
30
|
+
const headType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 0, trace.id);
|
|
31
31
|
if (headType.kind === "None" /* None */ || headType.kind === "Unknown" /* Unknown */) {
|
|
32
32
|
trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(headType) });
|
|
33
33
|
return headType;
|
|
@@ -45,7 +45,7 @@ function inspectTypeRecursivePrimaryExpression(state, xorNode) {
|
|
|
45
45
|
let leftType = headType;
|
|
46
46
|
for (const right of maybeExpressions) {
|
|
47
47
|
// eslint-disable-next-line no-await-in-loop
|
|
48
|
-
const rightType = yield (0, common_1.inspectXor)(state, right);
|
|
48
|
+
const rightType = yield (0, common_1.inspectXor)(state, right, trace.id);
|
|
49
49
|
leftType = rightType;
|
|
50
50
|
}
|
|
51
51
|
trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(leftType) });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectTypeRecursivePrimaryExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRecursivePrimaryExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,
|
|
1
|
+
{"version":3,"file":"inspectTypeRecursivePrimaryExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRecursivePrimaryExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,gCAA+D;AAC/D,sFAMmE;AAGnE,qCAA4F;AAE5F,SAAsB,qCAAqC,CACvD,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,qCAAqC,CAAC,IAAI,EAC1C,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAiC,OAAO,gEAA0C,CAAC;QAEhH,MAAM,SAAS,GAAyB,uBAAc,CAAC,aAAa,CAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAEpH,IAAI,SAAS,KAAK,SAAS,EAAE;YACzB,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,eAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;YAE3F,OAAO,eAAI,CAAC,eAAe,CAAC;SAC/B;QAED,MAAM,QAAQ,GAAyB,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAE7G,IAAI,QAAQ,CAAC,IAAI,sBAAuB,IAAI,QAAQ,CAAC,IAAI,4BAA0B,EAAE;YACjF,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAE/E,OAAO,QAAQ,CAAC;SACnB;QAED,MAAM,iBAAiB,GACnB,uBAAc,CAAC,oBAAoB,CAC/B,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,oCAEJ,CAAC;QAEN,IAAI,iBAAiB,KAAK,SAAS,EAAE;YACjC,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,eAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;YAE3F,OAAO,eAAI,CAAC,eAAe,CAAC;SAC/B;QAED,MAAM,gBAAgB,GAAwC,0BAAiB,CAAC,qBAAqB,CACjG,KAAK,CAAC,mBAAmB,EACzB,iBAAiB,CAAC,IAAI,CAAC,EAAE,CAC5B,CAAC;QAEF,IAAI,gBAAgB,KAAK,SAAS,EAAE;YAChC,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,eAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;YAE3F,OAAO,eAAI,CAAC,eAAe,CAAC;SAC/B;QAED,IAAI,QAAQ,GAAyB,QAAQ,CAAC;QAE9C,KAAK,MAAM,KAAK,IAAI,gBAAgB,EAAE;YAClC,4CAA4C;YAC5C,MAAM,SAAS,GAAyB,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;YACjF,QAAQ,GAAG,SAAS,CAAC;SACxB;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAE/E,OAAO,QAAQ,CAAC;;CACnB;AAnED,sFAmEC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Constant, Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
|
|
2
2
|
import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
|
|
3
3
|
import { InspectTypeState } from "./common";
|
|
4
|
-
export declare function inspectTypeTBinOpExpression(state: InspectTypeState, xorNode: TXorNode): Promise<Type.TPowerQueryType>;
|
|
4
|
+
export declare function inspectTypeTBinOpExpression(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.TPowerQueryType>;
|
|
5
5
|
export declare const Lookup: ReadonlyMap<string, Type.TypeKind>;
|
|
6
6
|
export declare const PartialLookup: ReadonlyMap<string, ReadonlySet<Type.TypeKind>>;
|
|
7
7
|
export declare function lookupKey(leftTypeKind: Type.TypeKind, operatorKind: Constant.TBinOpExpressionOperator, rightTypeKind: Type.TypeKind): string;
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTBinOpExpression.js
CHANGED
|
@@ -16,12 +16,12 @@ const PQP = require("@microsoft/powerquery-parser");
|
|
|
16
16
|
const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
|
|
17
17
|
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
18
18
|
const powerquery_parser_1 = require("@microsoft/powerquery-parser");
|
|
19
|
-
const common_1 = require("./common");
|
|
20
19
|
const __1 = require("../../..");
|
|
21
|
-
|
|
20
|
+
const common_1 = require("./common");
|
|
21
|
+
function inspectTypeTBinOpExpression(state, xorNode, maybeCorrelationId) {
|
|
22
22
|
var _a;
|
|
23
23
|
return __awaiter(this, void 0, void 0, function* () {
|
|
24
|
-
const trace = state.traceManager.entry("Type" /*
|
|
24
|
+
const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeTBinOpExpression.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
|
|
25
25
|
(_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
|
|
26
26
|
powerquery_parser_1.Assert.isTrue(language_1.AstUtils.isTBinOpExpressionKind(xorNode.node.kind), `xorNode isn't a TBinOpExpression`, {
|
|
27
27
|
nodeId: xorNode.node.id,
|
|
@@ -41,11 +41,11 @@ function inspectTypeTBinOpExpression(state, xorNode) {
|
|
|
41
41
|
}
|
|
42
42
|
// '1'
|
|
43
43
|
else if (maybeOperatorKind === undefined) {
|
|
44
|
-
result = yield (0, common_1.inspectXor)(state, maybeLeft);
|
|
44
|
+
result = yield (0, common_1.inspectXor)(state, maybeLeft, trace.id);
|
|
45
45
|
}
|
|
46
46
|
// '1 +'
|
|
47
47
|
else if (maybeRight === undefined || parser_1.XorNodeUtils.isContextXor(maybeRight)) {
|
|
48
|
-
const leftType = yield (0, common_1.inspectXor)(state, maybeLeft);
|
|
48
|
+
const leftType = yield (0, common_1.inspectXor)(state, maybeLeft, trace.id);
|
|
49
49
|
const operatorKind = maybeOperatorKind;
|
|
50
50
|
const key = partialLookupKey(leftType.kind, operatorKind);
|
|
51
51
|
const maybeAllowedTypeKinds = exports.PartialLookup.get(key);
|
|
@@ -69,9 +69,9 @@ function inspectTypeTBinOpExpression(state, xorNode) {
|
|
|
69
69
|
}
|
|
70
70
|
// '1 + 1'
|
|
71
71
|
else {
|
|
72
|
-
const leftType = yield (0, common_1.inspectXor)(state, maybeLeft);
|
|
72
|
+
const leftType = yield (0, common_1.inspectXor)(state, maybeLeft, trace.id);
|
|
73
73
|
const operatorKind = maybeOperatorKind;
|
|
74
|
-
const rightType = yield (0, common_1.inspectXor)(state, maybeRight);
|
|
74
|
+
const rightType = yield (0, common_1.inspectXor)(state, maybeRight, trace.id);
|
|
75
75
|
const key = lookupKey(leftType.kind, operatorKind, rightType.kind);
|
|
76
76
|
const maybeResultTypeKind = exports.Lookup.get(key);
|
|
77
77
|
if (maybeResultTypeKind === undefined) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectTypeTBinOpExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeTBinOpExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AACpD,0FAAuH;AACvH,sFAAsH;
|
|
1
|
+
{"version":3,"file":"inspectTypeTBinOpExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeTBinOpExpression.ts"],"names":[],"mappings":"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"}
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
|
|
2
2
|
import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
|
|
3
3
|
import { InspectTypeState } from "./common";
|
|
4
|
-
export declare function inspectTypeTableType(state: InspectTypeState, xorNode: TXorNode): Promise<Type.TableType | Type.TableTypePrimaryExpression | Type.Unknown>;
|
|
4
|
+
export declare function inspectTypeTableType(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.TableType | Type.TableTypePrimaryExpression | Type.Unknown>;
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.js
CHANGED
|
@@ -14,13 +14,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
14
14
|
exports.inspectTypeTableType = void 0;
|
|
15
15
|
const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
|
|
16
16
|
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
17
|
-
const common_1 = require("./common");
|
|
18
17
|
const __1 = require("../../..");
|
|
18
|
+
const common_1 = require("./common");
|
|
19
19
|
const examineFieldSpecificationList_1 = require("./examineFieldSpecificationList");
|
|
20
|
-
function inspectTypeTableType(state, xorNode) {
|
|
20
|
+
function inspectTypeTableType(state, xorNode, maybeCorrelationId) {
|
|
21
21
|
var _a;
|
|
22
22
|
return __awaiter(this, void 0, void 0, function* () {
|
|
23
|
-
const trace = state.traceManager.entry("Type" /*
|
|
23
|
+
const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeTableType.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
|
|
24
24
|
(_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
|
|
25
25
|
parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "TableType" /* TableType */);
|
|
26
26
|
const maybeRowType = parser_1.NodeIdMapUtils.maybeNthChild(state.nodeIdMapCollection, xorNode.node.id, 1);
|
|
@@ -29,14 +29,14 @@ function inspectTypeTableType(state, xorNode) {
|
|
|
29
29
|
result = language_1.Type.UnknownInstance;
|
|
30
30
|
}
|
|
31
31
|
else if (maybeRowType.node.kind === "FieldSpecificationList" /* FieldSpecificationList */) {
|
|
32
|
-
result = Object.assign({ kind: "Type" /* Type */, maybeExtendedKind: "TableType" /* TableType */, isNullable: false }, (yield (0, examineFieldSpecificationList_1.examineFieldSpecificationList)(state, maybeRowType)));
|
|
32
|
+
result = Object.assign({ kind: "Type" /* Type */, maybeExtendedKind: "TableType" /* TableType */, isNullable: false }, (yield (0, examineFieldSpecificationList_1.examineFieldSpecificationList)(state, maybeRowType, trace.id)));
|
|
33
33
|
}
|
|
34
34
|
else {
|
|
35
35
|
result = {
|
|
36
36
|
kind: "Type" /* Type */,
|
|
37
37
|
maybeExtendedKind: "TableTypePrimaryExpression" /* TableTypePrimaryExpression */,
|
|
38
38
|
isNullable: false,
|
|
39
|
-
primaryExpression: yield (0, common_1.inspectXor)(state, maybeRowType),
|
|
39
|
+
primaryExpression: yield (0, common_1.inspectXor)(state, maybeRowType, trace.id),
|
|
40
40
|
};
|
|
41
41
|
}
|
|
42
42
|
trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectTypeTableType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAGnH,qCAAwD;AACxD,
|
|
1
|
+
{"version":3,"file":"inspectTypeTableType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AAGnH,gCAA+D;AAC/D,qCAAwD;AACxD,mFAAgF;AAEhF,SAAsB,oBAAoB,CACtC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,oBAAoB,CAAC,IAAI,EACzB,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAgB,OAAO,8BAAyB,CAAC;QAE9E,MAAM,YAAY,GAAyB,uBAAc,CAAC,aAAa,CACnE,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,CACJ,CAAC;QAEF,IAAI,MAA4B,CAAC;QAEjC,IAAI,YAAY,KAAK,SAAS,EAAE;YAC5B,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;aAAM,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,0DAAwC,EAAE;YACvE,MAAM,mBACF,IAAI,qBACJ,iBAAiB,+BACjB,UAAU,EAAE,KAAK,IACd,CAAC,MAAM,IAAA,6DAA6B,EAAC,KAAK,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CAC1E,CAAC;SACL;aAAM;YACH,MAAM,GAAG;gBACL,IAAI,mBAAoB;gBACxB,iBAAiB,+DAAkD;gBACnE,UAAU,EAAE,KAAK;gBACjB,iBAAiB,EAAE,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC;aACrE,CAAC;SACL;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AA5CD,oDA4CC"}
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeUnaryExpression.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
|
|
2
2
|
import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
|
|
3
3
|
import { InspectTypeState } from "./common";
|
|
4
|
-
export declare function inspectTypeUnaryExpression(state: InspectTypeState, xorNode: TXorNode): Promise<Type.TPowerQueryType>;
|
|
4
|
+
export declare function inspectTypeUnaryExpression(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.TPowerQueryType>;
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeUnaryExpression.js
CHANGED
|
@@ -15,12 +15,12 @@ exports.inspectTypeUnaryExpression = void 0;
|
|
|
15
15
|
const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
|
|
16
16
|
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
17
17
|
const powerquery_parser_1 = require("@microsoft/powerquery-parser");
|
|
18
|
-
const common_1 = require("./common");
|
|
19
18
|
const __1 = require("../../..");
|
|
20
|
-
|
|
19
|
+
const common_1 = require("./common");
|
|
20
|
+
function inspectTypeUnaryExpression(state, xorNode, maybeCorrelationId) {
|
|
21
21
|
var _a;
|
|
22
22
|
return __awaiter(this, void 0, void 0, function* () {
|
|
23
|
-
const trace = state.traceManager.entry("Type" /*
|
|
23
|
+
const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeUnaryExpression.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
|
|
24
24
|
(_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
|
|
25
25
|
parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "UnaryExpression" /* UnaryExpression */);
|
|
26
26
|
const nodeIdMapCollection = state.nodeIdMapCollection;
|
|
@@ -37,7 +37,7 @@ function inspectTypeUnaryExpression(state, xorNode) {
|
|
|
37
37
|
}
|
|
38
38
|
else {
|
|
39
39
|
const expression = maybeExpression;
|
|
40
|
-
const expressionType = yield (0, common_1.inspectXor)(state, expression);
|
|
40
|
+
const expressionType = yield (0, common_1.inspectXor)(state, expression, trace.id);
|
|
41
41
|
if (expressionType.kind === "Number" /* Number */) {
|
|
42
42
|
result = inspectTypeUnaryNumber(state, expressionType, unaryOperatorWrapper.node.id);
|
|
43
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectTypeUnaryExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeUnaryExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAA6G;AAC7G,sFAOmE;AAEnE,oEAAsD;AAEtD,
|
|
1
|
+
{"version":3,"file":"inspectTypeUnaryExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeUnaryExpression.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,19 +22,20 @@ function tryScopeType(settings, nodeIdMapCollection, nodeId,
|
|
|
22
22
|
// Else create a new TypeCache and include it in the return.
|
|
23
23
|
typeCache = typeCache_1.TypeCacheUtils.createEmptyCache()) {
|
|
24
24
|
return __awaiter(this, void 0, void 0, function* () {
|
|
25
|
-
const trace = settings.traceManager.entry("
|
|
25
|
+
const trace = settings.traceManager.entry("Inspection.ScopeType" /* InspectScopeType */, tryScopeType.name, settings.maybeInitialCorrelationId);
|
|
26
26
|
const state = {
|
|
27
27
|
locale: settings.locale,
|
|
28
28
|
maybeCancellationToken: settings.maybeCancellationToken,
|
|
29
29
|
maybeEachScopeById: settings.maybeEachScopeById,
|
|
30
30
|
maybeExternalTypeResolver: settings.maybeExternalTypeResolver,
|
|
31
|
+
maybeInitialCorrelationId: trace.id,
|
|
31
32
|
traceManager: settings.traceManager,
|
|
32
33
|
givenTypeById: typeCache.typeById,
|
|
33
34
|
deltaTypeById: new Map(),
|
|
34
35
|
nodeIdMapCollection,
|
|
35
36
|
scopeById: typeCache.scopeById,
|
|
36
37
|
};
|
|
37
|
-
const result = powerquery_parser_1.ResultUtils.ensureResultAsync(
|
|
38
|
+
const result = powerquery_parser_1.ResultUtils.ensureResultAsync(() => inspectScopeType(state, nodeId, trace.id), settings.locale);
|
|
38
39
|
trace.exit();
|
|
39
40
|
return result;
|
|
40
41
|
});
|
|
@@ -42,27 +43,29 @@ typeCache = typeCache_1.TypeCacheUtils.createEmptyCache()) {
|
|
|
42
43
|
exports.tryScopeType = tryScopeType;
|
|
43
44
|
function tryType(settings, nodeIdMapCollection, nodeId, typeCache = typeCache_1.TypeCacheUtils.createEmptyCache()) {
|
|
44
45
|
return __awaiter(this, void 0, void 0, function* () {
|
|
45
|
-
const trace = settings.traceManager.entry("Type" /*
|
|
46
|
+
const trace = settings.traceManager.entry("Inspection.Type" /* InspectType */, tryType.name, settings.maybeInitialCorrelationId);
|
|
46
47
|
const state = {
|
|
47
48
|
locale: settings.locale,
|
|
48
49
|
maybeCancellationToken: settings.maybeCancellationToken,
|
|
49
50
|
maybeEachScopeById: settings.maybeEachScopeById,
|
|
50
51
|
maybeExternalTypeResolver: settings.maybeExternalTypeResolver,
|
|
52
|
+
maybeInitialCorrelationId: trace.id,
|
|
51
53
|
traceManager: settings.traceManager,
|
|
52
54
|
givenTypeById: typeCache.typeById,
|
|
53
55
|
deltaTypeById: new Map(),
|
|
54
56
|
nodeIdMapCollection,
|
|
55
57
|
scopeById: typeCache.scopeById,
|
|
56
58
|
};
|
|
57
|
-
const result = yield powerquery_parser_1.ResultUtils.ensureResultAsync(
|
|
59
|
+
const result = yield powerquery_parser_1.ResultUtils.ensureResultAsync(() => (0, inspectType_1.inspectXor)(state, parser_1.NodeIdMapUtils.assertGetXor(nodeIdMapCollection, nodeId), trace.id), settings.locale);
|
|
58
60
|
trace.exit({ ["IsError" /* IsError */]: result.kind });
|
|
59
61
|
return result;
|
|
60
62
|
});
|
|
61
63
|
}
|
|
62
64
|
exports.tryType = tryType;
|
|
63
|
-
function inspectScopeType(state, nodeId) {
|
|
65
|
+
function inspectScopeType(state, nodeId, correlationId) {
|
|
64
66
|
return __awaiter(this, void 0, void 0, function* () {
|
|
65
|
-
const
|
|
67
|
+
const trace = state.traceManager.entry("Inspection.ScopeType" /* InspectScopeType */, inspectScopeType.name, correlationId);
|
|
68
|
+
const nodeScope = yield (0, inspectType_1.assertGetOrCreateNodeScope)(state, nodeId, trace.id);
|
|
66
69
|
for (const scopeItem of nodeScope.values()) {
|
|
67
70
|
if (!state.givenTypeById.has(scopeItem.id)) {
|
|
68
71
|
// eslint-disable-next-line no-await-in-loop
|
|
@@ -77,6 +80,7 @@ function inspectScopeType(state, nodeId) {
|
|
|
77
80
|
const type = powerquery_parser_1.Assert.asDefined(state.givenTypeById.get(scopeItem.id), `expected nodeId to be in givenTypeById`, { nodeId: scopeItem.id });
|
|
78
81
|
result.set(key, type);
|
|
79
82
|
}
|
|
83
|
+
trace.exit();
|
|
80
84
|
return result;
|
|
81
85
|
});
|
|
82
86
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/type/task.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAGlC,oEAAmE;AACnE,sFAAsG;AAItG,+CAAmH;AAGnH,4CAAyD;AAMzD,yCAAyC;AACzC,SAAsB,YAAY,CAC9B,QAA4B,EAC5B,mBAAyC,EACzC,MAAc;AACd,oGAAoG;AACpG,4DAA4D;AAC5D,YAAuB,0BAAc,CAAC,gBAAgB,EAAE;;QAExD,MAAM,KAAK,GAAU,QAAQ,CAAC,YAAY,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"task.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/type/task.ts"],"names":[],"mappings":"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"}
|