From 7221f92ee2db8ad84581a033279d8ad7faddd273 Mon Sep 17 00:00:00 2001
From: Matthew Kwiecien <mkwieci2@gmail.com>
Date: Sat, 9 Feb 2019 12:59:16 -0600
Subject: [PATCH 1/4] Get syntax from arguments and document editor language
 when wrapping.

---
 extensions/emmet/src/abbreviationActions.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/extensions/emmet/src/abbreviationActions.ts b/extensions/emmet/src/abbreviationActions.ts
index 4ee8e221f99c1..f332aff2e000e 100644
--- a/extensions/emmet/src/abbreviationActions.ts
+++ b/extensions/emmet/src/abbreviationActions.ts
@@ -54,7 +54,11 @@ function doWrapping(individualLines: boolean, args: any) {
 			return;
 		}
 	}
-	const syntax = 'html';
+	args = args || {};
+	if (!args['language']) {
+		args['language'] = editor.document.languageId;
+	}
+	const syntax = getSyntaxFromArgs(args) || 'html';
 	const rootNode = parseDocument(editor.document, false);
 
 	let inPreview = false;

From 0b3c33b801672d55724c4eb8f15ecc78d4024089 Mon Sep 17 00:00:00 2001
From: Matthew Kwiecien <mkwieci2@gmail.com>
Date: Sun, 10 Feb 2019 10:09:56 -0600
Subject: [PATCH 2/4] Adding unit tests to check for className when file is
 jsx.

---
 .../src/test/wrapWithAbbreviation.test.ts     | 380 ++++++++++--------
 1 file changed, 210 insertions(+), 170 deletions(-)

diff --git a/extensions/emmet/src/test/wrapWithAbbreviation.test.ts b/extensions/emmet/src/test/wrapWithAbbreviation.test.ts
index 9fc924508e244..fa15a67875141 100644
--- a/extensions/emmet/src/test/wrapWithAbbreviation.test.ts
+++ b/extensions/emmet/src/test/wrapWithAbbreviation.test.ts
@@ -63,6 +63,22 @@ const wrapInlineElementExpectedFormatFalse = `
 	</ul>
 `;
 
