Skip to content

Conversation

@michitux
Copy link
Contributor

@michitux michitux commented Nov 6, 2025

Jira URL

https://jira.xwiki.org/browse/XRENDERING-799

Changes

Description

  • Transform macros to inline in InlineFilterListener.
  • Add a test for InlineFilterListener.
  • Add an integration test for the XWiki 2.0 parser.

Clarifications

  • This is a parser change, but I think it's quite unexpected that in an inline context you would get standalone macros.

Screenshots & Video

The example from the Jira issue:

Before:
image

After:
image

Executed Tests

Built the whole xwiki-rendering with LANG=C.UTF-8 mvn clean install -Pdocker,legacy,integration-tests,snapshotModules,quality,distribution

Expected merging strategy

  • Prefers squash: Yes
  • Backport on branches:
    • Unsure, would be nice to backport the bug fix but seems dangerous.

* Transform macros to inline in InlineFilterListener.
* Add a test for InlineFilterListener.
* Add an integration test for the XWiki 2.0 parser.
@michitux michitux self-assigned this Nov 6, 2025
@michitux michitux requested review from Copilot and tmortagne and removed request for Copilot November 6, 2025 14:21
@michitux
Copy link
Contributor Author

michitux commented Nov 6, 2025

@tmortagne Any comment regarding backporting to LTS version(s)?

@michitux michitux merged commit 4c7e0f4 into xwiki:master Nov 7, 2025
10 checks passed
github-actions bot pushed a commit that referenced this pull request Nov 7, 2025
* Transform macros to inline in InlineFilterListener.
* Add a test for InlineFilterListener.
* Add an integration test for the XWiki 2.0 parser.

(cherry picked from commit 4c7e0f4)
github-actions bot pushed a commit that referenced this pull request Nov 7, 2025
* Transform macros to inline in InlineFilterListener.
* Add a test for InlineFilterListener.
* Add an integration test for the XWiki 2.0 parser.

(cherry picked from commit 4c7e0f4)
@michitux michitux deleted the XRENDERING-799 branch November 7, 2025 08:53
michitux added a commit that referenced this pull request Nov 7, 2025
* Transform macros to inline in InlineFilterListener.
* Add a test for InlineFilterListener.
* Add an integration test for the XWiki 2.0 parser.

(cherry picked from commit 4c7e0f4)
michitux added a commit that referenced this pull request Nov 7, 2025
* Transform macros to inline in InlineFilterListener.
* Add a test for InlineFilterListener.
* Add an integration test for the XWiki 2.0 parser.

(cherry picked from commit 4c7e0f4)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants