Macros followed by an empty block with parameters gets wrapped in a span when converted to annotated html

Note 1: the affects version(s) needs to be refined.
Note 2: this issue is reported in order to fix XWIKI-21973

Reproduction steps

Create a content with a macro followed by a parameter, for instance

{{icon name="add"/}}(% id="test" %)

And converts it to annotated (x)html

Expected

Then parameters produce an empty span after the macro.

p><!--startmacro:icon|-|name="add"--><!--stopmacro-->&nbsp;<span id="test"></span></p>

Actual

The macro is wrapped in a span with the parameters are attributes.

p><span id="test"><!--startmacro:icon|-|name="add"--><!--stopmacro-->&nbsp;</span></p>