Skip to content
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

Correctly match newlines whitin htmltags. #122

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Correctly match newlines whitin htmltags. #122

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
748d706
Correctly match newlines in tags.
Aug 14, 2023
f9d1b95
Revert regex to current implementation while adding the PCRE_DOTALL m…
Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/Caxy/HtmlDiff/AbstractDiff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ protected function convertHtmlToListOfWords(string $text) : array
// Normalize no-break-spaces to regular spaces
$text = str_replace("\xc2\xa0", ' ', $text);

preg_match_all('/<.+?>|[^<]+/mu', $text, $sentencesAndTags, PREG_SPLIT_NO_EMPTY);
preg_match_all('/<[^>]+?>|[^<]+/mu', $text, $sentencesAndTags, PREG_SPLIT_NO_EMPTY);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alternatively we could add the s (PCRE_DOTALL) modifier so that the dot would match newlines as well.

However, this might seem more clear? Are there situations where this change would actually affect the outcome in a negative way?

I think it's technically allowed to have > within an attribute value of an HTML tag...

<div data-some-value="1 > 0">

that's technically valid I think?

So are we better off adding the s modifier to solve this instead?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've tested all regexes (current, mine, yours) with the example you provided and they all break the tag in the data-some-value contents. So this is currently a problem and i dont know how to fix this particular issue.

However, i do agree the dotall modifier is more clear, i will change the merge request to use that.


foreach ($sentencesAndTags[0] as $sentenceOrHtmlTag) {
if ($sentenceOrHtmlTag === '') {
Expand Down
25 changes: 25 additions & 0 deletions tests/fixtures/HtmlDiff/multiline-tag.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<options>
<option type="boolean" name="setKeepNewLines" value="true" />
<option type="boolean" name="setPurifierEnabled" value="false" />
</options>

<oldText>
<li
attribute="value">
value
</li>
</oldText>

<newText>
<li
attribute="value">
newvalue
</li>
</newText>

<expected>
<li
attribute="value">
<del class="diffmod">value</del><ins class="diffmod">newvalue</ins>
</li>
</expected>