Merge from master

src/vs/base/common/jsonEdit.ts

@@ -2,21 +2,22 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-'use strict';
 
-import { ParseError, Node, parseTree, findNodeAtLocation, JSONPath, Segment } from 'vs/base/common/json';
-import { Edit, FormattingOptions, format, applyEdit } from 'vs/base/common/jsonFormatter';
+import { ParseError, Node, JSONPath, Segment, parseTree, findNodeAtLocation } from './json';
+import { Edit, format, isEOL, FormattingOptions } from './jsonFormatter';
+
 
 export function removeProperty(text: string, path: JSONPath, formattingOptions: FormattingOptions): Edit[] {
 	return setProperty(text, path, void 0, formattingOptions);
 }
 
-export function setProperty(text: string, path: JSONPath, value: any, formattingOptions: FormattingOptions, getInsertionIndex?: (properties: string[]) => number): Edit[] {
+export function setProperty(text: string, originalPath: JSONPath, value: any, formattingOptions: FormattingOptions, getInsertionIndex?: (properties: string[]) => number): Edit[] {
+	let path = originalPath.slice();
 	let errors: ParseError[] = [];
 	let root = parseTree(text, errors);
-	let parent: Node = void 0;
+	let parent: Node | undefined = void 0;
 
-	let lastSegment: Segment = void 0;
+	let lastSegment: Segment | undefined = void 0;
 	while (path.length > 0) {
 		lastSegment = path.pop();
 		parent = findNodeAtLocation(root, path);
@@ -37,10 +38,13 @@ export function setProperty(text: string, path: JSONPath, value: any, formatting
 			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);
-	} else if (parent.type === 'object' && typeof lastSegment === 'string') {
+	} else if (parent.type === 'object' && typeof lastSegment === 'string' && Array.isArray(parent.children)) {
 		let existing = findNodeAtLocation(parent, [lastSegment]);
 		if (existing !== void 0) {
 			if (value === void 0) { // delete
+				if (!existing.parent) {
+					throw new Error('Malformed AST');
+				}
 				let propertyIndex = parent.children.indexOf(existing.parent);
 				let removeBegin: number;
 				let removeEnd = existing.parent.offset + existing.parent.length;
@@ -66,7 +70,7 @@ export function setProperty(text: string, path: JSONPath, value: any, formatting
 				return []; // property does not exist, nothing to do
 			}
 			let newProperty = `${JSON.stringify(lastSegment)}: ${JSON.stringify(value)}`;
-			let index = getInsertionIndex ? getInsertionIndex(parent.children.map(p => p.children[0].value)) : parent.children.length;
+			let index = getInsertionIndex ? getInsertionIndex(parent.children.map(p => p.children![0].value)) : parent.children.length;
 			let edit: Edit;
 			if (index > 0) {
 				let previous = parent.children[index - 1];
@@ -78,7 +82,7 @@ export function setProperty(text: string, path: JSONPath, value: any, formatting
 			}
 			return withFormatting(text, edit, formattingOptions);
 		}
-	} else if (parent.type === 'array' && typeof lastSegment === 'number') {
+	} else if (parent.type === 'array' && typeof lastSegment === 'number' && Array.isArray(parent.children)) {
 		let insertIndex = lastSegment;
 		if (insertIndex === -1) {
 			// Insert
@@ -126,6 +130,15 @@ function withFormatting(text: string, edit: Edit, formattingOptions: FormattingO
 	// format the new text
 	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 && !isEOL(newText, begin - 1)) {
+			begin--;
+		}
+		while (end < newText.length && !isEOL(newText, end)) {
+			end++;
+		}
+	}
+
 	let edits = format(newText, { offset: begin, length: end - begin }, formattingOptions);
 
 	// apply the formatting edits and track the begin and end offsets of the changes
@@ -139,4 +152,12 @@ function withFormatting(text: string, edit: Edit, formattingOptions: FormattingO
 	// create a single edit with all changes
 	let editLength = text.length - (newText.length - end) - begin;
 	return [{ offset: begin, length: editLength, content: newText.substring(begin, end) }];
+}
+
+export function applyEdit(text: string, edit: Edit): string {
+	return text.substring(0, edit.offset) + edit.content + text.substring(edit.offset + edit.length);
+}
+
+export function isWS(text: string, offset: number) {
+	return '\r\n \t'.indexOf(text.charAt(offset)) !== -1;
 }