fix(markdown) Images with empty alt or links with empty text (#3233)

highlightjs · Jun 14, 2021 · 2dd87a6 · 2dd87a6
1 parent 40b6a8a
commit 2dd87a6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,7 @@
 
 Grammars:
 
+- fix(markdown) Images with empty alt or links with empty text (#3233) [Josh Goebel][]
 - enh(powershell) added `pwsh` alias (#3236) [tebeco][]
 - fix(r) fix bug highlighting examples in doc comments [Konrad Rudolph][]
 - fix(python) identifiers starting with underscore not highlighted (#3221) [Antoine Lambert][]

diff --git a/src/languages/markdown.js b/src/languages/markdown.js
@@ -105,12 +105,16 @@ export default function(hljs) {
       },
       // whatever else, lower relevance (might not be a link at all)
       {
-        begin: /\[.+?\]\(.*?\)/,
+        begin: /\[.*?\]\(.*?\)/,
         relevance: 0
       }
     ],
     returnBegin: true,
     contains: [
+      {
+        // empty strings for alt or link text
+        match: /\[(?=\])/
+      },
       {
         className: 'string',
         relevance: 0,

diff --git a/test/markup/markdown/links.expect.txt b/test/markup/markdown/links.expect.txt
@@ -0,0 +1,4 @@
+![](<span class="hljs-link">https://example.com</span>)
+[](<span class="hljs-link">https://example.com</span>)
+![<span class="hljs-string">alt</span>](<span class="hljs-link">https://example.com</span>)
+[<span class="hljs-string">text</span>](<span class="hljs-link">https://example.com</span>)
diff --git a/test/markup/markdown/links.txt b/test/markup/markdown/links.txt
@@ -0,0 +1,4 @@
+![](https://example.com)
+[](https://example.com)
+![alt](https://example.com)
+[text](https://example.com)