Skip to content

Commit 8526a1c

Browse files
romanreshromanresh
authored
Merge pull request #16 from romanresh/master
Up hljs version
2 parents 19a9048 + 936e525 commit 8526a1c

File tree

8 files changed

+45
-39
lines changed

8 files changed

+45
-39
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
# Changelog
22
All notable changes to this project will be documented in this file.
33

4+
## [2.0.0] - 2020-09-28
5+
### Added
6+
- Support the @code directives
7+
### Changed
8+
- Update dependency on highlight.js (support 10.0)
9+
410
## [1.2.0] - 2019-09-13
511
### Added
612
- Support the @pages directive

‎cshtml-razor.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ function hljsDefineCshtmlRazor(hljs) {
117117
begin: '@[A-Za-z0-9\\._:-]+',
118118
returnBegin: true,
119119
end: "(\\r|\\n|<|\\s|\"|')",
120-
subLanguage: 'cs',
120+
subLanguage: 'csharp',
121121
contains: [
122122
{
123123
begin: '@',
@@ -165,7 +165,7 @@ function hljsDefineCshtmlRazor(hljs) {
165165
end: "\\)",
166166
returnBegin: true,
167167
returnEnd: true,
168-
subLanguage: 'cs',
168+
subLanguage: 'csharp',
169169
contains: [
170170
{
171171
begin: "@\\(",
@@ -174,7 +174,7 @@ function hljsDefineCshtmlRazor(hljs) {
174174
{
175175
begin: "\\(",
176176
end: "\\)",
177-
subLanguage: 'cs',
177+
subLanguage: 'csharp',
178178
contains: [hljs.QUOTE_STRING_MODE, 'self', razor_text_block]
179179
},
180180
razor_text_block,
@@ -215,7 +215,7 @@ function hljsDefineCshtmlRazor(hljs) {
215215
variants: cs_code_block_variants,
216216
returnBegin: true,
217217
returnEnd: true,
218-
subLanguage: 'cs',
218+
subLanguage: 'csharp',
219219
contains: [
220220
{
221221
begin: "@(code\\s*)?\\{",
@@ -251,7 +251,7 @@ function hljsDefineCshtmlRazor(hljs) {
251251
variants: razor_code_block_variants,
252252
returnBegin: true,
253253
returnEnd: true,
254-
subLanguage: 'cs',
254+
subLanguage: 'csharp',
255255
contains: [
256256
{
257257
variants: razor_code_block_variants.map(function (v) { return { begin: v.begin }; }),
@@ -260,7 +260,7 @@ function hljsDefineCshtmlRazor(hljs) {
260260
{ begin: "@", className: SPECIAL_SYMBOL_CLASSNAME },
261261
{
262262
variants: razor_code_block_variants.map(function (v) { return { begin: v.begin.substr(1, v.begin.length - 2) }; }),
263-
subLanguage: 'cs'
263+
subLanguage: 'csharp'
264264
},
265265
{ begin: "{", className: SPECIAL_SYMBOL_CLASSNAME }
266266
]
@@ -279,7 +279,7 @@ function hljsDefineCshtmlRazor(hljs) {
279279
{ begin: "[\\s]*else\\sif[\\s]*\\([^{]+[\\s]*{" },
280280
{ begin: "[\\s]*else[\\s]*" }
281281
],
282-
subLanguage: 'cs'
282+
subLanguage: 'csharp'
283283
},
284284
{
285285
begin: "{",
@@ -296,10 +296,10 @@ function hljsDefineCshtmlRazor(hljs) {
296296
end: "}",
297297
returnBegin: true,
298298
returnEnd: true,
299-
subLanguage: 'cs',
299+
subLanguage: 'csharp',
300300
contains: [
301301
{ begin: "@", className: SPECIAL_SYMBOL_CLASSNAME },
302-
{ begin: "try[\\s]*{", subLanguage: 'cs' },
302+
{ begin: "try[\\s]*{", subLanguage: 'csharp' },
303303
{
304304
variants: [
305305
{ begin: "}[\\s]*catch[\\s]*\\([^\\)]+\\)[\\s]*{" },
@@ -313,7 +313,7 @@ function hljsDefineCshtmlRazor(hljs) {
313313
{ begin: "[\\s]*catch[\\s]*\\([^\\)]+\\)[\\s]*", },
314314
{ begin: "[\\s]*finally[\\s]*", },
315315
],
316-
subLanguage: 'cs'
316+
subLanguage: 'csharp'
317317
},
318318
{ begin: "{", className: SPECIAL_SYMBOL_CLASSNAME }
319319
]
@@ -342,7 +342,7 @@ function hljsDefineCshtmlRazor(hljs) {
342342
var rasor_await = {
343343
begin: "@await ",
344344
returnBegin: true,
345-
subLanguage: 'cs',
345+
subLanguage: 'csharp',
346346
end: "(\\r|\\n|<|\\s)",
347347
contains: [
348348
{

‎package-lock.json‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "highlightjs-cshtml-razor",
3-
"version": "1.3.0",
3+
"version": "2.0.0",
44
"description": "highlight.js syntax definition for ASP.NET Razor CSHTML language",
55
"main": "cshtml-razor.js",
66
"scripts": {
@@ -33,7 +33,7 @@
3333
},
3434
"homepage": "https://github.com/highlightjs/highlightjs-cshtml-razor#readme",
3535
"devDependencies": {
36-
"highlight.js": "^9.15.10",
36+
"highlight.js": "^10.0.0",
3737
"mocha": "^5.2.0",
3838
"should": "^13.2.3"
3939
},

‎test/markup/code-block-multiline.expect.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
before
2-
<span class="cs"></span><span class="hljs-built_in">@{</span><span class="cs">
2+
<span class="hljs-built_in">@{</span><span class="csharp">
33
<span class="hljs-keyword">var</span> inCSharp = <span class="hljs-literal">true</span>;
4-
</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">
4+
</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">
55
</span><span class="hljs-built_in">}</span>
66
after
7-
<span class="cs"></span><span class="hljs-built_in">@{</span><span class="cs">
7+
<span class="hljs-built_in">@{</span><span class="csharp">
88
<span class="hljs-keyword">var</span> inCSharp = <span class="hljs-literal">true</span>;
9-
</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">
9+
</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">
1010
</span><span class="hljs-built_in">}</span>
1111

1212

1313
code:
14-
<span class="cs"></span><span class="hljs-built_in">@code {</span><span class="cs">
14+
<span class="hljs-built_in">@code {</span><span class="csharp">
1515
<span class="hljs-keyword">var</span> inCSharp = <span class="hljs-literal">true</span>;
16-
</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">
16+
</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">
1717
</span><span class="hljs-built_in">}</span>

‎test/markup/if-else-block.expect.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
before
2-
<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">
2+
<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">
33
block
4-
</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">
4+
</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">
55
block
66
</span><span class="hljs-built_in">}</span>
77
after

‎test/markup/inline.expect.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
Hello <span class="cs"></span><span class="hljs-built_in">@</span><span class="cs">owner</span> from html
2-
Hello <span class="cs"></span><span class="hljs-built_in">@</span><span class="cs">owner[<span class="hljs-string">"test"</span>]</span> from html
3-
Hello <span class="cs"></span><span class="hljs-built_in">@</span><span class="cs">owner.test</span> from html
4-
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>
5-
Hello <span class="cs"></span><span class="hljs-built_in">@</span><span class="cs">owner</span>
1+
Hello <span class="hljs-built_in">@</span><span class="csharp">owner</span> from html
2+
Hello <span class="hljs-built_in">@</span><span class="csharp">owner[<span class="hljs-string">&quot;test&quot;</span>]</span> from html
3+
Hello <span class="hljs-built_in">@</span><span class="csharp">owner.test</span> from html
4+
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>
5+
Hello <span class="hljs-built_in">@</span><span class="csharp">owner</span>
66
from html
77
[email protected]
88
@@escapedat

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
<span class="cs"></span><span class="hljs-built_in">@{</span><span class="cs">
1+
<span class="hljs-built_in">@{</span><span class="csharp">
22
<span class="hljs-keyword">var</span> inCSharp = <span class="hljs-literal">true</span>;
3-
</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">
4-
</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">
3+
</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">
4+
</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">
55
</span><span class="hljs-built_in">}</span>
66

7-
<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">
7+
<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">
88
<span class="hljs-keyword">var</span> inCSharp = <span class="hljs-literal">true</span>;
9-
</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">
10-
</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">
9+
</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">
10+
</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">
1111
</span><span class="hljs-built_in">}</span>
1212

13-
<span class="cshtml-razor"></span><span class="hljs-built_in">@section Test{</span><span class="cshtml-razor">
13+
<span class="hljs-built_in">@section Test{</span><span class="cshtml-razor">
1414
var inCSharp = true;
15-
<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>
16-
<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>
15+
<span class="hljs-built_in">@&lt;text&gt;</span><span class="cshtml-razor">xml</span><span class="hljs-built_in">&lt;/text&gt;</span>
16+
<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>
1717
</span><span class="hljs-built_in">}</span>

0 commit comments

Comments
 (0)