VSCodeVim/Vim
1
1
Fork 0
mirror of https://github.com/VSCodeVim/Vim.git synced 2024-09-11 12:25:59 +03:00
Code Issues Projects Releases Wiki Activity

Fixes #8872. Fix surround with html tag attribute (#9140)

Browse Source
This commit is contained in:
Peter Kosarnik 2024-08-06 00:23:10 +02:00 committed by GitHub
parent 503788d199
commit af6b0be578
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/actions/plugins/surround.ts
View File

@ -654,7 +654,7 @@ class SurroundHelper {
surroundState.operator === 'delete'
? ''
: surroundState.tag
? optNewline + '</' + surroundState.tag.tag + '>'
? optNewline + '</' + SurroundHelper.trimAttributes(surroundState.tag.tag) + '>'
: optNewline + replacement.right;
for (const { leftEdge, rightEdge, cursorIndex } of surroundState.edges) {
@ -680,4 +680,10 @@ class SurroundHelper {
// finish / cleanup. sql-koala was here :D
await vimState.setCurrentMode(Mode.Normal);
}
private static trimAttributes(wholeTag: string) {
const endTagIndex = wholeTag.indexOf(' ');
const isAnyAttributeAfterTag = endTagIndex !== -1;
return isAnyAttributeAfterTag ? wholeTag.substring(0, endTagIndex) : wholeTag;
}
}

12
test/plugins/surround.test.ts
View File

@ -507,6 +507,18 @@ suite('surround plugin', () => {
},
});
newTest({
title: "'VStt' surrounds selection and correctly trims class attribute in closing tag",
start: ['first li|ne test'],
keysPressed: 'VStt',
end: ['<div class="test">', 'first line test', '|</div>'],
stub: {
stubClass: CommandSurroundAddSurroundingTag,
methodName: 'readTag',
returnValue: 'div class="test"',
},
});
newTest({
title: "'S)' surrounds visual line selection without space",
start: ['first', 'sec|ond', 'third'],