Reorganize grammars #1407
Closed
Reorganize grammars #1407
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…e from gfm to normal. Fences can interrupt paragraphs. Pedantic mode doesn\'t support code fences
…nterrupt paragraphs in commonmark.
…itution for readability
…eadings\' delimiter
UziTech
approved these changes
Jan 5, 2019
|
@davisjam Can you review for redos vulnerabilities? |
Feder1co5oave
commented
Jan 7, 2019
| @@ -14,9 +14,9 @@ | |||
| var block = { | |||
| newline: /^\n+/, | |||
| code: /^( {4}[^\n]+\n*)+/, | |||
| fences: noop, | |||
| fences: /^ {0,3}(`{3,}|~{3,})([^`\n]*)\n(?:|([\s\S]*?)\n)(?: {0,3}\1[~`]* *(?:\n+|$)|$)/, | |||
There was a problem hiding this comment.
this rule was copied from block.gfm as-is.
Feder1co5oave
commented
Jan 7, 2019
| hr: /^ {0,3}((?:- *){3,}|(?:_ *){3,}|(?:\* *){3,})(?:\n+|$)/, | ||
| heading: /^ *(#{1,6}) *([^\n]+?) *(?:#+ *)?(?:\n+|$)/, | ||
| heading: /^ {0,3}(#{1,6}) +([^\n]*?)(?: +#+)? *(?:\n+|$)/, |
There was a problem hiding this comment.
@davisjam I think this is "better" than before?
| fences: /^ {0,3}(`{3,}|~{3,})([^`\n]*)\n(?:|([\s\S]*?)\n)(?: {0,3}\1[~`]* *(?:\n+|$)|$)/, | ||
| paragraph: /^/, | ||
| heading: /^ *(#{1,6}) +([^\n]+?) *#* *(?:\n+|$)/ | ||
| nptable: /^ *([^|\n ].*\|.*)\n *([-:]+ *\|[-| :]*)(?:\n((?:.*[^>\n ].*(?:\n|$))*)\n*|$)/, |
There was a problem hiding this comment.
these were copied as-is from block.tables
|
@Feder1co5oave could you fix the merge conflicts so we can get this merged? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
I noticed commonmark tests were being run in
gfmmode. So I disabled it and moved block rules around to better represent the difference between the two grammar flavors:code fences are now parsed with
gfm: falsetoo (they're a part of commonmark)ATX headings require a space after the
#s ingfm: falsemode, too. They're still not required inpedanticmode.tables are supported whenever
gfm: true(they're a part of gfm), so the oldtablesmode (described as "github flavored markdown + tables") is now practically the same asgfmmode.re-write the
paragraphrule to make it more clear and efficient.setext headings can no longer interrupt paragraphs. This means that the following markdown
Paragraph? Heading? =======was previously parsed (and still is, but only in
pedanticmode) aswhereas now it is
Neither of these complies with commonmark, which introduced multi-line setext headings and whould parse it like
This involves parsing a paragraph-like block, followed by a line made of
=or-. Now that I think of it, I'm not sure it's worth introducing this breaking change, and then another. Or we could merge this and wait until we get setext heading parsing 100% compliant before releasing. Let's hear opinions on this.lists can now interrupt paragraphs, but only if unordered, or starting from 1. (as per example 268)
Fixes
I don't know at this time of any filed issues solved by this PR.
Expectation
marked should parse commonmark in
normalmode (gfm: false, tables: false), and github flavored markdown ingfmmode, according to spec.We should consider deprecating the
tablesoption.Committer
In most cases, this should be a different person than the contributor.