@microsoft/powerquery-language-services 0.2.19 → 0.3.1

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

@@ -1,146 +1,97 @@
 "use strict";
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDocumentSymbols = void 0;
-var PQP = require("@microsoft/powerquery-parser");
-var parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
-var InspectionUtils = require("./inspectionUtils");
-var commonTypes_1 = require("./commonTypes");
-var workspaceCache_1 = require("./workspaceCache");
+const PQP = require("@microsoft/powerquery-parser");
+const parser_1 = require("@microsoft/powerquery-parser/lib/powerquery-parser/parser");
+const InspectionUtils = require("./inspectionUtils");
+const commonTypes_1 = require("./commonTypes");
+const workspaceCache_1 = require("./workspaceCache");
 function getDocumentSymbols(textDocument, lexAndParseSettings, maintainWorkspaceCache) {
-    var cacheItem = workspaceCache_1.WorkspaceCacheUtils.getOrCreateParse(textDocument, lexAndParseSettings);
-    if (!PQP.TaskUtils.isParseStageOk(cacheItem) && !PQP.TaskUtils.isParseStageParseError(cacheItem)) {
-        return [];
-    }
-    var nodeIdMapCollection = cacheItem.nodeIdMapCollection;
-    var currentSymbols = [];
-    var parentSymbolById = new Map();
-    addIdentifierPairedExpressionSymbols(nodeIdMapCollection, currentSymbols, parentSymbolById);
-    addRecordSymbols(nodeIdMapCollection, currentSymbols, parentSymbolById);
-    if (!maintainWorkspaceCache) {
-        workspaceCache_1.WorkspaceCacheUtils.close(textDocument);
-    }
-    return currentSymbols;
+    return __awaiter(this, void 0, void 0, function* () {
+        const maybeTriedParse = yield workspaceCache_1.WorkspaceCacheUtils.getOrCreateParsePromise(textDocument, lexAndParseSettings);
+        if (maybeTriedParse === undefined || PQP.TaskUtils.isParseStageCommonError(maybeTriedParse)) {
+            return [];
+        }
+        const nodeIdMapCollection = maybeTriedParse.nodeIdMapCollection;
+        const currentSymbols = [];
+        const parentSymbolById = new Map();
+        addIdentifierPairedExpressionSymbols(nodeIdMapCollection, currentSymbols, parentSymbolById);
+        addRecordSymbols(nodeIdMapCollection, currentSymbols, parentSymbolById);
+        if (!maintainWorkspaceCache) {
+            workspaceCache_1.WorkspaceCacheUtils.close(textDocument);
+        }
+        return currentSymbols;
+    });
 }
 exports.getDocumentSymbols = getDocumentSymbols;
 function addIdentifierPairedExpressionSymbols(nodeIdMapCollection, currentSymbols, parentSymbolById) {
-    var e_1, _a;
-    var _b;
-    var identifierPairedExpressionIds = (_b = nodeIdMapCollection.idsByNodeKind.get("IdentifierPairedExpression" /* IdentifierPairedExpression */)) !== null && _b !== void 0 ? _b : new Set();
-    var identifierPairedExpressionsXorNodes = parser_1.NodeIdMapIterator.assertIterXor(nodeIdMapCollection, __spreadArray([], __read(identifierPairedExpressionIds.values()), false));
-    try {
-        for (var identifierPairedExpressionsXorNodes_1 = __values(identifierPairedExpressionsXorNodes), identifierPairedExpressionsXorNodes_1_1 = identifierPairedExpressionsXorNodes_1.next(); !identifierPairedExpressionsXorNodes_1_1.done; identifierPairedExpressionsXorNodes_1_1 = identifierPairedExpressionsXorNodes_1.next()) {
-            var xorNode = identifierPairedExpressionsXorNodes_1_1.value;
-            if (!parser_1.XorNodeUtils.isAstXorChecked(xorNode, "IdentifierPairedExpression" /* IdentifierPairedExpression */)) {
-                continue;
-            }
-            var nodeId = xorNode.node.id;
-            var documentSymbol = InspectionUtils.getSymbolForIdentifierPairedExpression(xorNode.node);
-            addDocumentSymbols(nodeIdMapCollection, parentSymbolById, nodeId, currentSymbols, documentSymbol);
-            parentSymbolById.set(nodeId, documentSymbol);
-        }
-    }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (identifierPairedExpressionsXorNodes_1_1 && !identifierPairedExpressionsXorNodes_1_1.done && (_a = identifierPairedExpressionsXorNodes_1.return)) _a.call(identifierPairedExpressionsXorNodes_1);
+    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 */)) {
+            continue;
         }
