paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 06:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

markdown: Update regex for strikethrough.

Browse Source 
This uses the correct regex for strikethrough. Also, added
a test to make sure that strikethrough works when it contains
link with whitespace.

Fixes #7596.
This commit is contained in:
akashnimare
2017-12-22 17:21:08 +05:30
committed by showell
parent dd406e87e9
commit ef51a39552
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/fixtures/markdown_test_cases.json
View File

@@ -188,6 +188,12 @@
"expected_output": "<p>I <del> like software </del> love hardware</p>", "expected_output": "<p>I <del> like software </del> love hardware</p>",
"text_content": "I like software love hardware" "text_content": "I like software love hardware"
}, },
{
"name": "strikthrough_link",
"input": "~~test http://xx.xx link~~",
"expected_output": "<p><del>test <a href=\"http://xx.xx\" target=\"_blank\" title=\"http://xx.xx\">http://xx.xx</a> link</del></p>",
"text_content": "test http://xx.xx link"
},
{ {
"name": "underscore_disabled", "name": "underscore_disabled",
"input": "_foo_", "input": "_foo_",

2
zerver/lib/bugdown/__init__.py
View File

@@ -1395,7 +1395,7 @@ class Bugdown(markdown.Extension):
# Custom strikethrough syntax: ~~foo~~ # Custom strikethrough syntax: ~~foo~~
md.inlinePatterns.add('del', md.inlinePatterns.add('del',
markdown.inlinepatterns.SimpleTagPattern( markdown.inlinepatterns.SimpleTagPattern(
r'(?<!~)(\~\~)([^~{0}\n]+?)\2(?!~)', 'del'), '>strong') r'(?<!~)(\~\~)([^~\n]+?)(\~\~)(?!~)', 'del'), '>strong')
# Text inside ** must start and end with a word character # Text inside ** must start and end with a word character
# it need for things like "const char *x = (char *)y" # it need for things like "const char *x = (char *)y"