+const wrapMultiLineJsxExpected = `
+	<ul class="nav main">
+		<div className="hello">
+			<li class="item1">img</li>
+			<li class="item2">$hithere</li>
+		</div>
+	</ul>
+`;
+
+const wrapIndividualLinesJsxExpected = `
+	<ul class="nav main">
+		<div className="hello1"><li class="item1">img</li></div>
+		<div className="hello2"><li class="item2">$hithere</li></div>
+	</ul>
+`;
+
 suite('Tests for Wrap with Abbreviations', () => {
 	teardown(closeAllEditors);
 
@@ -135,219 +151,219 @@ suite('Tests for Wrap with Abbreviations', () => {
 	</ul>
 	`;
 
-		return withRandomFileEditor(contents, 'html', (editor, _) => {
-			editor.selections = [new Selection(2, 0, 2, 0)];
-			const promise = wrapWithAbbreviation({ abbreviation: 'li.hello|c' });
-			if (!promise) {
-				assert.equal(1, 2, 'Wrap returned undefined instead of promise.');
-				return Promise.resolve();
-			}
-			return promise.then(() => {
-				assert.equal(editor.document.getText(), expectedContents);
-				return Promise.resolve();
-			});
+	return withRandomFileEditor(contents, 'html', (editor, _) => {
+		editor.selections = [new Selection(2, 0, 2, 0)];
+		const promise = wrapWithAbbreviation({ abbreviation: 'li.hello|c' });
+		if (!promise) {
+			assert.equal(1, 2, 'Wrap returned undefined instead of promise.');
+			return Promise.resolve();
+		}
+		return promise.then(() => {
+			assert.equal(editor.document.getText(), expectedContents);
+			return Promise.resolve();
 		});
 	});
+});
 
-	test('Wrap with abbreviation entire node when cursor is on opening tag', () => {
-		const contents = `
+test('Wrap with abbreviation entire node when cursor is on opening tag', () => {
+	const contents = `
+<div class="nav main">
+	hello
+</div>
+`;
+	const expectedContents = `
+<div>
 	<div class="nav main">
 		hello
 	</div>
-	`;
-		const expectedContents = `
-	<div>
-		<div class="nav main">
-			hello
-		</div>
-	</div>
-	`;
+</div>
+`;
 
-		return withRandomFileEditor(contents, 'html', (editor, _) => {
-			editor.selections = [new Selection(1, 1, 1, 1)];
-			const promise = wrapWithAbbreviation({ abbreviation: 'div' });
-			if (!promise) {
-				assert.equal(1, 2, 'Wrap returned undefined instead of promise.');
-				return Promise.resolve();
-			}
-			return promise.then(() => {
-				assert.equal(editor.document.getText(), expectedContents);
-				return Promise.resolve();
-			});
+	return withRandomFileEditor(contents, 'html', (editor, _) => {
+		editor.selections = [new Selection(1, 1, 1, 1)];
+		const promise = wrapWithAbbreviation({ abbreviation: 'div' });
+		if (!promise) {
+			assert.equal(1, 2, 'Wrap returned undefined instead of promise.');
+			return Promise.resolve();
+		}
+		return promise.then(() => {
+			assert.equal(editor.document.getText(), expectedContents);
+			return Promise.resolve();
 		});
 	});
+});
 
-	test('Wrap with abbreviation entire node when cursor is on closing tag', () => {
-		const contents = `
+test('Wrap with abbreviation entire node when cursor is on closing tag', () => {
+	const contents = `
+<div class="nav main">
+	hello
+</div>
+`;
+	const expectedContents = `
+<div>
 	<div class="nav main">
 		hello
 	</div>
-	`;
-		const expectedContents = `
-	<div>
-		<div class="nav main">
-			hello
-		</div>
-	</div>
-	`;
+</div>
+`;
 
-		return withRandomFileEditor(contents, 'html', (editor, _) => {
-			editor.selections = [new Selection(3, 1, 3, 1)];
-			const promise = wrapWithAbbreviation({ abbreviation: 'div' });
-			if (!promise) {
-				assert.equal(1, 2, 'Wrap returned undefined instead of promise.');
-				return Promise.resolve();
-			}
-			return promise.then(() => {
-				assert.equal(editor.document.getText(), expectedContents);
-				return Promise.resolve();
-			});
+	return withRandomFileEditor(contents, 'html', (editor, _) => {
+		editor.selections = [new Selection(3, 1, 3, 1)];
+		const promise = wrapWithAbbreviation({ abbreviation: 'div' });
+		if (!promise) {
+			assert.equal(1, 2, 'Wrap returned undefined instead of promise.');
+			return Promise.resolve();
+		}
+		return promise.then(() => {
+			assert.equal(editor.document.getText(), expectedContents);
+			return Promise.resolve();
 		});
 	});
+});
 
-	test('Wrap with multiline abbreviation doesnt add extra spaces', () => {
-		// Issue #29898
-		const contents = `
-	hello
-	`;
-		const expectedContents = `
-	<ul>
-		<li><a href="">hello</a></li>
-	</ul>
-	`;
+test('Wrap with multiline abbreviation doesnt add extra spaces', () => {
+	// Issue #29898
+	const contents = `
+hello
+`;
+	const expectedContents = `
+<ul>
+	<li><a href="">hello</a></li>
+</ul>
+`;
 
-		return withRandomFileEditor(contents, 'html', (editor, _) => {
-			editor.selections = [new Selection(1, 2, 1, 2)];
-			const promise = wrapWithAbbreviation({ abbreviation: 'ul>li>a' });
-			if (!promise) {
-				assert.equal(1, 2, 'Wrap returned undefined instead of promise.');
-				return Promise.resolve();
-			}
-			return promise.then(() => {
-				assert.equal(editor.document.getText(), expectedContents);
-				return Promise.resolve();
-			});
+	return withRandomFileEditor(contents, 'html', (editor, _) => {
+		editor.selections = [new Selection(1, 2, 1, 2)];
+		const promise = wrapWithAbbreviation({ abbreviation: 'ul>li>a' });
+		if (!promise) {
+			assert.equal(1, 2, 'Wrap returned undefined instead of promise.');
+			return Promise.resolve();
+		}
+		return promise.then(() => {
+			assert.equal(editor.document.getText(), expectedContents);
+			return Promise.resolve();
 		});
 	});
+});
 
-	test('Wrap individual lines with abbreviation', () => {
-		const contents = `
-	<ul class="nav main">
-		<li class="item1">This $10 is not a tabstop</li>
-		<li class="item2">hi.there</li>
-	</ul>
+test('Wrap individual lines with abbreviation', () => {
+	const contents = `
+<ul class="nav main">
+	<li class="item1">This $10 is not a tabstop</li>
+	<li class="item2">hi.there</li>
+</ul>
 `;
-		const wrapIndividualLinesExpected = `
-	<ul class="nav main">
-		<ul>
-			<li class="hello1"><li class="item1">This $10 is not a tabstop</li></li>
-			<li class="hello2"><li class="item2">hi.there</li></li>
-		</ul>
+	const wrapIndividualLinesExpected = `
+<ul class="nav main">
+	<ul>
+		<li class="hello1"><li class="item1">This $10 is not a tabstop</li></li>
+		<li class="hello2"><li class="item2">hi.there</li></li>
 	</ul>
+</ul>
 `;
-		return withRandomFileEditor(contents, 'html', (editor, _) => {
-			editor.selections = [new Selection(2, 2, 3, 33)];
-			const promise = wrapIndividualLinesWithAbbreviation({ abbreviation: 'ul>li.hello$*' });
-			if (!promise) {
-				assert.equal(1, 2, 'Wrap Individual Lines with Abbreviation returned undefined.');
-				return Promise.resolve();
-			}
-			return promise.then(() => {
-				assert.equal(editor.document.getText(), wrapIndividualLinesExpected);
-				return Promise.resolve();
-			});
+	return withRandomFileEditor(contents, 'html', (editor, _) => {
+		editor.selections = [new Selection(2, 2, 3, 33)];
+		const promise = wrapIndividualLinesWithAbbreviation({ abbreviation: 'ul>li.hello$*' });
+		if (!promise) {
+			assert.equal(1, 2, 'Wrap Individual Lines with Abbreviation returned undefined.');
+			return Promise.resolve();
+		}
+		return promise.then(() => {
+			assert.equal(editor.document.getText(), wrapIndividualLinesExpected);
+			return Promise.resolve();
 		});
 	});
+});
 
-	test('Wrap individual lines with abbreviation with extra space selected', () => {
-		const contents = `
-	<ul class="nav main">
-		<li class="item1">img</li>
-		<li class="item2">hi.there</li>
+test('Wrap individual lines with abbreviation with extra space selected', () => {
+	const contents = `
+<ul class="nav main">
+	<li class="item1">img</li>
+	<li class="item2">hi.there</li>
+</ul>
+`;
+	const wrapIndividualLinesExpected = `
+<ul class="nav main">
+	<ul>
+		<li class="hello1"><li class="item1">img</li></li>
+		<li class="hello2"><li class="item2">hi.there</li></li>
 	</ul>
+</ul>
 `;
-		const wrapIndividualLinesExpected = `
-	<ul class="nav main">
-		<ul>
-			<li class="hello1"><li class="item1">img</li></li>
-			<li class="hello2"><li class="item2">hi.there</li></li>
-		</ul>
+	return withRandomFileEditor(contents, 'html', (editor, _) => {
+		editor.selections = [new Selection(2, 1, 4, 0)];
+		const promise = wrapIndividualLinesWithAbbreviation({ abbreviation: 'ul>li.hello$*' });
+		if (!promise) {
+			assert.equal(1, 2, 'Wrap Individual Lines with Abbreviation returned undefined.');
+			return Promise.resolve();
+		}
+		return promise.then(() => {
+			assert.equal(editor.document.getText(), wrapIndividualLinesExpected);
+			return Promise.resolve();
+		});
+	});
+});
+
+test('Wrap individual lines with abbreviation with comment filter', () => {
+	const contents = `
+<ul class="nav main">
+	<li class="item1">img</li>
+	<li class="item2">hi.there</li>
+</ul>
+`;
+	const wrapIndividualLinesExpected = `
+<ul class="nav main">
+	<ul>
+		<li class="hello"><li class="item1">img</li></li>
+		<!-- /.hello -->
+		<li class="hello"><li class="item2">hi.there</li></li>
+		<!-- /.hello -->
 	</ul>
+</ul>
 `;
-		return withRandomFileEditor(contents, 'html', (editor, _) => {
-			editor.selections = [new Selection(2, 1, 4, 0)];
-			const promise = wrapIndividualLinesWithAbbreviation({ abbreviation: 'ul>li.hello$*' });
-			if (!promise) {
-				assert.equal(1, 2, 'Wrap Individual Lines with Abbreviation returned undefined.');
-				return Promise.resolve();
-			}
-			return promise.then(() => {
-				assert.equal(editor.document.getText(), wrapIndividualLinesExpected);
-				return Promise.resolve();
-			});
+	return withRandomFileEditor(contents, 'html', (editor, _) => {
+		editor.selections = [new Selection(2, 2, 3, 33)];
+		const promise = wrapIndividualLinesWithAbbreviation({ abbreviation: 'ul>li.hello*|c' });
+		if (!promise) {
+			assert.equal(1, 2, 'Wrap Individual Lines with Abbreviation returned undefined.');
+			return Promise.resolve();
+		}
+		return promise.then(() => {
+			assert.equal(editor.document.getText(), wrapIndividualLinesExpected);
+			return Promise.resolve();
 		});
 	});
+});
 
-	test('Wrap individual lines with abbreviation with comment filter', () => {
-		const contents = `
+test('Wrap individual lines with abbreviation and trim', () => {
+	const contents = `
 	<ul class="nav main">
-		<li class="item1">img</li>
-		<li class="item2">hi.there</li>
+		• lorem ipsum
+		• lorem ipsum
 	</ul>
 `;
-		const wrapIndividualLinesExpected = `
+	const wrapIndividualLinesExpected = `
 	<ul class="nav main">
 		<ul>
-			<li class="hello"><li class="item1">img</li></li>
-			<!-- /.hello -->
-			<li class="hello"><li class="item2">hi.there</li></li>
-			<!-- /.hello -->
+			<li class="hello1">lorem ipsum</li>
+			<li class="hello2">lorem ipsum</li>
 		</ul>
 	</ul>
 `;
-		return withRandomFileEditor(contents, 'html', (editor, _) => {
-			editor.selections = [new Selection(2, 2, 3, 33)];
-			const promise = wrapIndividualLinesWithAbbreviation({ abbreviation: 'ul>li.hello*|c' });
-			if (!promise) {
-				assert.equal(1, 2, 'Wrap Individual Lines with Abbreviation returned undefined.');
-				return Promise.resolve();
-			}
-			return promise.then(() => {
-				assert.equal(editor.document.getText(), wrapIndividualLinesExpected);
-				return Promise.resolve();
-			});
-		});
-	});
+	return withRandomFileEditor(contents, 'html', (editor, _) => {
+		editor.selections = [new Selection(2, 3, 3, 16)];
+		const promise = wrapIndividualLinesWithAbbreviation({ abbreviation: 'ul>li.hello$*|t' });
+		if (!promise) {
+			assert.equal(1, 2, 'Wrap Individual Lines with Abbreviation returned undefined.');
+			return Promise.resolve();
+		}
 
-	test('Wrap individual lines with abbreviation and trim', () => {
-		const contents = `
-		<ul class="nav main">
-			• lorem ipsum
-			• lorem ipsum
-		</ul>
-	`;
-		const wrapIndividualLinesExpected = `
-		<ul class="nav main">
-			<ul>
-				<li class="hello1">lorem ipsum</li>
-				<li class="hello2">lorem ipsum</li>
-			</ul>
-		</ul>
-	`;
-		return withRandomFileEditor(contents, 'html', (editor, _) => {
-			editor.selections = [new Selection(2, 3, 3, 16)];
-			const promise = wrapIndividualLinesWithAbbreviation({ abbreviation: 'ul>li.hello$*|t' });
-			if (!promise) {
-				assert.equal(1, 2, 'Wrap Individual Lines with Abbreviation returned undefined.');
-				return Promise.resolve();
-			}
-
-			return promise.then(() => {
-				assert.equal(editor.document.getText(), wrapIndividualLinesExpected);
-				return Promise.resolve();
-			});
+		return promise.then(() => {
+			assert.equal(editor.document.getText(), wrapIndividualLinesExpected);
+			return Promise.resolve();
 		});
 	});
+});
 
 	test('Wrap with abbreviation and format set to false', () => {
 		return workspace.getConfiguration('emmet').update('syntaxProfiles',{ 'html' : { 'format': false } } , ConfigurationTarget.Global).then(() => {
@@ -384,11 +400,19 @@ suite('Tests for Wrap with Abbreviations', () => {
 
 		return testWrapWithAbbreviation([new Selection(2, 4, 3, 9), new Selection(5, 4, 6, 9)], 'div', wrapMultiLineExpected, htmlContentsForWrapMultiLineTests);
 	});
+
+	test('Wrap multiline with abbreviation uses className for jsx files', () => {
+		return testWrapWithAbbreviation([new Selection(2,2,3,33)], '.hello', wrapMultiLineJsxExpected, htmlContentsForWrapTests, 'jsx');
+	});
+
+	test('Wrap individual line with abbreviation uses className for jsx files', () => {
+		return testWrapIndividualLinesWithAbbreviation([new Selection(2,2,3,33)], '.hello$*', wrapIndividualLinesJsxExpected, htmlContentsForWrapTests, 'jsx');
+	});
 });
 
 
-function testWrapWithAbbreviation(selections: Selection[], abbreviation: string, expectedContents: string, input: string = htmlContentsForWrapTests): Thenable<any> {
-	return withRandomFileEditor(input, 'html', (editor, _) => {
+function testWrapWithAbbreviation(selections: Selection[], abbreviation: string, expectedContents: string, input: string = htmlContentsForWrapTests, fileExtension: string = 'html'): Thenable<any> {
+	return withRandomFileEditor(input, fileExtension, (editor, _) => {
 		editor.selections = selections;
 		const promise = wrapWithAbbreviation({ abbreviation });
 		if (!promise) {
@@ -402,3 +426,19 @@ function testWrapWithAbbreviation(selections: Selection[], abbreviation: string,
 		});
 	});
 }
+
+function testWrapIndividualLinesWithAbbreviation(selections: Selection[], abbreviation: string, expectedContents: string, input: string = htmlContentsForWrapTests, fileExtension: string = 'html'): Thenable<any> {
+	return withRandomFileEditor(input, fileExtension, (editor, _) => {
+		editor.selections = selections;
+		const promise = wrapIndividualLinesWithAbbreviation({ abbreviation });
+		if (!promise) {
+			assert.equal(1, 2, 'Wrap individual lines with Abbreviation returned undefined.');
+			return Promise.resolve();
+		}
+
+		return promise.then(() => {
+			assert.equal(editor.document.getText(), expectedContents);
+			return Promise.resolve();
+		});
+	});
+}

From 45f686fadcbf79e2e7ac1a36f0abdddc5f0cdf28 Mon Sep 17 00:00:00 2001
From: Matthew Kwiecien <mkwieci2@gmail.com>
Date: Sun, 10 Feb 2019 10:11:48 -0600
Subject: [PATCH 3/4] Refactoring the wrap with abbrev unit test class to be
 less repetitive.

---
 .../src/test/wrapWithAbbreviation.test.ts     | 263 ++++++------------
 1 file changed, 85 insertions(+), 178 deletions(-)

diff --git a/extensions/emmet/src/test/wrapWithAbbreviation.test.ts b/extensions/emmet/src/test/wrapWithAbbreviation.test.ts
index fa15a67875141..a396ec26e7b7f 100644
--- a/extensions/emmet/src/test/wrapWithAbbreviation.test.ts
+++ b/extensions/emmet/src/test/wrapWithAbbreviation.test.ts
@@ -150,220 +150,127 @@ suite('Tests for Wrap with Abbreviations', () => {
 		<!-- /.hello -->
 	</ul>
 	`;
-
-	return withRandomFileEditor(contents, 'html', (editor, _) => {
-		editor.selections = [new Selection(2, 0, 2, 0)];
-		const promise = wrapWithAbbreviation({ abbreviation: 'li.hello|c' });
-		if (!promise) {
-			assert.equal(1, 2, 'Wrap returned undefined instead of promise.');
-			return Promise.resolve();
-		}
-		return promise.then(() => {
-			assert.equal(editor.document.getText(), expectedContents);
-			return Promise.resolve();
-		});
+		return testWrapWithAbbreviation([new Selection(2, 0, 2, 0)], 'li.hello|c', expectedContents, contents);
 	});
-});
 
-test('Wrap with abbreviation entire node when cursor is on opening tag', () => {
-	const contents = `
-<div class="nav main">
-	hello
-</div>
-`;
-	const expectedContents = `
-<div>
+	test('Wrap with abbreviation entire node when cursor is on opening tag', () => {
+		const contents = `
 	<div class="nav main">
 		hello
 	</div>
-</div>
-`;
-
-	return withRandomFileEditor(contents, 'html', (editor, _) => {
-		editor.selections = [new Selection(1, 1, 1, 1)];
-		const promise = wrapWithAbbreviation({ abbreviation: 'div' });
-		if (!promise) {
-			assert.equal(1, 2, 'Wrap returned undefined instead of promise.');
-			return Promise.resolve();
-		}
-		return promise.then(() => {
-			assert.equal(editor.document.getText(), expectedContents);
-			return Promise.resolve();
-		});
+	`;
+		const expectedContents = `
+	<div>
+		<div class="nav main">
+			hello
+		</div>
+	</div>
+	`;
+		return testWrapWithAbbreviation([new Selection(1, 1, 1, 1)], 'div', expectedContents, contents);
 	});
-});
 
-test('Wrap with abbreviation entire node when cursor is on closing tag', () => {
-	const contents = `
-<div class="nav main">
-	hello
-</div>
-`;
-	const expectedContents = `
-<div>
+	test('Wrap with abbreviation entire node when cursor is on closing tag', () => {
+		const contents = `
 	<div class="nav main">
 		hello
 	</div>
-</div>
-`;
-
-	return withRandomFileEditor(contents, 'html', (editor, _) => {
-		editor.selections = [new Selection(3, 1, 3, 1)];
-		const promise = wrapWithAbbreviation({ abbreviation: 'div' });
-		if (!promise) {
-			assert.equal(1, 2, 'Wrap returned undefined instead of promise.');
-			return Promise.resolve();
-		}
-		return promise.then(() => {
-			assert.equal(editor.document.getText(), expectedContents);
-			return Promise.resolve();
-		});
-	});
-});
-
-test('Wrap with multiline abbreviation doesnt add extra spaces', () => {
-	// Issue #29898
-	const contents = `
-hello
-`;
-	const expectedContents = `
-<ul>
-	<li><a href="">hello</a></li>
-</ul>
-`;
-
-	return withRandomFileEditor(contents, 'html', (editor, _) => {
-		editor.selections = [new Selection(1, 2, 1, 2)];
-		const promise = wrapWithAbbreviation({ abbreviation: 'ul>li>a' });
-		if (!promise) {
-			assert.equal(1, 2, 'Wrap returned undefined instead of promise.');
-			return Promise.resolve();
-		}
-		return promise.then(() => {
-			assert.equal(editor.document.getText(), expectedContents);
-			return Promise.resolve();
-		});
+	`;
+		const expectedContents = `
+	<div>
+		<div class="nav main">
+			hello
+		</div>
+	</div>
+	`;
+		return testWrapWithAbbreviation([new Selection(3, 1, 3, 1)], 'div', expectedContents, contents);
 	});
-});
 
-test('Wrap individual lines with abbreviation', () => {
-	const contents = `
-<ul class="nav main">
-	<li class="item1">This $10 is not a tabstop</li>
-	<li class="item2">hi.there</li>
-</ul>
-`;
-	const wrapIndividualLinesExpected = `
-<ul class="nav main">
+	test('Wrap with multiline abbreviation doesnt add extra spaces', () => {
+		// Issue #29898
+		const contents = `
+	hello
+	`;
+		const expectedContents = `
 	<ul>
-		<li class="hello1"><li class="item1">This $10 is not a tabstop</li></li>
-		<li class="hello2"><li class="item2">hi.there</li></li>
+		<li><a href="">hello</a></li>
 	</ul>
-</ul>
-`;
-	return withRandomFileEditor(contents, 'html', (editor, _) => {
-		editor.selections = [new Selection(2, 2, 3, 33)];
-		const promise = wrapIndividualLinesWithAbbreviation({ abbreviation: 'ul>li.hello$*' });
-		if (!promise) {
-			assert.equal(1, 2, 'Wrap Individual Lines with Abbreviation returned undefined.');
-			return Promise.resolve();
-		}
-		return promise.then(() => {
-			assert.equal(editor.document.getText(), wrapIndividualLinesExpected);
-			return Promise.resolve();
-		});
+	`;
+		return testWrapWithAbbreviation([new Selection(1, 2, 1, 2)], 'ul>li>a', expectedContents, contents);
 	});
-});
 
-test('Wrap individual lines with abbreviation with extra space selected', () => {
-	const contents = `
-<ul class="nav main">
-	<li class="item1">img</li>
-	<li class="item2">hi.there</li>
-</ul>
+	test('Wrap individual lines with abbreviation', () => {
+		const contents = `
+	<ul class="nav main">
+		<li class="item1">This $10 is not a tabstop</li>
+		<li class="item2">hi.there</li>
+	</ul>
 `;
-	const wrapIndividualLinesExpected = `
-<ul class="nav main">
-	<ul>
-		<li class="hello1"><li class="item1">img</li></li>
-		<li class="hello2"><li class="item2">hi.there</li></li>
+		const wrapIndividualLinesExpected = `
+	<ul class="nav main">
+		<ul>
+			<li class="hello1"><li class="item1">This $10 is not a tabstop</li></li>
+			<li class="hello2"><li class="item2">hi.there</li></li>
+		</ul>
 	</ul>
-</ul>
 `;
-	return withRandomFileEditor(contents, 'html', (editor, _) => {
-		editor.selections = [new Selection(2, 1, 4, 0)];
-		const promise = wrapIndividualLinesWithAbbreviation({ abbreviation: 'ul>li.hello$*' });
-		if (!promise) {
-			assert.equal(1, 2, 'Wrap Individual Lines with Abbreviation returned undefined.');
-			return Promise.resolve();
-		}
-		return promise.then(() => {
-			assert.equal(editor.document.getText(), wrapIndividualLinesExpected);
-			return Promise.resolve();
-		});
+		return testWrapIndividualLinesWithAbbreviation([new Selection(2, 2, 3, 33)], 'ul>li.hello$*', wrapIndividualLinesExpected, contents);
 	});
-});
 
-test('Wrap individual lines with abbreviation with comment filter', () => {
-	const contents = `
-<ul class="nav main">
-	<li class="item1">img</li>
-	<li class="item2">hi.there</li>
-</ul>
+	test('Wrap individual lines with abbreviation with extra space selected', () => {
+		const contents = `
+	<ul class="nav main">
+		<li class="item1">img</li>
+		<li class="item2">hi.there</li>
+	</ul>
 `;
-	const wrapIndividualLinesExpected = `
-<ul class="nav main">
-	<ul>
-		<li class="hello"><li class="item1">img</li></li>
-		<!-- /.hello -->
-		<li class="hello"><li class="item2">hi.there</li></li>
-		<!-- /.hello -->
+		const wrapIndividualLinesExpected = `
+	<ul class="nav main">
+		<ul>
+			<li class="hello1"><li class="item1">img</li></li>
+			<li class="hello2"><li class="item2">hi.there</li></li>
+		</ul>
 	</ul>
-</ul>
 `;
-	return withRandomFileEditor(contents, 'html', (editor, _) => {
-		editor.selections = [new Selection(2, 2, 3, 33)];
-		const promise = wrapIndividualLinesWithAbbreviation({ abbreviation: 'ul>li.hello*|c' });
-		if (!promise) {
-			assert.equal(1, 2, 'Wrap Individual Lines with Abbreviation returned undefined.');
-			return Promise.resolve();
-		}
-		return promise.then(() => {
-			assert.equal(editor.document.getText(), wrapIndividualLinesExpected);
-			return Promise.resolve();
-		});
+		return testWrapIndividualLinesWithAbbreviation([new Selection(2, 1, 4, 0)], 'ul>li.hello$*', wrapIndividualLinesExpected, contents);
 	});
-});
 
-test('Wrap individual lines with abbreviation and trim', () => {
-	const contents = `
+	test('Wrap individual lines with abbreviation with comment filter', () => {
+		const contents = `
 	<ul class="nav main">
-		• lorem ipsum
-		• lorem ipsum
+		<li class="item1">img</li>
+		<li class="item2">hi.there</li>
 	</ul>
 `;
-	const wrapIndividualLinesExpected = `
+		const wrapIndividualLinesExpected = `
 	<ul class="nav main">
 		<ul>
-			<li class="hello1">lorem ipsum</li>
-			<li class="hello2">lorem ipsum</li>
+			<li class="hello"><li class="item1">img</li></li>
+			<!-- /.hello -->
+			<li class="hello"><li class="item2">hi.there</li></li>
+			<!-- /.hello -->
 		</ul>
 	</ul>
 `;
-	return withRandomFileEditor(contents, 'html', (editor, _) => {
-		editor.selections = [new Selection(2, 3, 3, 16)];
-		const promise = wrapIndividualLinesWithAbbreviation({ abbreviation: 'ul>li.hello$*|t' });
-		if (!promise) {
-			assert.equal(1, 2, 'Wrap Individual Lines with Abbreviation returned undefined.');
-			return Promise.resolve();
-		}
+		return testWrapIndividualLinesWithAbbreviation([new Selection(2, 2, 3, 33)], 'ul>li.hello*|c', wrapIndividualLinesExpected, contents);
+	});
 
-		return promise.then(() => {
-			assert.equal(editor.document.getText(), wrapIndividualLinesExpected);
-			return Promise.resolve();
-		});
+	test('Wrap individual lines with abbreviation and trim', () => {
+		const contents = `
+		<ul class="nav main">
+			• lorem ipsum
+			• lorem ipsum
+		</ul>
+	`;
+		const wrapIndividualLinesExpected = `
+		<ul class="nav main">
+			<ul>
+				<li class="hello1">lorem ipsum</li>
+				<li class="hello2">lorem ipsum</li>
+			</ul>
+		</ul>
+	`;
+		return testWrapIndividualLinesWithAbbreviation([new Selection(2, 3, 3, 16)], 'ul>li.hello$*|t', wrapIndividualLinesExpected, contents);
 	});
-});
 
 	test('Wrap with abbreviation and format set to false', () => {
 		return workspace.getConfiguration('emmet').update('syntaxProfiles',{ 'html' : { 'format': false } } , ConfigurationTarget.Global).then(() => {

From 6fb4ef694a219c22840c7a7631f245e4c591f620 Mon Sep 17 00:00:00 2001
From: Matthew Kwiecien <mkwieci2@gmail.com>
Date: Tue, 12 Feb 2019 18:39:17 -0600
Subject: [PATCH 4/4] PR Review: moving expected output to relevant tests.

---
 .../src/test/wrapWithAbbreviation.test.ts     | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/extensions/emmet/src/test/wrapWithAbbreviation.test.ts b/extensions/emmet/src/test/wrapWithAbbreviation.test.ts
index a396ec26e7b7f..d5a4a2bce3cd0 100644
--- a/extensions/emmet/src/test/wrapWithAbbreviation.test.ts
+++ b/extensions/emmet/src/test/wrapWithAbbreviation.test.ts
@@ -63,22 +63,6 @@ const wrapInlineElementExpectedFormatFalse = `
 	</ul>
 `;
 
-const wrapMultiLineJsxExpected = `
-	<ul class="nav main">
-		<div className="hello">
-			<li class="item1">img</li>
-			<li class="item2">$hithere</li>
-		</div>
-	</ul>
-`;
-
-const wrapIndividualLinesJsxExpected = `
-	<ul class="nav main">
-		<div className="hello1"><li class="item1">img</li></div>
-		<div className="hello2"><li class="item2">$hithere</li></div>
-	</ul>
-`;
-
 suite('Tests for Wrap with Abbreviations', () => {
 	teardown(closeAllEditors);
 
@@ -309,10 +293,26 @@ suite('Tests for Wrap with Abbreviations', () => {
 	});
 
 	test('Wrap multiline with abbreviation uses className for jsx files', () => {
+		const wrapMultiLineJsxExpected = `
+	<ul class="nav main">
+		<div className="hello">
+			<li class="item1">img</li>
+			<li class="item2">$hithere</li>
+		</div>
+	</ul>
+`;
+
 		return testWrapWithAbbreviation([new Selection(2,2,3,33)], '.hello', wrapMultiLineJsxExpected, htmlContentsForWrapTests, 'jsx');
 	});
 
 	test('Wrap individual line with abbreviation uses className for jsx files', () => {
+		const wrapIndividualLinesJsxExpected = `
+	<ul class="nav main">
+		<div className="hello1"><li class="item1">img</li></div>
+		<div className="hello2"><li class="item2">$hithere</li></div>
+	</ul>
+`;
+
 		return testWrapIndividualLinesWithAbbreviation([new Selection(2,2,3,33)], '.hello$*', wrapIndividualLinesJsxExpected, htmlContentsForWrapTests, 'jsx');
 	});
 });