Skip to content

XRENDERING-798: Line breaks followed by empty format at the end of block elements should be escaped #356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Sep 8, 2025
Merged

XRENDERING-798: Line breaks followed by empty format at the end of block elements should be escaped #356

merged 1 commit into from
Sep 8, 2025

Conversation

@michitux
Copy link
Contributor

@michitux michitux commented Sep 4, 2025

Jira URL

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

Changes

Description

  • Check for empty format to decide what syntax to use for new lines.
  • Extend integration test to cover this case.

Clarifications

  • This seems to be the first time that a look ahead of 2 is used - but from what I can see, we have the look ahead listener configured with depth 2, so this should be okay.

Screenshots & Video

No UI changes.

Executed Tests

Built the full xwiki-rendering with quality profile:

mvn clean install -Pquality,standalone,legacy

Expected merging strategy

  • Prefers squash: Yes
  • Backport on branches:
    • stable-17.4.x
    • stable-16.10.x

@michitux
XRENDERING-798: Line breaks followed by empty format at the end of bl…
4b0aa0f 
…ock elements should be escaped

* Check for empty format to decide what syntax to use for new lines.
* Extend integration test to cover this case.
@michitux michitux requested a review from tmortagne September 4, 2025 15:45
@michitux michitux self-assigned this Sep 4, 2025
@michitux michitux merged commit c14adcb into xwiki:master Sep 8, 2025
4 checks passed
@michitux michitux deleted the XRENDERING-798 branch September 8, 2025 09:10
github-actions bot pushed a commit that referenced this pull request Sep 8, 2025
@michitux @github-actions
XRENDERING-798: Line breaks followed by empty format at the end of bl…
ccd9b87 
…ock elements should be escaped (#356)

* Check for empty format to decide what syntax to use for new lines.
* Extend integration test to cover this case.

(cherry picked from commit c14adcb)
github-actions bot pushed a commit that referenced this pull request Sep 8, 2025
@michitux @github-actions
XRENDERING-798: Line breaks followed by empty format at the end of bl…
8db5bd9 
…ock elements should be escaped (#356)

* Check for empty format to decide what syntax to use for new lines.
* Extend integration test to cover this case.

(cherry picked from commit c14adcb)
This was referenced Sep 8, 2025
Merged
Merged
michitux added a commit that referenced this pull request Sep 8, 2025
@michitux
XRENDERING-798: Line breaks followed by empty format at the end of bl…
b53e675 
…ock elements should be escaped (#356)

* Check for empty format to decide what syntax to use for new lines.
* Extend integration test to cover this case.

(cherry picked from commit c14adcb)
michitux added a commit that referenced this pull request Sep 8, 2025
@michitux
XRENDERING-798: Line breaks followed by empty format at the end of bl…
023a99e 
…ock elements should be escaped (#356)

* Check for empty format to decide what syntax to use for new lines.
* Extend integration test to cover this case.

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

Reviewers

@tmortagne tmortagne tmortagne approved these changes

Assignees

@michitux michitux

Labels

backport stable-16.10.x backport stable-17.4.x

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@michitux @tmortagne