@codingame/monaco-vscode-npm-default-extension 1.82.6 → 1.83.1

package/npmBrowserMain.js

@@ -163,6 +163,9 @@ exports.xhrDisabled = xhrDisabled;
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "ParseErrorCode": () => (/* binding */ ParseErrorCode),
+/* harmony export */   "ScanError": () => (/* binding */ ScanError),
+/* harmony export */   "SyntaxKind": () => (/* binding */ SyntaxKind),
 /* harmony export */   "applyEdits": () => (/* binding */ applyEdits),
 /* harmony export */   "createScanner": () => (/* binding */ createScanner),
 /* harmony export */   "findNodeAtLocation": () => (/* binding */ findNodeAtLocation),
@@ -195,84 +198,130 @@ __webpack_require__.r(__webpack_exports__);
  * Creates a JSON scanner on the given text.
  * If ignoreTrivia is set, whitespaces or comments are ignored.
  */
-var createScanner = _impl_scanner__WEBPACK_IMPORTED_MODULE_2__.createScanner;
+const createScanner = _impl_scanner__WEBPACK_IMPORTED_MODULE_2__.createScanner;
+var ScanError;
+(function (ScanError) {
+    ScanError[ScanError["None"] = 0] = "None";
+    ScanError[ScanError["UnexpectedEndOfComment"] = 1] = "UnexpectedEndOfComment";
+    ScanError[ScanError["UnexpectedEndOfString"] = 2] = "UnexpectedEndOfString";
+    ScanError[ScanError["UnexpectedEndOfNumber"] = 3] = "UnexpectedEndOfNumber";
+    ScanError[ScanError["InvalidUnicode"] = 4] = "InvalidUnicode";
+    ScanError[ScanError["InvalidEscapeCharacter"] = 5] = "InvalidEscapeCharacter";
+    ScanError[ScanError["InvalidCharacter"] = 6] = "InvalidCharacter";
+})(ScanError || (ScanError = {}));
+var SyntaxKind;
+(function (SyntaxKind) {
+    SyntaxKind[SyntaxKind["OpenBraceToken"] = 1] = "OpenBraceToken";
+    SyntaxKind[SyntaxKind["CloseBraceToken"] = 2] = "CloseBraceToken";
+    SyntaxKind[SyntaxKind["OpenBracketToken"] = 3] = "OpenBracketToken";
+    SyntaxKind[SyntaxKind["CloseBracketToken"] = 4] = "CloseBracketToken";
+    SyntaxKind[SyntaxKind["CommaToken"] = 5] = "CommaToken";
+    SyntaxKind[SyntaxKind["ColonToken"] = 6] = "ColonToken";
+    SyntaxKind[SyntaxKind["NullKeyword"] = 7] = "NullKeyword";
+    SyntaxKind[SyntaxKind["TrueKeyword"] = 8] = "TrueKeyword";
+    SyntaxKind[SyntaxKind["FalseKeyword"] = 9] = "FalseKeyword";
+    SyntaxKind[SyntaxKind["StringLiteral"] = 10] = "StringLiteral";
+    SyntaxKind[SyntaxKind["NumericLiteral"] = 11] = "NumericLiteral";
+    SyntaxKind[SyntaxKind["LineCommentTrivia"] = 12] = "LineCommentTrivia";
+    SyntaxKind[SyntaxKind["BlockCommentTrivia"] = 13] = "BlockCommentTrivia";
+    SyntaxKind[SyntaxKind["LineBreakTrivia"] = 14] = "LineBreakTrivia";
+    SyntaxKind[SyntaxKind["Trivia"] = 15] = "Trivia";
+    SyntaxKind[SyntaxKind["Unknown"] = 16] = "Unknown";
+    SyntaxKind[SyntaxKind["EOF"] = 17] = "EOF";
+})(SyntaxKind || (SyntaxKind = {}));
 /**
  * For a given offset, evaluate the location in the JSON document. Each segment in the location path is either a property name or an array index.
  */
-var getLocation = _impl_parser__WEBPACK_IMPORTED_MODULE_3__.getLocation;
+const getLocation = _impl_parser__WEBPACK_IMPORTED_MODULE_3__.getLocation;
 /**
  * Parses the given text and returns the object the JSON content represents. On invalid input, the parser tries to be as fault tolerant as possible, but still return a result.
  * Therefore, always check the errors list to find out if the input was valid.
  */
-var parse = _impl_parser__WEBPACK_IMPORTED_MODULE_3__.parse;
+const parse = _impl_parser__WEBPACK_IMPORTED_MODULE_3__.parse;
 /**
  * Parses the given text and returns a tree representation the JSON content. On invalid input, the parser tries to be as fault tolerant as possible, but still return a result.
  */
-var parseTree = _impl_parser__WEBPACK_IMPORTED_MODULE_3__.parseTree;
+const parseTree = _impl_parser__WEBPACK_IMPORTED_MODULE_3__.parseTree;
 /**
  * Finds the node at the given path in a JSON DOM.
  */
-var findNodeAtLocation = _impl_parser__WEBPACK_IMPORTED_MODULE_3__.findNodeAtLocation;
+const findNodeAtLocation = _impl_parser__WEBPACK_IMPORTED_MODULE_3__.findNodeAtLocation;
 /**
  * Finds the innermost node at the given offset. If includeRightBound is set, also finds nodes that end at the given offset.
  */
-var findNodeAtOffset = _impl_parser__WEBPACK_IMPORTED_MODULE_3__.findNodeAtOffset;
+const findNodeAtOffset = _impl_parser__WEBPACK_IMPORTED_MODULE_3__.findNodeAtOffset;
 /**
  * Gets the JSON path of the given JSON DOM node
  */
-var getNodePath = _impl_parser__WEBPACK_IMPORTED_MODULE_3__.getNodePath;
+const getNodePath = _impl_parser__WEBPACK_IMPORTED_MODULE_3__.getNodePath;
 /**
  * Evaluates the JavaScript object of the given JSON DOM node
  */
-var getNodeValue = _impl_parser__WEBPACK_IMPORTED_MODULE_3__.getNodeValue;
+const getNodeValue = _impl_parser__WEBPACK_IMPORTED_MODULE_3__.getNodeValue;
 /**
  * Parses the given text and invokes the visitor functions for each object, array and literal reached.
  */
-var visit = _impl_parser__WEBPACK_IMPORTED_MODULE_3__.visit;
+const visit = _impl_parser__WEBPACK_IMPORTED_MODULE_3__.visit;
 /**
  * Takes JSON with JavaScript-style comments and remove
  * them. Optionally replaces every none-newline character
  * of comments with a replaceCharacter
  */
-var stripComments = _impl_parser__WEBPACK_IMPORTED_MODULE_3__.stripComments;
+const stripComments = _impl_parser__WEBPACK_IMPORTED_MODULE_3__.stripComments;
+var ParseErrorCode;
+(function (ParseErrorCode) {
+    ParseErrorCode[ParseErrorCode["InvalidSymbol"] = 1] = "InvalidSymbol";
+    ParseErrorCode[ParseErrorCode["InvalidNumberFormat"] = 2] = "InvalidNumberFormat";
+    ParseErrorCode[ParseErrorCode["PropertyNameExpected"] = 3] = "PropertyNameExpected";
+    ParseErrorCode[ParseErrorCode["ValueExpected"] = 4] = "ValueExpected";
+    ParseErrorCode[ParseErrorCode["ColonExpected"] = 5] = "ColonExpected";
+    ParseErrorCode[ParseErrorCode["CommaExpected"] = 6] = "CommaExpected";
+    ParseErrorCode[ParseErrorCode["CloseBraceExpected"] = 7] = "CloseBraceExpected";
+    ParseErrorCode[ParseErrorCode["CloseBracketExpected"] = 8] = "CloseBracketExpected";
+    ParseErrorCode[ParseErrorCode["EndOfFileExpected"] = 9] = "EndOfFileExpected";
+    ParseErrorCode[ParseErrorCode["InvalidCommentToken"] = 10] = "InvalidCommentToken";
+    ParseErrorCode[ParseErrorCode["UnexpectedEndOfComment"] = 11] = "UnexpectedEndOfComment";
+    ParseErrorCode[ParseErrorCode["UnexpectedEndOfString"] = 12] = "UnexpectedEndOfString";
+    ParseErrorCode[ParseErrorCode["UnexpectedEndOfNumber"] = 13] = "UnexpectedEndOfNumber";
+    ParseErrorCode[ParseErrorCode["InvalidUnicode"] = 14] = "InvalidUnicode";
+    ParseErrorCode[ParseErrorCode["InvalidEscapeCharacter"] = 15] = "InvalidEscapeCharacter";
+    ParseErrorCode[ParseErrorCode["InvalidCharacter"] = 16] = "InvalidCharacter";
+})(ParseErrorCode || (ParseErrorCode = {}));
 function printParseErrorCode(code) {
     switch (code) {
-        case 1 /* InvalidSymbol */: return 'InvalidSymbol';
-        case 2 /* InvalidNumberFormat */: return 'InvalidNumberFormat';
-        case 3 /* PropertyNameExpected */: return 'PropertyNameExpected';
-        case 4 /* ValueExpected */: return 'ValueExpected';
-        case 5 /* ColonExpected */: return 'ColonExpected';
-        case 6 /* CommaExpected */: return 'CommaExpected';
-        case 7 /* CloseBraceExpected */: return 'CloseBraceExpected';
-        case 8 /* CloseBracketExpected */: return 'CloseBracketExpected';
-        case 9 /* EndOfFileExpected */: return 'EndOfFileExpected';
-        case 10 /* InvalidCommentToken */: return 'InvalidCommentToken';
-        case 11 /* UnexpectedEndOfComment */: return 'UnexpectedEndOfComment';
-        case 12 /* UnexpectedEndOfString */: return 'UnexpectedEndOfString';
-        case 13 /* UnexpectedEndOfNumber */: return 'UnexpectedEndOfNumber';
-        case 14 /* InvalidUnicode */: return 'InvalidUnicode';
-        case 15 /* InvalidEscapeCharacter */: return 'InvalidEscapeCharacter';
-        case 16 /* InvalidCharacter */: return 'InvalidCharacter';
+        case 1 /* ParseErrorCode.InvalidSymbol */: return 'InvalidSymbol';
+        case 2 /* ParseErrorCode.InvalidNumberFormat */: return 'InvalidNumberFormat';
+        case 3 /* ParseErrorCode.PropertyNameExpected */: return 'PropertyNameExpected';
+        case 4 /* ParseErrorCode.ValueExpected */: return 'ValueExpected';
+        case 5 /* ParseErrorCode.ColonExpected */: return 'ColonExpected';
+        case 6 /* ParseErrorCode.CommaExpected */: return 'CommaExpected';
+        case 7 /* ParseErrorCode.CloseBraceExpected */: return 'CloseBraceExpected';
+        case 8 /* ParseErrorCode.CloseBracketExpected */: return 'CloseBracketExpected';
+        case 9 /* ParseErrorCode.EndOfFileExpected */: return 'EndOfFileExpected';
+        case 10 /* ParseErrorCode.InvalidCommentToken */: return 'InvalidCommentToken';
+        case 11 /* ParseErrorCode.UnexpectedEndOfComment */: return 'UnexpectedEndOfComment';
+        case 12 /* ParseErrorCode.UnexpectedEndOfString */: return 'UnexpectedEndOfString';
+        case 13 /* ParseErrorCode.UnexpectedEndOfNumber */: return 'UnexpectedEndOfNumber';
+        case 14 /* ParseErrorCode.InvalidUnicode */: return 'InvalidUnicode';
+        case 15 /* ParseErrorCode.InvalidEscapeCharacter */: return 'InvalidEscapeCharacter';
+        case 16 /* ParseErrorCode.InvalidCharacter */: return 'InvalidCharacter';
     }
     return '<unknown ParseErrorCode>';
 }
 /**
- * Computes the edits needed to format a JSON document.
+ * Computes the edit operations needed to format a JSON document.
  *
  * @param documentText The input text
  * @param range The range to format or `undefined` to format the full content
  * @param options The formatting options
- * @returns A list of edit operations describing the formatting changes to the original document. Edits can be either inserts, replacements or
- * removals of text segments. All offsets refer to the original state of the document. No two edits must change or remove the same range of
- * text in the original document. However, multiple edits can have
- * the same offset, for example multiple inserts, or an insert followed by a remove or replace. The order in the array defines which edit is applied first.
- * To apply edits to an input, you can use `applyEdits`.
+ * @returns The edit operations describing the formatting changes to the original document following the format described in {@linkcode EditResult}.
+ * To apply the edit operations to the input, use {@linkcode applyEdits}.
  */
 function format(documentText, range, options) {
     return _impl_format__WEBPACK_IMPORTED_MODULE_0__.format(documentText, range, options);
 }
 /**
- * Computes the edits needed to modify a value in the JSON document.
+ * Computes the edit operations needed to modify a value in the JSON document.
  *
  * @param documentText The input text
  * @param path The path of the value to change. The path represents either to the document root, a property or an array item.
@@ -280,21 +329,37 @@ function format(documentText, range, options) {
  * @param value The new value for the specified property or item. If the value is undefined,
  * the property or item will be removed.
  * @param options Options
- * @returns A list of edit operations describing the formatting changes to the original document. Edits can be either inserts, replacements or
- * removals of text segments. All offsets refer to the original state of the document. No two edits must change or remove the same range of
- * text in the original document. However, multiple edits can have
- * the same offset, for example multiple inserts, or an insert followed by a remove or replace. The order in the array defines which edit is applied first.
- * To apply edits to an input, you can use `applyEdits`.
+ * @returns The edit operations describing the changes to the original document, following the format described in {@linkcode EditResult}.
+ * To apply the edit operations to the input, use {@linkcode applyEdits}.
  */
 function modify(text, path, value, options) {
-    return _impl_edit__WEBPACK_IMPORTED_MODULE_1__.setProperty(text, path, value, options.formattingOptions, options.getInsertionIndex);
+    return _impl_edit__WEBPACK_IMPORTED_MODULE_1__.setProperty(text, path, value, options);
 }
 /**
- * Applies edits to a input string.
+ * Applies edits to an input string.
+ * @param text The input text
+ * @param edits Edit operations following the format described in {@linkcode EditResult}.
+ * @returns The text with the applied edits.
+ * @throws An error if the edit operations are not well-formed as described in {@linkcode EditResult}.
  */
 function applyEdits(text, edits) {
-    for (var i = edits.length - 1; i >= 0; i--) {
-        text = _impl_edit__WEBPACK_IMPORTED_MODULE_1__.applyEdit(text, edits[i]);
+    let sortedEdits = edits.slice(0).sort((a, b) => {
+        const diff = a.offset - b.offset;
+        if (diff === 0) {
+            return a.length - b.length;
+        }
+        return diff;
+    });
+    let lastModifiedOffset = text.length;
+    for (let i = sortedEdits.length - 1; i >= 0; i--) {
+        let e = sortedEdits[i];
+        if (e.offset + e.length <= lastModifiedOffset) {
+            text = _impl_edit__WEBPACK_IMPORTED_MODULE_1__.applyEdit(text, e);
+        }
+        else {
+            throw new Error('Overlapping edit');
+        }
+        lastModifiedOffset = e.offset;
     }
     return text;
 }
@@ -318,11 +383,11 @@ __webpack_require__.r(__webpack_exports__);
 
 
 function format(documentText, range, options) {
-    var initialIndentLevel;
-    var formatText;
-    var formatTextStart;
-    var rangeStart;
-    var rangeEnd;
+    let initialIndentLevel;
+    let formatText;
+    let formatTextStart;
+    let rangeStart;
+    let rangeEnd;
     if (range) {
         rangeStart = range.offset;
         rangeEnd = rangeStart + range.length;
@@ -330,7 +395,7 @@ function format(documentText, range, options) {
         while (formatTextStart > 0 && !isEOL(documentText, formatTextStart - 1)) {
             formatTextStart--;
         }
-        var endOffset = rangeEnd;
+        let endOffset = rangeEnd;
         while (endOffset < documentText.length && !isEOL(documentText, endOffset)) {
             endOffset++;
         }
@@ -344,136 +409,193 @@ function format(documentText, range, options) {
         rangeStart = 0;
         rangeEnd = documentText.length;
     }
-    var eol = getEOL(options, documentText);
-    var lineBreak = false;
-    var indentLevel = 0;
-    var indentValue;
+    const eol = getEOL(options, documentText);
+    let numberLineBreaks = 0;
+    let indentLevel = 0;
+    let indentValue;
     if (options.insertSpaces) {
         indentValue = repeat(' ', options.tabSize || 4);
     }
     else {
         indentValue = '\t';
     }
-    var scanner = (0,_scanner__WEBPACK_IMPORTED_MODULE_0__.createScanner)(formatText, false);
-    var hasError = false;
-    function newLineAndIndent() {
-        return eol + repeat(indentValue, initialIndentLevel + indentLevel);
+    let scanner = (0,_scanner__WEBPACK_IMPORTED_MODULE_0__.createScanner)(formatText, false);
+    let hasError = false;
+    function newLinesAndIndent() {
+        if (numberLineBreaks > 1) {
+            return repeat(eol, numberLineBreaks) + repeat(indentValue, initialIndentLevel + indentLevel);
+        }
+        else {
+            return eol + repeat(indentValue, initialIndentLevel + indentLevel);
+        }
     }
     function scanNext() {
-        var token = scanner.scan();
-        lineBreak = false;
-        while (token === 15 /* Trivia */ || token === 14 /* LineBreakTrivia */) {
-            lineBreak = lineBreak || (token === 14 /* LineBreakTrivia */);
+        let token = scanner.scan();
+        numberLineBreaks = 0;
+        while (token === 15 /* SyntaxKind.Trivia */ || token === 14 /* SyntaxKind.LineBreakTrivia */) {
+            if (token === 14 /* SyntaxKind.LineBreakTrivia */ && options.keepLines) {
+                numberLineBreaks += 1;
+            }
+            else if (token === 14 /* SyntaxKind.LineBreakTrivia */) {
+                numberLineBreaks = 1;
+            }
             token = scanner.scan();
         }
-        hasError = token === 16 /* Unknown */ || scanner.getTokenError() !== 0 /* None */;
+        hasError = token === 16 /* SyntaxKind.Unknown */ || scanner.getTokenError() !== 0 /* ScanError.None */;
         return token;
     }
-    var editOperations = [];
+    const editOperations = [];
     function addEdit(text, startOffset, endOffset) {
-        if (!hasError && startOffset < rangeEnd && endOffset > rangeStart && documentText.substring(startOffset, endOffset) !== text) {
+        if (!hasError && (!range || (startOffset < rangeEnd && endOffset > rangeStart)) && documentText.substring(startOffset, endOffset) !== text) {
             editOperations.push({ offset: startOffset, length: endOffset - startOffset, content: text });
         }
     }
-    var firstToken = scanNext();
-    if (firstToken !== 17 /* EOF */) {
-        var firstTokenStart = scanner.getTokenOffset() + formatTextStart;
-        var initialIndent = repeat(indentValue, initialIndentLevel);
+    let firstToken = scanNext();
+    if (options.keepLines && numberLineBreaks > 0) {
+        addEdit(repeat(eol, numberLineBreaks), 0, 0);
+    }
+    if (firstToken !== 17 /* SyntaxKind.EOF */) {
+        let firstTokenStart = scanner.getTokenOffset() + formatTextStart;
+        let initialIndent = repeat(indentValue, initialIndentLevel);
         addEdit(initialIndent, formatTextStart, firstTokenStart);
     }
-    while (firstToken !== 17 /* EOF */) {
-        var firstTokenEnd = scanner.getTokenOffset() + scanner.getTokenLength() + formatTextStart;
-        var secondToken = scanNext();
-        var replaceContent = '';
-        while (!lineBreak && (secondToken === 12 /* LineCommentTrivia */ || secondToken === 13 /* BlockCommentTrivia */)) {
-            // comments on the same line: keep them on the same line, but ignore them otherwise
-            var commentTokenStart = scanner.getTokenOffset() + formatTextStart;
+    while (firstToken !== 17 /* SyntaxKind.EOF */) {
+        let firstTokenEnd = scanner.getTokenOffset() + scanner.getTokenLength() + formatTextStart;
+        let secondToken = scanNext();
+        let replaceContent = '';
+        let needsLineBreak = false;
+        while (numberLineBreaks === 0 && (secondToken === 12 /* SyntaxKind.LineCommentTrivia */ || secondToken === 13 /* SyntaxKind.BlockCommentTrivia */)) {
+            let commentTokenStart = scanner.getTokenOffset() + formatTextStart;
             addEdit(' ', firstTokenEnd, commentTokenStart);
             firstTokenEnd = scanner.getTokenOffset() + scanner.getTokenLength() + formatTextStart;
-            replaceContent = secondToken === 12 /* LineCommentTrivia */ ? newLineAndIndent() : '';
+            needsLineBreak = secondToken === 12 /* SyntaxKind.LineCommentTrivia */;
+            replaceContent = needsLineBreak ? newLinesAndIndent() : '';
             secondToken = scanNext();
         }
-        if (secondToken === 2 /* CloseBraceToken */) {
-            if (firstToken !== 1 /* OpenBraceToken */) {
+        if (secondToken === 2 /* SyntaxKind.CloseBraceToken */) {
+            if (firstToken !== 1 /* SyntaxKind.OpenBraceToken */) {
                 indentLevel--;
-                replaceContent = newLineAndIndent();
+            }
+            ;
+            if (options.keepLines && numberLineBreaks > 0 || !options.keepLines && firstToken !== 1 /* SyntaxKind.OpenBraceToken */) {
+                replaceContent = newLinesAndIndent();
+            }
+            else if (options.keepLines) {
+                replaceContent = ' ';
             }
         }
-        else if (secondToken === 4 /* CloseBracketToken */) {
-            if (firstToken !== 3 /* OpenBracketToken */) {
+        else if (secondToken === 4 /* SyntaxKind.CloseBracketToken */) {
+            if (firstToken !== 3 /* SyntaxKind.OpenBracketToken */) {
                 indentLevel--;
-                replaceContent = newLineAndIndent();
+            }
+            ;
+            if (options.keepLines && numberLineBreaks > 0 || !options.keepLines && firstToken !== 3 /* SyntaxKind.OpenBracketToken */) {
+                replaceContent = newLinesAndIndent();
+            }
+            else if (options.keepLines) {
+                replaceContent = ' ';
             }
         }
         else {
             switch (firstToken) {
-                case 3 /* OpenBracketToken */:
-                case 1 /* OpenBraceToken */:
+                case 3 /* SyntaxKind.OpenBracketToken */:
+                case 1 /* SyntaxKind.OpenBraceToken */:
                     indentLevel++;
-                    replaceContent = newLineAndIndent();
-                    break;
-                case 5 /* CommaToken */:
-                case 12 /* LineCommentTrivia */:
-                    replaceContent = newLineAndIndent();
+                    if (options.keepLines && numberLineBreaks > 0 || !options.keepLines) {
+                        replaceContent = newLinesAndIndent();
+                    }
+                    else {
+                        replaceContent = ' ';
+                    }
                     break;
-                case 13 /* BlockCommentTrivia */:
-                    if (lineBreak) {
-                        replaceContent = newLineAndIndent();
+                case 5 /* SyntaxKind.CommaToken */:
+                    if (options.keepLines && numberLineBreaks > 0 || !options.keepLines) {
+                        replaceContent = newLinesAndIndent();
                     }
                     else {
-                        // symbol following comment on the same line: keep on same line, separate with ' '
                         replaceContent = ' ';
                     }
                     break;
-                case 6 /* ColonToken */:
-                    replaceContent = ' ';
+                case 12 /* SyntaxKind.LineCommentTrivia */:
+                    replaceContent = newLinesAndIndent();
                     break;
-                case 10 /* StringLiteral */:
-                    if (secondToken === 6 /* ColonToken */) {
-                        replaceContent = '';
-                        break;
+                case 13 /* SyntaxKind.BlockCommentTrivia */:
+                    if (numberLineBreaks > 0) {
+                        replaceContent = newLinesAndIndent();
+                    }
+                    else if (!needsLineBreak) {
+                        replaceContent = ' ';
                     }
-                // fall through
-                case 7 /* NullKeyword */:
-                case 8 /* TrueKeyword */:
-                case 9 /* FalseKeyword */:
-                case 11 /* NumericLiteral */:
-                case 2 /* CloseBraceToken */:
-                case 4 /* CloseBracketToken */:
-                    if (secondToken === 12 /* LineCommentTrivia */ || secondToken === 13 /* BlockCommentTrivia */) {
+                    break;
+                case 6 /* SyntaxKind.ColonToken */:
+                    if (options.keepLines && numberLineBreaks > 0) {
+                        replaceContent = newLinesAndIndent();
+                    }
+                    else if (!needsLineBreak) {
                         replaceContent = ' ';
                     }
-                    else if (secondToken !== 5 /* CommaToken */ && secondToken !== 17 /* EOF */) {
-                        hasError = true;
+                    break;
+                case 10 /* SyntaxKind.StringLiteral */:
+                    if (options.keepLines && numberLineBreaks > 0) {
+                        replaceContent = newLinesAndIndent();
+                    }
+                    else if (secondToken === 6 /* SyntaxKind.ColonToken */ && !needsLineBreak) {
+                        replaceContent = '';
                     }
                     break;
-                case 16 /* Unknown */:
+                case 7 /* SyntaxKind.NullKeyword */:
+                case 8 /* SyntaxKind.TrueKeyword */:
+                case 9 /* SyntaxKind.FalseKeyword */:
+                case 11 /* SyntaxKind.NumericLiteral */:
+                case 2 /* SyntaxKind.CloseBraceToken */:
+                case 4 /* SyntaxKind.CloseBracketToken */:
+                    if (options.keepLines && numberLineBreaks > 0) {
+                        replaceContent = newLinesAndIndent();
+                    }
+                    else {
+                        if ((secondToken === 12 /* SyntaxKind.LineCommentTrivia */ || secondToken === 13 /* SyntaxKind.BlockCommentTrivia */) && !needsLineBreak) {
+                            replaceContent = ' ';
+                        }
+                        else if (secondToken !== 5 /* SyntaxKind.CommaToken */ && secondToken !== 17 /* SyntaxKind.EOF */) {
+                            hasError = true;
+                        }
+                    }
+                    break;
+                case 16 /* SyntaxKind.Unknown */:
                     hasError = true;
                     break;
             }
-            if (lineBreak && (secondToken === 12 /* LineCommentTrivia */ || secondToken === 13 /* BlockCommentTrivia */)) {
-                replaceContent = newLineAndIndent();
+            if (numberLineBreaks > 0 && (secondToken === 12 /* SyntaxKind.LineCommentTrivia */ || secondToken === 13 /* SyntaxKind.BlockCommentTrivia */)) {
+                replaceContent = newLinesAndIndent();
+            }
+        }
+        if (secondToken === 17 /* SyntaxKind.EOF */) {
+            if (options.keepLines && numberLineBreaks > 0) {
+                replaceContent = newLinesAndIndent();
+            }
+            else {
+                replaceContent = options.insertFinalNewline ? eol : '';
             }
         }
-        var secondTokenStart = scanner.getTokenOffset() + formatTextStart;
+        const secondTokenStart = scanner.getTokenOffset() + formatTextStart;
         addEdit(replaceContent, firstTokenEnd, secondTokenStart);
         firstToken = secondToken;
     }
     return editOperations;
 }
 function repeat(s, count) {
-    var result = '';
-    for (var i = 0; i < count; i++) {
+    let result = '';
+    for (let i = 0; i < count; i++) {
         result += s;
     }
     return result;
 }
 function computeIndentLevel(content, options) {
-    var i = 0;
-    var nChars = 0;
-    var tabSize = options.tabSize || 4;
+    let i = 0;
+    let nChars = 0;
+    const tabSize = options.tabSize || 4;
     while (i < content.length) {
-        var ch = content.charAt(i);
+        let ch = content.charAt(i);
         if (ch === ' ') {
             nChars++;
         }
@@ -488,8 +610,8 @@ function computeIndentLevel(content, options) {
     return Math.floor(nChars / tabSize);
 }
 function getEOL(options, text) {
-    for (var i = 0; i < text.length; i++) {
-        var ch = text.charAt(i);
+    for (let i = 0; i < text.length; i++) {
+        const ch = text.charAt(i);
         if (ch === '\r') {
             if (i + 1 < text.length && text.charAt(i + 1) === '\n') {
                 return '\r\n';
@@ -525,23 +647,22 @@ __webpack_require__.r(__webpack_exports__);
  * Creates a JSON scanner on the given text.
  * If ignoreTrivia is set, whitespaces or comments are ignored.
  */
-function createScanner(text, ignoreTrivia) {
-    if (ignoreTrivia === void 0) { ignoreTrivia = false; }
-    var len = text.length;
-    var pos = 0, value = '', tokenOffset = 0, token = 16 /* Unknown */, lineNumber = 0, lineStartOffset = 0, tokenLineStartOffset = 0, prevTokenLineStartOffset = 0, scanError = 0 /* None */;
+function createScanner(text, ignoreTrivia = false) {
+    const len = text.length;
+    let pos = 0, value = '', tokenOffset = 0, token = 16 /* SyntaxKind.Unknown */, lineNumber = 0, lineStartOffset = 0, tokenLineStartOffset = 0, prevTokenLineStartOffset = 0, scanError = 0 /* ScanError.None */;
     function scanHexDigits(count, exact) {
-        var digits = 0;
-        var value = 0;
+        let digits = 0;
+        let value = 0;
         while (digits < count || !exact) {
-            var ch = text.charCodeAt(pos);
-            if (ch >= 48 /* _0 */ && ch <= 57 /* _9 */) {
-                value = value * 16 + ch - 48 /* _0 */;
+            let ch = text.charCodeAt(pos);
+            if (ch >= 48 /* CharacterCodes._0 */ && ch <= 57 /* CharacterCodes._9 */) {
+                value = value * 16 + ch - 48 /* CharacterCodes._0 */;
             }
-            else if (ch >= 65 /* A */ && ch <= 70 /* F */) {
-                value = value * 16 + ch - 65 /* A */ + 10;
+            else if (ch >= 65 /* CharacterCodes.A */ && ch <= 70 /* CharacterCodes.F */) {
+                value = value * 16 + ch - 65 /* CharacterCodes.A */ + 10;
             }
-            else if (ch >= 97 /* a */ && ch <= 102 /* f */) {
-                value = value * 16 + ch - 97 /* a */ + 10;
+            else if (ch >= 97 /* CharacterCodes.a */ && ch <= 102 /* CharacterCodes.f */) {
+                value = value * 16 + ch - 97 /* CharacterCodes.a */ + 10;
             }
             else {
                 break;
@@ -558,12 +679,12 @@ function createScanner(text, ignoreTrivia) {
         pos = newPosition;
         value = '';
         tokenOffset = 0;
-        token = 16 /* Unknown */;
-        scanError = 0 /* None */;
+        token = 16 /* SyntaxKind.Unknown */;
+        scanError = 0 /* ScanError.None */;
     }
     function scanNumber() {
-        var start = pos;
-        if (text.charCodeAt(pos) === 48 /* _0 */) {
+        let start = pos;
+        if (text.charCodeAt(pos) === 48 /* CharacterCodes._0 */) {
             pos++;
         }
         else {
@@ -572,7 +693,7 @@ function createScanner(text, ignoreTrivia) {
                 pos++;
             }
         }
-        if (pos < text.length && text.charCodeAt(pos) === 46 /* dot */) {
+        if (pos < text.length && text.charCodeAt(pos) === 46 /* CharacterCodes.dot */) {
             pos++;
             if (pos < text.length && isDigit(text.charCodeAt(pos))) {
                 pos++;
@@ -581,14 +702,14 @@ function createScanner(text, ignoreTrivia) {
                 }
             }
             else {
-                scanError = 3 /* UnexpectedEndOfNumber */;
+                scanError = 3 /* ScanError.UnexpectedEndOfNumber */;
                 return text.substring(start, pos);
             }
         }
-        var end = pos;
-        if (pos < text.length && (text.charCodeAt(pos) === 69 /* E */ || text.charCodeAt(pos) === 101 /* e */)) {
+        let end = pos;
+        if (pos < text.length && (text.charCodeAt(pos) === 69 /* CharacterCodes.E */ || text.charCodeAt(pos) === 101 /* CharacterCodes.e */)) {
             pos++;
-            if (pos < text.length && text.charCodeAt(pos) === 43 /* plus */ || text.charCodeAt(pos) === 45 /* minus */) {
+            if (pos < text.length && text.charCodeAt(pos) === 43 /* CharacterCodes.plus */ || text.charCodeAt(pos) === 45 /* CharacterCodes.minus */) {
                 pos++;
             }
             if (pos < text.length && isDigit(text.charCodeAt(pos))) {
@@ -599,69 +720,69 @@ function createScanner(text, ignoreTrivia) {
                 end = pos;
             }
             else {
-                scanError = 3 /* UnexpectedEndOfNumber */;
+                scanError = 3 /* ScanError.UnexpectedEndOfNumber */;
             }
         }
         return text.substring(start, end);
     }
     function scanString() {
-        var result = '', start = pos;
+        let result = '', start = pos;
         while (true) {
             if (pos >= len) {
                 result += text.substring(start, pos);
-                scanError = 2 /* UnexpectedEndOfString */;
+                scanError = 2 /* ScanError.UnexpectedEndOfString */;
                 break;
             }
-            var ch = text.charCodeAt(pos);
-            if (ch === 34 /* doubleQuote */) {
+            const ch = text.charCodeAt(pos);
+            if (ch === 34 /* CharacterCodes.doubleQuote */) {
                 result += text.substring(start, pos);
                 pos++;
                 break;
             }
-            if (ch === 92 /* backslash */) {
+            if (ch === 92 /* CharacterCodes.backslash */) {
                 result += text.substring(start, pos);
                 pos++;
                 if (pos >= len) {
-                    scanError = 2 /* UnexpectedEndOfString */;
+                    scanError = 2 /* ScanError.UnexpectedEndOfString */;
                     break;
                 }
-                var ch2 = text.charCodeAt(pos++);
+                const ch2 = text.charCodeAt(pos++);
                 switch (ch2) {
-                    case 34 /* doubleQuote */:
+                    case 34 /* CharacterCodes.doubleQuote */:
                         result += '\"';
                         break;
-                    case 92 /* backslash */:
+                    case 92 /* CharacterCodes.backslash */:
                         result += '\\';
                         break;
-                    case 47 /* slash */:
+                    case 47 /* CharacterCodes.slash */:
                         result += '/';
                         break;
-                    case 98 /* b */:
+                    case 98 /* CharacterCodes.b */:
                         result += '\b';
                         break;
-                    case 102 /* f */:
+                    case 102 /* CharacterCodes.f */:
                         result += '\f';
                         break;
-                    case 110 /* n */:
+                    case 110 /* CharacterCodes.n */:
                         result += '\n';
                         break;
-                    case 114 /* r */:
+                    case 114 /* CharacterCodes.r */:
                         result += '\r';
                         break;
-                    case 116 /* t */:
+                    case 116 /* CharacterCodes.t */:
                         result += '\t';
                         break;
-                    case 117 /* u */:
-                        var ch3 = scanHexDigits(4, true);
+                    case 117 /* CharacterCodes.u */:
+                        const ch3 = scanHexDigits(4, true);
                         if (ch3 >= 0) {
                             result += String.fromCharCode(ch3);
                         }
                         else {
-                            scanError = 4 /* InvalidUnicode */;
+                            scanError = 4 /* ScanError.InvalidUnicode */;
                         }
                         break;
                     default:
-                        scanError = 5 /* InvalidEscapeCharacter */;
+                        scanError = 5 /* ScanError.InvalidEscapeCharacter */;
                 }
                 start = pos;
                 continue;
@@ -669,11 +790,11 @@ function createScanner(text, ignoreTrivia) {
             if (ch >= 0 && ch <= 0x1f) {
                 if (isLineBreak(ch)) {
                     result += text.substring(start, pos);
-                    scanError = 2 /* UnexpectedEndOfString */;
+                    scanError = 2 /* ScanError.UnexpectedEndOfString */;
                     break;
                 }
                 else {
-                    scanError = 6 /* InvalidCharacter */;
+                    scanError = 6 /* ScanError.InvalidCharacter */;
                     // mark as error but continue with string
                 }
             }
@@ -683,16 +804,16 @@ function createScanner(text, ignoreTrivia) {
     }
     function scanNext() {
         value = '';
-        scanError = 0 /* None */;
+        scanError = 0 /* ScanError.None */;
         tokenOffset = pos;
         lineStartOffset = lineNumber;
         prevTokenLineStartOffset = tokenLineStartOffset;
         if (pos >= len) {
             // at the end
             tokenOffset = len;
-            return token = 17 /* EOF */;
+            return token = 17 /* SyntaxKind.EOF */;
         }
-        var code = text.charCodeAt(pos);
+        let code = text.charCodeAt(pos);
         // trivia: whitespace
         if (isWhiteSpace(code)) {
             do {
@@ -700,50 +821,50 @@ function createScanner(text, ignoreTrivia) {
                 value += String.fromCharCode(code);
                 code = text.charCodeAt(pos);
             } while (isWhiteSpace(code));
-            return token = 15 /* Trivia */;
+            return token = 15 /* SyntaxKind.Trivia */;
         }
         // trivia: newlines
         if (isLineBreak(code)) {
             pos++;
             value += String.fromCharCode(code);
-            if (code === 13 /* carriageReturn */ && text.charCodeAt(pos) === 10 /* lineFeed */) {
+            if (code === 13 /* CharacterCodes.carriageReturn */ && text.charCodeAt(pos) === 10 /* CharacterCodes.lineFeed */) {
                 pos++;
                 value += '\n';
             }
             lineNumber++;
             tokenLineStartOffset = pos;
-            return token = 14 /* LineBreakTrivia */;
+            return token = 14 /* SyntaxKind.LineBreakTrivia */;
         }
         switch (code) {
             // tokens: []{}:,
-            case 123 /* openBrace */:
+            case 123 /* CharacterCodes.openBrace */:
                 pos++;
-                return token = 1 /* OpenBraceToken */;
-            case 125 /* closeBrace */:
+                return token = 1 /* SyntaxKind.OpenBraceToken */;
+            case 125 /* CharacterCodes.closeBrace */:
                 pos++;
-                return token = 2 /* CloseBraceToken */;
-            case 91 /* openBracket */:
+                return token = 2 /* SyntaxKind.CloseBraceToken */;
+            case 91 /* CharacterCodes.openBracket */:
                 pos++;
-                return token = 3 /* OpenBracketToken */;
-            case 93 /* closeBracket */:
+                return token = 3 /* SyntaxKind.OpenBracketToken */;
+            case 93 /* CharacterCodes.closeBracket */:
                 pos++;
-                return token = 4 /* CloseBracketToken */;
-            case 58 /* colon */:
+                return token = 4 /* SyntaxKind.CloseBracketToken */;
+            case 58 /* CharacterCodes.colon */:
                 pos++;
-                return token = 6 /* ColonToken */;
-            case 44 /* comma */:
+                return token = 6 /* SyntaxKind.ColonToken */;
+            case 44 /* CharacterCodes.comma */:
                 pos++;
-                return token = 5 /* CommaToken */;
+                return token = 5 /* SyntaxKind.CommaToken */;
             // strings
-            case 34 /* doubleQuote */:
+            case 34 /* CharacterCodes.doubleQuote */:
                 pos++;
                 value = scanString();
-                return token = 10 /* StringLiteral */;
+                return token = 10 /* SyntaxKind.StringLiteral */;
             // comments
-            case 47 /* slash */:
-                var start = pos - 1;
+            case 47 /* CharacterCodes.slash */:
+                const start = pos - 1;
                 // Single-line comment
-                if (text.charCodeAt(pos + 1) === 47 /* slash */) {
+                if (text.charCodeAt(pos + 1) === 47 /* CharacterCodes.slash */) {
                     pos += 2;
                     while (pos < len) {
                         if (isLineBreak(text.charCodeAt(pos))) {
@@ -752,23 +873,23 @@ function createScanner(text, ignoreTrivia) {
                         pos++;
                     }
                     value = text.substring(start, pos);
-                    return token = 12 /* LineCommentTrivia */;
+                    return token = 12 /* SyntaxKind.LineCommentTrivia */;
                 }
                 // Multi-line comment
-                if (text.charCodeAt(pos + 1) === 42 /* asterisk */) {
+                if (text.charCodeAt(pos + 1) === 42 /* CharacterCodes.asterisk */) {
                     pos += 2;
-                    var safeLength = len - 1; // For lookahead.
-                    var commentClosed = false;
+                    const safeLength = len - 1; // For lookahead.
+                    let commentClosed = false;
                     while (pos < safeLength) {
-                        var ch = text.charCodeAt(pos);
-                        if (ch === 42 /* asterisk */ && text.charCodeAt(pos + 1) === 47 /* slash */) {
+                        const ch = text.charCodeAt(pos);
+                        if (ch === 42 /* CharacterCodes.asterisk */ && text.charCodeAt(pos + 1) === 47 /* CharacterCodes.slash */) {
                             pos += 2;
                             commentClosed = true;
                             break;
                         }
                         pos++;
                         if (isLineBreak(ch)) {
-                            if (ch === 13 /* carriageReturn */ && text.charCodeAt(pos) === 10 /* lineFeed */) {
+                            if (ch === 13 /* CharacterCodes.carriageReturn */ && text.charCodeAt(pos) === 10 /* CharacterCodes.lineFeed */) {
                                 pos++;
                             }
                             lineNumber++;
@@ -777,37 +898,37 @@ function createScanner(text, ignoreTrivia) {
                     }
                     if (!commentClosed) {
                         pos++;
-                        scanError = 1 /* UnexpectedEndOfComment */;
+                        scanError = 1 /* ScanError.UnexpectedEndOfComment */;
                     }
                     value = text.substring(start, pos);
-                    return token = 13 /* BlockCommentTrivia */;
+                    return token = 13 /* SyntaxKind.BlockCommentTrivia */;
                 }
                 // just a single slash
                 value += String.fromCharCode(code);
                 pos++;
-                return token = 16 /* Unknown */;
+                return token = 16 /* SyntaxKind.Unknown */;
             // numbers
-            case 45 /* minus */:
+            case 45 /* CharacterCodes.minus */:
                 value += String.fromCharCode(code);
                 pos++;
                 if (pos === len || !isDigit(text.charCodeAt(pos))) {
-                    return token = 16 /* Unknown */;
+                    return token = 16 /* SyntaxKind.Unknown */;
                 }
             // found a minus, followed by a number so
             // we fall through to proceed with scanning
             // numbers
-            case 48 /* _0 */:
-            case 49 /* _1 */:
-            case 50 /* _2 */:
-            case 51 /* _3 */:
-            case 52 /* _4 */:
-            case 53 /* _5 */:
-            case 54 /* _6 */:
-            case 55 /* _7 */:
-            case 56 /* _8 */:
-            case 57 /* _9 */:
+            case 48 /* CharacterCodes._0 */:
+            case 49 /* CharacterCodes._1 */:
+            case 50 /* CharacterCodes._2 */:
+            case 51 /* CharacterCodes._3 */:
+            case 52 /* CharacterCodes._4 */:
+            case 53 /* CharacterCodes._5 */:
+            case 54 /* CharacterCodes._6 */:
+            case 55 /* CharacterCodes._7 */:
+            case 56 /* CharacterCodes._8 */:
+            case 57 /* CharacterCodes._9 */:
                 value += scanNumber();
-                return token = 11 /* NumericLiteral */;
+                return token = 11 /* SyntaxKind.NumericLiteral */;
             // literals and unknown symbols
             default:
                 // is a literal? Read the full word.
@@ -819,16 +940,16 @@ function createScanner(text, ignoreTrivia) {
                     value = text.substring(tokenOffset, pos);
                     // keywords: true, false, null
                     switch (value) {
-                        case 'true': return token = 8 /* TrueKeyword */;
-                        case 'false': return token = 9 /* FalseKeyword */;
-                        case 'null': return token = 7 /* NullKeyword */;
+                        case 'true': return token = 8 /* SyntaxKind.TrueKeyword */;
+                        case 'false': return token = 9 /* SyntaxKind.FalseKeyword */;
+                        case 'null': return token = 7 /* SyntaxKind.NullKeyword */;
                     }
-                    return token = 16 /* Unknown */;
+                    return token = 16 /* SyntaxKind.Unknown */;
                 }
                 // some
                 value += String.fromCharCode(code);
                 pos++;
-                return token = 16 /* Unknown */;
+                return token = 16 /* SyntaxKind.Unknown */;
         }
     }
     function isUnknownContentCharacter(code) {
@@ -836,49 +957,130 @@ function createScanner(text, ignoreTrivia) {
             return false;
         }
         switch (code) {
-            case 125 /* closeBrace */:
-            case 93 /* closeBracket */:
-            case 123 /* openBrace */:
-            case 91 /* openBracket */:
-            case 34 /* doubleQuote */:
-            case 58 /* colon */:
-            case 44 /* comma */:
-            case 47 /* slash */:
+            case 125 /* CharacterCodes.closeBrace */:
+            case 93 /* CharacterCodes.closeBracket */:
+            case 123 /* CharacterCodes.openBrace */:
+            case 91 /* CharacterCodes.openBracket */:
+            case 34 /* CharacterCodes.doubleQuote */:
+            case 58 /* CharacterCodes.colon */:
+            case 44 /* CharacterCodes.comma */:
+            case 47 /* CharacterCodes.slash */:
                 return false;
         }
         return true;
     }
     function scanNextNonTrivia() {
-        var result;
+        let result;
         do {
             result = scanNext();
-        } while (result >= 12 /* LineCommentTrivia */ && result <= 15 /* Trivia */);
+        } while (result >= 12 /* SyntaxKind.LineCommentTrivia */ && result <= 15 /* SyntaxKind.Trivia */);
         return result;
     }
     return {
         setPosition: setPosition,
-        getPosition: function () { return pos; },
+        getPosition: () => pos,
         scan: ignoreTrivia ? scanNextNonTrivia : scanNext,
-        getToken: function () { return token; },
-        getTokenValue: function () { return value; },
-        getTokenOffset: function () { return tokenOffset; },
-        getTokenLength: function () { return pos - tokenOffset; },
-        getTokenStartLine: function () { return lineStartOffset; },
-        getTokenStartCharacter: function () { return tokenOffset - prevTokenLineStartOffset; },
-        getTokenError: function () { return scanError; },
+        getToken: () => token,
+        getTokenValue: () => value,
+        getTokenOffset: () => tokenOffset,
+        getTokenLength: () => pos - tokenOffset,
+        getTokenStartLine: () => lineStartOffset,
+        getTokenStartCharacter: () => tokenOffset - prevTokenLineStartOffset,
+        getTokenError: () => scanError,
     };
 }
 function isWhiteSpace(ch) {
-    return ch === 32 /* space */ || ch === 9 /* tab */ || ch === 11 /* verticalTab */ || ch === 12 /* formFeed */ ||
-        ch === 160 /* nonBreakingSpace */ || ch === 5760 /* ogham */ || ch >= 8192 /* enQuad */ && ch <= 8203 /* zeroWidthSpace */ ||
-        ch === 8239 /* narrowNoBreakSpace */ || ch === 8287 /* mathematicalSpace */ || ch === 12288 /* ideographicSpace */ || ch === 65279 /* byteOrderMark */;
+    return ch === 32 /* CharacterCodes.space */ || ch === 9 /* CharacterCodes.tab */;
 }
 function isLineBreak(ch) {
-    return ch === 10 /* lineFeed */ || ch === 13 /* carriageReturn */ || ch === 8232 /* lineSeparator */ || ch === 8233 /* paragraphSeparator */;
+    return ch === 10 /* CharacterCodes.lineFeed */ || ch === 13 /* CharacterCodes.carriageReturn */;
 }
 function isDigit(ch) {
-    return ch >= 48 /* _0 */ && ch <= 57 /* _9 */;
+    return ch >= 48 /* CharacterCodes._0 */ && ch <= 57 /* CharacterCodes._9 */;
 }
+var CharacterCodes;
+(function (CharacterCodes) {
+    CharacterCodes[CharacterCodes["lineFeed"] = 10] = "lineFeed";
+    CharacterCodes[CharacterCodes["carriageReturn"] = 13] = "carriageReturn";
+    CharacterCodes[CharacterCodes["space"] = 32] = "space";
+    CharacterCodes[CharacterCodes["_0"] = 48] = "_0";
+    CharacterCodes[CharacterCodes["_1"] = 49] = "_1";
+    CharacterCodes[CharacterCodes["_2"] = 50] = "_2";
+    CharacterCodes[CharacterCodes["_3"] = 51] = "_3";
+    CharacterCodes[CharacterCodes["_4"] = 52] = "_4";
+    CharacterCodes[CharacterCodes["_5"] = 53] = "_5";
+    CharacterCodes[CharacterCodes["_6"] = 54] = "_6";
+    CharacterCodes[CharacterCodes["_7"] = 55] = "_7";
+    CharacterCodes[CharacterCodes["_8"] = 56] = "_8";
+    CharacterCodes[CharacterCodes["_9"] = 57] = "_9";
+    CharacterCodes[CharacterCodes["a"] = 97] = "a";
+    CharacterCodes[CharacterCodes["b"] = 98] = "b";
+    CharacterCodes[CharacterCodes["c"] = 99] = "c";
+    CharacterCodes[CharacterCodes["d"] = 100] = "d";
+    CharacterCodes[CharacterCodes["e"] = 101] = "e";
+    CharacterCodes[CharacterCodes["f"] = 102] = "f";
+    CharacterCodes[CharacterCodes["g"] = 103] = "g";
+    CharacterCodes[CharacterCodes["h"] = 104] = "h";
+    CharacterCodes[CharacterCodes["i"] = 105] = "i";
+    CharacterCodes[CharacterCodes["j"] = 106] = "j";
+    CharacterCodes[CharacterCodes["k"] = 107] = "k";
+    CharacterCodes[CharacterCodes["l"] = 108] = "l";
+    CharacterCodes[CharacterCodes["m"] = 109] = "m";
+    CharacterCodes[CharacterCodes["n"] = 110] = "n";
+    CharacterCodes[CharacterCodes["o"] = 111] = "o";
+    CharacterCodes[CharacterCodes["p"] = 112] = "p";
+    CharacterCodes[CharacterCodes["q"] = 113] = "q";
+    CharacterCodes[CharacterCodes["r"] = 114] = "r";
+    CharacterCodes[CharacterCodes["s"] = 115] = "s";
+    CharacterCodes[CharacterCodes["t"] = 116] = "t";
+    CharacterCodes[CharacterCodes["u"] = 117] = "u";
+    CharacterCodes[CharacterCodes["v"] = 118] = "v";
+    CharacterCodes[CharacterCodes["w"] = 119] = "w";
+    CharacterCodes[CharacterCodes["x"] = 120] = "x";
+    CharacterCodes[CharacterCodes["y"] = 121] = "y";
+    CharacterCodes[CharacterCodes["z"] = 122] = "z";
+    CharacterCodes[CharacterCodes["A"] = 65] = "A";
+    CharacterCodes[CharacterCodes["B"] = 66] = "B";
+    CharacterCodes[CharacterCodes["C"] = 67] = "C";
+    CharacterCodes[CharacterCodes["D"] = 68] = "D";
+    CharacterCodes[CharacterCodes["E"] = 69] = "E";
+    CharacterCodes[CharacterCodes["F"] = 70] = "F";
+    CharacterCodes[CharacterCodes["G"] = 71] = "G";
+    CharacterCodes[CharacterCodes["H"] = 72] = "H";
+    CharacterCodes[CharacterCodes["I"] = 73] = "I";
+    CharacterCodes[CharacterCodes["J"] = 74] = "J";
+    CharacterCodes[CharacterCodes["K"] = 75] = "K";
+    CharacterCodes[CharacterCodes["L"] = 76] = "L";
+    CharacterCodes[CharacterCodes["M"] = 77] = "M";
+    CharacterCodes[CharacterCodes["N"] = 78] = "N";
+    CharacterCodes[CharacterCodes["O"] = 79] = "O";
+    CharacterCodes[CharacterCodes["P"] = 80] = "P";
+    CharacterCodes[CharacterCodes["Q"] = 81] = "Q";
+    CharacterCodes[CharacterCodes["R"] = 82] = "R";
+    CharacterCodes[CharacterCodes["S"] = 83] = "S";
+    CharacterCodes[CharacterCodes["T"] = 84] = "T";
+    CharacterCodes[CharacterCodes["U"] = 85] = "U";
+    CharacterCodes[CharacterCodes["V"] = 86] = "V";
+    CharacterCodes[CharacterCodes["W"] = 87] = "W";
+    CharacterCodes[CharacterCodes["X"] = 88] = "X";
+    CharacterCodes[CharacterCodes["Y"] = 89] = "Y";
+    CharacterCodes[CharacterCodes["Z"] = 90] = "Z";
+    CharacterCodes[CharacterCodes["asterisk"] = 42] = "asterisk";
+    CharacterCodes[CharacterCodes["backslash"] = 92] = "backslash";
+    CharacterCodes[CharacterCodes["closeBrace"] = 125] = "closeBrace";
+    CharacterCodes[CharacterCodes["closeBracket"] = 93] = "closeBracket";
+    CharacterCodes[CharacterCodes["colon"] = 58] = "colon";
+    CharacterCodes[CharacterCodes["comma"] = 44] = "comma";
+    CharacterCodes[CharacterCodes["dot"] = 46] = "dot";
+    CharacterCodes[CharacterCodes["doubleQuote"] = 34] = "doubleQuote";
+    CharacterCodes[CharacterCodes["minus"] = 45] = "minus";
+    CharacterCodes[CharacterCodes["openBrace"] = 123] = "openBrace";
+    CharacterCodes[CharacterCodes["openBracket"] = 91] = "openBracket";
+    CharacterCodes[CharacterCodes["plus"] = 43] = "plus";
+    CharacterCodes[CharacterCodes["slash"] = 47] = "slash";
+    CharacterCodes[CharacterCodes["formFeed"] = 12] = "formFeed";
+    CharacterCodes[CharacterCodes["tab"] = 9] = "tab";
+})(CharacterCodes || (CharacterCodes = {}));
 
 
 /***/ }),
@@ -902,22 +1104,21 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-function removeProperty(text, path, formattingOptions) {
-    return setProperty(text, path, void 0, formattingOptions);
+function removeProperty(text, path, options) {
+    return setProperty(text, path, void 0, options);
 }
-function setProperty(text, originalPath, value, formattingOptions, getInsertionIndex) {
-    var _a;
-    var path = originalPath.slice();
-    var errors = [];
-    var root = (0,_parser__WEBPACK_IMPORTED_MODULE_1__.parseTree)(text, errors);
-    var parent = void 0;
-    var lastSegment = void 0;
+function setProperty(text, originalPath, value, options) {
+    const path = originalPath.slice();
+    const errors = [];
+    const root = (0,_parser__WEBPACK_IMPORTED_MODULE_1__.parseTree)(text, errors);
+    let parent = void 0;
+    let lastSegment = void 0;
     while (path.length > 0) {
         lastSegment = path.pop();
         parent = (0,_parser__WEBPACK_IMPORTED_MODULE_1__.findNodeAtLocation)(root, path);
         if (parent === void 0 && value !== void 0) {
             if (typeof lastSegment === 'string') {
-                value = (_a = {}, _a[lastSegment] = value, _a);
+                value = { [lastSegment]: value };
             }
             else {
                 value = [value];
@@ -932,47 +1133,47 @@ function setProperty(text, originalPath, value, formattingOptions, getInsertionI
         if (value === void 0) { // delete
             throw new Error('Can not delete in empty document');
         }
-        return withFormatting(text, { offset: root ? root.offset : 0, length: root ? root.length : 0, content: JSON.stringify(value) }, formattingOptions);
+        return withFormatting(text, { offset: root ? root.offset : 0, length: root ? root.length : 0, content: JSON.stringify(value) }, options);
     }
     else if (parent.type === 'object' && typeof lastSegment === 'string' && Array.isArray(parent.children)) {
-        var existing = (0,_parser__WEBPACK_IMPORTED_MODULE_1__.findNodeAtLocation)(parent, [lastSegment]);
+        const existing = (0,_parser__WEBPACK_IMPORTED_MODULE_1__.findNodeAtLocation)(parent, [lastSegment]);
         if (existing !== void 0) {
             if (value === void 0) { // delete
                 if (!existing.parent) {
                     throw new Error('Malformed AST');
                 }
-                var propertyIndex = parent.children.indexOf(existing.parent);
-                var removeBegin = void 0;
-                var removeEnd = existing.parent.offset + existing.parent.length;
+                const propertyIndex = parent.children.indexOf(existing.parent);
+                let removeBegin;
+                let removeEnd = existing.parent.offset + existing.parent.length;
                 if (propertyIndex > 0) {
                     // remove the comma of the previous node
-                    var previous = parent.children[propertyIndex - 1];
+                    let previous = parent.children[propertyIndex - 1];
                     removeBegin = previous.offset + previous.length;
                 }
                 else {
                     removeBegin = parent.offset + 1;
                     if (parent.children.length > 1) {
                         // remove the comma of the next node
-                        var next = parent.children[1];
+                        let next = parent.children[1];
                         removeEnd = next.offset;
                     }
                 }
-                return withFormatting(text, { offset: removeBegin, length: removeEnd - removeBegin, content: '' }, formattingOptions);
+                return withFormatting(text, { offset: removeBegin, length: removeEnd - removeBegin, content: '' }, options);
             }
             else {
                 // set value of existing property
-                return withFormatting(text, { offset: existing.offset, length: existing.length, content: JSON.stringify(value) }, formattingOptions);
+                return withFormatting(text, { offset: existing.offset, length: existing.length, content: JSON.stringify(value) }, options);
             }
         }
         else {
             if (value === void 0) { // delete
                 return []; // property does not exist, nothing to do
             }
-            var newProperty = JSON.stringify(lastSegment) + ": " + JSON.stringify(value);
-            var index = getInsertionIndex ? getInsertionIndex(parent.children.map(function (p) { return p.children[0].value; })) : parent.children.length;
-            var edit = void 0;
+            const newProperty = `${JSON.stringify(lastSegment)}: ${JSON.stringify(value)}`;
+            const index = options.getInsertionIndex ? options.getInsertionIndex(parent.children.map(p => p.children[0].value)) : parent.children.length;
+            let edit;
             if (index > 0) {
-                var previous = parent.children[index - 1];
+                let previous = parent.children[index - 1];
                 edit = { offset: previous.offset + previous.length, length: 0, content: ',' + newProperty };
             }
             else if (parent.children.length === 0) {
@@ -981,61 +1182,79 @@ function setProperty(text, originalPath, value, formattingOptions, getInsertionI
             else {
                 edit = { offset: parent.offset + 1, length: 0, content: newProperty + ',' };
             }
-            return withFormatting(text, edit, formattingOptions);
+            return withFormatting(text, edit, options);
         }
     }
     else if (parent.type === 'array' && typeof lastSegment === 'number' && Array.isArray(parent.children)) {
-        var insertIndex = lastSegment;
+        const insertIndex = lastSegment;
         if (insertIndex === -1) {
             // Insert
-            var newProperty = "" + JSON.stringify(value);
-            var edit = void 0;
+            const newProperty = `${JSON.stringify(value)}`;
+            let edit;
             if (parent.children.length === 0) {
                 edit = { offset: parent.offset + 1, length: 0, content: newProperty };
             }
             else {
-                var previous = parent.children[parent.children.length - 1];
+                const previous = parent.children[parent.children.length - 1];
                 edit = { offset: previous.offset + previous.length, length: 0, content: ',' + newProperty };
             }
-            return withFormatting(text, edit, formattingOptions);
+            return withFormatting(text, edit, options);
         }
-        else {
-            if (value === void 0 && parent.children.length >= 0) {
-                //Removal
-                var removalIndex = lastSegment;
-                var toRemove = parent.children[removalIndex];
-                var edit = void 0;
-                if (parent.children.length === 1) {
-                    // only item
-                    edit = { offset: parent.offset + 1, length: parent.length - 2, content: '' };
-                }
-                else if (parent.children.length - 1 === removalIndex) {
-                    // last item
-                    var previous = parent.children[removalIndex - 1];
-                    var offset = previous.offset + previous.length;
-                    var parentEndOffset = parent.offset + parent.length;
-                    edit = { offset: offset, length: parentEndOffset - 2 - offset, content: '' };
-                }
-                else {
-                    edit = { offset: toRemove.offset, length: parent.children[removalIndex + 1].offset - toRemove.offset, content: '' };
-                }
-                return withFormatting(text, edit, formattingOptions);
+        else if (value === void 0 && parent.children.length >= 0) {
+            // Removal
+            const removalIndex = lastSegment;
+            const toRemove = parent.children[removalIndex];
+            let edit;
+            if (parent.children.length === 1) {
+                // only item
+                edit = { offset: parent.offset + 1, length: parent.length - 2, content: '' };
+            }
+            else if (parent.children.length - 1 === removalIndex) {
+                // last item
+                let previous = parent.children[removalIndex - 1];
+                let offset = previous.offset + previous.length;
+                let parentEndOffset = parent.offset + parent.length;
+                edit = { offset, length: parentEndOffset - 2 - offset, content: '' };
             }
             else {
-                throw new Error('Array modification not supported yet');
+                edit = { offset: toRemove.offset, length: parent.children[removalIndex + 1].offset - toRemove.offset, content: '' };
             }
+            return withFormatting(text, edit, options);
+        }
+        else if (value !== void 0) {
+            let edit;
+            const newProperty = `${JSON.stringify(value)}`;
+            if (!options.isArrayInsertion && parent.children.length > lastSegment) {
+                const toModify = parent.children[lastSegment];
+                edit = { offset: toModify.offset, length: toModify.length, content: newProperty };
+            }
+            else if (parent.children.length === 0 || lastSegment === 0) {
+                edit = { offset: parent.offset + 1, length: 0, content: parent.children.length === 0 ? newProperty : newProperty + ',' };
+            }
+            else {
+                const index = lastSegment > parent.children.length ? parent.children.length : lastSegment;
+                const previous = parent.children[index - 1];
+                edit = { offset: previous.offset + previous.length, length: 0, content: ',' + newProperty };
+            }
+            return withFormatting(text, edit, options);
+        }
+        else {
+            throw new Error(`Can not ${value === void 0 ? 'remove' : (options.isArrayInsertion ? 'insert' : 'modify')} Array index ${insertIndex} as length is not sufficient`);
         }
     }
     else {
-        throw new Error("Can not add " + (typeof lastSegment !== 'number' ? 'index' : 'property') + " to parent of type " + parent.type);
+        throw new Error(`Can not add ${typeof lastSegment !== 'number' ? 'index' : 'property'} to parent of type ${parent.type}`);
     }
 }
-function withFormatting(text, edit, formattingOptions) {
+function withFormatting(text, edit, options) {
+    if (!options.formattingOptions) {
+        return [edit];
+    }
     // apply the edit
-    var newText = applyEdit(text, edit);
+    let newText = applyEdit(text, edit);
     // format the new text
-    var begin = edit.offset;
-    var end = edit.offset + edit.content.length;
+    let begin = edit.offset;
+    let end = edit.offset + edit.content.length;
     if (edit.length === 0 || edit.content.length === 0) { // insert or remove
         while (begin > 0 && !(0,_format__WEBPACK_IMPORTED_MODULE_0__.isEOL)(newText, begin - 1)) {
             begin--;
@@ -1044,17 +1263,17 @@ function withFormatting(text, edit, formattingOptions) {
             end++;
         }
     }
-    var edits = (0,_format__WEBPACK_IMPORTED_MODULE_0__.format)(newText, { offset: begin, length: end - begin }, formattingOptions);
+    const edits = (0,_format__WEBPACK_IMPORTED_MODULE_0__.format)(newText, { offset: begin, length: end - begin }, { ...options.formattingOptions, keepLines: false });
     // apply the formatting edits and track the begin and end offsets of the changes
-    for (var i = edits.length - 1; i >= 0; i--) {
-        var edit_1 = edits[i];
-        newText = applyEdit(newText, edit_1);
-        begin = Math.min(begin, edit_1.offset);
-        end = Math.max(end, edit_1.offset + edit_1.length);
-        end += edit_1.content.length - edit_1.length;
+    for (let i = edits.length - 1; i >= 0; i--) {
+        const edit = edits[i];
+        newText = applyEdit(newText, edit);
+        begin = Math.min(begin, edit.offset);
+        end = Math.max(end, edit.offset + edit.length);
+        end += edit.content.length - edit.length;
     }
     // create a single edit with all changes
-    var editLength = text.length - (newText.length - end) - begin;
+    const editLength = text.length - (newText.length - end) - begin;
     return [{ offset: begin, length: editLength, content: newText.substring(begin, end) }];
 }
 function applyEdit(text, edit) {
@@ -1101,17 +1320,17 @@ var ParseOptions;
  * For a given offset, evaluate the location in the JSON document. Each segment in the location path is either a property name or an array index.
  */
 function getLocation(text, position) {
-    var segments = []; // strings or numbers
-    var earlyReturnException = new Object();
-    var previousNode = undefined;
-    var previousNodeInst = {
+    const segments = []; // strings or numbers
+    const earlyReturnException = new Object();
+    let previousNode = undefined;
+    const previousNodeInst = {
         value: {},
         offset: 0,
         length: 0,
         type: 'object',
         parent: undefined
     };
-    var isAtPropertyKey = false;
+    let isAtPropertyKey = false;
     function setPreviousNode(value, offset, length, type) {
         previousNodeInst.value = value;
         previousNodeInst.offset = offset;
@@ -1122,7 +1341,7 @@ function getLocation(text, position) {
     }
     try {
         visit(text, {
-            onObjectBegin: function (offset, length) {
+            onObjectBegin: (offset, length) => {
                 if (position <= offset) {
                     throw earlyReturnException;
                 }
@@ -1130,7 +1349,7 @@ function getLocation(text, position) {
                 isAtPropertyKey = position > offset;
                 segments.push(''); // push a placeholder (will be replaced)
             },
-            onObjectProperty: function (name, offset, length) {
+            onObjectProperty: (name, offset, length) => {
                 if (position < offset) {
                     throw earlyReturnException;
                 }
@@ -1140,28 +1359,28 @@ function getLocation(text, position) {
                     throw earlyReturnException;
                 }
             },
-            onObjectEnd: function (offset, length) {
+            onObjectEnd: (offset, length) => {
                 if (position <= offset) {
                     throw earlyReturnException;
                 }
                 previousNode = undefined;
                 segments.pop();
             },
-            onArrayBegin: function (offset, length) {
+            onArrayBegin: (offset, length) => {
                 if (position <= offset) {
                     throw earlyReturnException;
                 }
                 previousNode = undefined;
                 segments.push(0);
             },
-            onArrayEnd: function (offset, length) {
+            onArrayEnd: (offset, length) => {
                 if (position <= offset) {
                     throw earlyReturnException;
                 }
                 previousNode = undefined;
                 segments.pop();
             },
-            onLiteralValue: function (value, offset, length) {
+            onLiteralValue: (value, offset, length) => {
                 if (position < offset) {
                     throw earlyReturnException;
                 }
@@ -1170,7 +1389,7 @@ function getLocation(text, position) {
                     throw earlyReturnException;
                 }
             },
-            onSeparator: function (sep, offset, length) {
+            onSeparator: (sep, offset, length) => {
                 if (position <= offset) {
                     throw earlyReturnException;
                 }
@@ -1180,7 +1399,7 @@ function getLocation(text, position) {
                     previousNode = undefined;
                 }
                 else if (sep === ',') {
-                    var last = segments[segments.length - 1];
+                    const last = segments[segments.length - 1];
                     if (typeof last === 'number') {
                         segments[segments.length - 1] = last + 1;
                     }
@@ -1200,11 +1419,11 @@ function getLocation(text, position) {
     }
     return {
         path: segments,
-        previousNode: previousNode,
-        isAtPropertyKey: isAtPropertyKey,
-        matches: function (pattern) {
-            var k = 0;
-            for (var i = 0; k < pattern.length && i < segments.length; i++) {
+        previousNode,
+        isAtPropertyKey,
+        matches: (pattern) => {
+            let k = 0;
+            for (let i = 0; k < pattern.length && i < segments.length; i++) {
                 if (pattern[k] === segments[i] || pattern[k] === '*') {
                     k++;
                 }
@@ -1220,12 +1439,10 @@ function getLocation(text, position) {
  * Parses the given text and returns the object the JSON content represents. On invalid input, the parser tries to be as fault tolerant as possible, but still return a result.
  * Therefore always check the errors list to find out if the input was valid.
  */
-function parse(text, errors, options) {
-    if (errors === void 0) { errors = []; }
-    if (options === void 0) { options = ParseOptions.DEFAULT; }
-    var currentProperty = null;
-    var currentParent = [];
-    var previousParents = [];
+function parse(text, errors = [], options = ParseOptions.DEFAULT) {
+    let currentProperty = null;
+    let currentParent = [];
+    const previousParents = [];
     function onValue(value) {
         if (Array.isArray(currentParent)) {
             currentParent.push(value);
@@ -1234,33 +1451,33 @@ function parse(text, errors, options) {
             currentParent[currentProperty] = value;
         }
     }
-    var visitor = {
-        onObjectBegin: function () {
-            var object = {};
+    const visitor = {
+        onObjectBegin: () => {
+            const object = {};
             onValue(object);
             previousParents.push(currentParent);
             currentParent = object;
             currentProperty = null;
         },
-        onObjectProperty: function (name) {
+        onObjectProperty: (name) => {
             currentProperty = name;
         },
-        onObjectEnd: function () {
+        onObjectEnd: () => {
             currentParent = previousParents.pop();
         },
-        onArrayBegin: function () {
-            var array = [];
+        onArrayBegin: () => {
+            const array = [];
             onValue(array);
             previousParents.push(currentParent);
             currentParent = array;
             currentProperty = null;
         },
-        onArrayEnd: function () {
+        onArrayEnd: () => {
             currentParent = previousParents.pop();
         },
         onLiteralValue: onValue,
-        onError: function (error, offset, length) {
-            errors.push({ error: error, offset: offset, length: length });
+        onError: (error, offset, length) => {
+            errors.push({ error, offset, length });
         }
     };
     visit(text, visitor, options);
@@ -1269,10 +1486,8 @@ function parse(text, errors, options) {
 /**
  * Parses the given text and returns a tree representation the JSON content. On invalid input, the parser tries to be as fault tolerant as possible, but still return a result.
  */
-function parseTree(text, errors, options) {
-    if (errors === void 0) { errors = []; }
-    if (options === void 0) { options = ParseOptions.DEFAULT; }
-    var currentParent = { type: 'array', offset: -1, length: -1, children: [], parent: undefined }; // artificial root
+function parseTree(text, errors = [], options = ParseOptions.DEFAULT) {
+    let currentParent = { type: 'array', offset: -1, length: -1, children: [], parent: undefined }; // artificial root
     function ensurePropertyComplete(endOffset) {
         if (currentParent.type === 'property') {
             currentParent.length = endOffset - currentParent.offset;
@@ -1283,33 +1498,33 @@ function parseTree(text, errors, options) {
         currentParent.children.push(valueNode);
         return valueNode;
     }
-    var visitor = {
-        onObjectBegin: function (offset) {
-            currentParent = onValue({ type: 'object', offset: offset, length: -1, parent: currentParent, children: [] });
+    const visitor = {
+        onObjectBegin: (offset) => {
+            currentParent = onValue({ type: 'object', offset, length: -1, parent: currentParent, children: [] });
         },
-        onObjectProperty: function (name, offset, length) {
-            currentParent = onValue({ type: 'property', offset: offset, length: -1, parent: currentParent, children: [] });
-            currentParent.children.push({ type: 'string', value: name, offset: offset, length: length, parent: currentParent });
+        onObjectProperty: (name, offset, length) => {
+            currentParent = onValue({ type: 'property', offset, length: -1, parent: currentParent, children: [] });
+            currentParent.children.push({ type: 'string', value: name, offset, length, parent: currentParent });
         },
-        onObjectEnd: function (offset, length) {
+        onObjectEnd: (offset, length) => {
             ensurePropertyComplete(offset + length); // in case of a missing value for a property: make sure property is complete
             currentParent.length = offset + length - currentParent.offset;
             currentParent = currentParent.parent;
             ensurePropertyComplete(offset + length);
         },
-        onArrayBegin: function (offset, length) {
-            currentParent = onValue({ type: 'array', offset: offset, length: -1, parent: currentParent, children: [] });
+        onArrayBegin: (offset, length) => {
+            currentParent = onValue({ type: 'array', offset, length: -1, parent: currentParent, children: [] });
         },
-        onArrayEnd: function (offset, length) {
+        onArrayEnd: (offset, length) => {
             currentParent.length = offset + length - currentParent.offset;
             currentParent = currentParent.parent;
             ensurePropertyComplete(offset + length);
         },
-        onLiteralValue: function (value, offset, length) {
-            onValue({ type: getNodeType(value), offset: offset, length: length, parent: currentParent, value: value });
+        onLiteralValue: (value, offset, length) => {
+            onValue({ type: getNodeType(value), offset, length, parent: currentParent, value });
             ensurePropertyComplete(offset + length);
         },
-        onSeparator: function (sep, offset, length) {
+        onSeparator: (sep, offset, length) => {
             if (currentParent.type === 'property') {
                 if (sep === ':') {
                     currentParent.colonOffset = offset;
@@ -1319,12 +1534,12 @@ function parseTree(text, errors, options) {
                 }
             }
         },
-        onError: function (error, offset, length) {
-            errors.push({ error: error, offset: offset, length: length });
+        onError: (error, offset, length) => {
+            errors.push({ error, offset, length });
         }
     };
     visit(text, visitor, options);
-    var result = currentParent.children[0];
+    const result = currentParent.children[0];
     if (result) {
         delete result.parent;
     }
@@ -1337,17 +1552,15 @@ function findNodeAtLocation(root, path) {
     if (!root) {
         return undefined;
     }
-    var node = root;
-    for (var _i = 0, path_1 = path; _i < path_1.length; _i++) {
-        var segment = path_1[_i];
+    let node = root;
+    for (let segment of path) {
         if (typeof segment === 'string') {
             if (node.type !== 'object' || !Array.isArray(node.children)) {
                 return undefined;
             }
-            var found = false;
-            for (var _a = 0, _b = node.children; _a < _b.length; _a++) {
-                var propertyNode = _b[_a];
-                if (Array.isArray(propertyNode.children) && propertyNode.children[0].value === segment) {
+            let found = false;
+            for (const propertyNode of node.children) {
+                if (Array.isArray(propertyNode.children) && propertyNode.children[0].value === segment && propertyNode.children.length === 2) {
                     node = propertyNode.children[1];
                     found = true;
                     break;
@@ -1358,7 +1571,7 @@ function findNodeAtLocation(root, path) {
             }
         }
         else {
-            var index = segment;
+            const index = segment;
             if (node.type !== 'array' || index < 0 || !Array.isArray(node.children) || index >= node.children.length) {
                 return undefined;
             }
@@ -1374,13 +1587,13 @@ function getNodePath(node) {
     if (!node.parent || !node.parent.children) {
         return [];
     }
-    var path = getNodePath(node.parent);
+    const path = getNodePath(node.parent);
     if (node.parent.type === 'property') {
-        var key = node.parent.children[0].value;
+        const key = node.parent.children[0].value;
         path.push(key);
     }
     else if (node.parent.type === 'array') {
-        var index = node.parent.children.indexOf(node);
+        const index = node.parent.children.indexOf(node);
         if (index !== -1) {
             path.push(index);
         }
@@ -1395,10 +1608,9 @@ function getNodeValue(node) {
         case 'array':
             return node.children.map(getNodeValue);
         case 'object':
-            var obj = Object.create(null);
-            for (var _i = 0, _a = node.children; _i < _a.length; _i++) {
-                var prop = _a[_i];
-                var valueNode = prop.children[1];
+            const obj = Object.create(null);
+            for (let prop of node.children) {
+                const valueNode = prop.children[1];
                 if (valueNode) {
                     obj[prop.children[0].value] = getNodeValue(valueNode);
                 }
@@ -1413,20 +1625,18 @@ function getNodeValue(node) {
             return undefined;
     }
 }
-function contains(node, offset, includeRightBound) {
-    if (includeRightBound === void 0) { includeRightBound = false; }
+function contains(node, offset, includeRightBound = false) {
     return (offset >= node.offset && offset < (node.offset + node.length)) || includeRightBound && (offset === (node.offset + node.length));
 }
 /**
  * Finds the most inner node at the given offset. If includeRightBound is set, also finds nodes that end at the given offset.
  */
-function findNodeAtOffset(node, offset, includeRightBound) {
-    if (includeRightBound === void 0) { includeRightBound = false; }
+function findNodeAtOffset(node, offset, includeRightBound = false) {
     if (contains(node, offset, includeRightBound)) {
-        var children = node.children;
+        const children = node.children;
         if (Array.isArray(children)) {
-            for (var i = 0; i < children.length && children[i].offset <= offset; i++) {
-                var item = findNodeAtOffset(children[i], offset, includeRightBound);
+            for (let i = 0; i < children.length && children[i].offset <= offset; i++) {
+                const item = findNodeAtOffset(children[i], offset, includeRightBound);
                 if (item) {
                     return item;
                 }
@@ -1439,71 +1649,77 @@ function findNodeAtOffset(node, offset, includeRightBound) {
 /**
  * Parses the given text and invokes the visitor functions for each object, array and literal reached.
  */
-function visit(text, visitor, options) {
-    if (options === void 0) { options = ParseOptions.DEFAULT; }
-    var _scanner = (0,_scanner__WEBPACK_IMPORTED_MODULE_0__.createScanner)(text, false);
+function visit(text, visitor, options = ParseOptions.DEFAULT) {
+    const _scanner = (0,_scanner__WEBPACK_IMPORTED_MODULE_0__.createScanner)(text, false);
+    // Important: Only pass copies of this to visitor functions to prevent accidental modification, and
+    // to not affect visitor functions which stored a reference to a previous JSONPath
+    const _jsonPath = [];
     function toNoArgVisit(visitFunction) {
-        return visitFunction ? function () { return visitFunction(_scanner.getTokenOffset(), _scanner.getTokenLength(), _scanner.getTokenStartLine(), _scanner.getTokenStartCharacter()); } : function () { return true; };
+        return visitFunction ? () => visitFunction(_scanner.getTokenOffset(), _scanner.getTokenLength(), _scanner.getTokenStartLine(), _scanner.getTokenStartCharacter()) : () => true;
+    }
+    function toNoArgVisitWithPath(visitFunction) {
+        return visitFunction ? () => visitFunction(_scanner.getTokenOffset(), _scanner.getTokenLength(), _scanner.getTokenStartLine(), _scanner.getTokenStartCharacter(), () => _jsonPath.slice()) : () => true;
     }
     function toOneArgVisit(visitFunction) {
-        return visitFunction ? function (arg) { return visitFunction(arg, _scanner.getTokenOffset(), _scanner.getTokenLength(), _scanner.getTokenStartLine(), _scanner.getTokenStartCharacter()); } : function () { return true; };
+        return visitFunction ? (arg) => visitFunction(arg, _scanner.getTokenOffset(), _scanner.getTokenLength(), _scanner.getTokenStartLine(), _scanner.getTokenStartCharacter()) : () => true;
     }
-    var onObjectBegin = toNoArgVisit(visitor.onObjectBegin), onObjectProperty = toOneArgVisit(visitor.onObjectProperty), onObjectEnd = toNoArgVisit(visitor.onObjectEnd), onArrayBegin = toNoArgVisit(visitor.onArrayBegin), onArrayEnd = toNoArgVisit(visitor.onArrayEnd), onLiteralValue = toOneArgVisit(visitor.onLiteralValue), onSeparator = toOneArgVisit(visitor.onSeparator), onComment = toNoArgVisit(visitor.onComment), onError = toOneArgVisit(visitor.onError);
-    var disallowComments = options && options.disallowComments;
-    var allowTrailingComma = options && options.allowTrailingComma;
+    function toOneArgVisitWithPath(visitFunction) {
+        return visitFunction ? (arg) => visitFunction(arg, _scanner.getTokenOffset(), _scanner.getTokenLength(), _scanner.getTokenStartLine(), _scanner.getTokenStartCharacter(), () => _jsonPath.slice()) : () => true;
+    }
+    const onObjectBegin = toNoArgVisitWithPath(visitor.onObjectBegin), onObjectProperty = toOneArgVisitWithPath(visitor.onObjectProperty), onObjectEnd = toNoArgVisit(visitor.onObjectEnd), onArrayBegin = toNoArgVisitWithPath(visitor.onArrayBegin), onArrayEnd = toNoArgVisit(visitor.onArrayEnd), onLiteralValue = toOneArgVisitWithPath(visitor.onLiteralValue), onSeparator = toOneArgVisit(visitor.onSeparator), onComment = toNoArgVisit(visitor.onComment), onError = toOneArgVisit(visitor.onError);
+    const disallowComments = options && options.disallowComments;
+    const allowTrailingComma = options && options.allowTrailingComma;
     function scanNext() {
         while (true) {
-            var token = _scanner.scan();
+            const token = _scanner.scan();
             switch (_scanner.getTokenError()) {
-                case 4 /* InvalidUnicode */:
-                    handleError(14 /* InvalidUnicode */);
+                case 4 /* ScanError.InvalidUnicode */:
+                    handleError(14 /* ParseErrorCode.InvalidUnicode */);
                     break;
-                case 5 /* InvalidEscapeCharacter */:
-                    handleError(15 /* InvalidEscapeCharacter */);
+                case 5 /* ScanError.InvalidEscapeCharacter */:
+                    handleError(15 /* ParseErrorCode.InvalidEscapeCharacter */);
                     break;
-                case 3 /* UnexpectedEndOfNumber */:
-                    handleError(13 /* UnexpectedEndOfNumber */);
+                case 3 /* ScanError.UnexpectedEndOfNumber */:
+                    handleError(13 /* ParseErrorCode.UnexpectedEndOfNumber */);
                     break;
-                case 1 /* UnexpectedEndOfComment */:
+                case 1 /* ScanError.UnexpectedEndOfComment */:
                     if (!disallowComments) {
-                        handleError(11 /* UnexpectedEndOfComment */);
+                        handleError(11 /* ParseErrorCode.UnexpectedEndOfComment */);
                     }
                     break;
-                case 2 /* UnexpectedEndOfString */:
-                    handleError(12 /* UnexpectedEndOfString */);
+                case 2 /* ScanError.UnexpectedEndOfString */:
+                    handleError(12 /* ParseErrorCode.UnexpectedEndOfString */);
                     break;
-                case 6 /* InvalidCharacter */:
-                    handleError(16 /* InvalidCharacter */);
+                case 6 /* ScanError.InvalidCharacter */:
+                    handleError(16 /* ParseErrorCode.InvalidCharacter */);
                     break;
             }
             switch (token) {
-                case 12 /* LineCommentTrivia */:
-                case 13 /* BlockCommentTrivia */:
+                case 12 /* SyntaxKind.LineCommentTrivia */:
+                case 13 /* SyntaxKind.BlockCommentTrivia */:
                     if (disallowComments) {
-                        handleError(10 /* InvalidCommentToken */);
+                        handleError(10 /* ParseErrorCode.InvalidCommentToken */);
                     }
                     else {
                         onComment();
                     }
                     break;
-                case 16 /* Unknown */:
-                    handleError(1 /* InvalidSymbol */);
+                case 16 /* SyntaxKind.Unknown */:
+                    handleError(1 /* ParseErrorCode.InvalidSymbol */);
                     break;
-                case 15 /* Trivia */:
-                case 14 /* LineBreakTrivia */:
+                case 15 /* SyntaxKind.Trivia */:
+                case 14 /* SyntaxKind.LineBreakTrivia */:
                     break;
                 default:
                     return token;
             }
         }
     }
-    function handleError(error, skipUntilAfter, skipUntil) {
-        if (skipUntilAfter === void 0) { skipUntilAfter = []; }
-        if (skipUntil === void 0) { skipUntil = []; }
+    function handleError(error, skipUntilAfter = [], skipUntil = []) {
         onError(error);
         if (skipUntilAfter.length + skipUntil.length > 0) {
-            var token = _scanner.getToken();
-            while (token !== 17 /* EOF */) {
+            let token = _scanner.getToken();
+            while (token !== 17 /* SyntaxKind.EOF */) {
                 if (skipUntilAfter.indexOf(token) !== -1) {
                     scanNext();
                     break;
@@ -1516,39 +1732,36 @@ function visit(text, visitor, options) {
         }
     }
     function parseString(isValue) {
-        var value = _scanner.getTokenValue();
+        const value = _scanner.getTokenValue();
         if (isValue) {
             onLiteralValue(value);
         }
         else {
             onObjectProperty(value);
+            // add property name afterwards
+            _jsonPath.push(value);
         }
         scanNext();
         return true;
     }
     function parseLiteral() {
         switch (_scanner.getToken()) {
-            case 11 /* NumericLiteral */:
-                var value = 0;
-                try {
-                    value = JSON.parse(_scanner.getTokenValue());
-                    if (typeof value !== 'number') {
-                        handleError(2 /* InvalidNumberFormat */);
-                        value = 0;
-                    }
-                }
-                catch (e) {
-                    handleError(2 /* InvalidNumberFormat */);
+            case 11 /* SyntaxKind.NumericLiteral */:
+                const tokenValue = _scanner.getTokenValue();
+                let value = Number(tokenValue);
+                if (isNaN(value)) {
+                    handleError(2 /* ParseErrorCode.InvalidNumberFormat */);
+                    value = 0;
                 }
                 onLiteralValue(value);
                 break;
-            case 7 /* NullKeyword */:
+            case 7 /* SyntaxKind.NullKeyword */:
                 onLiteralValue(null);
                 break;
-            case 8 /* TrueKeyword */:
+            case 8 /* SyntaxKind.TrueKeyword */:
                 onLiteralValue(true);
                 break;
-            case 9 /* FalseKeyword */:
+            case 9 /* SyntaxKind.FalseKeyword */:
                 onLiteralValue(false);
                 break;
             default:
@@ -1558,49 +1771,50 @@ function visit(text, visitor, options) {
         return true;
     }
     function parseProperty() {
-        if (_scanner.getToken() !== 10 /* StringLiteral */) {
-            handleError(3 /* PropertyNameExpected */, [], [2 /* CloseBraceToken */, 5 /* CommaToken */]);
+        if (_scanner.getToken() !== 10 /* SyntaxKind.StringLiteral */) {
+            handleError(3 /* ParseErrorCode.PropertyNameExpected */, [], [2 /* SyntaxKind.CloseBraceToken */, 5 /* SyntaxKind.CommaToken */]);
             return false;
         }
         parseString(false);
-        if (_scanner.getToken() === 6 /* ColonToken */) {
+        if (_scanner.getToken() === 6 /* SyntaxKind.ColonToken */) {
             onSeparator(':');
             scanNext(); // consume colon
             if (!parseValue()) {
-                handleError(4 /* ValueExpected */, [], [2 /* CloseBraceToken */, 5 /* CommaToken */]);
+                handleError(4 /* ParseErrorCode.ValueExpected */, [], [2 /* SyntaxKind.CloseBraceToken */, 5 /* SyntaxKind.CommaToken */]);
             }
         }
         else {
-            handleError(5 /* ColonExpected */, [], [2 /* CloseBraceToken */, 5 /* CommaToken */]);
+            handleError(5 /* ParseErrorCode.ColonExpected */, [], [2 /* SyntaxKind.CloseBraceToken */, 5 /* SyntaxKind.CommaToken */]);
         }
+        _jsonPath.pop(); // remove processed property name
         return true;
     }
     function parseObject() {
         onObjectBegin();
         scanNext(); // consume open brace
-        var needsComma = false;
-        while (_scanner.getToken() !== 2 /* CloseBraceToken */ && _scanner.getToken() !== 17 /* EOF */) {
-            if (_scanner.getToken() === 5 /* CommaToken */) {
+        let needsComma = false;
+        while (_scanner.getToken() !== 2 /* SyntaxKind.CloseBraceToken */ && _scanner.getToken() !== 17 /* SyntaxKind.EOF */) {
+            if (_scanner.getToken() === 5 /* SyntaxKind.CommaToken */) {
                 if (!needsComma) {
-                    handleError(4 /* ValueExpected */, [], []);
+                    handleError(4 /* ParseErrorCode.ValueExpected */, [], []);
                 }
                 onSeparator(',');
                 scanNext(); // consume comma
-                if (_scanner.getToken() === 2 /* CloseBraceToken */ && allowTrailingComma) {
+                if (_scanner.getToken() === 2 /* SyntaxKind.CloseBraceToken */ && allowTrailingComma) {
                     break;
                 }
             }
             else if (needsComma) {
-                handleError(6 /* CommaExpected */, [], []);
+                handleError(6 /* ParseErrorCode.CommaExpected */, [], []);
             }
             if (!parseProperty()) {
-                handleError(4 /* ValueExpected */, [], [2 /* CloseBraceToken */, 5 /* CommaToken */]);
+                handleError(4 /* ParseErrorCode.ValueExpected */, [], [2 /* SyntaxKind.CloseBraceToken */, 5 /* SyntaxKind.CommaToken */]);
             }
             needsComma = true;
         }
         onObjectEnd();
-        if (_scanner.getToken() !== 2 /* CloseBraceToken */) {
-            handleError(7 /* CloseBraceExpected */, [2 /* CloseBraceToken */], []);
+        if (_scanner.getToken() !== 2 /* SyntaxKind.CloseBraceToken */) {
+            handleError(7 /* ParseErrorCode.CloseBraceExpected */, [2 /* SyntaxKind.CloseBraceToken */], []);
         }
         else {
             scanNext(); // consume close brace
@@ -1610,29 +1824,40 @@ function visit(text, visitor, options) {
     function parseArray() {
         onArrayBegin();
         scanNext(); // consume open bracket
-        var needsComma = false;
-        while (_scanner.getToken() !== 4 /* CloseBracketToken */ && _scanner.getToken() !== 17 /* EOF */) {
-            if (_scanner.getToken() === 5 /* CommaToken */) {
+        let isFirstElement = true;
+        let needsComma = false;
+        while (_scanner.getToken() !== 4 /* SyntaxKind.CloseBracketToken */ && _scanner.getToken() !== 17 /* SyntaxKind.EOF */) {
+            if (_scanner.getToken() === 5 /* SyntaxKind.CommaToken */) {
                 if (!needsComma) {
-                    handleError(4 /* ValueExpected */, [], []);
+                    handleError(4 /* ParseErrorCode.ValueExpected */, [], []);
                 }
                 onSeparator(',');
                 scanNext(); // consume comma
-                if (_scanner.getToken() === 4 /* CloseBracketToken */ && allowTrailingComma) {
+                if (_scanner.getToken() === 4 /* SyntaxKind.CloseBracketToken */ && allowTrailingComma) {
                     break;
                 }
             }
             else if (needsComma) {
-                handleError(6 /* CommaExpected */, [], []);
+                handleError(6 /* ParseErrorCode.CommaExpected */, [], []);
+            }
+            if (isFirstElement) {
+                _jsonPath.push(0);
+                isFirstElement = false;
+            }
+            else {
+                _jsonPath[_jsonPath.length - 1]++;
             }
             if (!parseValue()) {
-                handleError(4 /* ValueExpected */, [], [4 /* CloseBracketToken */, 5 /* CommaToken */]);
+                handleError(4 /* ParseErrorCode.ValueExpected */, [], [4 /* SyntaxKind.CloseBracketToken */, 5 /* SyntaxKind.CommaToken */]);
             }
             needsComma = true;
         }
         onArrayEnd();
-        if (_scanner.getToken() !== 4 /* CloseBracketToken */) {
-            handleError(8 /* CloseBracketExpected */, [4 /* CloseBracketToken */], []);
+        if (!isFirstElement) {
+            _jsonPath.pop(); // remove array index
+        }
+        if (_scanner.getToken() !== 4 /* SyntaxKind.CloseBracketToken */) {
+            handleError(8 /* ParseErrorCode.CloseBracketExpected */, [4 /* SyntaxKind.CloseBracketToken */], []);
         }
         else {
             scanNext(); // consume close bracket
@@ -1641,30 +1866,30 @@ function visit(text, visitor, options) {
     }
     function parseValue() {
         switch (_scanner.getToken()) {
-            case 3 /* OpenBracketToken */:
+            case 3 /* SyntaxKind.OpenBracketToken */:
                 return parseArray();
-            case 1 /* OpenBraceToken */:
+            case 1 /* SyntaxKind.OpenBraceToken */:
                 return parseObject();
-            case 10 /* StringLiteral */:
+            case 10 /* SyntaxKind.StringLiteral */:
                 return parseString(true);
             default:
                 return parseLiteral();
         }
     }
     scanNext();
-    if (_scanner.getToken() === 17 /* EOF */) {
+    if (_scanner.getToken() === 17 /* SyntaxKind.EOF */) {
         if (options.allowEmptyContent) {
             return true;
         }
-        handleError(4 /* ValueExpected */, [], []);
+        handleError(4 /* ParseErrorCode.ValueExpected */, [], []);
         return false;
     }
     if (!parseValue()) {
-        handleError(4 /* ValueExpected */, [], []);
+        handleError(4 /* ParseErrorCode.ValueExpected */, [], []);
         return false;
     }
-    if (_scanner.getToken() !== 17 /* EOF */) {
-        handleError(9 /* EndOfFileExpected */, [], []);
+    if (_scanner.getToken() !== 17 /* SyntaxKind.EOF */) {
+        handleError(9 /* ParseErrorCode.EndOfFileExpected */, [], []);
     }
     return true;
 }
@@ -1674,14 +1899,14 @@ function visit(text, visitor, options) {
  * of comments with a replaceCharacter
  */
 function stripComments(text, replaceCh) {
-    var _scanner = (0,_scanner__WEBPACK_IMPORTED_MODULE_0__.createScanner)(text), parts = [], kind, offset = 0, pos;
+    let _scanner = (0,_scanner__WEBPACK_IMPORTED_MODULE_0__.createScanner)(text), parts = [], kind, offset = 0, pos;
     do {
         pos = _scanner.getPosition();
         kind = _scanner.scan();
         switch (kind) {
-            case 12 /* LineCommentTrivia */:
-            case 13 /* BlockCommentTrivia */:
-            case 17 /* EOF */:
+            case 12 /* SyntaxKind.LineCommentTrivia */:
+            case 13 /* SyntaxKind.BlockCommentTrivia */:
+            case 17 /* SyntaxKind.EOF */:
                 if (offset !== pos) {
                     parts.push(text.substring(offset, pos));
                 }
@@ -1691,7 +1916,7 @@ function stripComments(text, replaceCh) {
                 offset = _scanner.getPosition();
                 break;
         }
-    } while (kind !== 17 /* EOF */);
+    } while (kind !== 17 /* SyntaxKind.EOF */);
     return parts.join('');
 }
 function getNodeType(value) {
@@ -2151,11 +2376,12 @@ class PackageJSONContribution {
         return null;
     }
     isValidNPMName(name) {
-        // following rules from https://github.com/npm/validate-npm-package-name
-        if (!name || name.length > 214 || name.match(/^[_.]/)) {
+        // following rules from https://github.com/npm/validate-npm-package-name,
+        // leading slash added as additional security measure
+        if (!name || name.length > 214 || name.match(/^[-_.\s]/)) {
             return false;
         }
-        const match = name.match(/^(?:@([^/]+?)[/])?([^/]+?)$/);
+        const match = name.match(/^(?:@([^/~\s)('!*]+?)[/])?([^/~)('!*\s]+?)$/);
         if (match) {
             const scope = match[1];
             if (scope && encodeURIComponent(scope) !== scope) {
@@ -2181,7 +2407,7 @@ class PackageJSONContribution {
     }
     npmView(npmCommandPath, pack, resource) {
         return new Promise((resolve, _reject) => {
-            const args = ['view', '--json', pack, 'description', 'dist-tags.latest', 'homepage', 'version', 'time'];
+            const args = ['view', '--json', '--', pack, 'description', 'dist-tags.latest', 'homepage', 'version', 'time'];
             const cwd = resource && resource.scheme === 'file' ? (0, path_1.dirname)(resource.fsPath) : undefined;
             cp.execFile(npmCommandPath, args, { cwd }, (error, stdout) => {
                 if (!error) {