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

Markdown: Improved URL tokenization #2678

Merged
merged 2 commits into from Dec 22, 2020
Merged

Markdown: Improved URL tokenization #2678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
580b306
Markdown: Improved URL tokenization
RunDevelopment Dec 22, 2020
ac6b04a
Simplified regex
RunDevelopment Dec 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 13 additions & 7 deletions components/prism-markdown.js
View file
Open in desktop
Expand Up @@ -221,21 +221,27 @@
// [example](http://example.com "Optional title")
// [example][id]
// [example] [id]
pattern: createInline(/!?\[(?:(?!\])<inner>)+\](?:\([^\s)]+(?:[\t ]+"(?:\\.|[^"\\])*")?\)| ?\[(?:(?!\])<inner>)+\])/.source),
pattern: createInline(/!?\[(?:(?!\])<inner>)+\](?:\([^\s)]+(?:[\t ]+"(?:\\.|[^"\\])*")?\)|[ \t]?\[(?:(?!\])<inner>)+\])/.source),
lookbehind: true,
greedy: true,
inside: {
'variable': {
pattern: /(\[)[^\]]+(?=\]$)/,
lookbehind: true
},
'operator': /^!/,
'content': {
pattern: /(^!?\[)[^\]]+(?=\])/,
pattern: /(^\[)[^\]]+(?=\])/,
lookbehind: true,
inside: {} // see below
},
'variable': {
pattern: /(^\][ \t]?\[)[^\]]+(?=\]$)/,
lookbehind: true
},
'url': {
pattern: /(^\]\()[^\s)]+/,
lookbehind: true
},
'string': {
pattern: /"(?:\\.|[^"\\])*"(?=\)$)/
pattern: /(^[ \t]+)"(?:\\.|[^"\\])*"(?=\)$)/,
lookbehind: true
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion components/prism-markdown.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

67 changes: 23 additions & 44 deletions tests/languages/markdown/bold_feature.test
View file
Open in desktop
Expand Up @@ -24,41 +24,32 @@ not__bold__ __this__either
[
["bold", [
["punctuation", "**"],
["content", [
"foobar"
]],
["content", ["foobar"]],
["punctuation", "**"]
]],
["bold", [
["punctuation", "**"],
["content", [
"foo\r\nbar"
]],
["content", ["foo\r\nbar"]],
["punctuation", "**"]
]],
["bold", [
["punctuation", "__"],
["content", [
"foobar"
]],
["content", ["foobar"]],
["punctuation", "__"]
]],
["bold", [
["punctuation", "__"],
["content", [
"foo\r\nbar"
]],
["content", ["foo\r\nbar"]],
["punctuation", "__"]
]],

["bold", [
["punctuation", "__"],
["content", [
"foo ",
["italic", [
["punctuation", "*"],
["content", [
"bar"
]],
["content", ["bar"]],
["punctuation", "*"]
]],
" baz"
Expand All @@ -71,9 +62,7 @@ not__bold__ __this__either
"foo ",
["italic", [
["punctuation", "_"],
["content", [
"bar"
]],
["content", ["bar"]],
["punctuation", "_"]
]],
" baz"
Expand All @@ -86,9 +75,7 @@ not__bold__ __this__either
"foo ",
["strike", [
["punctuation", "~"],
["content", [
"bar"
]],
["content", ["bar"]],
["punctuation", "~"]
]],
" baz"
Expand All @@ -101,9 +88,7 @@ not__bold__ __this__either
"foo ",
["strike", [
["punctuation", "~~"],
["content", [
"bar"
]],
["content", ["bar"]],
["punctuation", "~~"]
]],
" baz"
Expand All @@ -116,23 +101,22 @@ not__bold__ __this__either
"foo",
["url", [
"[",
["content", [
"bar"
]],
"](baz)"
["content", ["bar"]],
"](",
["url", "baz"],
")"
]]
]],
["punctuation", "__"]
]],

["bold", [
["punctuation", "**"],
["content", [
"foo ",
["italic", [
["punctuation", "*"],
["content", [
"bar"
]],
["content", ["bar"]],
["punctuation", "*"]
]],
" baz"
Expand All @@ -145,9 +129,7 @@ not__bold__ __this__either
"foo ",
["italic", [
["punctuation", "_"],
["content", [
"bar"
]],
["content", ["bar"]],
["punctuation", "_"]
]],
" baz"
Expand All @@ -160,9 +142,7 @@ not__bold__ __this__either
"foo ",
["strike", [
["punctuation", "~"],
["content", [
"bar"
]],
["content", ["bar"]],
["punctuation", "~"]
]],
" baz"
Expand All @@ -175,9 +155,7 @@ not__bold__ __this__either
"foo ",
["strike", [
["punctuation", "~~"],
["content", [
"bar"
]],
["content", ["bar"]],
["punctuation", "~~"]
]],
" baz"
Expand All @@ -190,14 +168,15 @@ not__bold__ __this__either
"foo",
["url", [
"[",
["content", [
"bar"
]],
"](baz)"
["content", ["bar"]],
"](",
["url", "baz"],
")"
]]
]],
["punctuation", "**"]
]],

"\r\n\r\nnot__bold__ __this__either"
]

