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

allow html without \n after #1438

Merged
merged 4 commits into from
Mar 25, 2019
+4 −2
Merged

allow html without \n after #1438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0f0b763
allow html without \n after
UziTech Mar 7, 2019
f1089fe
add test
UziTech Mar 12, 2019
246dd3d
fix whitespace after tag
UziTech Mar 12, 2019
42e816c
fix again
UziTech Mar 12, 2019
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
4 changes: 2 additions & 2 deletions lib/marked.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ var block = {
+ '|<![A-Z][\\s\\S]*?>\\n*' // (4)
+ '|<!\\[CDATA\\[[\\s\\S]*?\\]\\]>\\n*' // (5)
+ '|</?(tag)(?: +|\\n|/?>)[\\s\\S]*?(?:\\n{2,}|$)' // (6)
+ '|<(?!script|pre|style)([a-z][\\w-]*)(?:attribute)*? */?>(?=\\h*\\n)[\\s\\S]*?(?:\\n{2,}|$)' // (7) open tag
+ '|</(?!script|pre|style)[a-z][\\w-]*\\s*>(?=\\h*\\n)[\\s\\S]*?(?:\\n{2,}|$)' // (7) closing tag
Copy link
Member Author

@UziTech UziTech Mar 8, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

@Feder1co5oave I'm not sure what the \\h* is supposed to do. As far as I know \H isn't a special character in regex.

Copy link
Contributor

Choose a reason for hiding this comment

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

\h has meaning in some languages.

Language Meaning of \h
Ruby Hex chars, e.g. [0-9a-fA-F]
Java, PHP, Perl Horizontal whitespace, cf. \v

Copy link
Contributor

Choose a reason for hiding this comment

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

...so I imagine this regex originated in a language (or in someone's head) where \h had meaning.

Copy link
Contributor

Choose a reason for hiding this comment

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

...I've written a research paper on this topic if @UziTech @styfle @Feder1co5oave would be interested.

Copy link
Contributor

@davisjam davisjam Mar 11, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

  • Is there a test case that includes horizontal whitespace where the \h was?
  • It's possible the original regex should have used something like [ \t] instead?

Copy link
Contributor

Choose a reason for hiding this comment

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

It was intended to be [ \t]* I guess, I just don't remember why I used \h instead, and why it required a newline after the tag :(

Copy link
Member Author

Choose a reason for hiding this comment

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

I added [ \t]* in place of \h but with some manual testing it doesn't seem to change anything. All of the tests I can think of still pass with or without [ \t]*

Copy link
Member Author

Choose a reason for hiding this comment

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

That could be due to the fact that we strip white space before we check the output.

Copy link
Contributor

Choose a reason for hiding this comment

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

We still strip whitespace when testing? Wasn't html-differ supposed to fix this?

Copy link
Member Author

Choose a reason for hiding this comment

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

We were only using html-differ for the spec tests. The files were still using the manual method.

I fixed it in #1449

+ '|<(?!script|pre|style)([a-z][\\w-]*)(?:attribute)*? */?>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:\\n{2,}|$)' // (7) open tag
+ '|</(?!script|pre|style)[a-z][\\w-]*\\s*>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:\\n{2,}|$)' // (7) closing tag
+ ')',
def: /^ {0,3}\[(label)\]: *\n? *<?([^\s>]+)>?(?:(?: +\n? *| *\n *)(title))? *(?:\n+|$)/,
table: noop,
Expand Down
1 change: 1 addition & 0 deletions test/new/html_no_new_line.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<img src='sdfg'>
1 change: 1 addition & 0 deletions test/new/html_no_new_line.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<img src='sdfg'>