@microsoft/powerquery-language-services 0.3.24 → 0.3.25
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.
|
@@ -36,36 +36,38 @@ exports.getDocumentSymbols = getDocumentSymbols;
|
|
|
36
36
|
function addIdentifierPairedExpressionSymbols(nodeIdMapCollection, currentSymbols, parentSymbolById) {
|
|
37
37
|
var _a;
|
|
38
38
|
const identifierPairedExpressionIds = (_a = nodeIdMapCollection.idsByNodeKind.get("IdentifierPairedExpression" /* IdentifierPairedExpression */)) !== null && _a !== void 0 ? _a : new Set();
|
|
39
|
-
const
|
|
40
|
-
|
|
41
|
-
if (!parser_1.XorNodeUtils.
|
|
39
|
+
for (const nodeId of identifierPairedExpressionIds) {
|
|
40
|
+
const xorNode = parser_1.NodeIdMapUtils.assertGetXorChecked(nodeIdMapCollection, nodeId, "IdentifierPairedExpression" /* IdentifierPairedExpression */);
|
|
41
|
+
if (!parser_1.XorNodeUtils.isAstXor(xorNode)) {
|
|
42
42
|
continue;
|
|
43
43
|
}
|
|
44
|
-
const
|
|
45
|
-
const documentSymbol = InspectionUtils.getSymbolForIdentifierPairedExpression(
|
|
44
|
+
const astNode = xorNode.node;
|
|
45
|
+
const documentSymbol = InspectionUtils.getSymbolForIdentifierPairedExpression(astNode);
|
|
46
46
|
addDocumentSymbols(nodeIdMapCollection, parentSymbolById, nodeId, currentSymbols, documentSymbol);
|
|
47
47
|
parentSymbolById.set(nodeId, documentSymbol);
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
50
|
function addRecordSymbols(nodeIdMapCollection, currentSymbols, parentSymbolById) {
|
|
51
51
|
var _a, _b;
|
|
52
|
-
const
|
|
53
|
-
|
|
54
|
-
|
|
52
|
+
const recordIdCollections = [
|
|
53
|
+
(_a = nodeIdMapCollection.idsByNodeKind.get("RecordExpression" /* RecordExpression */)) !== null && _a !== void 0 ? _a : new Set(),
|
|
54
|
+
(_b = nodeIdMapCollection.idsByNodeKind.get("RecordLiteral" /* RecordLiteral */)) !== null && _b !== void 0 ? _b : new Set(),
|
|
55
55
|
];
|
|
56
|
-
const
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
56
|
+
for (const collection of recordIdCollections) {
|
|
57
|
+
for (const nodeId of collection) {
|
|
58
|
+
const xorNode = parser_1.NodeIdMapUtils.assertGetXorChecked(nodeIdMapCollection, nodeId, ["RecordExpression" /* RecordExpression */, "RecordLiteral" /* RecordLiteral */]);
|
|
59
|
+
if (!parser_1.XorNodeUtils.isAstXor(xorNode)) {
|
|
60
|
+
continue;
|
|
61
|
+
}
|
|
62
|
+
const astNode = xorNode.node;
|
|
63
|
+
// Process the record if the immediate parent is a Struct
|
|
64
|
+
const parentId = nodeIdMapCollection.parentIdById.get(astNode.id);
|
|
65
|
+
const parentSymbol = parentId ? parentSymbolById.get(parentId) : undefined;
|
|
66
|
+
if (parentSymbol && parentSymbol.kind === commonTypes_1.SymbolKind.Struct) {
|
|
67
|
+
const fieldSymbols = InspectionUtils.getSymbolsForRecord(astNode);
|
|
68
|
+
if (fieldSymbols.length > 0) {
|
|
69
|
+
addDocumentSymbols(nodeIdMapCollection, parentSymbolById, astNode.id, currentSymbols, ...fieldSymbols);
|
|
70
|
+
}
|
|
69
71
|
}
|
|
70
72
|
}
|
|
71
73
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"documentSymbols.js","sourceRoot":"","sources":["../../src/powerquery-language-services/documentSymbols.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AACpD,sFAKmE;AAGnE,qDAAqD;AACrD,+CAAyE;AACzE,qDAAuD;AAEvD,SAAsB,kBAAkB,CACpC,YAA0B,EAC1B,mBAAwD,EACxD,uBAAgC;;QAEhC,MAAM,eAAe,GAAwC,MAAM,oCAAmB,CAAC,uBAAuB,CAC1G,YAAY,EACZ,mBAAmB,EACnB,uBAAuB,CAC1B,CAAC;QAEF,IAAI,eAAe,KAAK,SAAS,IAAI,GAAG,CAAC,SAAS,CAAC,uBAAuB,CAAC,eAAe,CAAC,EAAE;YACzF,OAAO,EAAE,CAAC;SACb;QAED,MAAM,mBAAmB,GAAyB,eAAe,CAAC,mBAAmB,CAAC;QACtF,MAAM,cAAc,GAAqB,EAAE,CAAC;QAC5C,MAAM,gBAAgB,GAAgC,IAAI,GAAG,EAAE,CAAC;QAEhE,oCAAoC,CAAC,mBAAmB,EAAE,cAAc,EAAE,gBAAgB,CAAC,CAAC;QAC5F,gBAAgB,CAAC,mBAAmB,EAAE,cAAc,EAAE,gBAAgB,CAAC,CAAC;QACxE,oCAAmB,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAExC,OAAO,cAAc,CAAC;IAC1B,CAAC;CAAA;AAxBD,gDAwBC;AAED,SAAS,oCAAoC,CACzC,mBAAyC,EACzC,cAAgC,EAChC,gBAA6C;;IAE7C,MAAM,6BAA6B,GAC/B,MAAA,mBAAmB,CAAC,aAAa,CAAC,GAAG,+DAAyC,mCAAI,IAAI,GAAG,EAAE,CAAC;IAEhG,MAAM,
|
|
1
|
+
{"version":3,"file":"documentSymbols.js","sourceRoot":"","sources":["../../src/powerquery-language-services/documentSymbols.ts"],"names":[],"mappings":"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"}
|
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.25",
|
|
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.54",
|
|
53
|
+
"@microsoft/powerquery-parser": "0.8.6",
|
|
54
54
|
"vscode-languageserver-textdocument": "1.0.4",
|
|
55
55
|
"vscode-languageserver-types": "3.17.1"
|
|
56
56
|
},
|