Expand Down
67 changes: 23 additions & 44 deletions tests/languages/markdown/italic_feature.test
View file
Open in desktop
Expand Up @@ -24,41 +24,32 @@ not_italic_ _this_either
[
["italic", [
["punctuation", "*"],
["content", [
"foobar"
]],
["content", ["foobar"]],
["punctuation", "*"]
]],
["italic", [
["punctuation", "*"],
["content", [
"foo\r\nbar"
]],
["content", ["foo\r\nbar"]],
["punctuation", "*"]
]],
["italic", [
["punctuation", "_"],
["content", [
"foobar"
]],
["content", ["foobar"]],
["punctuation", "_"]
]],
["italic", [
["punctuation", "_"],
["content", [
"foo\r\nbar"
]],
["content", ["foo\r\nbar"]],
["punctuation", "_"]
]],

["italic", [
["punctuation", "_"],
["content", [
"foo ",
["bold", [
["punctuation", "__"],
["content", [
"bar"
]],
["content", ["bar"]],
["punctuation", "__"]
]],
" baz"
Expand All @@ -71,9 +62,7 @@ not_italic_ _this_either
"foo ",
["bold", [
["punctuation", "**"],
["content", [
"bar"
]],
["content", ["bar"]],
["punctuation", "**"]
]],
" baz"
Expand All @@ -86,9 +75,7 @@ not_italic_ _this_either
"foo ",
["strike", [
["punctuation", "~"],
["content", [
"bar"
]],
["content", ["bar"]],
["punctuation", "~"]
]],
" baz"
Expand All @@ -101,9 +88,7 @@ not_italic_ _this_either
"foo ",
["strike", [
["punctuation", "~~"],
["content", [
"bar"
]],
["content", ["bar"]],
["punctuation", "~~"]
]],
" baz"
Expand All @@ -116,23 +101,22 @@ not_italic_ _this_either
"foo",
["url", [
"[",
["content", [
"bar"
]],
"](baz)"
["content", ["bar"]],
"](",
["url", "baz"],
")"
]]
]],
["punctuation", "_"]
]],

["italic", [
["punctuation", "*"],
["content", [
"foo ",
["bold", [
["punctuation", "__"],
["content", [
"bar"
]],
["content", ["bar"]],
["punctuation", "__"]
]],
" baz"
Expand All @@ -145,9 +129,7 @@ not_italic_ _this_either
"foo ",
["bold", [
["punctuation", "**"],
["content", [
"bar"
]],
["content", ["bar"]],
["punctuation", "**"]
]],
" baz"
Expand All @@ -160,9 +142,7 @@ not_italic_ _this_either
"foo ",
["strike", [
["punctuation", "~"],
["content", [
"bar"
]],
["content", ["bar"]],
["punctuation", "~"]
]],
" baz"
Expand All @@ -175,9 +155,7 @@ not_italic_ _this_either
"foo ",
["strike", [
["punctuation", "~~"],
["content", [
"bar"
]],
["content", ["bar"]],
["punctuation", "~~"]
]],
" baz"
Expand All @@ -190,14 +168,15 @@ not_italic_ _this_either
"foo",
["url", [
"[",
["content", [
"bar"
]],
"](baz)"
["content", ["bar"]],
"](",
["url", "baz"],
")"
]]
]],
["punctuation", "*"]
]],

"\r\n\r\nnot_italic_ _this_either"
]

Expand Down