Update tests and remove _ around placeholders

microsoft · Aug 1, 2017 · d237486 · d237486
1 parent 374dcf8
commit d237486
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/emmetHelper.ts b/src/emmetHelper.ts
@@ -78,7 +78,7 @@ export function doComplete(document: TextDocument, position: Position, syntax: s
 		if (expandedText) {
 			expandedAbbr = CompletionItem.create(abbreviation);
 			expandedAbbr.textEdit = TextEdit.replace(abbreviationRange, expandedText);
-			expandedAbbr.documentation = makeCursorsGorgeous(expandedText);
+			expandedAbbr.documentation = replaceTabStopsWithCursors(expandedText);
 			expandedAbbr.insertTextFormat = InsertTextFormat.Snippet;
 			expandedAbbr.detail = 'Emmet Abbreviation';
 			if (filters.indexOf('bem') > -1) {
@@ -139,7 +139,7 @@ function makeSnippetSuggestion(snippets: string[], prefix: string, abbreviation:
 		}
 
 		let item = CompletionItem.create(snippetKey);
-		item.documentation = makeCursorsGorgeous(expandedAbbr);
+		item.documentation = replaceTabStopsWithCursors(expandedAbbr);
 		item.detail = 'Emmet Abbreviation';
 		item.textEdit = TextEdit.replace(abbreviationRange, expandedAbbr);
 		item.insertTextFormat = InsertTextFormat.Snippet;
@@ -176,8 +176,8 @@ function getCurrentWord(document: TextDocument, position: Position): string {
 	}
 }
 
-function makeCursorsGorgeous(expandedWord: string): string {
-	return expandedWord.replace(/\$\{\d+\}/g, '|').replace(/\$\{\d+:([^\}]+)\}/g, '_$1_');
+function replaceTabStopsWithCursors(expandedWord: string): string {
+	return expandedWord.replace(/\$\{\d+\}/g, '|').replace(/\$\{\d+:([^\}]+)\}/g, '$1');
 }
 
 function removeTabStops(expandedWord: string): string {

diff --git a/src/emmetHelperTest.ts b/src/emmetHelperTest.ts
@@ -238,9 +238,9 @@ describe('Test completions', () => {
     it('should provide completions', () => {
         return updateExtensionsPath(null).then(() => {
             const testCases: [string, number, number, string, string][] = [
-                ['<div>ul>li*3</div>', 0, 7, 'ul', '<ul></ul>'],
-                ['<div>ul>li*3</div>', 0, 10, 'ul>li', '<ul>\n\t<li></li>\n</ul>'],
-                ['<div>(ul>li)*3</div>', 0, 14, '(ul>li)*3', '<ul>\n\t<li></li>\n</ul>\n<ul>\n\t<li></li>\n</ul>\n<ul>\n\t<li></li>\n</ul>']
+                ['<div>ul>li*3</div>', 0, 7, 'ul', '<ul>|</ul>'],
+                ['<div>ul>li*3</div>', 0, 10, 'ul>li', '<ul>\n\t<li>|</li>\n</ul>'],
+                ['<div>(ul>li)*3</div>', 0, 14, '(ul>li)*3', '<ul>\n\t<li>|</li>\n</ul>\n<ul>\n\t<li>|</li>\n</ul>\n<ul>\n\t<li>|</li>\n</ul>']
             ];
 
             testCases.forEach(([content, positionLine, positionChar, expectedAbbr, expectedExpansion]) => {