Merge pull request #16 from romanresh/master

Up hljs version

Author: romanresh

Diff for: CHANGELOG.md

@@ -1,6 +1,12 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [2.0.0] - 2020-09-28
+### Added
+- Support the @code directives
+### Changed
+- Update dependency on highlight.js (support 10.0)
+
 ## [1.2.0] - 2019-09-13
 ### Added
 - Support the @pages directive

Diff for: cshtml-razor.js

@@ -117,7 +117,7 @@ function hljsDefineCshtmlRazor(hljs) {
         begin: '@[A-Za-z0-9\\._:-]+',
         returnBegin: true,
         end: "(\\r|\\n|<|\\s|\"|')",
-        subLanguage: 'cs',
+        subLanguage: 'csharp',
         contains: [
             {
                 begin: '@',
@@ -165,7 +165,7 @@ function hljsDefineCshtmlRazor(hljs) {
         end: "\\)",
         returnBegin: true,
         returnEnd: true,
-        subLanguage: 'cs',
+        subLanguage: 'csharp',
         contains: [
             {
                 begin: "@\\(",
@@ -174,7 +174,7 @@ function hljsDefineCshtmlRazor(hljs) {
             {
                 begin: "\\(",
                 end: "\\)",
-                subLanguage: 'cs',
+                subLanguage: 'csharp',
                 contains: [hljs.QUOTE_STRING_MODE, 'self', razor_text_block]
             },
             razor_text_block,
@@ -215,7 +215,7 @@ function hljsDefineCshtmlRazor(hljs) {
         variants: cs_code_block_variants,
         returnBegin: true,
         returnEnd: true,
-        subLanguage: 'cs',
+        subLanguage: 'csharp',
         contains: [
             {
                 begin: "@(code\\s*)?\\{",
@@ -251,7 +251,7 @@ function hljsDefineCshtmlRazor(hljs) {
         variants: razor_code_block_variants,
         returnBegin: true,
         returnEnd: true,
-        subLanguage: 'cs',
+        subLanguage: 'csharp',
         contains: [
             {
                 variants: razor_code_block_variants.map(function (v) { return { begin: v.begin }; }),
@@ -260,7 +260,7 @@ function hljsDefineCshtmlRazor(hljs) {
                     { begin: "@", className: SPECIAL_SYMBOL_CLASSNAME },
                     {
                         variants: razor_code_block_variants.map(function (v) { return { begin: v.begin.substr(1, v.begin.length - 2) }; }),
-                        subLanguage: 'cs'
+                        subLanguage: 'csharp'
                     },
                     { begin: "{", className: SPECIAL_SYMBOL_CLASSNAME }
                 ]
@@ -279,7 +279,7 @@ function hljsDefineCshtmlRazor(hljs) {
                             { begin: "[\\s]*else\\sif[\\s]*\\([^{]+[\\s]*{" },
                             { begin: "[\\s]*else[\\s]*" }
                         ],
-                        subLanguage: 'cs'
+                        subLanguage: 'csharp'
                     },
                     {
                         begin: "{",
@@ -296,10 +296,10 @@ function hljsDefineCshtmlRazor(hljs) {
         end: "}",
         returnBegin: true,
         returnEnd: true,
-        subLanguage: 'cs',
+        subLanguage: 'csharp',
         contains: [
             { begin: "@", className: SPECIAL_SYMBOL_CLASSNAME },
-            { begin: "try[\\s]*{", subLanguage: 'cs' },
+            { begin: "try[\\s]*{", subLanguage: 'csharp' },
             {
                 variants: [
                     { begin: "}[\\s]*catch[\\s]*\\([^\\)]+\\)[\\s]*{" },
@@ -313,7 +313,7 @@ function hljsDefineCshtmlRazor(hljs) {
                             { begin: "[\\s]*catch[\\s]*\\([^\\)]+\\)[\\s]*", },
                             { begin: "[\\s]*finally[\\s]*", },
                         ],
-                        subLanguage: 'cs'
+                        subLanguage: 'csharp'
                     },
                     { begin: "{", className: SPECIAL_SYMBOL_CLASSNAME }
                 ]
@@ -342,7 +342,7 @@ function hljsDefineCshtmlRazor(hljs) {
     var rasor_await = {
         begin: "@await ",
         returnBegin: true,
-        subLanguage: 'cs',
+        subLanguage: 'csharp',
         end: "(\\r|\\n|<|\\s)",
         contains: [
             {

Diff for: package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "highlightjs-cshtml-razor",
-  "version": "1.3.0",
+  "version": "2.0.0",
   "description": "highlight.js syntax definition for ASP.NET Razor CSHTML language",
   "main": "cshtml-razor.js",
   "scripts": {
@@ -33,7 +33,7 @@
   },
   "homepage": "https://github.com/highlightjs/highlightjs-cshtml-razor#readme",
   "devDependencies": {
-    "highlight.js": "^9.15.10",
+    "highlight.js": "^10.0.0",
     "mocha": "^5.2.0",
     "should": "^13.2.3"
   },

Diff for: package.json

@@ -1,17 +1,17 @@
 before
-<span class="cs"></span><span class="hljs-built_in">@{</span><span class="cs">
+<span class="hljs-built_in">@{</span><span class="csharp">
     <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-built_in">&lt;text&gt;</span><span class="cshtml-razor">xml</span><span class="hljs-built_in">&lt;/text&gt;</span><span class="csharp">
 </span><span class="hljs-built_in">}</span>
 after
-<span class="cs"></span><span class="hljs-built_in">@{</span><span class="cs">
+<span class="hljs-built_in">@{</span><span class="csharp">
     <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-built_in">&lt;text&gt;</span><span class="cshtml-razor">xml</span><span class="hljs-built_in">&lt;/text&gt;</span><span class="csharp">
 </span><span class="hljs-built_in">}</span>
 
 
 code:
-<span class="cs"></span><span class="hljs-built_in">@code {</span><span class="cs">
+<span class="hljs-built_in">@code {</span><span class="csharp">
     <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-built_in">&lt;text&gt;</span><span class="cshtml-razor">xml</span><span class="hljs-built_in">&lt;/text&gt;</span><span class="csharp">
 </span><span class="hljs-built_in">}</span>

Diff for: test/markup/code-block-multiline.expect.txt

@@ -1,7 +1,7 @@
 before
-<span class="cs"></span><span class="hljs-built_in">@</span><span class="cs"><span class="hljs-keyword">if</span>(<span class="hljs-literal">true</span>) </span><span class="hljs-built_in">{</span><span class="cs">
+<span class="hljs-built_in">@</span><span class="csharp"><span class="hljs-keyword">if</span>(<span class="hljs-literal">true</span>) </span><span class="hljs-built_in">{</span><span class="csharp">
     block
-</span><span class="hljs-built_in">}</span><span class="cs"> <span class="hljs-keyword">else</span> </span><span class="hljs-built_in">{</span><span class="cs">
+</span><span class="hljs-built_in">}</span><span class="csharp"> <span class="hljs-keyword">else</span> </span><span class="hljs-built_in">{</span><span class="csharp">
     block
 </span><span class="hljs-built_in">}</span>
 after

Diff for: test/markup/if-else-block.expect.txt

@@ -1,8 +1,8 @@
-Hello <span class="cs"></span><span class="hljs-built_in">@</span><span class="cs">owner</span> from html
-Hello <span class="cs"></span><span class="hljs-built_in">@</span><span class="cs">owner[<span class="hljs-string">"test"</span>]</span> from html
-Hello <span class="cs"></span><span class="hljs-built_in">@</span><span class="cs">owner.test</span> from html
-Hello <span class="cs"></span><span class="hljs-built_in">@</span><span class="cs">owner</span><span class="hljs-tag">&lt;<span class="hljs-name">b</span>&gt;</span>from html<span class="hljs-tag">&lt;/<span class="hljs-name">b</span>&gt;</span>
-Hello <span class="cs"></span><span class="hljs-built_in">@</span><span class="cs">owner</span>
+Hello <span class="hljs-built_in">@</span><span class="csharp">owner</span> from html
+Hello <span class="hljs-built_in">@</span><span class="csharp">owner[<span class="hljs-string">&quot;test&quot;</span>]</span> from html
+Hello <span class="hljs-built_in">@</span><span class="csharp">owner.test</span> from html
+Hello <span class="hljs-built_in">@</span><span class="csharp">owner</span><span class="hljs-tag">&lt;<span class="hljs-name">b</span>&gt;</span>from html<span class="hljs-tag">&lt;/<span class="hljs-name">b</span>&gt;</span>
+Hello <span class="hljs-built_in">@</span><span class="csharp">owner</span>
 from html
 [email protected]
 @@escapedat

Diff for: test/markup/inline.expect.txt

@@ -1,17 +1,17 @@
-<span class="cs"></span><span class="hljs-built_in">@{</span><span class="cs">
+<span class="hljs-built_in">@{</span><span class="csharp">
     <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">@&lt;text&gt;</span><span class="cshtml-razor">xml</span><span class="hljs-built_in">&lt;/text&gt;</span><span class="csharp">
+    </span><span class="hljs-tag">&lt;<span class="hljs-name">div</span> <span class="hljs-attr">class</span>=<span class="hljs-string">&quot;foo&quot;</span>&gt;</span><span class="csharp">content</span><span class="hljs-tag">&lt;/<span class="hljs-name">div</span>&gt;</span><span class="csharp">
 </span><span class="hljs-built_in">}</span>
 
-<span class="cs"></span><span class="hljs-built_in">@</span><span class="cs"><span class="hljs-keyword">if</span>(<span class="hljs-literal">true</span>)</span><span class="hljs-built_in">{</span><span class="cs">
+<span class="hljs-built_in">@</span><span class="csharp"><span class="hljs-keyword">if</span>(<span class="hljs-literal">true</span>)</span><span class="hljs-built_in">{</span><span class="csharp">
     <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">@&lt;text&gt;</span><span class="cshtml-razor">xml</span><span class="hljs-built_in">&lt;/text&gt;</span><span class="csharp">
+    </span><span class="hljs-tag">&lt;<span class="hljs-name">div</span> <span class="hljs-attr">class</span>=<span class="hljs-string">&quot;foo&quot;</span>&gt;</span><span class="csharp">content</span><span class="hljs-tag">&lt;/<span class="hljs-name">div</span>&gt;</span><span class="csharp">
 </span><span class="hljs-built_in">}</span>
 
-<span class="cshtml-razor"></span><span class="hljs-built_in">@section Test{</span><span class="cshtml-razor">
+<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 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">&quot;foo&quot;</span>&gt;</span>content<span class="hljs-tag">&lt;/<span class="hljs-name">div</span>&gt;</span>
 </span><span class="hljs-built_in">}</span>