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

Jump to bottom

[commonmark] make html comments, html inlines, html blocks and links compliant #1135

Merged
merged 79 commits into from Apr 10, 2018
Merged

[commonmark] make html comments, html inlines, html blocks and links compliant #1135

merged 79 commits into from Apr 10, 2018

Commits on Mar 4, 2018

  1. add commonmark tests for (inline) raw html

    @Feder1co5oave
    Feder1co5oave committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    ffd386a View commit details
    Browse the repository at this point in the history

  2. add commonmark tests for html comments

    @Feder1co5oave
    Feder1co5oave committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    056f4e2 View commit details
    Browse the repository at this point in the history

  3. new inline html rule, to comply with commonmark

    @Feder1co5oave
    Feder1co5oave committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    9450b09 View commit details
    Browse the repository at this point in the history

  4. new html comment rule to comply with commonmark (html5). 

    non-compliant: allow `--` inside html comments.
adjust inline tag rule accordingly.
    @Feder1co5oave
    Feder1co5oave committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    652ba97 View commit details
    Browse the repository at this point in the history

  5. allow colons in tag names and attributes. Decrease group depth in regex

    @Feder1co5oave
    Feder1co5oave committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    b2611c1 View commit details
    Browse the repository at this point in the history

  6. allow a regex source string as a parameter for edit()

    @Feder1co5oave
    Feder1co5oave committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    f2ebd43 View commit details
    Browse the repository at this point in the history

  7. refactor tag inline rule

    @Feder1co5oave
    Feder1co5oave committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    27d4da6 View commit details
    Browse the repository at this point in the history

  8. refactor html block rule

    @Feder1co5oave
    Feder1co5oave committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    4de3c98 View commit details
    Browse the repository at this point in the history

  9. rename gfm_links -> gfm_autolinks

    @Feder1co5oave
    Feder1co5oave committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    c12c5d7 View commit details
    Browse the repository at this point in the history

  10. rename test headings-id -> headings_id

    @Feder1co5oave
    Feder1co5oave committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    316db0a View commit details
    Browse the repository at this point in the history

  11. remove superfluous test fixture (already covered by original/links_re… 

    …ference_style and new/cm_link_defs)
    @Feder1co5oave
    Feder1co5oave committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    d89012f View commit details
    Browse the repository at this point in the history

  12. !fixup b2611c1 

    Disallow colons in tag names
    @Feder1co5oave
    Feder1co5oave committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    8e30cd2 View commit details
    Browse the repository at this point in the history

  13. divide html_comments test into subtests

    @Feder1co5oave
    Feder1co5oave committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    bcf9abb View commit details
    Browse the repository at this point in the history

  14. option pedantic overrides gfm, and turns off gfm, tables and breaks. 

    FIXME update README
    @Feder1co5oave
    Feder1co5oave committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    1b8ca2b View commit details
    Browse the repository at this point in the history

  15. add commonmark tests for html blocks

    @Feder1co5oave
    Feder1co5oave committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    c1ef53c View commit details
    Browse the repository at this point in the history

  16. save the current html block parsing in the pedantic mode

    @Feder1co5oave
    Feder1co5oave committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    56972f8 View commit details
    Browse the repository at this point in the history

  17. new rule for html blocks, to comply with commonmark. 

    BREAKING CHANGE: inline markdown is not parsed inside html blocks.
    @Feder1co5oave
    Feder1co5oave committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    d08039e View commit details
    Browse the repository at this point in the history

  18. adjust html_comments test case in accordance with commonmark

    @Feder1co5oave
    Feder1co5oave committed Mar 4, 2018
    Configuration menu
    Copy the full SHA
    7abf702 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2018

  1. rearrange test in cm_html_blocks to test end of file

    @Feder1co5oave
    Feder1co5oave committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    fb2f317 View commit details
    Browse the repository at this point in the history

  2. add commonmark tests for links

    @Feder1co5oave
    Feder1co5oave committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    0904e44 View commit details
    Browse the repository at this point in the history

  3. encode urls with %xx entities

    @Feder1co5oave
    Feder1co5oave committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    de66018 View commit details
    Browse the repository at this point in the history

  4. escape html entities in link/image href

    @Feder1co5oave
    Feder1co5oave committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    d2cef5a View commit details
    Browse the repository at this point in the history

  5. encode urls in tests accordingly

    @Feder1co5oave
    Feder1co5oave committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    ef64418 View commit details
    Browse the repository at this point in the history

  6. allow frontmatter in original tests

    @Feder1co5oave
    Feder1co5oave committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    786334a View commit details
    Browse the repository at this point in the history

  7. Revert fac31ed "allow matched double quotes in link definition title … 

    …(markdown.pl behavior)."
    @Feder1co5oave
    Feder1co5oave committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    bf9c9c5 View commit details
    Browse the repository at this point in the history

  8. allow matched double quotes in link definition title only in pedantic… 

    … mode
    @Feder1co5oave
    Feder1co5oave committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    821e2da View commit details
    Browse the repository at this point in the history

  9. test literal_quotes_in_titles in pedantic mode

    @Feder1co5oave
    Feder1co5oave committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    dc92048 View commit details
    Browse the repository at this point in the history

  10. save current link parsing in pedantic mode

    @Feder1co5oave
    Feder1co5oave committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    3be817b View commit details
    Browse the repository at this point in the history

  11. test links_inline_style in pedantic mode

    @Feder1co5oave
    Feder1co5oave committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    6750997 View commit details
    Browse the repository at this point in the history

  12. don't allow spaces in link URIs

    @Feder1co5oave
    Feder1co5oave committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    e66f7aa View commit details
    Browse the repository at this point in the history

  13. allow backslash-escapes in link text, href, title and link definition… 

    … references.

