Surround with HTML tags with attributes puts attributes in closing tag

[Porges]

Describe the bug
It used to be that surrounding (e.g.) xyz with <a href="…"> would correctly generate <a href="…">xyz</a>, however this functionality seems to have been broken when surround started to use the top bar instead of the status bar (sorry, I don’t know what these are really called in VS Code terms).

To Reproduce

1. insert the text xyz
2. type viwS<a href="">, then Enter
3. the editor reads <a href="">xyz</a href="">

Expected behavior

1. insert the text xyz
2. type viwS<a href="">, then Enter
3. the editor reads <a href="">xyz</a>

Environment (please complete the following information):

Version: 1.61.0 (user setup)
Commit: ee8c7def80afc00dd6e593ef12f37756d8f504ea
Date: 2021-10-07T18:13:09.652Z
Electron: 13.5.1
Chrome: 91.0.4472.164
Node.js: 14.16.0
V8: 9.1.269.39-electron.0
OS: Windows_NT x64 10.0.22471

VSCodeVim version: 1.21.8.

[Porges]

Another (small) thing is that “surround tag mode” used to be completed automatically when you typed >, but now you must push Enter.