fix sections

Author: Roman Reshetnikov

README.md

@@ -13,7 +13,7 @@ Simply include the `highlight.js` script package in your webpage or node app, lo
 If you're not using a build system and just want to embed this in your webpage:
 
 ```html
-<script type="text/javascript" src="/path/to/highlight.pack.js"></script>
+<script type="text/javascript" src="/path/to/highlightjs/highlight.pack.js"></script>
 <script type="text/javascript" src="/path/to/highlightjs-cshtml-razor/cshtml-razor.js"></script>
 <script type="text/javascript">
     hljs.registerLanguage('cshtml-razor', window.hljsDefineCshtmlRazor);

cshtml-razor.js

@@ -1,6 +1,6 @@
 /*
  * Language: cshtml-razor
- * Requires: xml.js, cs.js
+ * Requires: xml.js, cs.js, css.js, javascript.js
  * Author: Roman Resh <[email protected]>
 */
 
@@ -56,17 +56,6 @@ function getXmlBlocks(hljs, additional_blocks) {
             className: 'meta',
             begin: /<\?xml/, end: /\?>/, relevance: 10
         },
-        {
-            begin: /<\?(php)?/, end: /\?>/,
-            subLanguage: 'php',
-            contains: [
-                { begin: '/\\*', end: '\\*/', skip: true },
-                { begin: 'b"', end: '"', skip: true },
-                { begin: 'b\'', end: '\'', skip: true },
-                hljs.inherit(hljs.APOS_STRING_MODE, { illegal: null, className: null, contains: null, skip: true }),
-                hljs.inherit(hljs.QUOTE_STRING_MODE, { illegal: null, className: null, contains: null, skip: true })
-            ]
-        },
         {
             className: 'tag',
             begin: '<style(?=\\s|>|$)', end: '>',
@@ -101,6 +90,7 @@ function getXmlBlocks(hljs, additional_blocks) {
 }
 function hljsDefineCshtmlRazor(hljs) {
     var SPECIAL_SYMBOL_CLASSNAME = "built_in";
+    var CONTENT_REPLACER = {};
     var closed_brace = {
         begin: "}",
         className: SPECIAL_SYMBOL_CLASSNAME,
@@ -215,6 +205,7 @@ function hljsDefineCshtmlRazor(hljs) {
                 begin: "@\\{",
                 className: SPECIAL_SYMBOL_CLASSNAME
             },
+            CONTENT_REPLACER,
             closed_brace
         ]
     };
@@ -246,6 +237,7 @@ function hljsDefineCshtmlRazor(hljs) {
                     { begin: "{", className: SPECIAL_SYMBOL_CLASSNAME }
                 ]
             },
+            CONTENT_REPLACER,
             {
                 variants: [
                     { begin: "}[\\s]*else\\sif[\\s]*\\([^{]+[\\s]*{" },
@@ -278,7 +270,7 @@ function hljsDefineCshtmlRazor(hljs) {
         end: "}",
         returnBegin: true,
         returnEnd: true,
-        subLanguage: ["cs"],
+        subLanguage: "cs",
         contains: [
             { begin: "@", className: SPECIAL_SYMBOL_CLASSNAME },
             { begin: "try[\\s]*{", subLanguage: "cs" },
@@ -300,32 +292,26 @@ function hljsDefineCshtmlRazor(hljs) {
                     { begin: "{", className: SPECIAL_SYMBOL_CLASSNAME }
                 ]
             },
-            razor_text_block,
+            CONTENT_REPLACER,
             braces,
             closed_brace
         ]
     };
-
-    razor_try_block.contains = razor_try_block.contains.concat(xml_blocks);
     var razor_section_block = {
         begin: section_begin,
         returnBegin: true,
         returnEnd: true,
         end: "}",
-        subLanguage: ['cshtml-razor'],
+        subLanguage: 'cshtml-razor',
         contains: [
             {
                 begin: section_begin,
                 className: SPECIAL_SYMBOL_CLASSNAME
             },
-            razor_code_block,
-            razor_block,
-            razor_try_block,
             braces,
             closed_brace
         ]
     };
-    razor_section_block.contains = razor_section_block.contains.concat(xml_blocks);
     var rasor_await = {
         begin: "@await ",
         returnBegin: true,
@@ -344,7 +330,7 @@ function hljsDefineCshtmlRazor(hljs) {
     };
 
     var result = {
-        aliases: ['cshtml'],
+        aliases: ['cshtml','razor','razor-cshtml'],
         contains: [
             razor_directives,
             razor_block,
@@ -369,10 +355,11 @@ function hljsDefineCshtmlRazor(hljs) {
     };
     result.contains = result.contains.concat(xml_blocks);
 
-    [razor_block, razor_code_block]
+    [razor_block, razor_code_block, razor_try_block]
         .forEach(function(mode) {
             var razorModes = result.contains.filter(function(c) { return c !== mode; });
-            mode.contains.splice.apply(mode.contains, [1, 0].concat(razorModes));
+            var replacerIndex = mode.contains.indexOf(CONTENT_REPLACER);
+            mode.contains.splice.apply(mode.contains, [replacerIndex, 1].concat(razorModes));
         });
 
     return result;

test/index.html

@@ -9,9 +9,9 @@
         <title></title>
         <meta name="description" content="">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <link rel="stylesheet" href="./node_modules/highlightjs/styles/default.css">
-        <script type="text/javascript" src="./node_modules/highlightjs/highlight.pack.js"></script>
-        <script type="text/javascript" src="cshtml-razor.js"></script>
+        <link rel="stylesheet" href="../node_modules/highlightjs/styles/default.css">
+        <script type="text/javascript" src="../node_modules/highlightjs/highlight.pack.js"></script>
+        <script type="text/javascript" src="../cshtml-razor.js"></script>
         <script type="text/javascript">
             hljs.registerLanguage('cshtml-razor', window.hljsDefineCshtmlRazor);
             hljs.initHighlightingOnLoad();
@@ -52,7 +52,13 @@
 [email protected]
 @@escapedat
         </code></pre>
-        <pre><code class="hljs cshtml"></code></pre>
+        <pre><code class="hljs cshtml">
+                @section Footer {
+                    &lt;div class="view"&gt;
+                        footer
+                    &lt;/div&gt;
+                }
+        </code></pre>
         <script src="" async defer></script>
     </body>
 </html>

test/markup/razor-in-razor.expect.txt

@@ -8,4 +8,10 @@
     <span class="hljs-keyword">var</span> inCSharp = <span class="hljs-literal">true</span>;
     </span><span class="cshtml-razor"></span><span class="hljs-built_in">@&lt;text&gt;</span><span class="cshtml-razor">xml</span><span class="hljs-built_in">&lt;/text&gt;</span><span class="cs">
     </span><span class="hljs-tag">&lt;<span class="hljs-name">div</span> <span class="hljs-attr">class</span>=<span class="hljs-string">"foo"</span>&gt;</span><span class="cs">content</span><span class="hljs-tag">&lt;/<span class="hljs-name">div</span>&gt;</span><span class="cs">
+</span><span class="hljs-built_in">}</span>
+
+<span class="cshtml-razor"></span><span class="hljs-built_in">@section Test{</span><span class="cshtml-razor">
+    var inCSharp = true;
+    <span class="cshtml-razor"></span><span class="hljs-built_in">@&lt;text&gt;</span><span class="cshtml-razor">xml</span><span class="hljs-built_in">&lt;/text&gt;</span>
+    <span class="hljs-tag">&lt;<span class="hljs-name">div</span> <span class="hljs-attr">class</span>=<span class="hljs-string">"foo"</span>&gt;</span>content<span class="hljs-tag">&lt;/<span class="hljs-name">div</span>&gt;</span>
 </span><span class="hljs-built_in">}</span>

test/markup/razor-in-razor.txt

@@ -8,4 +8,10 @@
     var inCSharp = true;
     @<text>xml</text>
     <div class="foo">content</div>
+}
+
+@section Test{
+    var inCSharp = true;
+    @<text>xml</text>
+    <div class="foo">content</div>
 }