Fixes microsoft#29802 Corner cases of Select next/prev item feature

ramya-rao-a · ramya-rao-a · commit e2a18e4b6d21 · 2017-06-28T15:30:33.000-07:00
diff --git a/extensions/emmet/src/selectItemHTML.ts b/extensions/emmet/src/selectItemHTML.ts
@@ -13,7 +13,7 @@ export function nextItemHTML(selectionStart: vscode.Position, selectionEnd: vsco
 
 	if (currentNode.type !== 'comment') {
 		// If cursor is in the tag name, select tag
-		if (selectionEnd.translate(0, -currentNode.name.length).isBefore(currentNode.open.start)) {
+		if (selectionEnd.isBefore(currentNode.open.start.translate(0, currentNode.name.length))) {
 			return getSelectionFromNode(currentNode, editor.document);
 		}
 
@@ -113,7 +113,7 @@ function getNextAttribute(selectionStart: vscode.Position, selectionEnd: vscode.
 			return new vscode.Selection(attr.start, attr.end);
 		}
 
-		if ((<vscode.Position>attr.value.start).isEqual(attr.value.end)) {
+		if (!attr.value || (<vscode.Position>attr.value.start).isEqual(attr.value.end)) {
 			// No attr value to select
 			continue;
 		}
@@ -163,7 +163,7 @@ function getPrevAttribute(selectionStart: vscode.Position, selectionEnd: vscode.
 			continue;
 		}
 
-		if ((<vscode.Position>attr.value.start).isEqual(attr.value.end) || selectionStart.isBefore(attr.value.start)) {
+		if (!attr.value || (<vscode.Position>attr.value.start).isEqual(attr.value.end) || selectionStart.isBefore(attr.value.start)) {
 			// select full attr
 			return new vscode.Selection(attr.start, attr.end);
 		}

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ export function nextItemHTML(selectionStart: vscode.Position, selectionEnd: vsco`
`13`	`13`
`14`	`14`	`if (currentNode.type !== 'comment') {`
`15`	`15`	`// If cursor is in the tag name, select tag`
`16`		`- if (selectionEnd.translate(0, -currentNode.name.length).isBefore(currentNode.open.start)) {`
	`16`	`+ if (selectionEnd.isBefore(currentNode.open.start.translate(0, currentNode.name.length))) {`
`17`	`17`	`return getSelectionFromNode(currentNode, editor.document);`
`18`	`18`	`}`
`19`	`19`
`@@ -113,7 +113,7 @@ function getNextAttribute(selectionStart: vscode.Position, selectionEnd: vscode.`
`113`	`113`	`return new vscode.Selection(attr.start, attr.end);`
`114`	`114`	`}`
`115`	`115`
`116`		`- if ((<vscode.Position>attr.value.start).isEqual(attr.value.end)) {`
	`116`	`+ if (!attr.value \|\| (<vscode.Position>attr.value.start).isEqual(attr.value.end)) {`
`117`	`117`	`// No attr value to select`
`118`	`118`	`continue;`
`119`	`119`	`}`
`@@ -163,7 +163,7 @@ function getPrevAttribute(selectionStart: vscode.Position, selectionEnd: vscode.`
`163`	`163`	`continue;`
`164`	`164`	`}`
`165`	`165`
`166`		`- if ((<vscode.Position>attr.value.start).isEqual(attr.value.end) \|\| selectionStart.isBefore(attr.value.start)) {`
	`166`	`+ if (!attr.value \|\| (<vscode.Position>attr.value.start).isEqual(attr.value.end) \|\| selectionStart.isBefore(attr.value.start)) {`
`167`	`167`	`// select full attr`
`168`	`168`	`return new vscode.Selection(attr.start, attr.end);`
`169`	`169`	`}`