InlineLexer.escapes() handles markdown escapes sequences.
TODO handle escapes everywhere in the document.
    @Feder1co5oave
    Feder1co5oave committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    fc17a2c View commit details
    Browse the repository at this point in the history

  14. allow ONE level of matching parenthesis in links. 

    NON-COMPLIANT with commonmark!
adjust test markedjs#468 accordingly.
    @Feder1co5oave
    Feder1co5oave committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    9f20c46 View commit details
    Browse the repository at this point in the history

  15. allow unbalanced parenthesis in links URIs wrapped in angle brackets

    @Feder1co5oave
    Feder1co5oave committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    d8ff951 View commit details
    Browse the repository at this point in the history

  16. let html entities in link URIs pass through as-is (we cannot decode t… 

    …hem all).

This is not required by commonmark, browsers will do just fine.
    @Feder1co5oave
    Feder1co5oave committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    277d093 View commit details
    Browse the repository at this point in the history

  17. allow link titles to be wrapped in parenthesis

    @Feder1co5oave
    Feder1co5oave committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    3afc360 View commit details
    Browse the repository at this point in the history

  18. remove commonmark test markedjs#478 because we treat U+00A0 (non-brea… 

    …king space) as a regular space. FIXME
    @Feder1co5oave
    Feder1co5oave committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    29d33d9 View commit details
    Browse the repository at this point in the history

  19. [security] fix possible ReDOS vulnerable regex rule by refactoring (d… 

    …oesn't change the alphabet)
    @Feder1co5oave
    Feder1co5oave committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    271d357 View commit details
    Browse the repository at this point in the history

  20. allow brackets in link text if they are inside a code span. Add test.

    @Feder1co5oave
    Feder1co5oave committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    47365c1 View commit details
    Browse the repository at this point in the history

  21. [refactor] rename rule inside -> label

    @Feder1co5oave
    Feder1co5oave committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    8877ff7 View commit details
    Browse the repository at this point in the history

  22. allow ONE level of matching parenthesis in link text. 

    NON-COMPLIANT with commonmark!
Adjust test markedjs#483 accordingly
    @Feder1co5oave
    Feder1co5oave committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    ca349c8 View commit details
    Browse the repository at this point in the history

  23. run test cm_links with xhtml

    @Feder1co5oave
    Feder1co5oave committed Mar 5, 2018
    Configuration menu
    Copy the full SHA
    5125739 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2018

  1. [commonmark] BREAKING CHANGE: link nesting is not allowed. If multipl… 

    …e links are nested, the innermost one is used.
    @Feder1co5oave
    Feder1co5oave committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    eb95a71 View commit details
    Browse the repository at this point in the history

  2. add tests for link nesting

    @Feder1co5oave
    Feder1co5oave committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    13dd38a View commit details
    Browse the repository at this point in the history

  3. !fixup eb95a71

    @Feder1co5oave
    Feder1co5oave committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    ef3516c View commit details
    Browse the repository at this point in the history

  4. lint marked.js

    @Feder1co5oave
    Feder1co5oave committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    5b135c3 View commit details
    Browse the repository at this point in the history

  5. remove commonmark tests 489-491 for nested links

    @Feder1co5oave
    Feder1co5oave committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    55f47f1 View commit details
    Browse the repository at this point in the history

  6. Revert 13dd38a "add tests for link nesting"

    @Feder1co5oave
    Feder1co5oave committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    7a80cdf View commit details
    Browse the repository at this point in the history

  7. Revert eb95a71 "[commonmark] BREAKING CHANGE: link nesting is not all… 

    …owed. If multiple links are nested, the innermost one is used."

I don't like the cm rule for nested links.
NON-COMPLIANT with commonmark.
    @Feder1co5oave
    Feder1co5oave committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    f21a4d6 View commit details
    Browse the repository at this point in the history

  8. remove commonmark tests 492, 495-497 for link precedence with other m… 

    …arkup. NON-COMPLIANT with commonmark
    @Feder1co5oave
    Feder1co5oave committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    2094181 View commit details
    Browse the repository at this point in the history

  9. allow only one level of matching brackets in reference links text. 

    NON-COMPLIANT with commonmark. Adjust test 499 accordingly.
    @Feder1co5oave
    Feder1co5oave committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    aeca6a1 View commit details
    Browse the repository at this point in the history

  10. allow link nesting, adjust tests 503-504 accordingly. NON-COMPLIANT w… 

    …ith commonmark
    @Feder1co5oave
    Feder1co5oave committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    5536922 View commit details
    Browse the repository at this point in the history

  11. remove commonmark tests 505, 507-509 for link precedence with other m… 

    …arkup. NON-COMPLIANT with commonmark
    @Feder1co5oave
    Feder1co5oave committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    e56e35a View commit details
    Browse the repository at this point in the history

  12. perform space normalization when storing link reference labels

    @Feder1co5oave
    Feder1co5oave committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    22b06cc View commit details
    Browse the repository at this point in the history

  13. BREAKING CHANGE: space is no longer allowed between [link text] and [… 

    …link label] in reference links.

The old behavior is now available in the pedantic mode.
To comply with commonmark: http://spec.commonmark.org/0.28/#example-514
    @Feder1co5oave
    Feder1co5oave committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    b9394a0 View commit details
    Browse the repository at this point in the history

  14. run original tests with spaces between link text and label in pedanti… 

    …c mode
    @Feder1co5oave
    Feder1co5oave committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    fc97171 View commit details
    Browse the repository at this point in the history

  15. fix test 513

    @Feder1co5oave
    Feder1co5oave committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    d47dc29 View commit details
    Browse the repository at this point in the history

  16. do not process escapes in link labels

    @Feder1co5oave
    Feder1co5oave committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    f584aca View commit details
    Browse the repository at this point in the history

  17. fix tests in cm_links

    @Feder1co5oave
    Feder1co5oave committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    eea3932 View commit details
    Browse the repository at this point in the history

  18. link labels must have at least one non-whitespace character

    @Feder1co5oave
    Feder1co5oave committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    8594a06 View commit details
    Browse the repository at this point in the history

  19. add collapsed reference [links][] = [links][links]

    @Feder1co5oave
    Feder1co5oave committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    209dff1 View commit details
    Browse the repository at this point in the history

  20. fix tests in cm_links

    @Feder1co5oave
    Feder1co5oave committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    ea48e96 View commit details
    Browse the repository at this point in the history

  21. remove commonmark test 535 (link precedence with other markup). 

    NON-COMPLIANT with commonmark
    @Feder1co5oave
    Feder1co5oave committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    dfc5b3e View commit details
    Browse the repository at this point in the history

  22. fix tests in cm_links

    @Feder1co5oave
    Feder1co5oave committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    d29f68a View commit details
    Browse the repository at this point in the history

  23. adjust commonmark tests 544-548, 556, 560 that contain markup inside … 

    …the image description.

NON-COMPLIANT with commonmark (just a recommendation. This can be fixed in the future by using the InlineLexer+TextRenderer)
    @Feder1co5oave
    Feder1co5oave committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    2e23540 View commit details
    Browse the repository at this point in the history

  24. update the list of markdown escapes, per commonmark

    @Feder1co5oave
    Feder1co5oave committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    f7d4d21 View commit details
    Browse the repository at this point in the history

  25. do not allow control characters in link destinations, per commonmark

    @Feder1co5oave
    Feder1co5oave committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    c398550 View commit details
    Browse the repository at this point in the history

  26. fix tests whitespace

    @Feder1co5oave
    Feder1co5oave committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    e4fd972 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2018

  1. Merge remote-tracking branch 'markedjs/master' into cm_links

    @Feder1co5oave
    Feder1co5oave committed Mar 8, 2018
    Configuration menu
    Copy the full SHA
    680a6c3 View commit details
    Browse the repository at this point in the history

  2. re-enable cm_autolinks test case (now passing)

    @Feder1co5oave
    Feder1co5oave committed Mar 8, 2018
    Configuration menu
    Copy the full SHA
    163a482 View commit details
    Browse the repository at this point in the history

  3. document pedantic option overrides gfm

    @Feder1co5oave
    Feder1co5oave committed Mar 8, 2018
    Configuration menu
    Copy the full SHA
    4e2b647 View commit details
    Browse the repository at this point in the history

  4. fix backtracking vulnerability in block.pedantic.html as in markedj… 

    …s#1083
    @Feder1co5oave
    Feder1co5oave committed Mar 8, 2018
    Configuration menu
    Copy the full SHA
    9cb1900 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2018

  1. Merge remote-tracking branch 'markedjs/master' into cm_links

    @Feder1co5oave
    Feder1co5oave committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    b738cd6 View commit details
    Browse the repository at this point in the history

  2. re-enable passing commonmark tests

    @Feder1co5oave
    Feder1co5oave committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    4aa4f02 View commit details
    Browse the repository at this point in the history

  3. do not allow newlines inside html attributes, make cm test 60 pass

    @Feder1co5oave
    Feder1co5oave committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    bc7c9db View commit details
    Browse the repository at this point in the history

  4. do not randomize jasmine tests (different spec files interfered with … 

    …each other)
    @Feder1co5oave
    Feder1co5oave committed Apr 9, 2018
    Configuration menu
    Copy the full SHA
    d94a68c View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2018

  1. Merge branch 'master' into pr/1135

    @UziTech
    UziTech committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    4e52c42 View commit details
    Browse the repository at this point in the history

  2. remove passing tests

    @UziTech
    UziTech committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    5396950 View commit details
    Browse the repository at this point in the history

  3. randomize tests

    @UziTech
    UziTech committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    8815ba3 View commit details
    Browse the repository at this point in the history

  4. update completed table

    @UziTech
    UziTech committed Apr 10, 2018
    Configuration menu
    Copy the full SHA
    a6c6f0d View commit details
    Browse the repository at this point in the history