Return if there was parsing error

ramya-rao-a · ramya-rao-a · commit 915e1eb8cbf5 · 2017-06-26T14:18:38.000-07:00
diff --git a/extensions/emmet/src/balance.ts b/extensions/emmet/src/balance.ts
@@ -30,6 +30,9 @@ function balance(out: boolean) {
 	let getRangeFunction = out ? getRangeToBalanceOut : getRangeToBalanceIn;
 
 	let rootNode: HtmlNode = parse(new DocumentStreamReader(editor.document));
+	if (!rootNode) {
+		return;
+	}
 
 	let newSelections: vscode.Selection[] = [];
 	editor.selections.forEach(selection => {
diff --git a/extensions/emmet/src/matchTag.ts b/extensions/emmet/src/matchTag.ts
@@ -17,6 +17,9 @@ export function matchTag() {
 	}
 
 	let rootNode: HtmlNode = parse(new DocumentStreamReader(editor.document));
+	if (!rootNode) {
+		return;
+	}
 	let updatedSelections = [];
 	editor.selections.forEach(selection => {
 		let updatedSelection = getUpdatedSelections(editor, selection.start, rootNode);
@@ -38,7 +41,8 @@ function getUpdatedSelections(editor: vscode.TextEditor, position: vscode.Positi
 		return;
 	}
 
-	let finalPosition = position.isBeforeOrEqual(currentNode.open.end) ? currentNode.close.start : currentNode.open.start;
+	// Place cursor inside the close tag if cursor is inside the open tag, else place it inside the open tag
+	let finalPosition = position.isBeforeOrEqual(currentNode.open.end) ? currentNode.close.start.translate(0, 2) : currentNode.open.start.translate(0, 1);
 	return new vscode.Selection(finalPosition, finalPosition);
 }
 
diff --git a/extensions/emmet/src/mergeLines.ts b/extensions/emmet/src/mergeLines.ts
@@ -21,7 +21,9 @@ export function mergeLines() {
 	}
 
 	let rootNode: Node = parse(new DocumentStreamReader(editor.document));
-
+	if (!rootNode) {
+		return;
+	}
 	editor.edit(editBuilder => {
 		editor.selections.reverse().forEach(selection => {
 			let [rangeToReplace, textToReplaceWith] = getRangesToReplace(editor.document, selection, rootNode);
diff --git a/extensions/emmet/src/selectItem.ts b/extensions/emmet/src/selectItem.ts
@@ -35,6 +35,9 @@ export function fetchSelectItem(direction: string): void {
 	}
 
 	let rootNode: Node = parseContent(new DocumentStreamReader(editor.document));
+	if (!rootNode) {
+		return;
+	}
 	let newSelections: vscode.Selection[] = [];
 	editor.selections.forEach(selection => {
 		const selectionStart = selection.isReversed ? selection.active : selection.anchor;
diff --git a/extensions/emmet/src/splitJoinTag.ts b/extensions/emmet/src/splitJoinTag.ts
@@ -21,7 +21,9 @@ export function splitJoinTag() {
 	}
 
 	let rootNode: Node = parse(new DocumentStreamReader(editor.document));
-
+	if (!rootNode) {
+		return;
+	}
 	editor.edit(editBuilder => {
 		editor.selections.reverse().forEach(selection => {
 			let [rangeToReplace, textToReplaceWith] = getRangesToReplace(editor.document, selection, rootNode);
diff --git a/extensions/emmet/src/toggleComment.ts b/extensions/emmet/src/toggleComment.ts
@@ -41,7 +41,9 @@ export function toggleComment() {
 	}
 
 	let rootNode = parseContent(new DocumentStreamReader(editor.document));
-
+	if (!rootNode) {
+		return;
+	}
 	editor.edit(editBuilder => {
 		editor.selections.reverse().forEach(selection => {
 			let [rangesToUnComment, rangeToComment] = toggleCommentInternal(editor.document, selection, rootNode);
diff --git a/extensions/emmet/src/updateTag.ts b/extensions/emmet/src/updateTag.ts
@@ -17,6 +17,9 @@ export function updateTag(tagName: string) {
 	}
 
 	let rootNode: HtmlNode = parse(new DocumentStreamReader(editor.document));
+	if (!rootNode) {
+		return;
+	}
 	let rangesToUpdate = [];
 	editor.selections.reverse().forEach(selection => {
 		rangesToUpdate = rangesToUpdate.concat(getRangesToUpdate(editor, selection, rootNode));

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,9 @@ export function matchTag() {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`let rootNode: HtmlNode = parse(new DocumentStreamReader(editor.document));`
	`20`	`+ if (!rootNode) {`
	`21`	`+ return;`
	`22`	`+ }`
`20`	`23`	`let updatedSelections = [];`
`21`	`24`	`editor.selections.forEach(selection => {`
`22`	`25`	`let updatedSelection = getUpdatedSelections(editor, selection.start, rootNode);`
`@@ -38,7 +41,8 @@ function getUpdatedSelections(editor: vscode.TextEditor, position: vscode.Positi`
`38`	`41`	`return;`
`39`	`42`	`}`
`40`	`43`
`41`		`- let finalPosition = position.isBeforeOrEqual(currentNode.open.end) ? currentNode.close.start : currentNode.open.start;`
	`44`	`+ // Place cursor inside the close tag if cursor is inside the open tag, else place it inside the open tag`
	`45`	`+ let finalPosition = position.isBeforeOrEqual(currentNode.open.end) ? currentNode.close.start.translate(0, 2) : currentNode.open.start.translate(0, 1);`
`42`	`46`	`return new vscode.Selection(finalPosition, finalPosition);`
`43`	`47`	`}`
`44`	`48`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,9 @@ export function fetchSelectItem(direction: string): void {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`let rootNode: Node = parseContent(new DocumentStreamReader(editor.document));`
	`38`	`+ if (!rootNode) {`
	`39`	`+ return;`
	`40`	`+ }`
`38`	`41`	`let newSelections: vscode.Selection[] = [];`
`39`	`42`	`editor.selections.forEach(selection => {`
`40`	`43`	`const selectionStart = selection.isReversed ? selection.active : selection.anchor;`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,9 @@ export function updateTag(tagName: string) {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`let rootNode: HtmlNode = parse(new DocumentStreamReader(editor.document));`
	`20`	`+ if (!rootNode) {`
	`21`	`+ return;`
	`22`	`+ }`
`20`	`23`	`let rangesToUpdate = [];`
`21`	`24`	`editor.selections.reverse().forEach(selection => {`
`22`	`25`	`rangesToUpdate = rangesToUpdate.concat(getRangesToUpdate(editor, selection, rootNode));`