@microsoft/powerquery-language-services 0.3.23 → 0.3.26

package/lib/powerquery-language-services/documentSymbols.js

@@ -36,36 +36,38 @@ exports.getDocumentSymbols = getDocumentSymbols;
 function addIdentifierPairedExpressionSymbols(nodeIdMapCollection, currentSymbols, parentSymbolById) {
     var _a;
     const identifierPairedExpressionIds = (_a = nodeIdMapCollection.idsByNodeKind.get("IdentifierPairedExpression" /* IdentifierPairedExpression */)) !== null && _a !== void 0 ? _a : new Set();
-    const identifierPairedExpressionsXorNodes = parser_1.NodeIdMapIterator.assertIterXor(nodeIdMapCollection, [...identifierPairedExpressionIds.values()]);
-    for (const xorNode of identifierPairedExpressionsXorNodes) {
-        if (!parser_1.XorNodeUtils.isAstXorChecked(xorNode, "IdentifierPairedExpression" /* IdentifierPairedExpression */)) {
+    for (const nodeId of identifierPairedExpressionIds) {
+        const xorNode = parser_1.NodeIdMapUtils.assertGetXorChecked(nodeIdMapCollection, nodeId, "IdentifierPairedExpression" /* IdentifierPairedExpression */);
+        if (!parser_1.XorNodeUtils.isAstXor(xorNode)) {
             continue;
         }
-        const nodeId = xorNode.node.id;
-        const documentSymbol = InspectionUtils.getSymbolForIdentifierPairedExpression(xorNode.node);
+        const astNode = xorNode.node;
+        const documentSymbol = InspectionUtils.getSymbolForIdentifierPairedExpression(astNode);
         addDocumentSymbols(nodeIdMapCollection, parentSymbolById, nodeId, currentSymbols, documentSymbol);
         parentSymbolById.set(nodeId, documentSymbol);
     }
 }
 function addRecordSymbols(nodeIdMapCollection, currentSymbols, parentSymbolById) {
     var _a, _b;
-    const recordIds = [
-        ...((_a = nodeIdMapCollection.idsByNodeKind.get("RecordExpression" /* RecordExpression */)) !== null && _a !== void 0 ? _a : new Set()).values(),
-        ...((_b = nodeIdMapCollection.idsByNodeKind.get("RecordLiteral" /* RecordLiteral */)) !== null && _b !== void 0 ? _b : new Set()).values(),
+    const recordIdCollections = [
+        (_a = nodeIdMapCollection.idsByNodeKind.get("RecordExpression" /* RecordExpression */)) !== null && _a !== void 0 ? _a : new Set(),
+        (_b = nodeIdMapCollection.idsByNodeKind.get("RecordLiteral" /* RecordLiteral */)) !== null && _b !== void 0 ? _b : new Set(),
     ];
-    const recordXorNodes = parser_1.NodeIdMapIterator.assertIterXor(nodeIdMapCollection, recordIds);
-    for (const xorNode of recordXorNodes) {
-        if (!parser_1.XorNodeUtils.isAstXor(xorNode)) {
-            continue;
-        }
-        const asAst = xorNode.node;
-        // Process the record if the immediate parent is a Struct
-        const parentId = nodeIdMapCollection.parentIdById.get(xorNode.node.id);
-        const parentSymbol = parentId ? parentSymbolById.get(parentId) : undefined;
-        if (parentSymbol && parentSymbol.kind === commonTypes_1.SymbolKind.Struct) {
-            const fieldSymbols = InspectionUtils.getSymbolsForRecord(asAst);
-            if (fieldSymbols.length > 0) {
-                addDocumentSymbols(nodeIdMapCollection, parentSymbolById, asAst.id, currentSymbols, ...fieldSymbols);
+    for (const collection of recordIdCollections) {
+        for (const nodeId of collection) {
+            const xorNode = parser_1.NodeIdMapUtils.assertGetXorChecked(nodeIdMapCollection, nodeId, ["RecordExpression" /* RecordExpression */, "RecordLiteral" /* RecordLiteral */]);
+            if (!parser_1.XorNodeUtils.isAstXor(xorNode)) {
+                continue;
+            }
+            const astNode = xorNode.node;
+            // Process the record if the immediate parent is a Struct
+            const parentId = nodeIdMapCollection.parentIdById.get(astNode.id);
+            const parentSymbol = parentId ? parentSymbolById.get(parentId) : undefined;
+            if (parentSymbol && parentSymbol.kind === commonTypes_1.SymbolKind.Struct) {
+                const fieldSymbols = InspectionUtils.getSymbolsForRecord(astNode);
+                if (fieldSymbols.length > 0) {
+                    addDocumentSymbols(nodeIdMapCollection, parentSymbolById, astNode.id, currentSymbols, ...fieldSymbols);
+                }
             }
         }
     }

package/lib/powerquery-language-services/documentSymbols.js.map

@@ -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,mCAAmC,GAA4B,0BAAiB,CAAC,aAAa,CAChG,mBAAmB,EACnB,CAAC,GAAG,6BAA6B,CAAC,MAAM,EAAE,CAAC,CAC9C,CAAC;IAEF,KAAK,MAAM,OAAO,IAAI,mCAAmC,EAAE;QACvD,IACI,CAAC,qBAAY,CAAC,eAAe,CACzB,OAAO,gEAEV,EACH;YACE,SAAS;SACZ;QAED,MAAM,MAAM,GAAW,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACvC,MAAM,cAAc,GAAmB,eAAe,CAAC,sCAAsC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE5G,kBAAkB,CAAC,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;QAClG,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;KAChD;AACL,CAAC;AAED,SAAS,gBAAgB,CACrB,mBAAyC,EACzC,cAAgC,EAChC,gBAA6C;;IAE7C,MAAM,SAAS,GAA0B;QACrC,GAAG,CAAC,MAAA,mBAAmB,CAAC,aAAa,CAAC,GAAG,2CAA+B,mCAAI,IAAI,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE;QAC/F,GAAG,CAAC,MAAA,mBAAmB,CAAC,aAAa,CAAC,GAAG,qCAA4B,mCAAI,IAAI,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE;KAC/F,CAAC;IAEF,MAAM,cAAc,GAA4B,0BAAiB,CAAC,aAAa,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAC;IAEhH,KAAK,MAAM,OAAO,IAAI,cAAc,EAAE;QAClC,IAAI,CAAC,qBAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YACjC,SAAS;SACZ;QAED,MAAM,KAAK,GAA6C,OAAO,CAAC,IAEzC,CAAC;QAExB,yDAAyD;QACzD,MAAM,QAAQ,GAAuB,mBAAmB,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC3F,MAAM,YAAY,GAA+B,QAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAEvG,IAAI,YAAY,IAAI,YAAY,CAAC,IAAI,KAAK,wBAAU,CAAC,MAAM,EAAE;YACzD,MAAM,YAAY,GAAkC,eAAe,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;YAE/F,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;gBACzB,kBAAkB,CAAC,mBAAmB,EAAE,gBAAgB,EAAE,KAAK,CAAC,EAAE,EAAE,cAAc,EAAE,GAAG,YAAY,CAAC,CAAC;aACxG;SACJ;KACJ;AACL,CAAC;AAED,SAAS,kBAAkB,CACvB,mBAAyC,EACzC,gBAA6C,EAC7C,MAAc,EACd,cAAgC,EAChC,GAAG,UAA4B;IAE/B,MAAM,YAAY,GAA+B,gBAAgB,CAAC,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,CAAC,CAAC;IAEjH,IAAI,YAAY,EAAE;QACd,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE;YACxB,YAAY,CAAC,QAAQ,GAAG,EAAE,CAAC;SAC9B;QAED,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;QAE1C,OAAO;KACV;IAED,uBAAuB;IACvB,cAAc,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;AACvC,CAAC;AAED,SAAS,gBAAgB,CACrB,mBAAyC,EACzC,gBAA6C,EAC7C,MAAc;IAEd,8BAA8B;IAC9B,MAAM,YAAY,GAAuB,mBAAmB,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAEtF,IAAI,CAAC,YAAY,EAAE;QACf,2BAA2B;QAC3B,OAAO,SAAS,CAAC;KACpB;IAED,IAAI,YAAY,GAA+B,gBAAgB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAElF,IAAI,CAAC,YAAY,EAAE;QACf,YAAY,GAAG,gBAAgB,CAAC,mBAAmB,EAAE,gBAAgB,EAAE,YAAY,CAAC,CAAC;KACxF;IAED,OAAO,YAAY,CAAC;AACxB,CAAC"}
+{"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,KAAK,MAAM,MAAM,IAAI,6BAA6B,EAAE;QAChD,MAAM,OAAO,GACT,uBAAc,CAAC,mBAAmB,CAC9B,mBAAmB,EACnB,MAAM,gEAET,CAAC;QAEN,IAAI,CAAC,qBAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YACjC,SAAS;SACZ;QAED,MAAM,OAAO,GAAmC,OAAO,CAAC,IAAI,CAAC;QAC7D,MAAM,cAAc,GAAmB,eAAe,CAAC,sCAAsC,CAAC,OAAO,CAAC,CAAC;QACvG,kBAAkB,CAAC,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;QAClG,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;KAChD;AACL,CAAC;AAED,SAAS,gBAAgB,CACrB,mBAAyC,EACzC,cAAgC,EAChC,gBAA6C;;IAE7C,MAAM,mBAAmB,GAA+B;QACpD,MAAA,mBAAmB,CAAC,aAAa,CAAC,GAAG,2CAA+B,mCAAI,IAAI,GAAG,EAAE;QACjF,MAAA,mBAAmB,CAAC,aAAa,CAAC,GAAG,qCAA4B,mCAAI,IAAI,GAAG,EAAE;KACjF,CAAC;IAEF,KAAK,MAAM,UAAU,IAAI,mBAAmB,EAAE;QAC1C,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE;YAC7B,MAAM,OAAO,GAAsD,uBAAc,CAAC,mBAAmB,CAEnG,mBAAmB,EAAE,MAAM,EAAE,gFAA2D,CAAC,CAAC;YAE5F,IAAI,CAAC,qBAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;gBACjC,SAAS;aACZ;YAED,MAAM,OAAO,GAA6C,OAAO,CAAC,IAAI,CAAC;YAEvE,yDAAyD;YACzD,MAAM,QAAQ,GAAuB,mBAAmB,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACtF,MAAM,YAAY,GAA+B,QAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAEvG,IAAI,YAAY,IAAI,YAAY,CAAC,IAAI,KAAK,wBAAU,CAAC,MAAM,EAAE;gBACzD,MAAM,YAAY,GAAkC,eAAe,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;gBAEjG,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;oBACzB,kBAAkB,CACd,mBAAmB,EACnB,gBAAgB,EAChB,OAAO,CAAC,EAAE,EACV,cAAc,EACd,GAAG,YAAY,CAClB,CAAC;iBACL;aACJ;SACJ;KACJ;AACL,CAAC;AAED,SAAS,kBAAkB,CACvB,mBAAyC,EACzC,gBAA6C,EAC7C,MAAc,EACd,cAAgC,EAChC,GAAG,UAA4B;IAE/B,MAAM,YAAY,GAA+B,gBAAgB,CAAC,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,CAAC,CAAC;IAEjH,IAAI,YAAY,EAAE;QACd,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE;YACxB,YAAY,CAAC,QAAQ,GAAG,EAAE,CAAC;SAC9B;QAED,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;QAE1C,OAAO;KACV;IAED,uBAAuB;IACvB,cAAc,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;AACvC,CAAC;AAED,SAAS,gBAAgB,CACrB,mBAAyC,EACzC,gBAA6C,EAC7C,MAAc;IAEd,8BAA8B;IAC9B,MAAM,YAAY,GAAuB,mBAAmB,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAEtF,IAAI,CAAC,YAAY,EAAE;QACf,2BAA2B;QAC3B,OAAO,SAAS,CAAC;KACpB;IAED,IAAI,YAAY,GAA+B,gBAAgB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAElF,IAAI,CAAC,YAAY,EAAE;QACf,YAAY,GAAG,gBAAgB,CAAC,mBAAmB,EAAE,gBAAgB,EAAE,YAAY,CAAC,CAAC;KACxF;IAED,OAAO,YAAY,CAAC;AACxB,CAAC"}

package/lib/powerquery-language-services/formatter.d.ts

@@ -1,4 +1,4 @@
 import * as PQF from "@microsoft/powerquery-formatter";
 import { TextEdit } from "vscode-languageserver-types";
 import { TextDocument } from "vscode-languageserver-textdocument";
-export declare function tryFormat(document: TextDocument, settings: PQF.FormatSettings): Promise<TextEdit[]>;
+export declare function tryFormat(document: TextDocument, settings: PQF.FormatSettings, experimental: boolean): Promise<TextEdit[]>;

package/lib/powerquery-language-services/formatter.js

@@ -16,10 +16,12 @@ const PQF = require("@microsoft/powerquery-formatter");
 const PQP = require("@microsoft/powerquery-parser");
 const vscode_languageserver_types_1 = require("vscode-languageserver-types");
 const powerquery_parser_1 = require("@microsoft/powerquery-parser");
-function tryFormat(document, settings) {
+function tryFormat(document, settings, experimental) {
     return __awaiter(this, void 0, void 0, function* () {
         const formatSettings = Object.assign(Object.assign({}, PQF.DefaultSettings), settings);
-        const triedFormat = yield PQF.tryFormat(formatSettings, document.getText());
+        const triedFormat = experimental
+            ? yield PQF.tryFormatV2(formatSettings, document.getText())
+            : yield PQF.tryFormat(formatSettings, document.getText());
         if (powerquery_parser_1.ResultUtils.isOk(triedFormat)) {
             return [vscode_languageserver_types_1.TextEdit.replace(fullDocumentRange(document), triedFormat.value)];
         }

package/lib/powerquery-language-services/formatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"formatter.js","sourceRoot":"","sources":["../../src/powerquery-language-services/formatter.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,uDAAuD;AACvD,oDAAoD;AACpD,6EAA8D;AAC9D,oEAA2D;AAG3D,SAAsB,SAAS,CAAC,QAAsB,EAAE,QAA4B;;QAChF,MAAM,cAAc,mCACb,GAAG,CAAC,eAAe,GACnB,QAAQ,CACd,CAAC;QAEF,MAAM,WAAW,GAAoB,MAAM,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;QAE7F,IAAI,+BAAW,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;YAC/B,OAAO,CAAC,sCAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;SAC7E;QACD,0CAA0C;aACrC,IAAI,GAAG,CAAC,WAAW,CAAC,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE;YACvD,MAAM,WAAW,CAAC,KAAK,CAAC;SAC3B;QACD,mEAAmE;aAC9D;YACD,OAAO,EAAE,CAAC;SACb;IACL,CAAC;CAAA;AAnBD,8BAmBC;AAED,0CAA0C;AAC1C,SAAS,iBAAiB,CAAC,QAAsB;IAC7C,OAAO;QACH,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;QAC7B,GAAG,EAAE;YACD,IAAI,EAAE,QAAQ,CAAC,SAAS,GAAG,CAAC;YAC5B,SAAS,EAAE,MAAM,CAAC,SAAS;SAC9B;KACJ,CAAC;AACN,CAAC"}
+{"version":3,"file":"formatter.js","sourceRoot":"","sources":["../../src/powerquery-language-services/formatter.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,uDAAuD;AACvD,oDAAoD;AACpD,6EAA8D;AAC9D,oEAA2D;AAG3D,SAAsB,SAAS,CAC3B,QAAsB,EACtB,QAA4B,EAC5B,YAAqB;;QAErB,MAAM,cAAc,mCACb,GAAG,CAAC,eAAe,GACnB,QAAQ,CACd,CAAC;QAEF,MAAM,WAAW,GAAoB,YAAY;YAC7C,CAAC,CAAC,MAAM,GAAG,CAAC,WAAW,CAAC,cAAc,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC;YAC3D,CAAC,CAAC,MAAM,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;QAE9D,IAAI,+BAAW,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;YAC/B,OAAO,CAAC,sCAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;SAC7E;QACD,0CAA0C;aACrC,IAAI,GAAG,CAAC,WAAW,CAAC,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE;YACvD,MAAM,WAAW,CAAC,KAAK,CAAC;SAC3B;QACD,mEAAmE;aAC9D;YACD,OAAO,EAAE,CAAC;SACb;IACL,CAAC;CAAA;AAzBD,8BAyBC;AAED,0CAA0C;AAC1C,SAAS,iBAAiB,CAAC,QAAsB;IAC7C,OAAO;QACH,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;QAC7B,GAAG,EAAE;YACD,IAAI,EAAE,QAAQ,CAAC,SAAS,GAAG,CAAC;YAC5B,SAAS,EAAE,MAAM,CAAC,SAAS;SAC9B;KACJ,CAAC;AACN,CAAC"}

package/lib/powerquery-language-services/inspection/expectedType.js

@@ -73,6 +73,9 @@ function expectedType(parentXorNode, childIndex) {
         case "AsExpression" /* AsExpression */:
         case "IsExpression" /* IsExpression */:
             return expectTypeAsOrIsExpression(parentXorNode, childIndex);
+        case "CatchExpression" /* CatchExpression */:
+        case "OtherwiseExpression" /* OtherwiseExpression */:
+            return expectTypeErrorHandler(parentXorNode, childIndex);
         case "GeneralizedIdentifierPairedExpression" /* GeneralizedIdentifierPairedExpression */:
         case "IdentifierPairedExpression" /* IdentifierPairedExpression */:
             return expectTypeIdentifierPairedExpression(parentXorNode, childIndex);
@@ -271,15 +274,6 @@ function expectedType(parentXorNode, childIndex) {
                 default:
                     throw unknownChildIndexError(parentXorNode, childIndex);
             }
-        case "OtherwiseExpression" /* OtherwiseExpression */:
-            switch (childIndex) {
-                case 0:
-                    return language_1.Type.NotApplicableInstance;
-                case 1:
-                    return language_1.Type.ExpressionInstance;
-                default:
-                    throw unknownChildIndexError(parentXorNode, childIndex);
-            }
         case "ParenthesizedExpression" /* ParenthesizedExpression */:
             switch (childIndex) {
                 case 0:
@@ -343,6 +337,16 @@ function expectTypeAsOrIsExpression(parentXorNode, childIndex) {
             throw unknownChildIndexError(parentXorNode, childIndex);
     }
 }
+function expectTypeErrorHandler(parentXorNode, childIndex) {
+    switch (childIndex) {
+        case 0:
+            return language_1.Type.NotApplicableInstance;
+        case 1:
+            return language_1.Type.ExpressionInstance;
+        default:
+            throw unknownChildIndexError(parentXorNode, childIndex);
+    }
+}
 function expectTypeBinOpExpression(parentXorNode, childIndex) {
     switch (childIndex) {
         case 0:

package/lib/powerquery-language-services/inspection/expectedType.js.map

@@ -1 +1 @@
-{"version":3,"file":"expectedType.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/inspection/expectedType.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"expectedType.js","sourceRoot":"","sources":["../../../src/powerquery-language-services/inspection/expectedType.ts"],"names":[],"mappings":"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"}

package/lib/powerquery-language-services/inspection/type/inspectType/common.js

@@ -167,6 +167,7 @@ function inspectXor(state, xorNode, maybeCorrelationId) {
                 return Promise.resolve(language_1.Type.NotApplicableInstance);
             case "AsType" /* AsType */:
             case "AsNullablePrimitiveType" /* AsNullablePrimitiveType */:
+            case "CatchExpression" /* CatchExpression */:
             case "FieldTypeSpecification" /* FieldTypeSpecification */:
             case "OtherwiseExpression" /* OtherwiseExpression */:
             case "ParenthesizedExpression" /* ParenthesizedExpression */:
@@ -422,11 +423,10 @@ function recursiveIdentifierDereferenceHelper(state, xorNode, correlationId) {
     });
 }
 function createParameterType(parameter) {
-    if (parameter.maybeType === undefined) {
-        return language_1.Type.NoneInstance;
-    }
     return {
-        kind: language_1.TypeUtils.typeKindFromPrimitiveTypeConstantKind(parameter.maybeType),
+        kind: parameter.maybeType
+            ? language_1.TypeUtils.typeKindFromPrimitiveTypeConstantKind(parameter.maybeType)
+            : "Any" /* Any */,
         maybeExtendedKind: undefined,
         isNullable: parameter.isNullable || parameter.isOptional,
     };

package/lib/powerquery-language-services/inspection/type/inspectType/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/common.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/common.ts"],"names":[],"mappings":"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"}

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.js

@@ -12,6 +12,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.inspectTypeErrorHandlingExpression = void 0;
+const PQP = require("@microsoft/powerquery-parser");
 const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
 const __1 = require("../../..");
@@ -22,13 +23,35 @@ function inspectTypeErrorHandlingExpression(state, xorNode, maybeCorrelationId)
         const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeErrorHandlingExpression.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
         (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
         parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "ErrorHandlingExpression" /* ErrorHandlingExpression */);
-        const maybeOtherwiseExpression = parser_1.NodeIdMapUtils.maybeNthChildChecked(state.nodeIdMapCollection, xorNode.node.id, 2, "OtherwiseExpression" /* OtherwiseExpression */);
-        const result = language_1.TypeUtils.createAnyUnion([
-            yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 1, trace.id),
-            maybeOtherwiseExpression !== undefined
-                ? yield (0, common_1.inspectXor)(state, maybeOtherwiseExpression, trace.id)
-                : language_1.TypeUtils.createPrimitiveType(false, "Record" /* Record */),
-        ], state.traceManager, trace.id);
+        // Grabs Ast.ErrorHandlingExpression.maybeHandler
+        const maybeHandler = parser_1.NodeIdMapUtils.maybeNthChildChecked(state.nodeIdMapCollection, xorNode.node.id, 2, ["CatchExpression" /* CatchExpression */, "OtherwiseExpression" /* OtherwiseExpression */]);
+        let errorHandlerResult;
+        // No handler exists, i.e. `try 0`
+        if (maybeHandler === undefined) {
+            errorHandlerResult = language_1.Type.RecordInstance;
+        }
+        // If it's a catch handler, i.e. `try 1/0 catch () => "div by 0"`
+        else if (maybeHandler.node.kind === "CatchExpression" /* CatchExpression */) {
+            // We care about the evaluation of the function,
+            // and as typing isn't allowed on a catch expression it requires an inspection on the function's body
+            const maybeFnExpression = parser_1.NodeIdMapUtils.maybeNthChildChecked(state.nodeIdMapCollection, maybeHandler.node.id, 1, ["FunctionExpression" /* FunctionExpression */]);
+            // If there's no function expression, i.e. `try 1/0 catch`
+            if (maybeFnExpression === undefined) {
+                errorHandlerResult = language_1.Type.UnknownInstance;
+            }
+            // Else examine Ast.FunctionExpression.expression
+            else {
+                errorHandlerResult = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, maybeFnExpression, 3, trace.id);
+            }
+        }
+        // Much easier here, simply return the paired expression.
+        else if (maybeHandler.node.kind === "OtherwiseExpression" /* OtherwiseExpression */) {
+            errorHandlerResult = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, maybeHandler, 1, trace.id);
+        }
+        else {
+            throw new PQP.CommonError.InvariantError(`should never be reached`);
+        }
+        const result = language_1.TypeUtils.createAnyUnion([yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 1, trace.id), errorHandlerResult], state.traceManager, trace.id);
         trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
         return result;
     });

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.js.map

@@ -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,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"}
+{"version":3,"file":"inspectTypeErrorHandlingExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeErrorHandlingExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AACpD,0FAAmG;AACnG,sFAKmE;AAGnE,gCAA+D;AAC/D,qCAAgF;AAEhF,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,CAA+B,OAAO,0DAAuC,CAAC;QAE3G,iDAAiD;QACjD,MAAM,YAAY,GACd,uBAAc,CAAC,oBAAoB,CAC/B,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,EACD,0FAAgE,CACnE,CAAC;QAEN,IAAI,kBAAwC,CAAC;QAE7C,kCAAkC;QAClC,IAAI,YAAY,KAAK,SAAS,EAAE;YAC5B,kBAAkB,GAAG,eAAI,CAAC,cAAc,CAAC;SAC5C;QACD,iEAAiE;aAC5D,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,4CAAiC,EAAE;YAC9D,gDAAgD;YAChD,qGAAqG;YACrG,MAAM,iBAAiB,GACnB,uBAAc,CAAC,oBAAoB,CAC/B,KAAK,CAAC,mBAAmB,EACzB,YAAY,CAAC,IAAI,CAAC,EAAE,EACpB,CAAC,EACD,+CAAiC,CACpC,CAAC;YAEN,0DAA0D;YAC1D,IAAI,iBAAiB,KAAK,SAAS,EAAE;gBACjC,kBAAkB,GAAG,eAAI,CAAC,eAAe,CAAC;aAC7C;YACD,iDAAiD;iBAC5C;gBACD,kBAAkB,GAAG,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,iBAAiB,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;aACxG;SACJ;QACD,yDAAyD;aACpD,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,oDAAqC,EAAE;YAClE,kBAAkB,GAAG,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,YAAY,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;SACnG;aAAM;YACH,MAAM,IAAI,GAAG,CAAC,WAAW,CAAC,cAAc,CAAC,yBAAyB,CAAC,CAAC;SACvE;QAED,MAAM,MAAM,GAAyB,oBAAS,CAAC,cAAc,CACzD,CAAC,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,EAAE,kBAAkB,CAAC,EAC3F,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;AAnED,gFAmEC"}

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.js

@@ -14,6 +14,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.inspectTypeFunctionExpression = void 0;
 const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
+const powerquery_parser_1 = require("@microsoft/powerquery-parser");
 const common_1 = require("./common");
 const __1 = require("../../..");
 const pseudoFunctionExpressionType_1 = require("../../pseudoFunctionExpressionType");
@@ -25,47 +26,58 @@ function inspectTypeFunctionExpression(state, xorNode, maybeCorrelationId) {
         parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "FunctionExpression" /* FunctionExpression */);
         const pseudoType = (0, pseudoFunctionExpressionType_1.pseudoFunctionExpressionType)(state.nodeIdMapCollection, xorNode);
         const pseudoReturnType = pseudoType.returnType;
-        const expressionType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 3, trace.id);
-        // FunctionExpression.maybeFunctionReturnType doesn't always match FunctionExpression.expression.
-        // By examining the expression we might get a more accurate return type (eg. Function vs DefinedFunction),
-        // or discover an error (eg. maybeFunctionReturnType is Number but expression is Text).
-        let returnType;
-        // If the stated return type is Any,
-        // then it might as well be the expression's type as it can't be any wider than Any.
-        if (pseudoReturnType.kind === "Any" /* Any */) {
-            returnType = expressionType;
+        let result;
+        switch (state.typeStrategy) {
+            case "Extended" /* Extended */: {
+                const expressionType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 3, trace.id);
+                // FunctionExpression.maybeFunctionReturnType doesn't always match FunctionExpression.expression.
+                // By examining the expression we might get a more accurate return type (eg. Function vs DefinedFunction),
+                // or discover an error (eg. maybeFunctionReturnType is Number but expression is Text).
+                let returnType;
+                // If the stated return type is Any,
+                // then it might as well be the expression's type as it can't be any wider than Any.
+                if (pseudoReturnType.kind === "Any" /* Any */) {
+                    returnType = expressionType;
+                }
+                // If the return type is Any then see if we can narrow it to the stated return Type.
+                else if (expressionType.kind === "Any" /* Any */ &&
+                    expressionType.maybeExtendedKind === "AnyUnion" /* AnyUnion */ &&
+                    (0, common_1.allForAnyUnion)(expressionType, (type) => type.kind === pseudoReturnType.kind || type.kind === "Any" /* Any */)) {
+                    returnType = expressionType;
+                }
+                // If the stated return type doesn't match the expression's type then it's None.
+                else if (pseudoReturnType.kind !== expressionType.kind) {
+                    trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(language_1.Type.NoneInstance) });
+                    return language_1.Type.NoneInstance;
+                }
+                // If the expression's type can't be known, then assume it's the stated return Type.
+                else if (expressionType.kind === "Unknown" /* Unknown */) {
+                    returnType = pseudoReturnType;
+                }
+                // Else fallback to the expression's Type.
+                else {
+                    returnType = expressionType;
+                }
+                result = {
+                    kind: "Function" /* Function */,
+                    maybeExtendedKind: "DefinedFunction" /* DefinedFunction */,
+                    isNullable: false,
+                    parameters: pseudoType.parameters.map((pseudoParameter) => ({
+                        nameLiteral: pseudoParameter.name.literal,
+                        isNullable: pseudoParameter.isNullable,
+                        isOptional: pseudoParameter.isOptional,
+                        maybeType: pseudoParameter.maybeType,
+                    })),
+                    returnType,
+                };
+                break;
+            }
+            case "Primitive" /* Primitive */:
+                result = pseudoReturnType;
+                break;
+            default:
+                powerquery_parser_1.Assert.isNever(state.typeStrategy);
         }
-        // If the return type is Any then see if we can narrow it to the stated return Type.
-        else if (expressionType.kind === "Any" /* Any */ &&
-            expressionType.maybeExtendedKind === "AnyUnion" /* AnyUnion */ &&
-            (0, common_1.allForAnyUnion)(expressionType, (type) => type.kind === pseudoReturnType.kind || type.kind === "Any" /* Any */)) {
-            returnType = expressionType;
-        }
-        // If the stated return type doesn't match the expression's type then it's None.
-        else if (pseudoReturnType.kind !== expressionType.kind) {
-            trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(language_1.Type.NoneInstance) });
-            return language_1.Type.NoneInstance;
-        }
-        // If the expression's type can't be known, then assume it's the stated return Type.
-        else if (expressionType.kind === "Unknown" /* Unknown */) {
-            returnType = pseudoReturnType;
-        }
-        // Else fallback to the expression's Type.
-        else {
-            returnType = expressionType;
-        }
-        const result = {
-            kind: "Function" /* Function */,
-            maybeExtendedKind: "DefinedFunction" /* DefinedFunction */,
-            isNullable: false,
-            parameters: pseudoType.parameters.map((pseudoParameter) => ({
-                nameLiteral: pseudoParameter.name.literal,
-                isNullable: pseudoParameter.isNullable,
-                isOptional: pseudoParameter.isOptional,
-                maybeType: pseudoParameter.maybeType,
-            })),
-            returnType,
-        };
         trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
         return result;
     });

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.js.map

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeFunctionExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,0FAAwF;AAExF,sFAAmG;AAEnG,qCAAgG;AAChG,gCAA+D;AAC/D,qFAI4C;AAE5C,SAAsB,6BAA6B,CAC/C,KAAuB,EACvB,OAAiB,EACjB,kBAAsC;;;QAEtC,MAAM,KAAK,GAAU,KAAK,CAAC,YAAY,CAAC,KAAK,sCAEzC,6BAA6B,CAAC,IAAI,EAClC,kBAAkB,EAClB,cAAU,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAC3C,CAAC;QAEF,MAAA,KAAK,CAAC,sBAAsB,0CAAE,gBAAgB,EAAE,CAAC;QACjD,qBAAY,CAAC,gBAAgB,CAAyB,OAAO,gDAAkC,CAAC;QAEhG,MAAM,UAAU,GAAiC,IAAA,2DAA4B,EAAC,KAAK,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;QAClH,MAAM,gBAAgB,GAAyB,UAAU,CAAC,UAAU,CAAC;QACrE,MAAM,cAAc,GAAyB,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAEnH,iGAAiG;QACjG,0GAA0G;QAC1G,uFAAuF;QAEvF,IAAI,UAAgC,CAAC;QAErC,oCAAoC;QACpC,oFAAoF;QACpF,IAAI,gBAAgB,CAAC,IAAI,oBAAsB,EAAE;YAC7C,UAAU,GAAG,cAAc,CAAC;SAC/B;QACD,oFAAoF;aAC/E,IACD,cAAc,CAAC,IAAI,oBAAsB;YACzC,cAAc,CAAC,iBAAiB,8BAAmC;YACnE,IAAA,uBAAc,EACV,cAAc,EACd,CAAC,IAA0B,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,gBAAgB,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,oBAAsB,CACzG,EACH;YACE,UAAU,GAAG,cAAc,CAAC;SAC/B;QACD,gFAAgF;aAC3E,IAAI,gBAAgB,CAAC,IAAI,KAAK,cAAc,CAAC,IAAI,EAAE;YACpD,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,eAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;YAExF,OAAO,eAAI,CAAC,YAAY,CAAC;SAC5B;QACD,oFAAoF;aAC/E,IAAI,cAAc,CAAC,IAAI,4BAA0B,EAAE;YACpD,UAAU,GAAG,gBAAgB,CAAC;SACjC;QACD,0CAA0C;aACrC;YACD,UAAU,GAAG,cAAc,CAAC;SAC/B;QAED,MAAM,MAAM,GAAyB;YACjC,IAAI,2BAAwB;YAC5B,iBAAiB,yCAAuC;YACxD,UAAU,EAAE,KAAK;YACjB,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,eAA4C,EAAE,EAAE,CAAC,CAAC;gBACrF,WAAW,EAAE,eAAe,CAAC,IAAI,CAAC,OAAO;gBACzC,UAAU,EAAE,eAAe,CAAC,UAAU;gBACtC,UAAU,EAAE,eAAe,CAAC,UAAU;gBACtC,SAAS,EAAE,eAAe,CAAC,SAAS;aACvC,CAAC,CAAC;YACH,UAAU;SACb,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAxED,sEAwEC"}
+{"version":3,"file":"inspectTypeFunctionExpression.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionExpression.ts"],"names":[],"mappings":"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"}

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.d.ts

@@ -1,4 +1,4 @@
 import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
 import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
 import { InspectTypeState } from "./common";
-export declare function inspectTypeFunctionType(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.FunctionType | Type.Unknown>;
+export declare function inspectTypeFunctionType(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.FunctionType | Type.Type | Type.Unknown>;

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.js

@@ -16,6 +16,7 @@ const PQP = require("@microsoft/powerquery-parser");
 const language_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/language");
 const __1 = require("../../..");
 const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
+const powerquery_parser_1 = require("@microsoft/powerquery-parser");
 const common_1 = require("./common");
 function inspectTypeFunctionType(state, xorNode, maybeCorrelationId) {
     var _a;
@@ -23,27 +24,38 @@ function inspectTypeFunctionType(state, xorNode, maybeCorrelationId) {
         const trace = state.traceManager.entry("Inspection.Type" /* InspectType */, inspectTypeFunctionType.name, maybeCorrelationId, __1.TraceUtils.createXorNodeDetails(xorNode));
         (_a = state.maybeCancellationToken) === null || _a === void 0 ? void 0 : _a.throwIfCancelled();
         parser_1.XorNodeUtils.assertIsNodeKind(xorNode, "FunctionType" /* FunctionType */);
-        const maybeParameters = parser_1.NodeIdMapUtils.maybeNthChildChecked(state.nodeIdMapCollection, xorNode.node.id, 1, "ParameterList" /* ParameterList */);
-        if (maybeParameters === undefined) {
-            trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(language_1.Type.UnknownInstance) });
-            return language_1.Type.UnknownInstance;
+        let result;
+        switch (state.typeStrategy) {
+            case "Extended" /* Extended */: {
+                const maybeParameters = parser_1.NodeIdMapUtils.maybeNthChildChecked(state.nodeIdMapCollection, xorNode.node.id, 1, "ParameterList" /* ParameterList */);
+                if (maybeParameters === undefined) {
+                    trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(language_1.Type.UnknownInstance) });
+                    return language_1.Type.UnknownInstance;
+                }
+                const maybeArrayWrapper = parser_1.NodeIdMapUtils.maybeUnboxArrayWrapper(state.nodeIdMapCollection, maybeParameters.node.id);
+                if (maybeArrayWrapper === undefined) {
+                    trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(language_1.Type.UnknownInstance) });
+                    return language_1.Type.UnknownInstance;
+                }
+                const parameterTypes = parser_1.NodeIdMapIterator.iterArrayWrapper(state.nodeIdMapCollection, maybeArrayWrapper)
+                    .map((parameter) => language_1.TypeUtils.inspectParameter(state.nodeIdMapCollection, parser_1.XorNodeUtils.assertAsParameter(parameter)))
+                    .filter(PQP.TypeScriptUtils.isDefined);
+                const returnType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 2, trace.id);
+                result = {
+                    kind: "Type" /* Type */,
+                    maybeExtendedKind: "FunctionType" /* FunctionType */,
+                    isNullable: false,
+                    parameters: parameterTypes,
+                    returnType,
+                };
+                break;
+            }
+            case "Primitive" /* Primitive */:
+                result = language_1.Type.TypePrimitiveInstance;
+                break;
+            default:
+                powerquery_parser_1.Assert.isNever(state.typeStrategy);
         }
