WIP: Fix handling of right angle bracket (>) in attributes
#82
Conversation
andyw8
force-pushed
the
andyw8/fix-right-angled-bracket-in-attributes
branch
from
ce87755 to
8a988ed
Compare
andyw8
changed the title
andyw8
changed the title
>) in attributes
| @@ -4,7 +4,7 @@ | |||
|
|
|||
| module HtmlBeautifier | |||
| class HtmlParser < Parser | |||
| ELEMENT_CONTENT = %r{ (?:<%.*?%>|[^>])* }mx | |||
| ELEMENT_CONTENT = %r{ (?:<%.*?%>|data-action\s*=\s*"(?:[^"]*?->[^"]*?)"|[^>])* }mx | |||
There was a problem hiding this comment.
Ideally this should be generalized rather being tied to data-action.
There was a problem hiding this comment.
Agreed. I simply couldn't figure out the regex magic to make it work without being this specific
| @@ -623,6 +623,22 @@ | |||
| expect(described_class.beautify(source)).to eq(expected) | |||
| end | |||
|
|
|||
| it "does not break for > within an attribute value" do | |||
There was a problem hiding this comment.
This verifies it doesn't break code which is already formatted correctly, but there should probably be some other tests.
|
i couldnt really come up with a more clever regex but testing in regex101 the following still matched,
its a bit dumber but just allows > within quotes Hmm actually it lead me to adjust it once more to the following %r{ (?:[^"]?[-%]>[^"]?|[^>])* }mx moved the erb tag or - check together [-%] im not sure if this is correct but, ill fork sometime next week and see for myself |
|
So i gave it a try, neither of my queries were perfect @andyw8 i did notice if your revert |
|
It was copied from #78 (comment) but I haven't yet looked into it. |
This is the fix suggested by @jon-sully in #78 (comment)
It may need further work and verification, so I'm only opening it as a draft for now to allow for discussion.
Also, it breaks one of the current tests:
HtmlBeautifier indents general self-closing tags