Commit 9d2fddc26c05a9fd0a8b91ae9cb8769bde5a22b6
2018-11-28T14:21:20
Added strike support to markdown (#1563) This PR adds support for the strike operator in [both forms][1]. It does not include actual styling for the strike operator as it makes the ~ character really hard to read. [1]: https://webapps.stackexchange.com/questions/14986/strikethrough-with-github-markdown/103691#103691
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171
diff --git a/components/prism-markdown.js b/components/prism-markdown.js
index 8b63780..6ec38a0 100644
--- a/components/prism-markdown.js
+++ b/components/prism-markdown.js
@@ -83,6 +83,7 @@ Prism.languages.insertBefore('markdown', 'prolog', {
// Allow only one line break
pattern: /(^|[^\\])(\*\*|__)(?:(?:\r?\n|\r)(?!\r?\n|\r)|.)+?\2/,
lookbehind: true,
+ greedy: true,
inside: {
'punctuation': /^\*\*|^__|\*\*$|__$/
}
@@ -94,10 +95,23 @@ Prism.languages.insertBefore('markdown', 'prolog', {
// Allow only one line break
pattern: /(^|[^\\])([*_])(?:(?:\r?\n|\r)(?!\r?\n|\r)|.)+?\2/,
lookbehind: true,
+ greedy: true,
inside: {
'punctuation': /^[*_]|[*_]$/
}
},
+ 'strike': {
+ // ~~strike through~~
+ // ~strike~
+
+ // Allow only one line break
+ pattern: /(^|[^\\])(~~?)(?:(?:\r?\n|\r)(?!\r?\n|\r)|.)+?\2/,
+ lookbehind: true,
+ greedy: true,
+ inside: {
+ 'punctuation': /^~~?|~~?$/
+ }
+ },
'url': {
// [example](http://example.com "Optional title")
// [example] [id]
@@ -116,5 +130,10 @@ Prism.languages.insertBefore('markdown', 'prolog', {
Prism.languages.markdown['bold'].inside['url'] = Prism.languages.markdown['url'];
Prism.languages.markdown['italic'].inside['url'] = Prism.languages.markdown['url'];
+Prism.languages.markdown['strike'].inside['url'] = Prism.languages.markdown['url'];
Prism.languages.markdown['bold'].inside['italic'] = Prism.languages.markdown['italic'];
-Prism.languages.markdown['italic'].inside['bold'] = Prism.languages.markdown['bold'];
\ No newline at end of file
+Prism.languages.markdown['bold'].inside['strike'] = Prism.languages.markdown['strike'];
+Prism.languages.markdown['italic'].inside['bold'] = Prism.languages.markdown['bold'];
+Prism.languages.markdown['italic'].inside['strike'] = Prism.languages.markdown['strike'];
+Prism.languages.markdown['strike'].inside['bold'] = Prism.languages.markdown['bold'];
+Prism.languages.markdown['strike'].inside['italic'] = Prism.languages.markdown['italic'];
diff --git a/components/prism-markdown.min.js b/components/prism-markdown.min.js
index 012565b..a13d883 100644
--- a/components/prism-markdown.min.js
+++ b/components/prism-markdown.min.js
@@ -1 +1 @@
-Prism.languages.markdown=Prism.languages.extend("markup",{}),Prism.languages.insertBefore("markdown","prolog",{blockquote:{pattern:/^>(?:[\t ]*>)*/m,alias:"punctuation"},code:[{pattern:/^(?: {4}|\t).+/m,alias:"keyword"},{pattern:/``.+?``|`[^`\n]+`/,alias:"keyword"}],title:[{pattern:/\w+.*(?:\r?\n|\r)(?:==+|--+)/,alias:"important",inside:{punctuation:/==+$|--+$/}},{pattern:/(^\s*)#+.+/m,lookbehind:!0,alias:"important",inside:{punctuation:/^#+|#+$/}}],hr:{pattern:/(^\s*)([*-])(?:[\t ]*\2){2,}(?=\s*$)/m,lookbehind:!0,alias:"punctuation"},list:{pattern:/(^\s*)(?:[*+-]|\d+\.)(?=[\t ].)/m,lookbehind:!0,alias:"punctuation"},"url-reference":{pattern:/!?\[[^\]]+\]:[\t ]+(?:\S+|<(?:\\.|[^>\\])+>)(?:[\t ]+(?:"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|\((?:\\.|[^)\\])*\)))?/,inside:{variable:{pattern:/^(!?\[)[^\]]+/,lookbehind:!0},string:/(?:"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|\((?:\\.|[^)\\])*\))$/,punctuation:/^[\[\]!:]|[<>]/},alias:"url"},bold:{pattern:/(^|[^\\])(\*\*|__)(?:(?:\r?\n|\r)(?!\r?\n|\r)|.)+?\2/,lookbehind:!0,inside:{punctuation:/^\*\*|^__|\*\*$|__$/}},italic:{pattern:/(^|[^\\])([*_])(?:(?:\r?\n|\r)(?!\r?\n|\r)|.)+?\2/,lookbehind:!0,inside:{punctuation:/^[*_]|[*_]$/}},url:{pattern:/!?\[[^\]]+\](?:\([^\s)]+(?:[\t ]+"(?:\\.|[^"\\])*")?\)| ?\[[^\]\n]*\])/,inside:{variable:{pattern:/(!?\[)[^\]]+(?=\]$)/,lookbehind:!0},string:{pattern:/"(?:\\.|[^"\\])*"(?=\)$)/}}}}),Prism.languages.markdown.bold.inside.url=Prism.languages.markdown.url,Prism.languages.markdown.italic.inside.url=Prism.languages.markdown.url,Prism.languages.markdown.bold.inside.italic=Prism.languages.markdown.italic,Prism.languages.markdown.italic.inside.bold=Prism.languages.markdown.bold;
\ No newline at end of file
+Prism.languages.markdown=Prism.languages.extend("markup",{}),Prism.languages.insertBefore("markdown","prolog",{blockquote:{pattern:/^>(?:[\t ]*>)*/m,alias:"punctuation"},code:[{pattern:/^(?: {4}|\t).+/m,alias:"keyword"},{pattern:/``.+?``|`[^`\n]+`/,alias:"keyword"}],title:[{pattern:/\w+.*(?:\r?\n|\r)(?:==+|--+)/,alias:"important",inside:{punctuation:/==+$|--+$/}},{pattern:/(^\s*)#+.+/m,lookbehind:!0,alias:"important",inside:{punctuation:/^#+|#+$/}}],hr:{pattern:/(^\s*)([*-])(?:[\t ]*\2){2,}(?=\s*$)/m,lookbehind:!0,alias:"punctuation"},list:{pattern:/(^\s*)(?:[*+-]|\d+\.)(?=[\t ].)/m,lookbehind:!0,alias:"punctuation"},"url-reference":{pattern:/!?\[[^\]]+\]:[\t ]+(?:\S+|<(?:\\.|[^>\\])+>)(?:[\t ]+(?:"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|\((?:\\.|[^)\\])*\)))?/,inside:{variable:{pattern:/^(!?\[)[^\]]+/,lookbehind:!0},string:/(?:"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|\((?:\\.|[^)\\])*\))$/,punctuation:/^[\[\]!:]|[<>]/},alias:"url"},bold:{pattern:/(^|[^\\])(\*\*|__)(?:(?:\r?\n|\r)(?!\r?\n|\r)|.)+?\2/,lookbehind:!0,greedy:!0,inside:{punctuation:/^\*\*|^__|\*\*$|__$/}},italic:{pattern:/(^|[^\\])([*_])(?:(?:\r?\n|\r)(?!\r?\n|\r)|.)+?\2/,lookbehind:!0,greedy:!0,inside:{punctuation:/^[*_]|[*_]$/}},strike:{pattern:/(^|[^\\])(~~?)(?:(?:\r?\n|\r)(?!\r?\n|\r)|.)+?\2/,lookbehind:!0,greedy:!0,inside:{punctuation:/^~~?|~~?$/}},url:{pattern:/!?\[[^\]]+\](?:\([^\s)]+(?:[\t ]+"(?:\\.|[^"\\])*")?\)| ?\[[^\]\n]*\])/,inside:{variable:{pattern:/(!?\[)[^\]]+(?=\]$)/,lookbehind:!0},string:{pattern:/"(?:\\.|[^"\\])*"(?=\)$)/}}}}),Prism.languages.markdown.bold.inside.url=Prism.languages.markdown.url,Prism.languages.markdown.italic.inside.url=Prism.languages.markdown.url,Prism.languages.markdown.strike.inside.url=Prism.languages.markdown.url,Prism.languages.markdown.bold.inside.italic=Prism.languages.markdown.italic,Prism.languages.markdown.bold.inside.strike=Prism.languages.markdown.strike,Prism.languages.markdown.italic.inside.bold=Prism.languages.markdown.bold,Prism.languages.markdown.italic.inside.strike=Prism.languages.markdown.strike,Prism.languages.markdown.strike.inside.bold=Prism.languages.markdown.bold,Prism.languages.markdown.strike.inside.italic=Prism.languages.markdown.italic;
\ No newline at end of file
diff --git a/tests/languages/markdown/bold_feature.test b/tests/languages/markdown/bold_feature.test
index 7d8e8ba..486e6ab 100644
--- a/tests/languages/markdown/bold_feature.test
+++ b/tests/languages/markdown/bold_feature.test
@@ -7,6 +7,7 @@ bar__
__foo*bar*baz__
__foo_bar_baz__
+__foo~bar~baz__
__foo[bar](baz)__
----------------------------------------------------
@@ -58,6 +59,17 @@ __foo[bar](baz)__
["bold", [
["punctuation", "__"],
"foo",
+ ["strike", [
+ ["punctuation", "~"],
+ "bar",
+ ["punctuation", "~"]
+ ]],
+ "baz",
+ ["punctuation", "__"]
+ ]],
+ ["bold", [
+ ["punctuation", "__"],
+ "foo",
["url", [
"[bar](baz)"
]],
@@ -67,4 +79,4 @@ __foo[bar](baz)__
----------------------------------------------------
-Checks for bold. Also tests for inclusion of italic and url.
\ No newline at end of file
+Checks for bold. Also tests for inclusion of italic, strike, and url.
diff --git a/tests/languages/markdown/strike_feature.test b/tests/languages/markdown/strike_feature.test
new file mode 100644
index 0000000..49a4a13
--- /dev/null
+++ b/tests/languages/markdown/strike_feature.test
@@ -0,0 +1,70 @@
+~~foobar~~
+~~foo
+bar~~
+~foobar~
+~foo
+bar~
+
+~foo*bar*baz~
+~foo__bar__baz~
+~foo[bar](baz)~
+
+----------------------------------------------------
+
+[
+ ["strike", [
+ ["punctuation", "~~"],
+ "foobar",
+ ["punctuation", "~~"]
+ ]],
+ ["strike", [
+ ["punctuation", "~~"],
+ "foo\r\nbar",
+ ["punctuation", "~~"]
+ ]],
+ ["strike", [
+ ["punctuation", "~"],
+ "foobar",
+ ["punctuation", "~"]
+ ]],
+ ["strike", [
+ ["punctuation", "~"],
+ "foo\r\nbar",
+ ["punctuation", "~"]
+ ]],
+
+ ["strike", [
+ ["punctuation", "~"],
+ "foo",
+ ["italic", [
+ ["punctuation", "*"],
+ "bar",
+ ["punctuation", "*"]
+ ]],
+ "baz",
+ ["punctuation", "~"]
+ ]],
+ ["strike", [
+ ["punctuation", "~"],
+ "foo",
+ ["bold", [
+ ["punctuation", "__"],
+ "bar",
+ ["punctuation", "__"]
+ ]],
+ "baz",
+ ["punctuation", "~"]
+ ]],
+ ["strike", [
+ ["punctuation", "~"],
+ "foo",
+ ["url", [
+ "[bar](baz)"
+ ]],
+ ["punctuation", "~"]
+ ]]
+]
+
+----------------------------------------------------
+
+Checks for strike. Also tests for inclusion of bold, italic, and url.