-        const maybeArrayWrapper = parser_1.NodeIdMapUtils.maybeUnboxArrayWrapper(state.nodeIdMapCollection, maybeParameters.node.id);
-        if (maybeArrayWrapper === undefined) {
-            trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(language_1.Type.UnknownInstance) });
-            return language_1.Type.UnknownInstance;
-        }
-        const parameterTypes = parser_1.NodeIdMapIterator.iterArrayWrapper(state.nodeIdMapCollection, maybeArrayWrapper)
-            .map((parameter) => language_1.TypeUtils.inspectParameter(state.nodeIdMapCollection, parser_1.XorNodeUtils.assertAsParameter(parameter)))
-            .filter(PQP.TypeScriptUtils.isDefined);
-        const returnType = yield (0, common_1.inspectTypeFromChildAttributeIndex)(state, xorNode, 2, trace.id);
-        const result = {
-            kind: "Type" /* Type */,
-            maybeExtendedKind: "FunctionType" /* FunctionType */,
-            isNullable: false,
-            parameters: parameterTypes,
-            returnType,
-        };
         trace.exit({ ["Result" /* Result */]: __1.TraceUtils.createTypeDetails(result) });
         return result;
     });

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.js.map

@@ -1 +1 @@
-{"version":3,"file":"inspectTypeFunctionType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AACpD,0FAAmG;AACnG,gCAA+D;AAC/D,sFAMmE;AAGnE,qCAAgF;AAEhF,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,eAAe,GACjB,uBAAc,CAAC,oBAAoB,CAC/B,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,sCAEJ,CAAC;QAEN,IAAI,eAAe,KAAK,SAAS,EAAE;YAC/B,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,eAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;YAE3F,OAAO,eAAI,CAAC,eAAe,CAAC;SAC/B;QAED,MAAM,iBAAiB,GAA2C,uBAAc,CAAC,sBAAsB,CACnG,KAAK,CAAC,mBAAmB,EACzB,eAAe,CAAC,IAAI,CAAC,EAAE,CAC1B,CAAC;QAEF,IAAI,iBAAiB,KAAK,SAAS,EAAE;YACjC,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,eAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;YAE3F,OAAO,eAAI,CAAC,eAAe,CAAC;SAC/B;QAED,MAAM,cAAc,GAA0C,0BAAiB,CAAC,gBAAgB,CAC5F,KAAK,CAAC,mBAAmB,EACzB,iBAAiB,CACpB;aACI,GAAG,CAAC,CAAC,SAAmB,EAAE,EAAE,CACzB,oBAAS,CAAC,gBAAgB,CAAC,KAAK,CAAC,mBAAmB,EAAE,qBAAY,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CACnG;aACA,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAE3C,MAAM,UAAU,GAAyB,MAAM,IAAA,2CAAkC,EAAC,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;QAE/G,MAAM,MAAM,GAAyB;YACjC,IAAI,mBAAoB;YACxB,iBAAiB,mCAAoC;YACrD,UAAU,EAAE,KAAK;YACjB,UAAU,EAAE,cAAc;YAC1B,UAAU;SACb,CAAC;QAEF,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AA9DD,0DA8DC"}
+{"version":3,"file":"inspectTypeFunctionType.js","sourceRoot":"","sources":["../../../../../src/powerquery-language-services/inspection/type/inspectType/inspectTypeFunctionType.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;AAElC,oDAAoD;AACpD,0FAAmG;AACnG,gCAA+D;AAC/D,sFAMmE;AAEnE,oEAAsD;AAEtD,qCAAgF;AAGhF,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,IAAI,MAAoD,CAAC;QAEzD,QAAQ,KAAK,CAAC,YAAY,EAAE;YACxB,8BAA0B,CAAC,CAAC;gBACxB,MAAM,eAAe,GACjB,uBAAc,CAAC,oBAAoB,CAC/B,KAAK,CAAC,mBAAmB,EACzB,OAAO,CAAC,IAAI,CAAC,EAAE,EACf,CAAC,sCAEJ,CAAC;gBAEN,IAAI,eAAe,KAAK,SAAS,EAAE;oBAC/B,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,eAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;oBAE3F,OAAO,eAAI,CAAC,eAAe,CAAC;iBAC/B;gBAED,MAAM,iBAAiB,GAA2C,uBAAc,CAAC,sBAAsB,CACnG,KAAK,CAAC,mBAAmB,EACzB,eAAe,CAAC,IAAI,CAAC,EAAE,CAC1B,CAAC;gBAEF,IAAI,iBAAiB,KAAK,SAAS,EAAE;oBACjC,KAAK,CAAC,IAAI,CAAC,EAAE,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,eAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;oBAE3F,OAAO,eAAI,CAAC,eAAe,CAAC;iBAC/B;gBAED,MAAM,cAAc,GAA0C,0BAAiB,CAAC,gBAAgB,CAC5F,KAAK,CAAC,mBAAmB,EACzB,iBAAiB,CACpB;qBACI,GAAG,CAAC,CAAC,SAAmB,EAAE,EAAE,CACzB,oBAAS,CAAC,gBAAgB,CAAC,KAAK,CAAC,mBAAmB,EAAE,qBAAY,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,CACnG;qBACA,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;gBAE3C,MAAM,UAAU,GAAyB,MAAM,IAAA,2CAAkC,EAC7E,KAAK,EACL,OAAO,EACP,CAAC,EACD,KAAK,CAAC,EAAE,CACX,CAAC;gBAEF,MAAM,GAAG;oBACL,IAAI,mBAAoB;oBACxB,iBAAiB,mCAAoC;oBACrD,UAAU,EAAE,KAAK;oBACjB,UAAU,EAAE,cAAc;oBAC1B,UAAU;iBACb,CAAC;gBAEF,MAAM;aACT;YAED;gBACI,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,uBAAsB,EAAE,cAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAE7E,OAAO,MAAM,CAAC;;CACjB;AAlFD,0DAkFC"}

package/lib/powerquery-language-services/inspection/type/inspectType/inspectTypeList.d.ts

@@ -1,4 +1,4 @@
 import { TXorNode } from "@microsoft/powerquery-parser/lib/powerquery-parser/parser";
 import { Type } from "@microsoft/powerquery-parser/lib/powerquery-parser/language";
 import { InspectTypeState } from "./common";
-export declare function inspectTypeList(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.DefinedList>;
+export declare function inspectTypeList(state: InspectTypeState, xorNode: TXorNode, maybeCorrelationId: number | undefined): Promise<Type.List | Type.DefinedList>;