development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 05:19:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Emmet fix #122231

Browse source
This commit is contained in:
Raymond Zhao 2021-05-03 13:38:47 -07:00
parent 81085f4312
commit 29b9648b3e
No known key found for this signature in database
GPG key ID: D36E5FCE46B63B58
2 changed files with 28 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extensions/emmet/src/abbreviationActions.ts
View file

@ -665,6 +665,8 @@ function expandAbbr(input: ExpandAbbreviationInput): string | undefined {
const expandOptions = helper.getExpandOptions(input.syntax, getEmmetConfiguration(input.syntax), input.filter);
if (input.textToWrap) {
// escape ${ sections, fixes #122231
input.textToWrap = input.textToWrap.map(e => e.replace(/\$\{/g, '\\\$\{'));
if (input.filter && input.filter.includes('t')) {
input.textToWrap = input.textToWrap.map(line => {
return line.replace(trimRegex, '').trim();

31
extensions/emmet/src/test/wrapWithAbbreviation.test.ts
View file

@ -13,6 +13,7 @@ const htmlContentsForBlockWrapTests = `
<ul class="nav main">
<li class="item1">img</li>
<li class="item2">$hithere</li>
<li class="item3">\${hithere}</li>
</ul>
`;
@ -20,6 +21,7 @@ const htmlContentsForInlineWrapTests = `
<ul class="nav main">
<em class="item1">img</em>
<em class="item2">$hithere</em>
<em class="item3">\${hithere}</em>
</ul>
`;
@ -31,6 +33,9 @@ const wrapBlockElementExpected = `
<div>
<li class="item2">$hithere</li>
</div>
<div>
<li class="item3">\${hithere}</li>
</div>
</ul>
`;
@ -38,6 +43,7 @@ const wrapInlineElementExpected = `
<ul class="nav main">
<span><em class="item1">img</em></span>
<span><em class="item2">$hithere</em></span>
<span><em class="item3">\${hithere}</em></span>
</ul>
`;
@ -49,6 +55,9 @@ const wrapSnippetExpected = `
<a href="">
<li class="item2">$hithere</li>
</a>
<a href="">
<li class="item3">\${hithere}</li>
</a>
</ul>
`;
@ -64,6 +73,11 @@ const wrapMultiLineAbbrExpected = `
<li class="item2">$hithere</li>
</li>
</ul>
<ul>
<li>
<li class="item3">\${hithere}</li>
</li>
</ul>
</ul>
`;
@ -77,15 +91,18 @@ const wrapInlineElementExpectedFormatFalse = `
<h1>
<li class="item2">$hithere</li>
</h1>
<h1>
<li class="item3">\${hithere}</li>
</h1>
</ul>
`;
suite('Tests for Wrap with Abbreviations', () => {
teardown(closeAllEditors);
const multiCursors = [new Selection(2, 6, 2, 6), new Selection(3, 6, 3, 6)];
const multiCursorsWithSelection = [new Selection(2, 2, 2, 28), new Selection(3, 2, 3, 33)];
const multiCursorsWithFullLineSelection = [new Selection(2, 0, 2, 28), new Selection(3, 0, 4, 0)];
const multiCursors = [new Selection(2, 6, 2, 6), new Selection(3, 6, 3, 6), new Selection(4, 6, 4, 6)];
const multiCursorsWithSelection = [new Selection(2, 2, 2, 28), new Selection(3, 2, 3, 33), new Selection(4, 6, 4, 36)];
const multiCursorsWithFullLineSelection = [new Selection(2, 0, 2, 28), new Selection(3, 0, 3, 33), new Selection(4, 0, 4, 36)];
const oldValueForSyntaxProfiles = workspace.getConfiguration('emmet').inspect('syntaxProfile');
@ -343,11 +360,12 @@ suite('Tests for Wrap with Abbreviations', () => {
<div className="hello">
<li class="item1">img</li>
<li class="item2">$hithere</li>
<li class="item3">\${hithere}</li>
</div>
</ul>
`;
return testWrapWithAbbreviation([new Selection(2, 2, 3, 33)], '.hello', wrapMultiLineJsxExpected, htmlContentsForBlockWrapTests, 'jsx');
return testWrapWithAbbreviation([new Selection(2, 2, 4, 36)], '.hello', wrapMultiLineJsxExpected, htmlContentsForBlockWrapTests, 'jsx');
});
test('Wrap individual line with abbreviation uses className for jsx files', () => {
@ -359,10 +377,13 @@ suite('Tests for Wrap with Abbreviations', () => {
<div className="hello2">
<li class="item2">$hithere</li>
</div>
<div className="hello3">
<li class="item3">\${hithere}</li>
</div>
</ul>
`;
return testWrapIndividualLinesWithAbbreviation([new Selection(2, 2, 3, 33)], '.hello$*', wrapIndividualLinesJsxExpected, htmlContentsForBlockWrapTests, 'jsx');
return testWrapIndividualLinesWithAbbreviation([new Selection(2, 2, 4, 36)], '.hello$*', wrapIndividualLinesJsxExpected, htmlContentsForBlockWrapTests, 'jsx');
});
test('Wrap with abbreviation merge overlapping computed ranges', () => {