(javascript) fix jsx self-closing tag issues

highlightjs · Dec 13, 2019 · b0fe526 · b0fe526
1 parent 40ef5c4
commit b0fe526
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/languages/javascript.js b/src/languages/javascript.js
@@ -188,17 +188,23 @@ function(hljs) {
             skip: true,
           },
           { // E4X / JSX
-            begin: /</, end: /(\/[A-Za-z0-9\\._:-]+|[A-Za-z0-9\\._:-]+\/)>/,
+            className: 'jsx',
+            begin: /<[A-Za-z0-9\\._:-]+/, end: /(\/[A-Za-z0-9\\._:-]+\/?)>/,
             subLanguage: 'xml',
             contains: [
+              // self-closing tag
               { begin: /<[A-Za-z0-9\\._:-]+\s*\/>/, skip: true },
+              // manually closed tag
               {
-                begin: /<[A-Za-z0-9\\._:-]+/, end: /(\/[A-Za-z0-9\\._:-]+|[A-Za-z0-9\\._:-]+\/)>/, skip: true,
+                begin: /<[A-Za-z0-9\\._:-]+/, end: /(\/[A-Za-z0-9\\._:-]+\/?)>/, skip: true,
                 contains: [
                   { begin: /<[A-Za-z0-9\\._:-]+\s*\/>/, skip: true },
                   'self'
                 ]
-              }
+              },
+              // it's possible our beginning JSX tag is actually self closing tag,
+              // so we need to allow for that possibility
+              { begin: /\/>/, skip: true, endsParent: true},
             ]
           }
         ],