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

[michitux]

Jira URL

• https://jira.xwiki.org/browse/XRENDERING-766

Changes

Description

• Properly discard macro syntax after a macro or verbatim block
• Don't wrap a macro or verbatim inside the format that follows it

Clarifications

• This is not actually fixing the original issue, but the problem the issue is about is also not actually an empty format, but a non-empty one (containing a space)
• See https://forum.xwiki.org/t/fixing-format-syntax-after-macro-and-verbatim-syntax/18686 for the related forum discussion.
• It turns out to be absolutely non-trivial to really keep all empty format, in particular with HTML and wiki syntax going through the same code but having completely different initial information, I think this needs a deeper change and a lot of thought how to treat different syntax combinations which is why I think removing/ignoring the format is the more consistent option for now.

Screenshots & Video

No direct UI changes.

Executed Tests

Built the whole xwiki-rendering project.

Expected merging strategy

• Prefers squash: Yes
• Backport on branches:
  • Would be nice but dangerous, not sure.