@microsoft/powerquery-language-services 0.3.18 → 0.3.20
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 +29 -11
- package/lib/powerquery-language-services/analysis/analysisBase.js.map +1 -1
- package/lib/powerquery-language-services/analysis/analysisSettings.d.ts +3 -0
- package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.js +1 -1
- package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.js +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.js +3 -3
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeNullCoalescingExpression.js +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeNullCoalescingExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTBinOpExpression.js +1 -1
- package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeTBinOpExpression.js.map +1 -1
- package/lib/powerquery-language-services/inspectionUtils.d.ts +3 -2
- package/lib/powerquery-language-services/inspectionUtils.js +11 -3
- package/lib/powerquery-language-services/inspectionUtils.js.map +1 -1
- package/lib/powerquery-language-services/providers/commonTypes.d.ts +3 -0
- package/lib/powerquery-language-services/providers/languageCompletionItemProvider.d.ts +1 -1
- package/lib/powerquery-language-services/providers/languageCompletionItemProvider.js +6 -2
- package/lib/powerquery-language-services/providers/languageCompletionItemProvider.js.map +1 -1
- package/lib/powerquery-language-services/providers/librarySymbolProvider.js +16 -3
- package/lib/powerquery-language-services/providers/librarySymbolProvider.js.map +1 -1
- package/lib/powerquery-language-services/providers/localDocumentSymbolProvider.d.ts +2 -2
- package/lib/powerquery-language-services/providers/localDocumentSymbolProvider.js +33 -9
- package/lib/powerquery-language-services/providers/localDocumentSymbolProvider.js.map +1 -1
- package/lib/powerquery-language-services/trace.d.ts +8 -1
- package/package.json +3 -3
|
@@ -40,14 +40,14 @@ class AnalysisBase {
|
|
|
40
40
|
}
|
|
41
41
|
getAutocompleteItems() {
|
|
42
42
|
return __awaiter(this, void 0, void 0, function* () {
|
|
43
|
-
|
|
43
|
+
const trace = this.analysisSettings.traceManager.entry("AnalysisBase" /* AnalysisBase */, this.getAutocompleteItems.name, this.analysisSettings.maybeInitialCorrelationId);
|
|
44
|
+
let context = {
|
|
45
|
+
traceManager: this.analysisSettings.traceManager,
|
|
46
|
+
maybeInitialCorrelationId: trace.id,
|
|
47
|
+
};
|
|
44
48
|
const maybeToken = yield this.getMaybePositionIdentifier();
|
|
45
49
|
if (maybeToken !== undefined) {
|
|
46
|
-
context = {
|
|
47
|
-
range: __1.CommonTypesUtils.rangeFromTokenRange(maybeToken.tokenRange),
|
|
48
|
-
text: maybeToken.literal,
|
|
49
|
-
tokenKind: maybeToken.kind,
|
|
50
|
-
};
|
|
50
|
+
context = Object.assign(Object.assign({}, context), { range: __1.CommonTypesUtils.rangeFromTokenRange(maybeToken.tokenRange), text: maybeToken.literal, tokenKind: maybeToken.kind });
|
|
51
51
|
}
|
|
52
52
|
// TODO: intellisense improvements
|
|
53
53
|
// - honor expected data type
|
|
@@ -61,52 +61,68 @@ class AnalysisBase {
|
|
|
61
61
|
}
|
|
62
62
|
}
|
|
63
63
|
}
|
|
64
|
-
|
|
64
|
+
const result = partial.sort(inspection_1.AutocompleteItemUtils.compareFn);
|
|
65
|
+
trace.exit();
|
|
66
|
+
return result;
|
|
65
67
|
});
|
|
66
68
|
}
|
|
67
69
|
getHover() {
|
|
68
70
|
return __awaiter(this, void 0, void 0, function* () {
|
|
71
|
+
const trace = this.analysisSettings.traceManager.entry("AnalysisBase" /* AnalysisBase */, this.getHover.name, this.analysisSettings.maybeInitialCorrelationId);
|
|
69
72
|
const maybeActiveNode = yield this.getMaybeActiveNode();
|
|
70
73
|
const maybeIdentifierUnderPosition = maybeActiveNode === null || maybeActiveNode === void 0 ? void 0 : maybeActiveNode.maybeExclusiveIdentifierUnderPosition;
|
|
71
74
|
if (maybeActiveNode === undefined ||
|
|
72
75
|
maybeIdentifierUnderPosition === undefined ||
|
|
73
76
|
!AnalysisBase.isValidHoverIdentifier(maybeActiveNode)) {
|
|
77
|
+
trace.exit();
|
|
74
78
|
return commonTypes_1.EmptyHover;
|
|
75
79
|
}
|
|
76
80
|
const identifier = maybeIdentifierUnderPosition;
|
|
77
81
|
const context = {
|
|
82
|
+
traceManager: this.analysisSettings.traceManager,
|
|
78
83
|
range: __1.CommonTypesUtils.rangeFromTokenRange(identifier.tokenRange),
|
|
79
84
|
identifier: identifier.literal,
|
|
85
|
+
maybeInitialCorrelationId: trace.id,
|
|
80
86
|
};
|
|
81
87
|
// Result priority is based on the order of the symbol providers
|
|
82
|
-
|
|
88
|
+
const result = AnalysisBase.resolveProviders(AnalysisBase.createHoverCalls(context, [this.localDocumentSymbolProvider, this.librarySymbolProvider], this.analysisSettings.symbolProviderTimeoutInMS), commonTypes_1.EmptyHover);
|
|
89
|
+
trace.exit();
|
|
90
|
+
return result;
|
|
83
91
|
});
|
|
84
92
|
}
|
|
85
93
|
getSignatureHelp() {
|
|
86
94
|
return __awaiter(this, void 0, void 0, function* () {
|
|
95
|
+
const trace = this.analysisSettings.traceManager.entry("AnalysisBase" /* AnalysisBase */, this.getSignatureHelp.name, this.analysisSettings.maybeInitialCorrelationId);
|
|
87
96
|
const maybeInspected = yield this.promiseMaybeInspected;
|
|
88
97
|
if (maybeInspected === undefined) {
|
|
98
|
+
trace.exit();
|
|
89
99
|
return commonTypes_1.EmptySignatureHelp;
|
|
90
100
|
}
|
|
91
|
-
const maybeContext = yield InspectionUtils.getMaybeContextForSignatureProvider(maybeInspected);
|
|
101
|
+
const maybeContext = yield InspectionUtils.getMaybeContextForSignatureProvider(maybeInspected, this.analysisSettings.traceManager, trace.id);
|
|
92
102
|
if (maybeContext === undefined) {
|
|
103
|
+
trace.exit();
|
|
93
104
|
return commonTypes_1.EmptySignatureHelp;
|
|
94
105
|
}
|
|
95
106
|
const context = maybeContext;
|
|
96
107
|
if (context.functionName === undefined) {
|
|
108
|
+
trace.exit();
|
|
97
109
|
return commonTypes_1.EmptySignatureHelp;
|
|
98
110
|
}
|
|
99
111
|
// Result priority is based on the order of the symbol providers
|
|
100
|
-
|
|
112
|
+
const result = AnalysisBase.resolveProviders(AnalysisBase.createSignatureHelpCalls(context, [this.localDocumentSymbolProvider, this.librarySymbolProvider], this.analysisSettings.symbolProviderTimeoutInMS), commonTypes_1.EmptySignatureHelp);
|
|
113
|
+
trace.exit();
|
|
114
|
+
return result;
|
|
101
115
|
});
|
|
102
116
|
}
|
|
103
117
|
getRenameEdits(newName) {
|
|
104
118
|
return __awaiter(this, void 0, void 0, function* () {
|
|
119
|
+
const trace = this.analysisSettings.traceManager.entry("AnalysisBase" /* AnalysisBase */, this.getRenameEdits.name, this.analysisSettings.maybeInitialCorrelationId);
|
|
105
120
|
const maybeInspected = yield this.promiseMaybeInspected;
|
|
106
121
|
const activeNode = yield this.getMaybeActiveNode();
|
|
107
122
|
const scopeById = maybeInspected === null || maybeInspected === void 0 ? void 0 : maybeInspected.typeCache.scopeById;
|
|
108
123
|
const maybeInclusiveIdentifierUnderPosition = activeNode === null || activeNode === void 0 ? void 0 : activeNode.maybeInclusiveIdentifierUnderPosition;
|
|
109
124
|
if (maybeInspected === undefined || maybeInclusiveIdentifierUnderPosition === undefined) {
|
|
125
|
+
trace.exit();
|
|
110
126
|
return [];
|
|
111
127
|
}
|
|
112
128
|
const identifiersToBeEdited = [];
|
|
@@ -167,10 +183,12 @@ class AnalysisBase {
|
|
|
167
183
|
if (identifiersToBeEdited.length === 0 && maybeInclusiveIdentifierUnderPosition) {
|
|
168
184
|
identifiersToBeEdited.push(maybeInclusiveIdentifierUnderPosition);
|
|
169
185
|
}
|
|
170
|
-
|
|
186
|
+
const result = identifiersToBeEdited.map((one) => ({
|
|
171
187
|
range: PositionUtils.createRangeFromTokenRange(one.tokenRange),
|
|
172
188
|
newText: newName,
|
|
173
189
|
}));
|
|
190
|
+
trace.exit();
|
|
191
|
+
return result;
|
|
174
192
|
});
|
|
175
193
|
}
|
|
176
194
|
static promiseWithTimeout(valueFn, timeoutReturnValue, timeoutInMS) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analysisBase.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/analysis/analysisBase.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAGlC,oEAAsD;
|
|
1
|
+
{"version":3,"file":"analysisBase.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/analysis/analysisBase.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { TraceManager } from "@microsoft/powerquery-parser/lib/powerquery-parser/common/trace";
|
|
1
2
|
import { AutocompleteItemProvider, ISymbolProvider } from "../providers/commonTypes";
|
|
2
3
|
import { Inspection } from "..";
|
|
3
4
|
import { InspectionSettings } from "../inspectionSettings";
|
|
@@ -9,5 +10,7 @@ export interface AnalysisSettings {
|
|
|
9
10
|
readonly maybeCreateLanguageAutocompleteItemProviderFn?: () => AutocompleteItemProvider;
|
|
10
11
|
readonly maybeCreateLibrarySymbolProviderFn?: (library: Library.ILibrary) => ISymbolProvider;
|
|
11
12
|
readonly maybeCreateLocalDocumentSymbolProviderFn?: (library: Library.ILibrary, promiseMaybeInspected: Promise<Inspection.Inspected | undefined>, createInspectionSettingsFn: () => InspectionSettings) => ISymbolProvider;
|
|
13
|
+
readonly maybeInitialCorrelationId: number | undefined;
|
|
12
14
|
readonly symbolProviderTimeoutInMS?: number;
|
|
15
|
+
readonly traceManager: TraceManager;
|
|
13
16
|
}
|
|
@@ -57,7 +57,7 @@ function inspectInvokeExpression(settings, nodeIdMapCollection, invokeExpression
|
|
|
57
57
|
givenArgumentTypes,
|
|
58
58
|
numMaxExpectedArguments,
|
|
59
59
|
numMinExpectedArguments,
|
|
60
|
-
typeChecked: language_1.TypeUtils.typeCheckInvocation(givenArgumentTypes, functionType),
|
|
60
|
+
typeChecked: language_1.TypeUtils.typeCheckInvocation(givenArgumentTypes, functionType, settings.traceManager, trace.id),
|
|
61
61
|
};
|
|
62
62
|
}
|
|
63
63
|
const result = {
|
package/lib/powerquery-language-services/inspection/invokeExpression/invokeExpression.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invokeExpression.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/invokeExpression/invokeExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AACpD,oEAAmE;AACnE,sFAMmE;AAEnE,0FAA8F;AAE9F,oCAA4F;AAE5F,kCAA6C;AAC7C,4CAAyD;AASzD,SAAgB,mBAAmB,CAC/B,QAA4B,EAC5B,mBAAyC,EACzC,kBAA0B;AAC1B,oGAAoG;AACpG,4DAA4D;AAC5D,YAAuB,0BAAc,CAAC,gBAAgB,EAAE;IAExD,MAAM,KAAK,GAAU,QAAQ,CAAC,YAAY,CAAC,KAAK,8DAE5C,mBAAmB,CAAC,IAAI,EACxB,QAAQ,CAAC,yBAAyB,CACrC,CAAC;IAEF,MAAM,eAAe,mCACd,QAAQ,KACX,yBAAyB,EAAE,KAAK,CAAC,EAAE,GACtC,CAAC;IAEF,MAAM,MAAM,GAAmC,+BAAW,CAAC,iBAAiB,CACxE,GAAG,EAAE,CAAC,uBAAuB,CAAC,eAAe,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,EAC5G,QAAQ,CAAC,MAAM,CAClB,CAAC;IAEF,OAAO,MAAM,CAAC;AAClB,CAAC;AAzBD,kDAyBC;AAED,SAAe,uBAAuB,CAClC,QAA4B,EAC5B,mBAAyC,EACzC,kBAA0B,EAC1B,SAAoB,EACpB,aAAqB;;;QAErB,MAAM,KAAK,GAAU,QAAQ,CAAC,YAAY,CAAC,KAAK,8DAE5C,uBAAuB,CAAC,IAAI,EAC5B,aAAa,CAChB,CAAC;QAEF,MAAA,QAAQ,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QAEpD,MAAM,4BAA4B,GAAyB,uBAAc,CAAC,QAAQ,CAC9E,mBAAmB,EACnB,kBAAkB,CACrB,CAAC;QAEF,IAAI,4BAA4B,KAAK,SAAS,EAAE;YAC5C,KAAK,CAAC,IAAI,CAAC,EAAE,+BAA0B,EAAE,IAAI,EAAE,CAAC,CAAC;YAEjD,MAAM,IAAI,GAAG,CAAC,WAAW,CAAC,cAAc,CAAC,kEAAkE,EAAE;gBACzG,kBAAkB;aACrB,CAAC,CAAC;SACN;QAED,MAAM,uBAAuB,GAAa,4BAA4B,CAAC;QAEvE,qBAAY,CAAC,wBAAwB,CAAC,uBAAuB,CAAC,CAAC;QAE/D,MAAM,YAAY,GAAa,uBAAc,CAAC,2CAA2C,CACrF,mBAAmB,EACnB,kBAAkB,CACrB,CAAC;QAEF,MAAM,YAAY,GAAyB,0BAAM,CAAC,OAAO,CACrD,MAAM,IAAA,cAAO,EAAC,QAAQ,EAAE,mBAAmB,EAAE,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,CAAC,CAChF,CAAC;QAEF,MAAM,SAAS,GAAuB,uBAAc,CAAC,sCAAsC,CACvF,mBAAmB,EACnB,kBAAkB,CACrB,CAAC;QAEF,IAAI,yBAAgE,CAAC;QAErE,IAAI,oBAAS,CAAC,iBAAiB,CAAC,YAAY,CAAC,EAAE;YAC3C,MAAM,iBAAiB,GAA4B,0BAAiB,CAAC,oBAAoB,CACrF,mBAAmB,EACnB,uBAAuB,CAC1B,CAAC;YAEF,MAAM,kBAAkB,GAAwC,MAAM,gBAAgB,CAClF,QAAQ,EACR,mBAAmB,EACnB,SAAS,EACT,iBAAiB,CACpB,CAAC;YAEF,MAAM,cAAc,GAA4B,iBAAiB,CAAC,KAAK,CAAC,CAAC,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC;YAEtG,MAAM,CAAC,uBAAuB,EAAE,uBAAuB,CAAC,GACpD,uBAAuB,CAAC,YAAY,CAAC,CAAC;YAE1C,yBAAyB,GAAG;gBACxB,cAAc;gBACd,kBAAkB;gBAClB,uBAAuB;gBACvB,uBAAuB;gBACvB,WAAW,EAAE,oBAAS,CAAC,mBAAmB,
|
|
1
|
+
{"version":3,"file":"invokeExpression.js","sourceRoot":"","sources":["../../../../src/powerquery-language-services/inspection/invokeExpression/invokeExpression.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,7 @@ function inspectTypeErrorHandlingExpression(state, xorNode, maybeCorrelationId)
|
|
|
28
28
|
maybeOtherwiseExpression !== undefined
|
|
29
29
|
? yield (0, common_1.inspectXor)(state, maybeOtherwiseExpression, trace.id)
|
|
30
30
|
: language_1.TypeUtils.createPrimitiveType(false, "Record" /* Record */),
|
|
31
|
-
]);
|
|
31
|
+
], state.traceManager, trace.id);
|
|
32
32
|
trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
|
|
33
33
|
return result;
|
|
34
34
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectTypeErrorHandlingExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAmG;AACnG,sFAKmE;AAGnE,gCAA+D;AAC/D,qCAA4F;AAE5F,SAAsB,kCAAkC,CACpD,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,kCAAkC,CAAC,IAAI,EACvC,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAA8B,OAAO,0DAAuC,CAAC;QAE1G,MAAM,wBAAwB,GAC1B,uBAAc,CAAC,oBAAoB,CAC/B,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,kDAEJ,CAAC;QAEN,MAAM,MAAM,GAAyB,oBAAS,CAAC,cAAc,
|
|
1
|
+
{"version":3,"file":"inspectTypeErrorHandlingExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAmG;AACnG,sFAKmE;AAGnE,gCAA+D;AAC/D,qCAA4F;AAE5F,SAAsB,kCAAkC,CACpD,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,kCAAkC,CAAC,IAAI,EACvC,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAA8B,OAAO,0DAAuC,CAAC;QAE1G,MAAM,wBAAwB,GAC1B,uBAAc,CAAC,oBAAoB,CAC/B,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,kDAEJ,CAAC;QAEN,MAAM,MAAM,GAAyB,oBAAS,CAAC,cAAc,CACzD;YACI,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC;YACrE,wBAAwB,KAAK,SAAS;gBAClC,CAAC,CAAC,MAAM,IAAA,mBAAU,EAAC,KAAK,EAAE,wBAAwB,EAAE,KAAK,CAAC,EAAE,CAAC;gBAC7D,CAAC,CAAC,oBAAS,CAAC,mBAAmB,CAAC,KAAK,wBAAuB;SACnE,EACD,KAAK,CAAC,YAAY,EAClB,KAAK,CAAC,EAAE,CACX,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AArCD,gFAqCC"}
|
package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeIfExpression.js
CHANGED
|
@@ -48,12 +48,12 @@ function inspectTypeIfExpression(state, xorNode, maybeCorrelationId) {
|
|
|
48
48
|
});
|
|
49
49
|
}
|
|
50
50
|
exports.inspectTypeIfExpression = inspectTypeIfExpression;
|
|
51
|
-
function createAnyUnion(state, xorNode,
|
|
51
|
+
function createAnyUnion(state, xorNode, correlationId) {
|
|
52
52
|
return __awaiter(this, void 0, void 0, function* () {
|
|
53
|
-
const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, createAnyUnion.name,
|
|
53
|
+
const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, createAnyUnion.name, correlationId, __1.TraceUtils.createXorNodeDetails(xorNode));
|
|
54
54
|
const trueExprType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 3, trace.id);
|
|
55
55
|
const falseExprType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 5, trace.id);
|
|
56
|
-
const result = language_1.TypeUtils.createAnyUnion([trueExprType, falseExprType]);
|
|
56
|
+
const result = language_1.TypeUtils.createAnyUnion([trueExprType, falseExprType], state.traceManager, trace.id);
|
|
57
57
|
trace.exit();
|
|
58
58
|
return result;
|
|
59
59
|
});
|
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;AAEnG,sFAA4G;AAE5G,qCAAgG;AAChG,gCAA+D;AAE/D,SAAsB,uBAAuB,CACzC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,uBAAuB,CAAC,IAAI,EAC5B,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAmB,OAAO,oCAA4B,CAAC;QAEpF,MAAM,aAAa,GAAyB,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAClH,IAAI,MAA4B,CAAC;QAEjC,IAAI,aAAa,CAAC,IAAI,4BAA0B,EAAE;YAC9C,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;QACD,mEAAmE;aAC9D,IAAI,aAAa,CAAC,IAAI,oBAAsB,EAAE;YAC/C,IACI,aAAa,CAAC,iBAAiB,8BAAmC;gBAClE,CAAC,IAAA,uBAAc,EACX,aAAa,EACb,CAAC,IAA0B,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,4BAA0B,IAAI,IAAI,CAAC,IAAI,oBAAsB,CACzG,EACH;gBACE,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;aAC9B;iBAAM;gBACH,MAAM,GAAG,MAAM,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;aAC3D;SACJ;aAAM,IAAI,aAAa,CAAC,IAAI,4BAA0B,EAAE;YACrD,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;SAC9B;aAAM;YACH,MAAM,GAAG,MAAM,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SAC3D;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AA3CD,0DA2CC;AAED,SAAe,cAAc,CACzB,KAAuB,EACvB,OAAkC,EAClC,
|
|
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;AAEnG,sFAA4G;AAE5G,qCAAgG;AAChG,gCAA+D;AAE/D,SAAsB,uBAAuB,CACzC,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,uBAAuB,CAAC,IAAI,EAC5B,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAmB,OAAO,oCAA4B,CAAC;QAEpF,MAAM,aAAa,GAAyB,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAClH,IAAI,MAA4B,CAAC;QAEjC,IAAI,aAAa,CAAC,IAAI,4BAA0B,EAAE;YAC9C,MAAM,GAAG,eAAI,CAAC,eAAe,CAAC;SACjC;QACD,mEAAmE;aAC9D,IAAI,aAAa,CAAC,IAAI,oBAAsB,EAAE;YAC/C,IACI,aAAa,CAAC,iBAAiB,8BAAmC;gBAClE,CAAC,IAAA,uBAAc,EACX,aAAa,EACb,CAAC,IAA0B,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,4BAA0B,IAAI,IAAI,CAAC,IAAI,oBAAsB,CACzG,EACH;gBACE,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;aAC9B;iBAAM;gBACH,MAAM,GAAG,MAAM,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;aAC3D;SACJ;aAAM,IAAI,aAAa,CAAC,IAAI,4BAA0B,EAAE;YACrD,MAAM,GAAG,eAAI,CAAC,YAAY,CAAC;SAC9B;aAAM;YACH,MAAM,GAAG,MAAM,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SAC3D;QAED,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AA3CD,0DA2CC;AAED,SAAe,cAAc,CACzB,KAAuB,EACvB,OAAkC,EAClC,aAAqB;;QAErB,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,cAAc,CAAC,IAAI,EACnB,aAAa,EACb,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAM,YAAY,GAAyB,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QACjH,MAAM,aAAa,GAAyB,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAElH,MAAM,MAAM,GAAyB,oBAAS,CAAC,cAAc,CACzD,CAAC,YAAY,EAAE,aAAa,CAAC,EAC7B,KAAK,CAAC,YAAY,EAClB,KAAK,CAAC,EAAE,CACX,CAAC;QAEF,KAAK,CAAC,IAAI,EAAE,CAAC;QAEb,OAAO,MAAM,CAAC;IAClB,CAAC;CAAA"}
|
|
@@ -35,7 +35,7 @@ function inspectTypeNullCoalescingExpression(state, xorNode, maybeCorrelationId)
|
|
|
35
35
|
result = language_1.Type.NoneInstance;
|
|
36
36
|
}
|
|
37
37
|
else {
|
|
38
|
-
result = language_1.TypeUtils.createAnyUnion([maybeLeftType, maybeRightType]);
|
|
38
|
+
result = language_1.TypeUtils.createAnyUnion([maybeLeftType, maybeRightType], state.traceManager, trace.id);
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
41
|
trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
|
|
@@ -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,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;
|
|
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,EAAE,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;aACpG;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/inspectTypeTBinOpExpression.js
CHANGED
|
@@ -64,7 +64,7 @@ function inspectTypeTBinOpExpression(state, xorNode, maybeCorrelationId) {
|
|
|
64
64
|
isNullable: true,
|
|
65
65
|
});
|
|
66
66
|
}
|
|
67
|
-
result = language_1.TypeUtils.createAnyUnion(unionedTypePairs);
|
|
67
|
+
result = language_1.TypeUtils.createAnyUnion(unionedTypePairs, state.traceManager, trace.id);
|
|
68
68
|
}
|
|
69
69
|
}
|
|
70
70
|
// '1 + 1'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectTypeTBinOpExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeTBinOpExpression.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"inspectTypeTBinOpExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeTBinOpExpression.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,12 +3,13 @@ import { Ast, Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/la
|
|
|
3
3
|
import { DocumentSymbol, SignatureHelp, SymbolKind } from "vscode-languageserver-types";
|
|
4
4
|
import { AutocompleteItemProviderContext, SignatureProviderContext } from "./providers/commonTypes";
|
|
5
5
|
import { Inspection } from ".";
|
|
6
|
+
import { TraceManager } from "@microsoft/powerquery-parser/lib/powerquery-parser/common/trace";
|
|
6
7
|
import { InspectionSettings } from "./inspectionSettings";
|
|
7
8
|
import { Library } from "./library";
|
|
8
9
|
import { TypeById } from "./inspection";
|
|
9
10
|
export declare function createInspectionSettings(settings: PQP.Settings, maybeEachScopeById: TypeById | undefined, maybeLibrary: Library.ILibrary | undefined, isWorkspaceCacheAllowed: boolean): InspectionSettings;
|
|
10
|
-
export declare function getMaybeContextForSignatureProvider(inspected: Inspection.Inspected): Promise<SignatureProviderContext | undefined>;
|
|
11
|
-
export declare function getMaybeSignatureHelp(context: SignatureProviderContext): SignatureHelp | null;
|
|
11
|
+
export declare function getMaybeContextForSignatureProvider(inspected: Inspection.Inspected, traceManager: TraceManager, maybeCorrelationId: number | undefined): Promise<SignatureProviderContext | undefined>;
|
|
12
|
+
export declare function getMaybeSignatureHelp(context: SignatureProviderContext, correlationId: number): SignatureHelp | null;
|
|
12
13
|
export declare function getMaybeType(inspected: Inspection.Inspected, identifier: string): Promise<Type.TPowerQueryType | undefined>;
|
|
13
14
|
export declare function getScopeItemKindText(scopeItemKind: Inspection.ScopeItemKind): string;
|
|
14
15
|
export declare function getSymbolKindFromLiteralExpression(node: Ast.LiteralExpression): SymbolKind;
|
|
@@ -23,35 +23,43 @@ function createInspectionSettings(settings, maybeEachScopeById, maybeLibrary, is
|
|
|
23
23
|
isWorkspaceCacheAllowed });
|
|
24
24
|
}
|
|
25
25
|
exports.createInspectionSettings = createInspectionSettings;
|
|
26
|
-
function getMaybeContextForSignatureProvider(inspected) {
|
|
26
|
+
function getMaybeContextForSignatureProvider(inspected, traceManager, maybeCorrelationId) {
|
|
27
27
|
return __awaiter(this, void 0, void 0, function* () {
|
|
28
|
+
const trace = traceManager.entry("InspectionUtils" /* InspectionUtils */, getMaybeContextForSignatureProvider.name, maybeCorrelationId);
|
|
28
29
|
const triedCurrentInvokeExpression = yield inspected.triedCurrentInvokeExpression;
|
|
29
30
|
if (powerquery_parser_1.ResultUtils.isError(triedCurrentInvokeExpression) || triedCurrentInvokeExpression.value === undefined) {
|
|
31
|
+
trace.exit();
|
|
30
32
|
return undefined;
|
|
31
33
|
}
|
|
32
34
|
const invokeExpression = triedCurrentInvokeExpression.value;
|
|
33
35
|
const functionName = invokeExpression.maybeName !== undefined ? invokeExpression.maybeName : undefined;
|
|
34
36
|
const argumentOrdinal = invokeExpression.maybeArguments !== undefined ? invokeExpression.maybeArguments.argumentOrdinal : undefined;
|
|
35
37
|
if (functionName !== undefined || argumentOrdinal !== undefined) {
|
|
38
|
+
trace.exit();
|
|
36
39
|
return {
|
|
37
40
|
argumentOrdinal,
|
|
38
41
|
functionName,
|
|
39
42
|
isNameInLocalScope: invokeExpression.isNameInLocalScope,
|
|
40
43
|
functionType: invokeExpression.functionType,
|
|
44
|
+
traceManager,
|
|
45
|
+
maybeInitialCorrelationId: trace.id,
|
|
41
46
|
};
|
|
42
47
|
}
|
|
43
48
|
else {
|
|
49
|
+
trace.exit();
|
|
44
50
|
return undefined;
|
|
45
51
|
}
|
|
46
52
|
});
|
|
47
53
|
}
|
|
48
54
|
exports.getMaybeContextForSignatureProvider = getMaybeContextForSignatureProvider;
|
|
49
|
-
function getMaybeSignatureHelp(context) {
|
|
55
|
+
function getMaybeSignatureHelp(context, correlationId) {
|
|
50
56
|
const identifierLiteral = context.functionName;
|
|
51
57
|
if (identifierLiteral === undefined || !language_1.TypeUtils.isDefinedFunction(context.functionType)) {
|
|
52
58
|
return null;
|
|
53
59
|
}
|
|
54
|
-
const nameOfParameters = context.functionType.parameters
|
|
60
|
+
const nameOfParameters = context.functionType.parameters
|
|
61
|
+
.map((parameter) => language_1.TypeUtils.nameOfFunctionParameter(parameter, context.traceManager, correlationId))
|
|
62
|
+
.join(", ");
|
|
55
63
|
const label = `${identifierLiteral}(${nameOfParameters})`;
|
|
56
64
|
const parameters = context.functionType.parameters;
|
|
57
65
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectionUtils.js","sourceRoot":"","sources":["../../src/powerquery-language-services/inspectionUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAIlC,oEAAmE;AACnE,0FAAmG;AACnG,6EAAwF;AAGxF,wBAA8C;
|
|
1
|
+
{"version":3,"file":"inspectionUtils.js","sourceRoot":"","sources":["../../src/powerquery-language-services/inspectionUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { Hover, Range, SignatureHelp } from "vscode-languageserver-types";
|
|
2
|
+
import { TraceManager } from "@microsoft/powerquery-parser/lib/powerquery-parser/common/trace";
|
|
2
3
|
import type { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
|
|
3
4
|
import type { AutocompleteItem } from "../inspection/autocomplete/autocompleteItem";
|
|
4
5
|
import type { ILibrary } from "../library/library";
|
|
@@ -16,6 +17,8 @@ export interface HoverProviderContext extends ProviderContext {
|
|
|
16
17
|
readonly identifier: string;
|
|
17
18
|
}
|
|
18
19
|
export interface ProviderContext {
|
|
20
|
+
readonly traceManager: TraceManager;
|
|
21
|
+
readonly maybeInitialCorrelationId: number | undefined;
|
|
19
22
|
readonly range?: Range;
|
|
20
23
|
}
|
|
21
24
|
export interface SignatureHelpProvider {
|
|
@@ -5,7 +5,7 @@ export declare class LanguageAutocompleteItemProvider implements AutocompleteIte
|
|
|
5
5
|
private readonly maybePromiseInspection;
|
|
6
6
|
private static readonly ExcludedKeywords;
|
|
7
7
|
constructor(maybePromiseInspection: Promise<Inspection.Inspected | undefined>);
|
|
8
|
-
getAutocompleteItems(
|
|
8
|
+
getAutocompleteItems(context: AutocompleteItemProviderContext): Promise<ReadonlyArray<AutocompleteItem>>;
|
|
9
9
|
private getKeywords;
|
|
10
10
|
private getLanguageConstants;
|
|
11
11
|
private getPrimitiveTypes;
|
|
@@ -17,18 +17,22 @@ class LanguageAutocompleteItemProvider {
|
|
|
17
17
|
constructor(maybePromiseInspection) {
|
|
18
18
|
this.maybePromiseInspection = maybePromiseInspection;
|
|
19
19
|
}
|
|
20
|
-
getAutocompleteItems(
|
|
20
|
+
getAutocompleteItems(context) {
|
|
21
21
|
return __awaiter(this, void 0, void 0, function* () {
|
|
22
|
+
const trace = context.traceManager.entry("LanguageCompletionProvider" /* LanguageCompletionProvider */, this.getAutocompleteItems.name, context.maybeInitialCorrelationId);
|
|
22
23
|
const maybeInspection = yield this.maybePromiseInspection;
|
|
23
24
|
if (maybeInspection === undefined) {
|
|
25
|
+
trace.exit({ maybeInspection: undefined });
|
|
24
26
|
return [];
|
|
25
27
|
}
|
|
26
28
|
const autocomplete = maybeInspection.autocomplete;
|
|
27
|
-
|
|
29
|
+
const result = [
|
|
28
30
|
...this.getKeywords(autocomplete.triedKeyword),
|
|
29
31
|
...this.getLanguageConstants(autocomplete.triedLanguageConstant),
|
|
30
32
|
...this.getPrimitiveTypes(autocomplete.triedPrimitiveType),
|
|
31
33
|
];
|
|
34
|
+
trace.exit();
|
|
35
|
+
return result;
|
|
32
36
|
});
|
|
33
37
|
}
|
|
34
38
|
getKeywords(triedKeywordAutocomplete) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"languageCompletionItemProvider.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/providers/languageCompletionItemProvider.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAGlC,oEAA2D;
|
|
1
|
+
{"version":3,"file":"languageCompletionItemProvider.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/providers/languageCompletionItemProvider.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAGlC,oEAA2D;AAQ3D,MAAa,gCAAgC;IAiBzC,YAA6B,sBAAiE;QAAjE,2BAAsB,GAAtB,sBAAsB,CAA2C;IAAG,CAAC;IAErF,oBAAoB,CAC7B,OAAwC;;YAExC,MAAM,KAAK,GAAU,OAAO,CAAC,YAAY,CAAC,KAAK,gEAE3C,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAC9B,OAAO,CAAC,yBAAyB,CACpC,CAAC;YAEF,MAAM,eAAe,GAAqC,MAAM,IAAI,CAAC,sBAAsB,CAAC;YAE5F,IAAI,eAAe,KAAK,SAAS,EAAE;gBAC/B,KAAK,CAAC,IAAI,CAAC,EAAE,eAAe,EAAE,SAAS,EAAE,CAAC,CAAC;gBAE3C,OAAO,EAAE,CAAC;aACb;YAED,MAAM,YAAY,GAA4B,eAAe,CAAC,YAAY,CAAC;YAE3E,MAAM,MAAM,GAAoC;gBAC5C,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,YAAY,CAAC;gBAC9C,GAAG,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,qBAAqB,CAAC;gBAChE,GAAG,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,kBAAkB,CAAC;aAC7D,CAAC;YAEF,KAAK,CAAC,IAAI,EAAE,CAAC;YAEb,OAAO,MAAM,CAAC;QAClB,CAAC;KAAA;IAEO,WAAW,CACf,wBAA6D;QAE7D,IAAI,+BAAW,CAAC,OAAO,CAAC,wBAAwB,CAAC,EAAE;YAC/C,OAAO,EAAE,CAAC;SACb;QAED,OAAO,wBAAwB,CAAC,KAAK,CAAC,MAAM,CACxC,CAAC,gBAAkC,EAAE,EAAE,CACnC,gCAAgC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,KAAK,CAAC,KAAK,KAAK,CACnG,CAAC;IACN,CAAC;IAEO,oBAAoB,CACxB,iCAA+E;QAE/E,OAAO,+BAAW,CAAC,IAAI,CAAC,iCAAiC,CAAC,IAAI,iCAAiC,CAAC,KAAK;YACjG,CAAC,CAAC,CAAC,iCAAiC,CAAC,KAAK,CAAC;YAC3C,CAAC,CAAC,EAAE,CAAC;IACb,CAAC;IAEO,iBAAiB,CACrB,8BAAyE;QAEzE,OAAO,+BAAW,CAAC,IAAI,CAAC,8BAA8B,CAAC,IAAI,8BAA8B,CAAC,KAAK;YAC3F,CAAC,CAAC,8BAA8B,CAAC,KAAK;YACtC,CAAC,CAAC,EAAE,CAAC;IACb,CAAC;;AA5EL,4EA6EC;AA5EG,oFAAoF;AACpF,qDAAqD;AAC7B,iDAAgB,GAA0B;;;;;;;;;;;;CAYjE,CAAC"}
|
|
@@ -26,7 +26,9 @@ class LibrarySymbolProvider {
|
|
|
26
26
|
// eslint-disable-next-line require-await
|
|
27
27
|
getAutocompleteItems(context) {
|
|
28
28
|
return __awaiter(this, void 0, void 0, function* () {
|
|
29
|
+
const trace = context.traceManager.entry("LibrarySymbolProvider" /* LibrarySymbolProvider */, this.getAutocompleteItems.name, context.maybeInitialCorrelationId);
|
|
29
30
|
if (!context.text || !context.range) {
|
|
31
|
+
trace.exit({ invalidContext: true });
|
|
30
32
|
return [];
|
|
31
33
|
}
|
|
32
34
|
const partial = [];
|
|
@@ -34,24 +36,28 @@ class LibrarySymbolProvider {
|
|
|
34
36
|
for (const [label, definition] of this.libraryDefinitions.entries()) {
|
|
35
37
|
partial.push(inspection_1.AutocompleteItemUtils.createFromLibraryDefinition(label, definition, maybeContextText));
|
|
36
38
|
}
|
|
39
|
+
trace.exit();
|
|
37
40
|
return partial;
|
|
38
41
|
});
|
|
39
42
|
}
|
|
40
43
|
// eslint-disable-next-line require-await
|
|
41
44
|
getHover(context) {
|
|
42
45
|
return __awaiter(this, void 0, void 0, function* () {
|
|
46
|
+
const trace = context.traceManager.entry("LibrarySymbolProvider" /* LibrarySymbolProvider */, this.getHover.name, context.maybeInitialCorrelationId);
|
|
43
47
|
if (!context.identifier) {
|
|
48
|
+
trace.exit({ invalidContext: true });
|
|
44
49
|
return null;
|
|
45
50
|
}
|
|
46
51
|
const identifierLiteral = context.identifier;
|
|
47
52
|
const maybeDefinition = this.libraryDefinitions.get(context.identifier);
|
|
48
53
|
if (maybeDefinition === undefined) {
|
|
54
|
+
trace.exit({ invalidContext: true });
|
|
49
55
|
return null;
|
|
50
56
|
}
|
|
51
57
|
const definition = maybeDefinition;
|
|
52
58
|
const definitionText = LibrarySymbolProvider.getDefinitionKindText(definition.kind);
|
|
53
|
-
const definitionTypeText = language_1.TypeUtils.nameOf(definition.asPowerQueryType);
|
|
54
|
-
|
|
59
|
+
const definitionTypeText = language_1.TypeUtils.nameOf(definition.asPowerQueryType, context.traceManager, trace.id);
|
|
60
|
+
const hover = {
|
|
55
61
|
contents: {
|
|
56
62
|
kind: vscode_languageserver_types_1.MarkupKind.PlainText,
|
|
57
63
|
language: "powerquery",
|
|
@@ -59,25 +65,32 @@ class LibrarySymbolProvider {
|
|
|
59
65
|
},
|
|
60
66
|
range: undefined,
|
|
61
67
|
};
|
|
68
|
+
trace.exit();
|
|
69
|
+
return hover;
|
|
62
70
|
});
|
|
63
71
|
}
|
|
64
72
|
// eslint-disable-next-line require-await
|
|
65
73
|
getSignatureHelp(context) {
|
|
66
74
|
var _a;
|
|
67
75
|
return __awaiter(this, void 0, void 0, function* () {
|
|
76
|
+
const trace = context.traceManager.entry("LibrarySymbolProvider" /* LibrarySymbolProvider */, this.getSignatureHelp.name, context.maybeInitialCorrelationId);
|
|
68
77
|
if (!context.functionName) {
|
|
78
|
+
trace.exit({ invalidContext: true });
|
|
69
79
|
return null;
|
|
70
80
|
}
|
|
71
81
|
const identifierLiteral = context.functionName;
|
|
72
82
|
const maybeDefinition = this.libraryDefinitions.get(identifierLiteral);
|
|
73
83
|
if (!library_1.LibraryUtils.isFunction(maybeDefinition)) {
|
|
84
|
+
trace.exit({ invalidContext: true });
|
|
74
85
|
return null;
|
|
75
86
|
}
|
|
76
|
-
|
|
87
|
+
const result = {
|
|
77
88
|
activeParameter: (_a = context.argumentOrdinal) !== null && _a !== void 0 ? _a : 0,
|
|
78
89
|
activeSignature: 0,
|
|
79
90
|
signatures: [this.getOrCreateSignatureInformation(identifierLiteral)],
|
|
80
91
|
};
|
|
92
|
+
trace.exit();
|
|
93
|
+
return result;
|
|
81
94
|
});
|
|
82
95
|
}
|
|
83
96
|
static getDefinitionKindText(kind) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"librarySymbolProvider.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/providers/librarySymbolProvider.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,6EAAqG;AACrG,oEAAsD;
|
|
1
|
+
{"version":3,"file":"librarySymbolProvider.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/providers/librarySymbolProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,8 +11,8 @@ export declare class LocalDocumentSymbolProvider implements ISymbolProvider {
|
|
|
11
11
|
getAutocompleteItems(context: AutocompleteItemProviderContext): Promise<ReadonlyArray<Inspection.AutocompleteItem>>;
|
|
12
12
|
getHover(context: HoverProviderContext): Promise<Hover | null>;
|
|
13
13
|
getSignatureHelp(context: SignatureProviderContext): Promise<SignatureHelp | null>;
|
|
14
|
-
protected static getHoverForIdentifierPairedExpression(context: HoverProviderContext, inspectionSettings: InspectionSettings, inspected: Inspection.Inspected, activeNode: Inspection.ActiveNode): Promise<Hover | undefined>;
|
|
15
|
-
protected static getHoverForScopeItem(context: HoverProviderContext, nodeScope: Inspection.NodeScope, scopeType: Inspection.ScopeTypeByKey): Hover | undefined;
|
|
14
|
+
protected static getHoverForIdentifierPairedExpression(context: HoverProviderContext, inspectionSettings: InspectionSettings, inspected: Inspection.Inspected, activeNode: Inspection.ActiveNode, correlationId: number): Promise<Hover | undefined>;
|
|
15
|
+
protected static getHoverForScopeItem(context: HoverProviderContext, nodeScope: Inspection.NodeScope, scopeType: Inspection.ScopeTypeByKey, correlationId: number): Hover | undefined;
|
|
16
16
|
private getMaybeInspectionInvokeExpression;
|
|
17
17
|
private getAutocompleteItemsFromFieldAccess;
|
|
18
18
|
}
|
|
@@ -27,50 +27,65 @@ class LocalDocumentSymbolProvider {
|
|
|
27
27
|
}
|
|
28
28
|
getAutocompleteItems(context) {
|
|
29
29
|
return __awaiter(this, void 0, void 0, function* () {
|
|
30
|
+
const trace = context.traceManager.entry("LocalDocumentSymbolProvider" /* LocalDocumentSymbolProvider */, this.getAutocompleteItems.name, context.maybeInitialCorrelationId);
|
|
30
31
|
const maybeInspected = yield this.promiseMaybeInspected;
|
|
31
32
|
if (maybeInspected === undefined) {
|
|
33
|
+
trace.exit({ maybeInspectedUndefined: true });
|
|
32
34
|
return [];
|
|
33
35
|
}
|
|
34
|
-
|
|
36
|
+
const result = [
|
|
35
37
|
...this.getAutocompleteItemsFromFieldAccess(maybeInspected),
|
|
36
38
|
...(yield InspectionUtils.getAutocompleteItemsFromScope(context, maybeInspected)),
|
|
37
39
|
];
|
|
40
|
+
trace.exit();
|
|
41
|
+
return result;
|
|
38
42
|
});
|
|
39
43
|
}
|
|
40
44
|
getHover(context) {
|
|
41
45
|
return __awaiter(this, void 0, void 0, function* () {
|
|
46
|
+
const trace = context.traceManager.entry("LocalDocumentSymbolProvider" /* LocalDocumentSymbolProvider */, this.getHover.name, context.maybeInitialCorrelationId);
|
|
42
47
|
const maybeInspected = yield this.promiseMaybeInspected;
|
|
43
48
|
if (maybeInspected === undefined) {
|
|
49
|
+
trace.exit({ maybeInspectedUndefined: true });
|
|
44
50
|
return null;
|
|
45
51
|
}
|
|
46
52
|
const activeNode = maybeInspected.maybeActiveNode;
|
|
47
53
|
if (!__1.Inspection.ActiveNodeUtils.isPositionInBounds(activeNode)) {
|
|
54
|
+
trace.exit({ outOfBounds: true });
|
|
48
55
|
return null;
|
|
49
56
|
}
|
|
50
|
-
let maybeHover = yield LocalDocumentSymbolProvider.getHoverForIdentifierPairedExpression(context, this.createInspectionSettingsFn(), maybeInspected, activeNode);
|
|
57
|
+
let maybeHover = yield LocalDocumentSymbolProvider.getHoverForIdentifierPairedExpression(context, this.createInspectionSettingsFn(), maybeInspected, activeNode, trace.id);
|
|
51
58
|
if (maybeHover !== undefined) {
|
|
59
|
+
trace.exit({ maybeHover: true });
|
|
52
60
|
return maybeHover;
|
|
53
61
|
}
|
|
54
62
|
const triedNodeScope = yield maybeInspected.triedNodeScope;
|
|
55
63
|
const triedScopeType = yield maybeInspected.triedScopeType;
|
|
56
64
|
if (!powerquery_parser_1.ResultUtils.isOk(triedNodeScope) || !powerquery_parser_1.ResultUtils.isOk(triedScopeType)) {
|
|
65
|
+
trace.exit({ inspectionError: true });
|
|
57
66
|
return null;
|
|
58
67
|
}
|
|
59
|
-
maybeHover = LocalDocumentSymbolProvider.getHoverForScopeItem(context, triedNodeScope.value, triedScopeType.value);
|
|
68
|
+
maybeHover = LocalDocumentSymbolProvider.getHoverForScopeItem(context, triedNodeScope.value, triedScopeType.value, trace.id);
|
|
69
|
+
trace.exit();
|
|
60
70
|
return maybeHover !== null && maybeHover !== void 0 ? maybeHover : null;
|
|
61
71
|
});
|
|
62
72
|
}
|
|
63
73
|
getSignatureHelp(context) {
|
|
64
74
|
return __awaiter(this, void 0, void 0, function* () {
|
|
75
|
+
const trace = context.traceManager.entry("LocalDocumentSymbolProvider" /* LocalDocumentSymbolProvider */, this.getSignatureHelp.name, context.maybeInitialCorrelationId);
|
|
65
76
|
const maybeInvokeInspection = yield this.getMaybeInspectionInvokeExpression();
|
|
66
77
|
if (maybeInvokeInspection === undefined) {
|
|
78
|
+
trace.exit({ maybeInvokeInspectionUndefined: true });
|
|
67
79
|
return null;
|
|
68
80
|
}
|
|
69
81
|
const inspection = maybeInvokeInspection;
|
|
70
82
|
if (inspection.maybeName && !inspection.isNameInLocalScope) {
|
|
83
|
+
trace.exit({ unknownName: true });
|
|
71
84
|
return null;
|
|
72
85
|
}
|
|
73
|
-
|
|
86
|
+
const result = InspectionUtils.getMaybeSignatureHelp(context, trace.id);
|
|
87
|
+
trace.exit();
|
|
88
|
+
return result;
|
|
74
89
|
});
|
|
75
90
|
}
|
|
76
91
|
// When hovering over a key it should show the type for the value.
|
|
@@ -78,14 +93,16 @@ class LocalDocumentSymbolProvider {
|
|
|
78
93
|
// * GeneralizedIdentifierPairedAnyLiteral
|
|
79
94
|
// * GeneralizedIdentifierPairedExpression
|
|
80
95
|
// * IdentifierPairedExpression
|
|
81
|
-
static getHoverForIdentifierPairedExpression(context, inspectionSettings, inspected, activeNode) {
|
|
96
|
+
static getHoverForIdentifierPairedExpression(context, inspectionSettings, inspected, activeNode, correlationId) {
|
|
82
97
|
var _a, _b, _c;
|
|
83
98
|
return __awaiter(this, void 0, void 0, function* () {
|
|
99
|
+
const trace = context.traceManager.entry("LocalDocumentSymbolProvider" /* LocalDocumentSymbolProvider */, this.getHoverForIdentifierPairedExpression.name, correlationId);
|
|
84
100
|
const parseState = inspected.parseState;
|
|
85
101
|
const ancestry = activeNode.ancestry;
|
|
86
102
|
const maybeLeafKind = (_a = ancestry[0]) === null || _a === void 0 ? void 0 : _a.node.kind;
|
|
87
103
|
const isValidLeafNodeKind = ["GeneralizedIdentifier" /* GeneralizedIdentifier */, "Identifier" /* Identifier */].includes(maybeLeafKind);
|
|
88
104
|
if (!isValidLeafNodeKind) {
|
|
105
|
+
trace.exit();
|
|
89
106
|
return undefined;
|
|
90
107
|
}
|
|
91
108
|
const maybeIdentifierPairedExpression = parser_1.AncestryUtils.maybeNthXorChecked(activeNode.ancestry, 1, [
|
|
@@ -95,16 +112,19 @@ class LocalDocumentSymbolProvider {
|
|
|
95
112
|
]);
|
|
96
113
|
// We're on an identifier in some other context which we don't support.
|
|
97
114
|
if (maybeIdentifierPairedExpression === undefined) {
|
|
115
|
+
trace.exit();
|
|
98
116
|
return undefined;
|
|
99
117
|
}
|
|
100
118
|
const maybeExpression = parser_1.NodeIdMapUtils.maybeNthChild(parseState.contextState.nodeIdMapCollection, maybeIdentifierPairedExpression.node.id, 2);
|
|
101
119
|
// We're on an identifier in some other context which we don't support.
|
|
102
120
|
if (maybeExpression === undefined) {
|
|
121
|
+
trace.exit();
|
|
103
122
|
return undefined;
|
|
104
123
|
}
|
|
105
124
|
const triedExpressionType = yield __1.Inspection.tryType(inspectionSettings, parseState.contextState.nodeIdMapCollection, maybeExpression.node.id, inspected.typeCache);
|
|
106
125
|
// TODO handle error
|
|
107
126
|
if (powerquery_parser_1.ResultUtils.isError(triedExpressionType)) {
|
|
127
|
+
trace.exit();
|
|
108
128
|
return undefined;
|
|
109
129
|
}
|
|
110
130
|
let scopeItemText = "unknown";
|
|
@@ -122,8 +142,8 @@ class LocalDocumentSymbolProvider {
|
|
|
122
142
|
else if (maybeFifthNodeKind === "LetExpression" /* LetExpression */) {
|
|
123
143
|
scopeItemText = InspectionUtils.getScopeItemKindText("LetVariable" /* LetVariable */);
|
|
124
144
|
}
|
|
125
|
-
const nameOfExpressionType = language_1.TypeUtils.nameOf(triedExpressionType.value);
|
|
126
|
-
|
|
145
|
+
const nameOfExpressionType = language_1.TypeUtils.nameOf(triedExpressionType.value, context.traceManager, trace.id);
|
|
146
|
+
const result = {
|
|
127
147
|
contents: {
|
|
128
148
|
kind: vscode_languageserver_types_1.MarkupKind.PlainText,
|
|
129
149
|
language: "powerquery",
|
|
@@ -131,9 +151,11 @@ class LocalDocumentSymbolProvider {
|
|
|
131
151
|
},
|
|
132
152
|
range: undefined,
|
|
133
153
|
};
|
|
154
|
+
trace.exit();
|
|
155
|
+
return result;
|
|
134
156
|
});
|
|
135
157
|
}
|
|
136
|
-
static getHoverForScopeItem(context, nodeScope, scopeType) {
|
|
158
|
+
static getHoverForScopeItem(context, nodeScope, scopeType, correlationId) {
|
|
137
159
|
const identifierLiteral = context.identifier;
|
|
138
160
|
const maybeScopeItem = nodeScope.get(identifierLiteral);
|
|
139
161
|
if (maybeScopeItem === undefined || maybeScopeItem.kind === "Undefined" /* Undefined */) {
|
|
@@ -141,7 +163,9 @@ class LocalDocumentSymbolProvider {
|
|
|
141
163
|
}
|
|
142
164
|
const scopeItemText = InspectionUtils.getScopeItemKindText(maybeScopeItem.kind);
|
|
143
165
|
const maybeScopeItemType = scopeType.get(identifierLiteral);
|
|
144
|
-
const scopeItemTypeText = maybeScopeItemType !== undefined
|
|
166
|
+
const scopeItemTypeText = maybeScopeItemType !== undefined
|
|
167
|
+
? language_1.TypeUtils.nameOf(maybeScopeItemType, context.traceManager, correlationId)
|
|
168
|
+
: "unknown";
|
|
145
169
|
return {
|
|
146
170
|
contents: {
|
|
147
171
|
kind: vscode_languageserver_types_1.MarkupKind.PlainText,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localDocumentSymbolProvider.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/providers/localDocumentSymbolProvider.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,sFAKmE;AACnE,0FAAmG;AACnG,6EAA+E;AAC/E,oEAA2D;
|
|
1
|
+
{"version":3,"file":"localDocumentSymbolProvider.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/providers/localDocumentSymbolProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,8 +13,15 @@ export declare const enum InspectionTraceConstant {
|
|
|
13
13
|
InspectScope = "Inspection.Scope",
|
|
14
14
|
InspectScopeItem = "Inspection.ScopeItem",
|
|
15
15
|
InspectScopeType = "Inspection.ScopeType",
|
|
16
|
-
InspectType = "Inspection.Type"
|
|
16
|
+
InspectType = "Inspection.Type",
|
|
17
|
+
InspectionUtils = "InspectionUtils"
|
|
18
|
+
}
|
|
19
|
+
export declare const enum ProviderTraceConstant {
|
|
20
|
+
LanguageCompletionProvider = "LanguageCompletionProvider",
|
|
21
|
+
LibrarySymbolProvider = "LibrarySymbolProvider",
|
|
22
|
+
LocalDocumentSymbolProvider = "LocalDocumentSymbolProvider"
|
|
17
23
|
}
|
|
18
24
|
export declare const enum ValidationTraceConstant {
|
|
25
|
+
AnalysisBase = "AnalysisBase",
|
|
19
26
|
Validation = "Validation"
|
|
20
27
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@microsoft/powerquery-language-services",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.20",
|
|
4
4
|
"author": "Microsoft",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"scripts": {
|
|
@@ -49,8 +49,8 @@
|
|
|
49
49
|
"typescript": "4.6.4"
|
|
50
50
|
},
|
|
51
51
|
"dependencies": {
|
|
52
|
-
"@microsoft/powerquery-formatter": "0.0.
|
|
53
|
-
"@microsoft/powerquery-parser": "0.8.
|
|
52
|
+
"@microsoft/powerquery-formatter": "0.0.53",
|
|
53
|
+
"@microsoft/powerquery-parser": "0.8.5",
|
|
54
54
|
"vscode-languageserver-textdocument": "1.0.4",
|
|
55
55
|
"vscode-languageserver-types": "3.17.1"
|
|
56
56
|
},
|