@microsoft/powerquery-language-services 0.9.2 → 0.9.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/powerquery-language-services/analysis/analysisBase.js +51 -48
- package/lib/powerquery-language-services/analysis/analysisBase.js.map +1 -1
- package/lib/powerquery-language-services/documentSymbols.js +6 -5
- package/lib/powerquery-language-services/documentSymbols.js.map +1 -1
- package/lib/powerquery-language-services/externalType/externalType.d.ts +1 -1
- package/lib/powerquery-language-services/externalType/externalType.js.map +1 -1
- package/lib/powerquery-language-services/externalType/externalTypeUtils.js +3 -2
- package/lib/powerquery-language-services/externalType/externalTypeUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/activeNode/activeNode.d.ts +2 -2
- package/lib/powerquery-language-services/inspection/activeNode/activeNode.js.map +1 -1
- package/lib/powerquery-language-services/inspection/activeNode/activeNodeUtils.js +41 -40
- package/lib/powerquery-language-services/inspection/activeNode/activeNodeUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.d.ts +4 -2
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.js +118 -95
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteFieldAccess.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItemUtils.d.ts +1 -3
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItemUtils.js +8 -31
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteItem/autocompleteItemUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.js +31 -31
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeyword.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordDefault.js +23 -22
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordDefault.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordErrorHandlingExpression.js +6 -6
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordErrorHandlingExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordIdentifierPairedExpression.js +2 -2
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordIdentifierPairedExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordLetExpression.js +6 -6
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordLetExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordListExpression.js +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordListExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordSectionMember.js +6 -5
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordSectionMember.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordTrailingText.js +6 -5
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteKeyword/autocompleteKeywordTrailingText.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.d.ts +2 -2
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.js +122 -78
- package/lib/powerquery-language-services/inspection/autocomplete/autocompleteLanguageConstant.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/autocompletePrimitiveType.js +56 -54
- package/lib/powerquery-language-services/inspection/autocomplete/autocompletePrimitiveType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/commonTypes.d.ts +6 -4
- package/lib/powerquery-language-services/inspection/autocomplete/task.js +6 -9
- package/lib/powerquery-language-services/inspection/autocomplete/task.js.map +1 -1
- package/lib/powerquery-language-services/inspection/autocomplete/trailingToken.d.ts +0 -1
- package/lib/powerquery-language-services/inspection/autocomplete/trailingTokenUtils.js +3 -3
- package/lib/powerquery-language-services/inspection/autocomplete/trailingTokenUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/deferenceIdentifier.js +17 -14
- package/lib/powerquery-language-services/inspection/deferenceIdentifier.js.map +1 -1
- package/lib/powerquery-language-services/inspection/expectedType.js +61 -60
- package/lib/powerquery-language-services/inspection/expectedType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/invokeExpression/currentInvokeExpression.js +15 -10
- package/lib/powerquery-language-services/inspection/invokeExpression/currentInvokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.js +8 -6
- package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/pseudoFunctionExpressionType.js +6 -6
- package/lib/powerquery-language-services/inspection/pseudoFunctionExpressionType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/scope/scope.d.ts +1 -1
- package/lib/powerquery-language-services/inspection/scope/scope.js.map +1 -1
- package/lib/powerquery-language-services/inspection/scope/scopeInspection.js +35 -33
- package/lib/powerquery-language-services/inspection/scope/scopeInspection.js.map +1 -1
- package/lib/powerquery-language-services/inspection/scope/scopeUtils.js +20 -18
- package/lib/powerquery-language-services/inspection/scope/scopeUtils.js.map +1 -1
- package/lib/powerquery-language-services/inspection/task.js +17 -14
- package/lib/powerquery-language-services/inspection/task.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/common.js +80 -79
- package/lib/powerquery-language-services/inspection/type/inspectType/common.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/examineFieldSpecificationList.js +4 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/examineFieldSpecificationList.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeConstant.js +20 -20
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeConstant.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeEachExpression.js +5 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeEachExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.js +8 -7
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/common.js +6 -5
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/common.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldProjection.js +23 -22
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldProjection.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldSelector.js +11 -10
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeField/inspectTypeFieldSelector.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSpecification.js +4 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFieldSpecification.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.js +15 -13
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.js +13 -11
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifier.js +4 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifier.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifierExpression.js +4 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIdentifierExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.js +10 -9
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.js +10 -9
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.js +8 -6
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.js +9 -7
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeLiteralExpression.js +9 -8
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeLiteralExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeNullCoalescingExpression.js +6 -5
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeNullCoalescingExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeParameter.js +5 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeParameter.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypePrimitiveType.js +5 -4
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypePrimitiveType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.js +10 -8
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.js +8 -6
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecord.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.js +9 -7
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecursivePrimaryExpression.js +10 -9
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecursivePrimaryExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTBinOpExpression.js +74 -73
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTBinOpExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.js +11 -9
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTableType.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeUnaryExpression.js +12 -11
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeUnaryExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/task.js +6 -4
- package/lib/powerquery-language-services/inspection/type/task.js.map +1 -1
- package/lib/powerquery-language-services/inspectionSettings.d.ts +1 -1
- package/lib/powerquery-language-services/inspectionSettings.js.map +1 -1
- package/lib/powerquery-language-services/inspectionUtils.js +22 -21
- package/lib/powerquery-language-services/inspectionUtils.js.map +1 -1
- package/lib/powerquery-language-services/library/library.d.ts +1 -1
- package/lib/powerquery-language-services/library/library.js.map +1 -1
- package/lib/powerquery-language-services/library/librarySymbolUtils.js +9 -9
- package/lib/powerquery-language-services/library/librarySymbolUtils.js.map +1 -1
- package/lib/powerquery-language-services/library/libraryUtils.js +12 -11
- package/lib/powerquery-language-services/library/libraryUtils.js.map +1 -1
- package/lib/powerquery-language-services/localization/templates.js +42 -42
- package/lib/powerquery-language-services/localization/templates.js.map +1 -1
- package/lib/powerquery-language-services/positionUtils.d.ts +1 -0
- package/lib/powerquery-language-services/positionUtils.js +20 -15
- package/lib/powerquery-language-services/positionUtils.js.map +1 -1
- package/lib/powerquery-language-services/providers/languageCompletionItemProvider.js +15 -15
- package/lib/powerquery-language-services/providers/languageCompletionItemProvider.js.map +1 -1
- package/lib/powerquery-language-services/providers/libraryProvider.js +7 -6
- package/lib/powerquery-language-services/providers/libraryProvider.js.map +1 -1
- package/lib/powerquery-language-services/providers/localDocumentProvider/foldingRanges.js +15 -13
- package/lib/powerquery-language-services/providers/localDocumentProvider/foldingRanges.js.map +1 -1
- package/lib/powerquery-language-services/providers/localDocumentProvider/localDocumentProvider.js +21 -20
- package/lib/powerquery-language-services/providers/localDocumentProvider/localDocumentProvider.js.map +1 -1
- package/lib/powerquery-language-services/providers/localDocumentProvider/partialSemanticToken.js +63 -61
- package/lib/powerquery-language-services/providers/localDocumentProvider/partialSemanticToken.js.map +1 -1
- package/lib/powerquery-language-services/tokenPositionComparison.d.ts +1 -1
- package/lib/powerquery-language-services/tokenPositionComparison.js.map +1 -1
- package/lib/powerquery-language-services/trace.d.ts +4 -4
- package/lib/powerquery-language-services/trace.js.map +1 -1
- package/lib/powerquery-language-services/validate/validate.js +2 -1
- package/lib/powerquery-language-services/validate/validate.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateDuplicateIdentifiers.js +13 -11
- package/lib/powerquery-language-services/validate/validateDuplicateIdentifiers.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateFunctionExpression.js +5 -3
- package/lib/powerquery-language-services/validate/validateFunctionExpression.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateInvokeExpression.js +5 -3
- package/lib/powerquery-language-services/validate/validateInvokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/validate/validateUnknownIdentifiers.js +9 -6
- package/lib/powerquery-language-services/validate/validateUnknownIdentifiers.js.map +1 -1
- package/package.json +4 -4
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectTypeIfExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAmG;
|
|
1
|
+
{"version":3,"file":"inspectTypeIfExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.ts"],"names":[],"mappings":"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"}
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.js
CHANGED
|
@@ -15,6 +15,7 @@ exports.inspectTypeInvokeExpression = void 0;
|
|
|
15
15
|
const powerquery_parser_1 = 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
|
+
const trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
|
|
18
19
|
const externalType_1 = require("../../../externalType");
|
|
19
20
|
const __1 = require("../../..");
|
|
20
21
|
const common_1 = require("./common");
|
|
@@ -22,40 +23,40 @@ const deferenceIdentifier_1 = require("../../deferenceIdentifier");
|
|
|
22
23
|
function inspectTypeInvokeExpression(state, xorNode, correlationId) {
|
|
23
24
|
var _a;
|
|
24
25
|
return __awaiter(this, void 0, void 0, function* () {
|
|
25
|
-
const trace = state.traceManager.entry(
|
|
26
|
+
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectType, inspectTypeInvokeExpression.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
|
|
26
27
|
(_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
|
|
27
|
-
parser_1.XorNodeUtils.assertIsNodeKind(xorNode,
|
|
28
|
+
parser_1.XorNodeUtils.assertIsNodeKind(xorNode, language_1.Ast.NodeKind.InvokeExpression);
|
|
28
29
|
const request = yield externalInvokeRequest(state, xorNode, trace.id);
|
|
29
30
|
if (request !== undefined) {
|
|
30
31
|
const type = state.library.externalTypeResolver(request);
|
|
31
32
|
if (type !== undefined) {
|
|
32
|
-
trace.exit({ [
|
|
33
|
+
trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(type) });
|
|
33
34
|
return type;
|
|
34
35
|
}
|
|
35
36
|
}
|
|
36
37
|
const previousSibling = parser_1.NodeIdMapUtils.assertRecursiveExpressionPreviousSibling(state.nodeIdMapCollection, xorNode.node.id);
|
|
37
38
|
const previousSiblingType = yield (0, common_1.inspectXor)(state, previousSibling, trace.id);
|
|
38
39
|
let result;
|
|
39
|
-
if (previousSiblingType.kind ===
|
|
40
|
+
if (previousSiblingType.kind === language_1.Type.TypeKind.Any) {
|
|
40
41
|
result = language_1.Type.AnyInstance;
|
|
41
42
|
}
|
|
42
|
-
else if (previousSiblingType.kind !==
|
|
43
|
+
else if (previousSiblingType.kind !== language_1.Type.TypeKind.Function) {
|
|
43
44
|
result = language_1.Type.NoneInstance;
|
|
44
45
|
}
|
|
45
|
-
else if (previousSiblingType.extendedKind ===
|
|
46
|
+
else if (previousSiblingType.extendedKind === language_1.Type.ExtendedTypeKind.DefinedFunction) {
|
|
46
47
|
result = previousSiblingType.returnType;
|
|
47
48
|
}
|
|
48
49
|
else {
|
|
49
50
|
result = language_1.Type.AnyInstance;
|
|
50
51
|
}
|
|
51
|
-
trace.exit({ [
|
|
52
|
+
trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(result) });
|
|
52
53
|
return result;
|
|
53
54
|
});
|
|
54
55
|
}
|
|
55
56
|
exports.inspectTypeInvokeExpression = inspectTypeInvokeExpression;
|
|
56
57
|
function externalInvokeRequest(state, xorNode, correlationId) {
|
|
57
58
|
return __awaiter(this, void 0, void 0, function* () {
|
|
58
|
-
const trace = state.traceManager.entry(
|
|
59
|
+
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectType, externalInvokeRequest.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
|
|
59
60
|
const identifier = parser_1.NodeIdMapUtils.invokeExpressionIdentifier(state.nodeIdMapCollection, xorNode.node.id);
|
|
60
61
|
if (identifier === undefined) {
|
|
61
62
|
trace.exit();
|
|
@@ -67,7 +68,7 @@ function externalInvokeRequest(state, xorNode, correlationId) {
|
|
|
67
68
|
return undefined;
|
|
68
69
|
}
|
|
69
70
|
const types = [];
|
|
70
|
-
for (const argument of parser_1.NodeIdMapIterator.iterInvokeExpression(state.nodeIdMapCollection, parser_1.XorNodeUtils.assertAsNodeKind(xorNode,
|
|
71
|
+
for (const argument of parser_1.NodeIdMapIterator.iterInvokeExpression(state.nodeIdMapCollection, parser_1.XorNodeUtils.assertAsNodeKind(xorNode, language_1.Ast.NodeKind.InvokeExpression))) {
|
|
71
72
|
// eslint-disable-next-line no-await-in-loop
|
|
72
73
|
types.push(yield (0, common_1.inspectXor)(state, argument, trace.id));
|
|
73
74
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectTypeInvokeExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAGlC,oEAAmE;AACnE,0FAAwF;AACxF,sFAMmE;
|
|
1
|
+
{"version":3,"file":"inspectTypeInvokeExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeInvokeExpression.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,35 +13,37 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
13
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
14
|
exports.inspectTypeList = void 0;
|
|
15
15
|
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
16
|
+
const trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
|
|
16
17
|
const powerquery_parser_1 = require("@microsoft/powerquery-parser");
|
|
17
18
|
const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
|
|
18
19
|
const __1 = require("../../..");
|
|
19
20
|
const common_1 = require("./common");
|
|
21
|
+
const inspectionSettings_1 = require("../../../inspectionSettings");
|
|
20
22
|
function inspectTypeList(state, xorNode, correlationId) {
|
|
21
23
|
var _a;
|
|
22
24
|
return __awaiter(this, void 0, void 0, function* () {
|
|
23
|
-
const trace = state.traceManager.entry(
|
|
25
|
+
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectType, inspectTypeList.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
|
|
24
26
|
let result;
|
|
25
27
|
switch (state.typeStrategy) {
|
|
26
|
-
case
|
|
28
|
+
case inspectionSettings_1.TypeStrategy.Extended: {
|
|
27
29
|
(_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
|
|
28
30
|
const items = parser_1.NodeIdMapIterator.iterListItems(state.nodeIdMapCollection, xorNode);
|
|
29
31
|
const elements = yield Promise.all(items.map((item) => (0, common_1.inspectXor)(state, item, trace.id)));
|
|
30
32
|
result = {
|
|
31
|
-
kind:
|
|
33
|
+
kind: language_1.Type.TypeKind.List,
|
|
32
34
|
isNullable: false,
|
|
33
|
-
extendedKind:
|
|
35
|
+
extendedKind: language_1.Type.ExtendedTypeKind.DefinedList,
|
|
34
36
|
elements,
|
|
35
37
|
};
|
|
36
38
|
break;
|
|
37
39
|
}
|
|
38
|
-
case
|
|
40
|
+
case inspectionSettings_1.TypeStrategy.Primitive:
|
|
39
41
|
result = language_1.Type.ListInstance;
|
|
40
42
|
break;
|
|
41
43
|
default:
|
|
42
44
|
powerquery_parser_1.Assert.isNever(state.typeStrategy);
|
|
43
45
|
}
|
|
44
|
-
trace.exit({ [
|
|
46
|
+
trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(result) });
|
|
45
47
|
return result;
|
|
46
48
|
});
|
|
47
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectTypeList.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeList.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,sFAAwG;
|
|
1
|
+
{"version":3,"file":"inspectTypeList.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeList.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,sFAAwG;AACxG,2FAAuG;AACvG,oEAAsD;AACtD,0FAAmF;AAEnF,gCAA+D;AAC/D,qCAAwD;AACxD,oEAA2D;AAE3D,SAAsB,eAAe,CACjC,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,WAAW,EACnC,eAAe,CAAC,IAAI,EACpB,aAAa,EACb,cAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CACrC,CAAC;QAEF,IAAI,MAAoC,CAAC;QAEzC,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,KAAK,iCAAY,CAAC,QAAQ,CAAC,CAAC;gBACxB,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;gBAC5C,MAAM,KAAK,GAA4B,0BAAiB,CAAC,aAAa,CAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;gBAE3G,MAAM,QAAQ,GAAwC,MAAM,OAAO,CAAC,GAAG,CACnE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAc,EAAE,EAAE,CAAC,IAAA,mBAAU,EAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CACnE,CAAC;gBAEF,MAAM,GAAG;oBACL,IAAI,EAAE,eAAI,CAAC,QAAQ,CAAC,IAAI;oBACxB,UAAU,EAAE,KAAK;oBACjB,YAAY,EAAE,eAAI,CAAC,gBAAgB,CAAC,WAAW;oBAC/C,QAAQ;iBACX,CAAC;gBAEF,MAAM;aACT;YAED,KAAK,iCAAY,CAAC,SAAS;gBACvB,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;gBAC3B,MAAM;YAEV;gBACI,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAC1C;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,MAAM,CAAC,EAAE,cAAU,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEvE,OAAO,MAAM,CAAC;;CACjB;AA5CD,0CA4CC"}
|
|
@@ -14,18 +14,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
14
14
|
exports.inspectTypeListType = 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 trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
|
|
17
18
|
const powerquery_parser_1 = require("@microsoft/powerquery-parser");
|
|
18
19
|
const __1 = require("../../..");
|
|
19
20
|
const common_1 = require("./common");
|
|
21
|
+
const inspectionSettings_1 = require("../../../inspectionSettings");
|
|
20
22
|
function inspectTypeListType(state, xorNode, correlationId) {
|
|
21
23
|
var _a;
|
|
22
24
|
return __awaiter(this, void 0, void 0, function* () {
|
|
23
|
-
const trace = state.traceManager.entry(
|
|
25
|
+
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectType, inspectTypeListType.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
|
|
24
26
|
(_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
|
|
25
|
-
parser_1.XorNodeUtils.assertIsNodeKind(xorNode,
|
|
27
|
+
parser_1.XorNodeUtils.assertIsNodeKind(xorNode, language_1.Ast.NodeKind.ListType);
|
|
26
28
|
let result;
|
|
27
29
|
switch (state.typeStrategy) {
|
|
28
|
-
case
|
|
30
|
+
case inspectionSettings_1.TypeStrategy.Extended: {
|
|
29
31
|
const listItem = parser_1.NodeIdMapUtils.nthChildXor(state.nodeIdMapCollection, xorNode.node.id, 1);
|
|
30
32
|
if (listItem === undefined) {
|
|
31
33
|
result = language_1.Type.UnknownInstance;
|
|
@@ -33,21 +35,21 @@ function inspectTypeListType(state, xorNode, correlationId) {
|
|
|
33
35
|
else {
|
|
34
36
|
const itemType = yield (0, common_1.inspectXor)(state, listItem, trace.id);
|
|
35
37
|
result = {
|
|
36
|
-
kind:
|
|
37
|
-
extendedKind:
|
|
38
|
+
kind: language_1.Type.TypeKind.Type,
|
|
39
|
+
extendedKind: language_1.Type.ExtendedTypeKind.ListType,
|
|
38
40
|
isNullable: false,
|
|
39
41
|
itemType,
|
|
40
42
|
};
|
|
41
43
|
}
|
|
42
44
|
break;
|
|
43
45
|
}
|
|
44
|
-
case
|
|
46
|
+
case inspectionSettings_1.TypeStrategy.Primitive:
|
|
45
47
|
result = language_1.Type.TypePrimitiveInstance;
|
|
46
48
|
break;
|
|
47
49
|
default:
|
|
48
50
|
powerquery_parser_1.Assert.isNever(state.typeStrategy);
|
|
49
51
|
}
|
|
50
|
-
trace.exit({ [
|
|
52
|
+
trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(result) });
|
|
51
53
|
return result;
|
|
52
54
|
});
|
|
53
55
|
}
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectTypeListType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;
|
|
1
|
+
{"version":3,"file":"inspectTypeListType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeListType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,sFAAmH;AACnH,2FAAuG;AACvG,oEAAsD;AAEtD,gCAA+D;AAC/D,qCAAwD;AACxD,oEAA2D;AAE3D,SAAsB,mBAAmB,CACrC,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,WAAW,EACnC,mBAAmB,CAAC,IAAI,EACxB,aAAa,EACb,cAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CACrC,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAC5C,qBAAY,CAAC,gBAAgB,CAAe,OAAO,EAAE,cAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAE5E,IAAI,MAAgD,CAAC;QAErD,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,KAAK,iCAAY,CAAC,QAAQ,CAAC,CAAC;gBACxB,MAAM,QAAQ,GAAyB,uBAAc,CAAC,WAAW,CAC7D,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,CACJ,CAAC;gBAEF,IAAI,QAAQ,KAAK,SAAS,EAAE;oBACxB,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;iBACjC;qBAAM;oBACH,MAAM,QAAQ,GAAyB,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;oBAEnF,MAAM,GAAG;wBACL,IAAI,EAAE,eAAI,CAAC,QAAQ,CAAC,IAAI;wBACxB,YAAY,EAAE,eAAI,CAAC,gBAAgB,CAAC,QAAQ;wBAC5C,UAAU,EAAE,KAAK;wBACjB,QAAQ;qBACX,CAAC;iBACL;gBAED,MAAM;aACT;YAED,KAAK,iCAAY,CAAC,SAAS;gBACvB,MAAM,GAAG,eAAI,CAAC,qBAAqB,CAAC;gBACpC,MAAM;YAEV;gBACI,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAC1C;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,MAAM,CAAC,EAAE,cAAU,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEvE,OAAO,MAAM,CAAC;;CACjB;AApDD,kDAoDC"}
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeLiteralExpression.js
CHANGED
|
@@ -4,40 +4,41 @@
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.inspectTypeLiteralExpression = void 0;
|
|
6
6
|
const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
|
|
7
|
+
const trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
|
|
7
8
|
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
8
9
|
const powerquery_parser_1 = require("@microsoft/powerquery-parser");
|
|
9
10
|
const __1 = require("../../..");
|
|
10
11
|
function inspectTypeLiteralExpression(state, xorNode, correlationId) {
|
|
11
|
-
const trace = state.traceManager.entry(
|
|
12
|
-
parser_1.XorNodeUtils.assertIsNodeKind(xorNode,
|
|
12
|
+
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectType, inspectTypeLiteralExpression.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
|
|
13
|
+
parser_1.XorNodeUtils.assertIsNodeKind(xorNode, language_1.Ast.NodeKind.LiteralExpression);
|
|
13
14
|
let literalExpression;
|
|
14
15
|
let typeKind;
|
|
15
16
|
let result;
|
|
16
17
|
switch (xorNode.kind) {
|
|
17
|
-
case
|
|
18
|
+
case parser_1.XorNodeKind.Ast: {
|
|
18
19
|
// We already checked it's a Ast Literal Expression.
|
|
19
20
|
literalExpression = xorNode.node;
|
|
20
21
|
typeKind = language_1.TypeUtils.typeKindFromLiteralKind(literalExpression.literalKind);
|
|
21
22
|
switch (typeKind) {
|
|
22
|
-
case
|
|
23
|
+
case language_1.Type.TypeKind.Number:
|
|
23
24
|
result = language_1.TypeUtils.numberLiteral(false, literalExpression.literal);
|
|
24
25
|
break;
|
|
25
|
-
case
|
|
26
|
+
case language_1.Type.TypeKind.Text:
|
|
26
27
|
result = language_1.TypeUtils.textLiteral(false, literalExpression.literal);
|
|
27
28
|
break;
|
|
28
29
|
default:
|
|
29
|
-
result = language_1.TypeUtils.primitiveType(literalExpression.literalKind ===
|
|
30
|
+
result = language_1.TypeUtils.primitiveType(literalExpression.literalKind === language_1.Ast.LiteralKind.Null, typeKind);
|
|
30
31
|
break;
|
|
31
32
|
}
|
|
32
33
|
break;
|
|
33
34
|
}
|
|
34
|
-
case
|
|
35
|
+
case parser_1.XorNodeKind.Context:
|
|
35
36
|
result = language_1.Type.UnknownInstance;
|
|
36
37
|
break;
|
|
37
38
|
default:
|
|
38
39
|
throw powerquery_parser_1.Assert.isNever(xorNode);
|
|
39
40
|
}
|
|
40
|
-
trace.exit({ [
|
|
41
|
+
trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(result) });
|
|
41
42
|
return result;
|
|
42
43
|
}
|
|
43
44
|
exports.inspectTypeLiteralExpression = inspectTypeLiteralExpression;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectTypeLiteralExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeLiteralExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,0FAAmG;
|
|
1
|
+
{"version":3,"file":"inspectTypeLiteralExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeLiteralExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,0FAAmG;AACnG,2FAAuG;AACvG,sFAAgH;AAChH,oEAAsD;AAEtD,gCAA+D;AAG/D,SAAgB,4BAA4B,CACxC,KAAuB,EACvB,OAAiB,EACjB,aAAiC;IAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,WAAW,EACnC,4BAA4B,CAAC,IAAI,EACjC,aAAa,EACb,cAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CACrC,CAAC;IAEF,qBAAY,CAAC,gBAAgB,CAAwB,OAAO,EAAE,cAAG,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;IAE9F,IAAI,iBAAoD,CAAC;IACzD,IAAI,QAAmC,CAAC;IACxC,IAAI,MAA4B,CAAC;IAEjC,QAAQ,OAAO,CAAC,IAAI,EAAE;QAClB,KAAK,oBAAW,CAAC,GAAG,CAAC,CAAC;YAClB,oDAAoD;YACpD,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;YACjC,QAAQ,GAAG,oBAAS,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;YAE5E,QAAQ,QAAQ,EAAE;gBACd,KAAK,eAAI,CAAC,QAAQ,CAAC,MAAM;oBACrB,MAAM,GAAG,oBAAS,CAAC,aAAa,CAAC,KAAK,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC;oBACnE,MAAM;gBAEV,KAAK,eAAI,CAAC,QAAQ,CAAC,IAAI;oBACnB,MAAM,GAAG,oBAAS,CAAC,WAAW,CAAC,KAAK,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC;oBACjE,MAAM;gBAEV;oBACI,MAAM,GAAG,oBAAS,CAAC,aAAa,CAAC,iBAAiB,CAAC,WAAW,KAAK,cAAG,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;oBAEnG,MAAM;aACb;YAED,MAAM;SACT;QAED,KAAK,oBAAW,CAAC,OAAO;YACpB,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;YAC9B,MAAM;QAEV;YACI,MAAM,0BAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;KACrC;IAED,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,MAAM,CAAC,EAAE,cAAU,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAEvE,OAAO,MAAM,CAAC;AAClB,CAAC;AArDD,oEAqDC"}
|
|
@@ -14,16 +14,17 @@ 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 trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
|
|
17
18
|
const __1 = require("../../..");
|
|
18
19
|
const common_1 = require("./common");
|
|
19
20
|
function inspectTypeNullCoalescingExpression(state, xorNode, correlationId) {
|
|
20
21
|
var _a;
|
|
21
22
|
return __awaiter(this, void 0, void 0, function* () {
|
|
22
|
-
const trace = state.traceManager.entry(
|
|
23
|
+
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectType, inspectTypeNullCoalescingExpression.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
|
|
23
24
|
(_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
|
|
24
|
-
parser_1.XorNodeUtils.assertIsNodeKind(xorNode,
|
|
25
|
+
parser_1.XorNodeUtils.assertIsNodeKind(xorNode, language_1.Ast.NodeKind.NullCoalescingExpression);
|
|
25
26
|
const leftType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 0, trace.id);
|
|
26
|
-
const nullCoalescingOperator = parser_1.NodeIdMapUtils.nthChildAstChecked(state.nodeIdMapCollection, xorNode.node.id, 1,
|
|
27
|
+
const nullCoalescingOperator = parser_1.NodeIdMapUtils.nthChildAstChecked(state.nodeIdMapCollection, xorNode.node.id, 1, language_1.Ast.NodeKind.Constant);
|
|
27
28
|
let result;
|
|
28
29
|
// '??' isn't present, treat it as an Expression.
|
|
29
30
|
if (nullCoalescingOperator === undefined) {
|
|
@@ -31,7 +32,7 @@ function inspectTypeNullCoalescingExpression(state, xorNode, correlationId) {
|
|
|
31
32
|
}
|
|
32
33
|
else {
|
|
33
34
|
const rightType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 2, trace.id);
|
|
34
|
-
if (leftType.kind ===
|
|
35
|
+
if (leftType.kind === language_1.Type.TypeKind.None || rightType.kind === language_1.Type.TypeKind.None) {
|
|
35
36
|
result = language_1.Type.NoneInstance;
|
|
36
37
|
}
|
|
37
38
|
else if (!leftType.isNullable) {
|
|
@@ -41,7 +42,7 @@ function inspectTypeNullCoalescingExpression(state, xorNode, correlationId) {
|
|
|
41
42
|
result = language_1.TypeUtils.anyUnion([leftType, rightType], state.traceManager, trace.id);
|
|
42
43
|
}
|
|
43
44
|
}
|
|
44
|
-
trace.exit({ [
|
|
45
|
+
trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(result) });
|
|
45
46
|
return result;
|
|
46
47
|
});
|
|
47
48
|
}
|
|
@@ -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;
|
|
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;AACnH,2FAAuG;AAEvG,gCAA+D;AAC/D,qCAAgF;AAEhF,SAAsB,mCAAmC,CACrD,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,WAAW,EACnC,mCAAmC,CAAC,IAAI,EACxC,aAAa,EACb,cAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CACrC,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAC5C,qBAAY,CAAC,gBAAgB,CAA+B,OAAO,EAAE,cAAG,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAC;QAE5G,MAAM,QAAQ,GAAyB,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAE7G,MAAM,sBAAsB,GAA8B,uBAAc,CAAC,kBAAkB,CACvF,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,EACD,cAAG,CAAC,QAAQ,CAAC,QAAQ,CACxB,CAAC;QAEF,IAAI,MAA4B,CAAC;QAEjC,iDAAiD;QACjD,IAAI,sBAAsB,KAAK,SAAS,EAAE;YACtC,MAAM,GAAG,QAAQ,CAAC;SACrB;aAAM;YACH,MAAM,SAAS,GAAyB,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;YAE9G,IAAI,QAAQ,CAAC,IAAI,KAAK,eAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,KAAK,eAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;gBAC/E,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;aAC9B;iBAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE;gBAC7B,MAAM,GAAG,QAAQ,CAAC;aACrB;iBAAM;gBACH,MAAM,GAAG,oBAAS,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;aACpF;SACJ;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,MAAM,CAAC,EAAE,cAAU,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEvE,OAAO,MAAM,CAAC;;CACjB;AA5CD,kFA4CC"}
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeParameter.js
CHANGED
|
@@ -14,18 +14,19 @@ 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 trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
|
|
17
18
|
const __1 = require("../../..");
|
|
18
19
|
const common_1 = require("./common");
|
|
19
20
|
function inspectTypeParameter(state, xorNode, correlationId) {
|
|
20
21
|
var _a;
|
|
21
22
|
return __awaiter(this, void 0, void 0, function* () {
|
|
22
|
-
const trace = state.traceManager.entry(
|
|
23
|
+
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectType, inspectTypeParameter.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
|
|
23
24
|
(_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
|
|
24
|
-
parser_1.XorNodeUtils.assertIsNodeKind(xorNode,
|
|
25
|
-
const optionalConstant = parser_1.NodeIdMapUtils.nthChildAstChecked(state.nodeIdMapCollection, xorNode.node.id, 0,
|
|
25
|
+
parser_1.XorNodeUtils.assertIsNodeKind(xorNode, language_1.Ast.NodeKind.Parameter);
|
|
26
|
+
const optionalConstant = parser_1.NodeIdMapUtils.nthChildAstChecked(state.nodeIdMapCollection, xorNode.node.id, 0, language_1.Ast.NodeKind.Constant);
|
|
26
27
|
const parameterType = language_1.TypeUtils.assertAsTPrimitiveType(yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 2, trace.id));
|
|
27
28
|
const result = Object.assign(Object.assign({}, parameterType), { isNullable: optionalConstant !== undefined || parameterType.isNullable });
|
|
28
|
-
trace.exit({ [
|
|
29
|
+
trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(result) });
|
|
29
30
|
return result;
|
|
30
31
|
});
|
|
31
32
|
}
|
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;
|
|
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;AACnH,2FAAuG;AAEvG,gCAA+D;AAC/D,qCAAgF;AAEhF,SAAsB,oBAAoB,CACtC,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,WAAW,EACnC,oBAAoB,CAAC,IAAI,EACzB,aAAa,EACb,cAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CACrC,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAC5C,qBAAY,CAAC,gBAAgB,CAAiB,OAAO,EAAE,cAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAE/E,MAAM,gBAAgB,GAA8B,uBAAc,CAAC,kBAAkB,CACjF,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,EACD,cAAG,CAAC,QAAQ,CAAC,QAAQ,CACxB,CAAC;QAEF,MAAM,aAAa,GAAqC,oBAAS,CAAC,sBAAsB,CACpF,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CACxE,CAAC;QAEF,MAAM,MAAM,mCACL,aAAa,KAChB,UAAU,EAAE,gBAAgB,KAAK,SAAS,IAAI,aAAa,CAAC,UAAU,GACzE,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,MAAM,CAAC,EAAE,cAAU,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEvE,OAAO,MAAM,CAAC;;CACjB;AAlCD,oDAkCC"}
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypePrimitiveType.js
CHANGED
|
@@ -4,13 +4,14 @@
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.inspectTypePrimitiveType = void 0;
|
|
6
6
|
const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
|
|
7
|
+
const trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
|
|
7
8
|
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
8
9
|
const __1 = require("../../..");
|
|
9
10
|
function inspectTypePrimitiveType(state, xorNode, correlationId) {
|
|
10
|
-
const trace = state.traceManager.entry(
|
|
11
|
-
parser_1.XorNodeUtils.assertIsNodeKind(xorNode,
|
|
11
|
+
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectType, inspectTypePrimitiveType.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
|
|
12
|
+
parser_1.XorNodeUtils.assertIsNodeKind(xorNode, language_1.Ast.NodeKind.PrimitiveType);
|
|
12
13
|
if (parser_1.XorNodeUtils.isContext(xorNode)) {
|
|
13
|
-
trace.exit({ [
|
|
14
|
+
trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(language_1.Type.UnknownInstance) });
|
|
14
15
|
return language_1.Type.UnknownInstance;
|
|
15
16
|
}
|
|
16
17
|
const kind = language_1.TypeUtils.typeKindFromPrimitiveTypeConstantKind(xorNode.node.primitiveTypeKind);
|
|
@@ -19,7 +20,7 @@ function inspectTypePrimitiveType(state, xorNode, correlationId) {
|
|
|
19
20
|
extendedKind: undefined,
|
|
20
21
|
isNullable: false,
|
|
21
22
|
};
|
|
22
|
-
trace.exit({ [
|
|
23
|
+
trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(result) });
|
|
23
24
|
return result;
|
|
24
25
|
}
|
|
25
26
|
exports.inspectTypePrimitiveType = inspectTypePrimitiveType;
|
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;
|
|
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;AACnG,2FAAuG;AACvG,sFAAmG;AAEnG,gCAA+D;AAG/D,SAAgB,wBAAwB,CACpC,KAAuB,EACvB,OAAiB,EACjB,aAAiC;IAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,WAAW,EACnC,wBAAwB,CAAC,IAAI,EAC7B,aAAa,EACb,cAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CACrC,CAAC;IAEF,qBAAY,CAAC,gBAAgB,CAAoB,OAAO,EAAE,cAAG,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IAEtF,IAAI,qBAAY,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;QACjC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,MAAM,CAAC,EAAE,cAAU,CAAC,WAAW,CAAC,eAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;QAErF,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,YAAY,EAAE,SAAS;QACvB,UAAU,EAAE,KAAK;KACpB,CAAC;IAEF,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,MAAM,CAAC,EAAE,cAAU,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAEvE,OAAO,MAAM,CAAC;AAClB,CAAC;AA/BD,4DA+BC"}
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.js
CHANGED
|
@@ -13,25 +13,27 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
13
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
14
|
exports.inspectTypeRangeExpression = void 0;
|
|
15
15
|
const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
|
|
16
|
+
const trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
|
|
16
17
|
const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
|
|
17
18
|
const __1 = require("../../..");
|
|
18
19
|
const common_1 = require("./common");
|
|
19
20
|
const powerquery_parser_1 = require("@microsoft/powerquery-parser");
|
|
21
|
+
const inspectionSettings_1 = require("../../../inspectionSettings");
|
|
20
22
|
function inspectTypeRangeExpression(state, xorNode, correlationId) {
|
|
21
23
|
var _a;
|
|
22
24
|
return __awaiter(this, void 0, void 0, function* () {
|
|
23
|
-
const trace = state.traceManager.entry(
|
|
25
|
+
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectType, inspectTypeRangeExpression.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
|
|
24
26
|
(_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
|
|
25
|
-
parser_1.XorNodeUtils.assertIsNodeKind(xorNode,
|
|
27
|
+
parser_1.XorNodeUtils.assertIsNodeKind(xorNode, language_1.Ast.NodeKind.RangeExpression);
|
|
26
28
|
let result;
|
|
27
29
|
switch (state.typeStrategy) {
|
|
28
|
-
case
|
|
30
|
+
case inspectionSettings_1.TypeStrategy.Extended: {
|
|
29
31
|
const leftType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 0, trace.id);
|
|
30
32
|
const rightType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 2, trace.id);
|
|
31
33
|
if (leftType === undefined || rightType === undefined) {
|
|
32
34
|
result = language_1.Type.UnknownInstance;
|
|
33
35
|
}
|
|
34
|
-
else if (leftType.kind ===
|
|
36
|
+
else if (leftType.kind === language_1.Type.TypeKind.Number && rightType.kind === language_1.Type.TypeKind.Number) {
|
|
35
37
|
// TODO: handle isNullable better
|
|
36
38
|
if (leftType.isNullable === true || rightType.isNullable === true) {
|
|
37
39
|
result = language_1.Type.NoneInstance;
|
|
@@ -40,10 +42,10 @@ function inspectTypeRangeExpression(state, xorNode, correlationId) {
|
|
|
40
42
|
result = language_1.Type.ListInstance;
|
|
41
43
|
}
|
|
42
44
|
}
|
|
43
|
-
else if (leftType.kind ===
|
|
45
|
+
else if (leftType.kind === language_1.Type.TypeKind.None || rightType.kind === language_1.Type.TypeKind.None) {
|
|
44
46
|
result = language_1.Type.NoneInstance;
|
|
45
47
|
}
|
|
46
|
-
else if (leftType.kind ===
|
|
48
|
+
else if (leftType.kind === language_1.Type.TypeKind.Unknown || rightType.kind === language_1.Type.TypeKind.Unknown) {
|
|
47
49
|
result = language_1.Type.UnknownInstance;
|
|
48
50
|
}
|
|
49
51
|
else {
|
|
@@ -51,13 +53,13 @@ function inspectTypeRangeExpression(state, xorNode, correlationId) {
|
|
|
51
53
|
}
|
|
52
54
|
break;
|
|
53
55
|
}
|
|
54
|
-
case
|
|
56
|
+
case inspectionSettings_1.TypeStrategy.Primitive:
|
|
55
57
|
result = language_1.Type.ListInstance;
|
|
56
58
|
break;
|
|
57
59
|
default:
|
|
58
60
|
powerquery_parser_1.Assert.isNever(state.typeStrategy);
|
|
59
61
|
}
|
|
60
|
-
trace.exit({ [
|
|
62
|
+
trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(result) });
|
|
61
63
|
return result;
|
|
62
64
|
});
|
|
63
65
|
}
|
|
@@ -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,0FAAwF;
|
|
1
|
+
{"version":3,"file":"inspectTypeRangeExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeRangeExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AACxF,2FAAuG;AACvG,sFAAmG;AAEnG,gCAA+D;AAC/D,qCAAgF;AAChF,oEAAsD;AACtD,oEAA2D;AAE3D,SAAsB,0BAA0B,CAC5C,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,WAAW,EACnC,0BAA0B,CAAC,IAAI,EAC/B,aAAa,EACb,cAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CACrC,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAC5C,qBAAY,CAAC,gBAAgB,CAAsB,OAAO,EAAE,cAAG,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;QAE1F,IAAI,MAA4C,CAAC;QAEjD,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,KAAK,iCAAY,CAAC,QAAQ,CAAC,CAAC;gBACxB,MAAM,QAAQ,GAAqC,MAAM,IAAA,2CAAkC,EACvF,KAAK,EACL,OAAO,EACP,CAAC,EACD,KAAK,CAAC,EAAE,CACX,CAAC;gBAEF,MAAM,SAAS,GAAqC,MAAM,IAAA,2CAAkC,EACxF,KAAK,EACL,OAAO,EACP,CAAC,EACD,KAAK,CAAC,EAAE,CACX,CAAC;gBAEF,IAAI,QAAQ,KAAK,SAAS,IAAI,SAAS,KAAK,SAAS,EAAE;oBACnD,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;iBACjC;qBAAM,IAAI,QAAQ,CAAC,IAAI,KAAK,eAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,SAAS,CAAC,IAAI,KAAK,eAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;oBAC1F,iCAAiC;oBACjC,IAAI,QAAQ,CAAC,UAAU,KAAK,IAAI,IAAI,SAAS,CAAC,UAAU,KAAK,IAAI,EAAE;wBAC/D,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;qBAC9B;yBAAM;wBACH,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;qBAC9B;iBACJ;qBAAM,IAAI,QAAQ,CAAC,IAAI,KAAK,eAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,KAAK,eAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;oBACtF,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;iBAC9B;qBAAM,IAAI,QAAQ,CAAC,IAAI,KAAK,eAAI,CAAC,QAAQ,CAAC,OAAO,IAAI,SAAS,CAAC,IAAI,KAAK,eAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;oBAC5F,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;iBACjC;qBAAM;oBACH,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;iBAC9B;gBAED,MAAM;aACT;YAED,KAAK,iCAAY,CAAC,SAAS;gBACvB,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;gBAC3B,MAAM;YAEV;gBACI,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAC1C;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,MAAM,CAAC,EAAE,cAAU,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEvE,OAAO,MAAM,CAAC;;CACjB;AAhED,gEAgEC"}
|
|
@@ -13,19 +13,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
13
13
|
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
|
+
const trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
|
|
16
17
|
const powerquery_parser_1 = require("@microsoft/powerquery-parser");
|
|
17
18
|
const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
|
|
18
19
|
const __1 = require("../../..");
|
|
19
20
|
const common_1 = require("./common");
|
|
21
|
+
const inspectionSettings_1 = require("../../../inspectionSettings");
|
|
20
22
|
function inspectTypeRecord(state, xorNode, correlationId) {
|
|
21
23
|
var _a;
|
|
22
24
|
return __awaiter(this, void 0, void 0, function* () {
|
|
23
|
-
const trace = state.traceManager.entry(
|
|
25
|
+
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectType, inspectTypeRecord.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
|
|
24
26
|
(_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
|
|
25
27
|
parser_1.XorNodeUtils.assertIsRecord(xorNode);
|
|
26
28
|
let result;
|
|
27
29
|
switch (state.typeStrategy) {
|
|
28
|
-
case
|
|
30
|
+
case inspectionSettings_1.TypeStrategy.Extended: {
|
|
29
31
|
const fields = new Map();
|
|
30
32
|
for (const keyValuePair of parser_1.NodeIdMapIterator.iterRecord(state.nodeIdMapCollection, xorNode)) {
|
|
31
33
|
if (keyValuePair.value) {
|
|
@@ -38,21 +40,21 @@ function inspectTypeRecord(state, xorNode, correlationId) {
|
|
|
38
40
|
}
|
|
39
41
|
}
|
|
40
42
|
result = {
|
|
41
|
-
kind:
|
|
42
|
-
extendedKind:
|
|
43
|
+
kind: language_1.Type.TypeKind.Record,
|
|
44
|
+
extendedKind: language_1.Type.ExtendedTypeKind.DefinedRecord,
|
|
43
45
|
isNullable: false,
|
|
44
46
|
fields,
|
|
45
47
|
isOpen: false,
|
|
46
48
|
};
|
|
47
49
|
break;
|
|
48
50
|
}
|
|
49
|
-
case
|
|
51
|
+
case inspectionSettings_1.TypeStrategy.Primitive:
|
|
50
52
|
result = language_1.Type.RecordInstance;
|
|
51
53
|
break;
|
|
52
54
|
default:
|
|
53
55
|
throw powerquery_parser_1.Assert.isNever(state.typeStrategy);
|
|
54
56
|
}
|
|
55
|
-
trace.exit({ [
|
|
57
|
+
trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(result) });
|
|
56
58
|
return result;
|
|
57
59
|
});
|
|
58
60
|
}
|
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;AACtH,2FAAuG;AACvG,oEAAsD;AACtD,0FAAmF;AAEnF,gCAA+D;AAC/D,qCAAwD;AACxD,oEAA2D;AAE3D,SAAsB,iBAAiB,CACnC,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,WAAW,EACnC,iBAAiB,CAAC,IAAI,EACtB,aAAa,EACb,cAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CACrC,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAC5C,qBAAY,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACrC,IAAI,MAAwC,CAAC;QAE7C,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,KAAK,iCAAY,CAAC,QAAQ,CAAC,CAAC;gBACxB,MAAM,MAAM,GAAsC,IAAI,GAAG,EAAE,CAAC;gBAE5D,KAAK,MAAM,YAAY,IAAI,0BAAiB,CAAC,UAAU,CAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,EAAE;oBACzF,IAAI,YAAY,CAAC,KAAK,EAAE;wBACpB,MAAM,CAAC,GAAG,CACN,YAAY,CAAC,oBAAoB;wBACjC,4CAA4C;wBAC5C,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,CACxD,CAAC;qBACL;yBAAM;wBACH,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,EAAE,eAAI,CAAC,eAAe,CAAC,CAAC;qBAC7D;iBACJ;gBAED,MAAM,GAAG;oBACL,IAAI,EAAE,eAAI,CAAC,QAAQ,CAAC,MAAM;oBAC1B,YAAY,EAAE,eAAI,CAAC,gBAAgB,CAAC,aAAa;oBACjD,UAAU,EAAE,KAAK;oBACjB,MAAM;oBACN,MAAM,EAAE,KAAK;iBAChB,CAAC;gBAEF,MAAM;aACT;YAED,KAAK,iCAAY,CAAC,SAAS;gBACvB,MAAM,GAAG,eAAI,CAAC,cAAc,CAAC;gBAC7B,MAAM;YAEV;gBACI,MAAM,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAChD;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,MAAM,CAAC,EAAE,cAAU,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEvE,OAAO,MAAM,CAAC;;CACjB;AAtDD,8CAsDC"}
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeRecordType.js
CHANGED
|
@@ -14,34 +14,36 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
14
14
|
exports.inspectTypeRecordType = 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 trace_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/common/trace");
|
|
17
18
|
const powerquery_parser_1 = require("@microsoft/powerquery-parser");
|
|
18
19
|
const __1 = require("../../..");
|
|
19
20
|
const examineFieldSpecificationList_1 = require("./examineFieldSpecificationList");
|
|
21
|
+
const inspectionSettings_1 = require("../../../inspectionSettings");
|
|
20
22
|
function inspectTypeRecordType(state, xorNode, correlationId) {
|
|
21
23
|
var _a;
|
|
22
24
|
return __awaiter(this, void 0, void 0, function* () {
|
|
23
|
-
const trace = state.traceManager.entry(
|
|
25
|
+
const trace = state.traceManager.entry(__1.InspectionTraceConstant.InspectType, inspectTypeRecordType.name, correlationId, __1.TraceUtils.xorNodeDetails(xorNode));
|
|
24
26
|
(_a = state.cancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
|
|
25
|
-
parser_1.XorNodeUtils.assertIsNodeKind(xorNode,
|
|
27
|
+
parser_1.XorNodeUtils.assertIsNodeKind(xorNode, language_1.Ast.NodeKind.RecordType);
|
|
26
28
|
let result;
|
|
27
29
|
switch (state.typeStrategy) {
|
|
28
|
-
case
|
|
29
|
-
const fields = parser_1.NodeIdMapUtils.nthChildXorChecked(state.nodeIdMapCollection, xorNode.node.id, 0,
|
|
30
|
+
case inspectionSettings_1.TypeStrategy.Extended: {
|
|
31
|
+
const fields = parser_1.NodeIdMapUtils.nthChildXorChecked(state.nodeIdMapCollection, xorNode.node.id, 0, language_1.Ast.NodeKind.FieldSpecificationList);
|
|
30
32
|
if (fields === undefined) {
|
|
31
33
|
result = language_1.Type.UnknownInstance;
|
|
32
34
|
}
|
|
33
35
|
else {
|
|
34
|
-
result = Object.assign({ kind:
|
|
36
|
+
result = Object.assign({ kind: language_1.Type.TypeKind.Type, extendedKind: language_1.Type.ExtendedTypeKind.RecordType, isNullable: false }, (yield (0, examineFieldSpecificationList_1.examineFieldSpecificationList)(state, fields, trace.id)));
|
|
35
37
|
}
|
|
36
38
|
break;
|
|
37
39
|
}
|
|
38
|
-
case
|
|
40
|
+
case inspectionSettings_1.TypeStrategy.Primitive:
|
|
39
41
|
result = language_1.Type.TypePrimitiveInstance;
|
|
40
42
|
break;
|
|
41
43
|
default:
|
|
42
44
|
powerquery_parser_1.Assert.isNever(state.typeStrategy);
|
|
43
45
|
}
|
|
44
|
-
trace.exit({ [
|
|
46
|
+
trace.exit({ [trace_1.TraceConstant.Result]: __1.TraceUtils.typeDetails(result) });
|
|
45
47
|
return result;
|
|
46
48
|
});
|
|
47
49
|
}
|
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;
|
|
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;AACnH,2FAAuG;AACvG,oEAAsD;AAEtD,gCAA+D;AAC/D,mFAAgF;AAEhF,oEAA2D;AAE3D,SAAsB,qBAAqB,CACvC,KAAuB,EACvB,OAAiB,EACjB,aAAiC;;;QAEjC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,CACzC,2BAAuB,CAAC,WAAW,EACnC,qBAAqB,CAAC,IAAI,EAC1B,aAAa,EACb,cAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CACrC,CAAC;QAEF,MAAA,KAAK,CAAC,iBAAiB,0CAAE,gBAAgB,EAAE,CAAC;QAC5C,qBAAY,CAAC,gBAAgB,CAAiB,OAAO,EAAE,cAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAEhF,IAAI,MAAkD,CAAC;QAEvD,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,KAAK,iCAAY,CAAC,QAAQ,CAAC,CAAC;gBACxB,MAAM,MAAM,GAAyB,uBAAc,CAAC,kBAAkB,CAClE,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,EACD,cAAG,CAAC,QAAQ,CAAC,sBAAsB,CACtC,CAAC;gBAEF,IAAI,MAAM,KAAK,SAAS,EAAE;oBACtB,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;iBACjC;qBAAM;oBACH,MAAM,mBACF,IAAI,EAAE,eAAI,CAAC,QAAQ,CAAC,IAAI,EACxB,YAAY,EAAE,eAAI,CAAC,gBAAgB,CAAC,UAAU,EAC9C,UAAU,EAAE,KAAK,IACd,CAAC,MAAM,IAAA,6DAA6B,EAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,CACpE,CAAC;iBACL;gBAED,MAAM;aACT;YAED,KAAK,iCAAY,CAAC,SAAS;gBACvB,MAAM,GAAG,eAAI,CAAC,qBAAqB,CAAC;gBACpC,MAAM;YAEV;gBACI,0BAAM,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAC1C;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,qBAAa,CAAC,MAAM,CAAC,EAAE,cAAU,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAEvE,OAAO,MAAM,CAAC;;CACjB;AAnDD,sDAmDC"}
|