-        finally { if (e_1) throw e_1.error; }
+        const nodeId = xorNode.node.id;
+        const documentSymbol = InspectionUtils.getSymbolForIdentifierPairedExpression(xorNode.node);
+        addDocumentSymbols(nodeIdMapCollection, parentSymbolById, nodeId, currentSymbols, documentSymbol);
+        parentSymbolById.set(nodeId, documentSymbol);
     }
 }
 function addRecordSymbols(nodeIdMapCollection, currentSymbols, parentSymbolById) {
-    var e_2, _a;
-    var _b, _c;
-    var recordIds = __spreadArray(__spreadArray([], __read(((_b = nodeIdMapCollection.idsByNodeKind.get("RecordExpression" /* RecordExpression */)) !== null && _b !== void 0 ? _b : new Set()).values()), false), __read(((_c = nodeIdMapCollection.idsByNodeKind.get("RecordLiteral" /* RecordLiteral */)) !== null && _c !== void 0 ? _c : new Set()).values()), false);
-    var recordXorNodes = parser_1.NodeIdMapIterator.assertIterXor(nodeIdMapCollection, recordIds);
-    try {
-        for (var recordXorNodes_1 = __values(recordXorNodes), recordXorNodes_1_1 = recordXorNodes_1.next(); !recordXorNodes_1_1.done; recordXorNodes_1_1 = recordXorNodes_1.next()) {
-            var xorNode = recordXorNodes_1_1.value;
-            if (!parser_1.XorNodeUtils.isAstXor(xorNode)) {
-                continue;
-            }
-            var asAst = xorNode.node;
-            // Process the record if the immediate parent is a Struct
-            var parentId = nodeIdMapCollection.parentIdById.get(xorNode.node.id);
-            var parentSymbol = parentId ? parentSymbolById.get(parentId) : undefined;
-            if (parentSymbol && parentSymbol.kind === commonTypes_1.SymbolKind.Struct) {
-                var fieldSymbols = InspectionUtils.getSymbolsForRecord(asAst);
-                if (fieldSymbols.length > 0) {
-                    addDocumentSymbols.apply(void 0, __spreadArray([nodeIdMapCollection, parentSymbolById, asAst.id, currentSymbols], __read(fieldSymbols), false));
-                }
-            }
+    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 recordXorNodes = parser_1.NodeIdMapIterator.assertIterXor(nodeIdMapCollection, recordIds);
+    for (const xorNode of recordXorNodes) {
+        if (!parser_1.XorNodeUtils.isAstXor(xorNode)) {
+            continue;
         }
-    }
-    catch (e_2_1) { e_2 = { error: e_2_1 }; }
-    finally {
-        try {
-            if (recordXorNodes_1_1 && !recordXorNodes_1_1.done && (_a = recordXorNodes_1.return)) _a.call(recordXorNodes_1);
+        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);
+            }
         }
-        finally { if (e_2) throw e_2.error; }
     }
 }
-function addDocumentSymbols(nodeIdMapCollection, parentSymbolById, nodeId, currentSymbols) {
-    var _a;
-    var newSymbols = [];
-    for (var _i = 4; _i < arguments.length; _i++) {
-        newSymbols[_i - 4] = arguments[_i];
-    }
-    var parentSymbol = findParentSymbol(nodeIdMapCollection, parentSymbolById, nodeId);
+function addDocumentSymbols(nodeIdMapCollection, parentSymbolById, nodeId, currentSymbols, ...newSymbols) {
+    const parentSymbol = findParentSymbol(nodeIdMapCollection, parentSymbolById, nodeId);
     if (parentSymbol) {
         if (!parentSymbol.children) {
             parentSymbol.children = [];
         }
-        (_a = parentSymbol.children).push.apply(_a, __spreadArray([], __read(newSymbols), false));
+        parentSymbol.children.push(...newSymbols);
         return;
     }
     // Add to the top level
-    currentSymbols.push.apply(currentSymbols, __spreadArray([], __read(newSymbols), false));
+    currentSymbols.push(...newSymbols);
 }
 function findParentSymbol(nodeIdMapCollection, parentSymbolById, nodeId) {
     // Get parent for current node
-    var parentNodeId = nodeIdMapCollection.parentIdById.get(nodeId);
+    const parentNodeId = nodeIdMapCollection.parentIdById.get(nodeId);
     if (!parentNodeId) {
         // No more parents to check
         return undefined;
     }
-    var parentSymbol = parentSymbolById.get(parentNodeId);
+    let parentSymbol = parentSymbolById.get(parentNodeId);
     if (!parentSymbol) {
         parentSymbol = findParentSymbol(nodeIdMapCollection, parentSymbolById, parentNodeId);
     }

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,kDAAoD;AACpD,oFAKmE;AAGnE,mDAAqD;AACrD,6CAAyE;AACzE,mDAAuE;AAEvE,SAAgB,kBAAkB,CAC9B,YAA0B,EAC1B,mBAAwD,EACxD,sBAA+B;IAE/B,IAAM,SAAS,GAAkC,oCAAmB,CAAC,gBAAgB,CACjF,YAAY,EACZ,mBAAmB,CACtB,CAAC;IAEF,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,sBAAsB,CAAC,SAAS,CAAC,EAAE;QAC9F,OAAO,EAAE,CAAC;KACb;IAED,IAAM,mBAAmB,GAAyB,SAAS,CAAC,mBAAmB,CAAC;IAChF,IAAM,cAAc,GAAqB,EAAE,CAAC;IAC5C,IAAM,gBAAgB,GAAgC,IAAI,GAAG,EAAE,CAAC;IAEhE,oCAAoC,CAAC,mBAAmB,EAAE,cAAc,EAAE,gBAAgB,CAAC,CAAC;IAC5F,gBAAgB,CAAC,mBAAmB,EAAE,cAAc,EAAE,gBAAgB,CAAC,CAAC;IAExE,IAAI,CAAC,sBAAsB,EAAE;QACzB,oCAAmB,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;KAC3C;IAED,OAAO,cAAc,CAAC;AAC1B,CAAC;AA1BD,gDA0BC;AAED,SAAS,oCAAoC,CACzC,mBAAyC,EACzC,cAAgC,EAChC,gBAA6C;;;IAE7C,IAAM,6BAA6B,GAC/B,MAAA,mBAAmB,CAAC,aAAa,CAAC,GAAG,+DAAyC,mCAAI,IAAI,GAAG,EAAE,CAAC;IAEhG,IAAM,mCAAmC,GAA4B,0BAAiB,CAAC,aAAa,CAChG,mBAAmB,2BACf,6BAA6B,CAAC,MAAM,EAAE,UAC7C,CAAC;;QAEF,KAAsB,IAAA,wCAAA,SAAA,mCAAmC,CAAA,wFAAA,yIAAE;YAAtD,IAAM,OAAO,gDAAA;YACd,IACI,CAAC,qBAAY,CAAC,eAAe,CACzB,OAAO,gEAEV,EACH;gBACE,SAAS;aACZ;YAED,IAAM,MAAM,GAAW,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YACvC,IAAM,cAAc,GAAmB,eAAe,CAAC,sCAAsC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAE5G,kBAAkB,CAAC,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;YAClG,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;SAChD;;;;;;;;;AACL,CAAC;AAED,SAAS,gBAAgB,CACrB,mBAAyC,EACzC,cAAgC,EAChC,gBAA6C;;;IAE7C,IAAM,SAAS,0CACR,CAAC,MAAA,mBAAmB,CAAC,aAAa,CAAC,GAAG,2CAA+B,mCAAI,IAAI,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,kBAC5F,CAAC,MAAA,mBAAmB,CAAC,aAAa,CAAC,GAAG,qCAA4B,mCAAI,IAAI,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,SAC/F,CAAC;IAEF,IAAM,cAAc,GAA4B,0BAAiB,CAAC,aAAa,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAC;;QAEhH,KAAsB,IAAA,mBAAA,SAAA,cAAc,CAAA,8CAAA,0EAAE;YAAjC,IAAM,OAAO,2BAAA;YACd,IAAI,CAAC,qBAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;gBACjC,SAAS;aACZ;YAED,IAAM,KAAK,GAA6C,OAAO,CAAC,IAEzC,CAAC;YAExB,yDAAyD;YACzD,IAAM,QAAQ,GAAuB,mBAAmB,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC3F,IAAM,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,IAAM,YAAY,GAAkC,eAAe,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;gBAE/F,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;oBACzB,kBAAkB,8BAAC,mBAAmB,EAAE,gBAAgB,EAAE,KAAK,CAAC,EAAE,EAAE,cAAc,UAAK,YAAY,WAAE;iBACxG;aACJ;SACJ;;;;;;;;;AACL,CAAC;AAED,SAAS,kBAAkB,CACvB,mBAAyC,EACzC,gBAA6C,EAC7C,MAAc,EACd,cAAgC;;IAChC,oBAA+B;SAA/B,UAA+B,EAA/B,qBAA+B,EAA/B,IAA+B;QAA/B,mCAA+B;;IAE/B,IAAM,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,CAAA,KAAA,YAAY,CAAC,QAAQ,CAAA,CAAC,IAAI,oCAAI,UAAU,WAAE;QAE1C,OAAO;KACV;IAED,uBAAuB;IACvB,cAAc,CAAC,IAAI,OAAnB,cAAc,2BAAS,UAAU,WAAE;AACvC,CAAC;AAED,SAAS,gBAAgB,CACrB,mBAAyC,EACzC,gBAA6C,EAC7C,MAAc;IAEd,8BAA8B;IAC9B,IAAM,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":"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"}

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

@@ -1,3 +1,3 @@
 import { FormattingOptions, TextEdit } from "vscode-languageserver-types";
 import { TextDocument } from "vscode-languageserver-textdocument";
-export declare function tryFormat(document: TextDocument, formattingOptions: FormattingOptions, locale: string): TextEdit[];
+export declare function tryFormat(document: TextDocument, formattingOptions: FormattingOptions, locale: string): Promise<TextEdit[]>;

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

@@ -1,44 +1,45 @@
 "use strict";
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tryFormat = void 0;
-var PQF = require("@microsoft/powerquery-formatter");
-var PQP = require("@microsoft/powerquery-parser");
-var vscode_languageserver_types_1 = require("vscode-languageserver-types");
-var powerquery_parser_1 = require("@microsoft/powerquery-parser");
+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, formattingOptions, locale) {
-    var indentationLiteral;
-    if (formattingOptions.insertSpaces) {
-        indentationLiteral = "    " /* SpaceX4 */;
-    }
-    else {
-        indentationLiteral = "\t" /* Tab */;
-    }
-    var formatSettings = __assign(__assign({}, PQF.DefaultSettings), { locale: locale, indentationLiteral: indentationLiteral });
-    var triedFormat = PQF.tryFormat(formatSettings, document.getText());
-    if (powerquery_parser_1.ResultUtils.isOk(triedFormat)) {
-        return [vscode_languageserver_types_1.TextEdit.replace(fullDocumentRange(document), triedFormat.value)];
-    }
-    // If an unhandled exception was returned.
-    else if (PQP.CommonError.isCommonError(triedFormat.error)) {
-        throw triedFormat.error;
-    }
-    // Else a lexer or parser error was returned and should be ignored.
-    else {
-        return [];
-    }
+    return __awaiter(this, void 0, void 0, function* () {
+        let indentationLiteral;
+        if (formattingOptions.insertSpaces) {
+            indentationLiteral = "    " /* SpaceX4 */;
+        }
+        else {
+            indentationLiteral = "\t" /* Tab */;
+        }
+        const formatSettings = Object.assign(Object.assign({}, PQF.DefaultSettings), { locale,
+            indentationLiteral });
+        const triedFormat = yield PQF.tryFormat(formatSettings, document.getText());
+        if (powerquery_parser_1.ResultUtils.isOk(triedFormat)) {
+            return [vscode_languageserver_types_1.TextEdit.replace(fullDocumentRange(document), triedFormat.value)];
+        }
+        // If an unhandled exception was returned.
+        else if (PQP.CommonError.isCommonError(triedFormat.error)) {
+            throw triedFormat.error;
+        }
+        // Else a lexer or parser error was returned and should be ignored.
+        else {
+            return [];
+        }
+    });
 }
 exports.tryFormat = tryFormat;
 // TODO: is there a better way to do this?

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,qDAAuD;AACvD,kDAAoD;AACpD,2EAAiF;AACjF,kEAA2D;AAG3D,SAAgB,SAAS,CAAC,QAAsB,EAAE,iBAAoC,EAAE,MAAc;IAClG,IAAI,kBAA0C,CAAC;IAE/C,IAAI,iBAAiB,CAAC,YAAY,EAAE;QAChC,kBAAkB,uBAAiC,CAAC;KACvD;SAAM;QACH,kBAAkB,iBAA6B,CAAC;KACnD;IAED,IAAM,cAAc,yBACb,GAAG,CAAC,eAAe,KACtB,MAAM,QAAA,EACN,kBAAkB,oBAAA,GACrB,CAAC;IAEF,IAAM,WAAW,GAAoB,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;IAEvF,IAAI,+BAAW,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;QAC/B,OAAO,CAAC,sCAAQ,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;KAC7E;IACD,0CAA0C;SACrC,IAAI,GAAG,CAAC,WAAW,CAAC,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE;QACvD,MAAM,WAAW,CAAC,KAAK,CAAC;KAC3B;IACD,mEAAmE;SAC9D;QACD,OAAO,EAAE,CAAC;KACb;AACL,CAAC;AA5BD,8BA4BC;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,6EAAiF;AACjF,oEAA2D;AAG3D,SAAsB,SAAS,CAC3B,QAAsB,EACtB,iBAAoC,EACpC,MAAc;;QAEd,IAAI,kBAA0C,CAAC;QAE/C,IAAI,iBAAiB,CAAC,YAAY,EAAE;YAChC,kBAAkB,uBAAiC,CAAC;SACvD;aAAM;YACH,kBAAkB,iBAA6B,CAAC;SACnD;QAED,MAAM,cAAc,mCACb,GAAG,CAAC,eAAe,KACtB,MAAM;YACN,kBAAkB,GACrB,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;AAhCD,8BAgCC;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/index.js

@@ -13,8 +13,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.documentClosed = exports.documentUpdated = exports.createTextDocument = exports.TraceUtils = exports.PositionUtils = exports.InspectionUtils = exports.Inspection = exports.CommonTypesUtils = void 0;
-var vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
-var workspaceCache_1 = require("./workspaceCache");
+const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
+const workspaceCache_1 = require("./workspaceCache");
 exports.CommonTypesUtils = require("./commonTypesUtils");
 exports.Inspection = require("./inspection");
 exports.InspectionUtils = require("./inspectionUtils");

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/powerquery-language-services/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;AAElC,yFAAkG;AAClG,mDAAuD;AAEvD,yDAAuD;AACvD,6CAA2C;AAC3C,uDAAqD;AACrD,mDAAiD;AACjD,6CAA2C;AAC3C,6CAA2B;AAC3B,gDAA8B;AAC9B,wDAAsC;AACtC,oDAAkC;AAClC,8CAA4B;AAC5B,uDAAqC;AACrC,4CAA0B;AAC1B,8CAA4B;AAC5B,0CAAwB;AACxB,6CAA2B;AAC3B,mDAAiC;AAEjC,SAAgB,kBAAkB,CAAC,EAAU,EAAE,OAAe,EAAE,OAAe;IAC3E,OAAO,iDAAY,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AACnE,CAAC;AAFD,gDAEC;AAED,SAAgB,eAAe,CAC3B,QAAsB,EACtB,OAAsD,EACtD,OAAe;IAEf,oCAAmB,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AAC3D,CAAC;AAND,0CAMC;AAED,SAAgB,cAAc,CAAC,QAAsB;IACjD,oCAAmB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;AACxC,CAAC;AAFD,wCAEC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/powerquery-language-services/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;AAElC,2FAAkG;AAClG,qDAAuD;AAEvD,yDAAuD;AACvD,6CAA2C;AAC3C,uDAAqD;AACrD,mDAAiD;AACjD,6CAA2C;AAC3C,6CAA2B;AAC3B,gDAA8B;AAC9B,wDAAsC;AACtC,oDAAkC;AAClC,8CAA4B;AAC5B,uDAAqC;AACrC,4CAA0B;AAC1B,8CAA4B;AAC5B,0CAAwB;AACxB,6CAA2B;AAC3B,mDAAiC;AAEjC,SAAgB,kBAAkB,CAAC,EAAU,EAAE,OAAe,EAAE,OAAe;IAC3E,OAAO,iDAAY,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AACnE,CAAC;AAFD,gDAEC;AAED,SAAgB,eAAe,CAC3B,QAAsB,EACtB,OAAsD,EACtD,OAAe;IAEf,oCAAmB,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AAC3D,CAAC;AAND,0CAMC;AAED,SAAgB,cAAc,CAAC,QAAsB;IACjD,oCAAmB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;AACxC,CAAC;AAFD,wCAEC"}