Skip to content

Commit 8c6b327

Browse files
romanreshromanresh
committed
dist folder, reorganize
1 parent 6476f8b commit 8c6b327

File tree

14 files changed

+76
-7
lines changed

14 files changed

+76
-7
lines changed

‎dist/cshtml-razor.min.js‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
hljs.registerLanguage("cshtml-razor",(()=>{"use strict";var n=n||{}
2+
;function e(n){var e="built_in",s={},a={begin:"}",className:e,endsParent:!0},i={
3+
begin:"{",end:"}",contains:[n.QUOTE_STRING_MODE,"self"]
4+
},r=n.COMMENT("@\\*","\\*@",{relevance:10}),t={begin:"@[A-Za-z0-9\\._:-]+",
5+
returnBegin:!0,end:"(\\r|\\n|<|\\s|\"|')",subLanguage:"csharp",contains:[{
6+
begin:"@",className:e},{begin:"\\[",end:"\\]",skip:!0},{begin:"\\(",end:"\\)",
7+
skip:!0}],returnEnd:!0},g={begin:"[@]{0,1}<text>",returnBegin:!0,end:"</text>",
8+
returnEnd:!0,subLanguage:"cshtml-razor",contains:[{begin:"[@]{0,1}<text>",
9+
className:e},{begin:"</text>",className:e,endsParent:!0}]},c={begin:"@\\(",
10+
end:"\\)",returnBegin:!0,returnEnd:!0,subLanguage:"csharp",contains:[{
11+
begin:"@\\(",className:e},{begin:"\\(",end:"\\)",subLanguage:"csharp",
12+
contains:[n.QUOTE_STRING_MODE,"self",g]},g,{begin:"\\)",className:e,
13+
endsParent:!0}]},b=((n,e)=>{var s={endsWithParent:!0,illegal:/</,relevance:0,
14+
contains:[{className:"attr",begin:"[A-Za-z0-9\\._:-]+",relevance:0},{
15+
begin:/=\s*/,relevance:0,contains:[{className:"string",variants:[{begin:/"/,
16+
end:/"/,contains:e},{begin:/'/,end:/'/,contains:e},{begin:/[^\s"'=<>`]+/}]}]}]}
17+
;return[{className:"meta",begin:"<!DOCTYPE",end:">",relevance:10,contains:[{
18+
begin:"\\[",end:"\\]"}]},n.COMMENT("\x3c!--","--\x3e",{relevance:10}),{
19+
begin:"<\\!\\[CDATA\\[",end:"\\]\\]>",relevance:10},{className:"meta",
20+
begin:/<\?xml/,end:/\?>/,relevance:10},{className:"tag",
21+
begin:"<style(?=\\s|>|$)",end:">",keywords:{name:"style"},contains:[s],starts:{
22+
end:"</style>",returnEnd:!0,subLanguage:["css","xml"]}},{className:"tag",
23+
begin:"<script(?=\\s|>|$)",end:">",keywords:{name:"script"},contains:[s],
24+
starts:{end:"<\/script>",returnEnd:!0,
25+
subLanguage:["actionscript","javascript","handlebars","xml"]}},{className:"tag",
26+
begin:"</?",end:"/?>",contains:[{className:"name",begin:/[^\/><\s]+/,relevance:0
27+
},s]}].concat(e)
28+
})(n,[t,c]),l="^\\s*@(page|model|using|inherits|inject|layout)",u={
29+
begin:l+"[^\\r\\n{\\(]*$",end:"$",returnBegin:!0,returnEnd:!0,contains:[{
30+
begin:l,className:e},{variants:[{begin:"\\r|\\n",endsParent:!0},{
31+
begin:"\\s[^\\r\\n]+",end:"$"},{begin:"$"}],className:"type",endsParent:!0}]
32+
},d={variants:[{begin:"@\\{",end:"}"},{begin:"@code\\s*\\{",end:"}"}],
33+
returnBegin:!0,returnEnd:!0,subLanguage:"csharp",contains:[{
34+
begin:"@(code\\s*)?\\{",className:e},s,{begin:"{",end:"}",contains:["self"],
35+
skip:!0},a]},o={begin:"^\\s*@helper[\\s]*[^{]+[\\s]*{",returnBegin:!0,
36+
returnEnd:!0,end:"}",subLanguage:"cshtml-razor",contains:[{begin:"@helper",
37+
className:e},{begin:"{",className:e},a]},m=[{begin:"@for[\\s]*\\([^{]+[\\s]*{",
38+
end:"}"},{begin:"@if[\\s]*\\([^{]+[\\s]*{",end:"}"},{
39+
begin:"@switch[\\s]*\\([^{]+[\\s]*{",end:"}"},{
40+
begin:"@while[\\s]*\\([^{]+[\\s]*{",end:"}"},{
41+
begin:"@using[\\s]*\\([^{]+[\\s]*{",end:"}"},{
42+
begin:"@lock[\\s]*\\([^{]+[\\s]*{",end:"}"},{
43+
begin:"@foreach[\\s]*\\([^{]+[\\s]*{",end:"}"}],p={variants:m,returnBegin:!0,
44+
returnEnd:!0,subLanguage:"csharp",contains:[{variants:m.map((n=>({begin:n.begin
45+
}))),returnBegin:!0,contains:[{begin:"@",className:e},{variants:m.map((n=>({
46+
begin:n.begin.substr(1,n.begin.length-2)}))),subLanguage:"csharp"},{begin:"{",
47+
className:e}]},s,{variants:[{begin:"}[\\s]*else\\sif[\\s]*\\([^{]+[\\s]*{"},{
48+
begin:"}[\\s]*else[\\s]*{"}],returnBegin:!0,contains:[{begin:"}",className:e},{
49+
variants:[{begin:"[\\s]*else\\sif[\\s]*\\([^{]+[\\s]*{"},{
50+
begin:"[\\s]*else[\\s]*"}],subLanguage:"csharp"},{begin:"{",className:e}]},i,a]
51+
},N={begin:"@try[\\s]*{",end:"}",returnBegin:!0,returnEnd:!0,
52+
subLanguage:"csharp",contains:[{begin:"@",className:e},{begin:"try[\\s]*{",
53+
subLanguage:"csharp"},{variants:[{begin:"}[\\s]*catch[\\s]*\\([^\\)]+\\)[\\s]*{"
54+
},{begin:"}[\\s]*finally[\\s]*{"}],returnBegin:!0,contains:[{begin:"}",
55+
className:e},{variants:[{begin:"[\\s]*catch[\\s]*\\([^\\)]+\\)[\\s]*"},{
56+
begin:"[\\s]*finally[\\s]*"}],subLanguage:"csharp"},{begin:"{",className:e}]
57+
},s,i,a]},h="@section[\\s]+[a-zA-Z0-9]+[\\s]*{",v={
58+
aliases:["cshtml","razor","razor-cshtml"],contains:[u,o,d,p,{begin:h,
59+
returnBegin:!0,returnEnd:!0,end:"}",subLanguage:"cshtml-razor",contains:[{
60+
begin:h,className:e},i,a]},{begin:"@await ",returnBegin:!0,subLanguage:"csharp",
61+
end:"(\\r|\\n|<|\\s)",contains:[{begin:"@await ",className:e},{
62+
begin:"[<\\r\\n]",endsParent:!0}]},N,{variants:[{begin:"@@"},{begin:"[a-zA-Z]+@"
63+
}],skip:!0},g,r,c,{className:"meta",begin:"<!DOCTYPE",end:">",relevance:10,
64+
contains:[{begin:"\\[",end:"\\]"}]},{begin:"<\\!\\[CDATA\\[",end:"\\]\\]>",
65+
relevance:10}]};return v.contains=v.contains.concat(b),[d,p,N].forEach((n=>{
66+
var e=v.contains.filter((e=>e!==n)),a=n.contains.indexOf(s)
67+
;n.contains.splice.apply(n.contains,[a,1].concat(e))})),v}return n.exports=n=>{
68+
n.registerLanguage("cshtml-razor",e)
69+
},n.exports.definer=e,n.exports.definer||n.exports})());

‎package-lock.json‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "highlightjs-cshtml-razor",
33
"version": "2.1.0",
44
"description": "highlight.js syntax definition for ASP.NET Razor CSHTML language",
5-
"main": "src/cshtml-razor.js",
5+
"main": "src/languages/cshtml-razor.js",
66
"scripts": {
77
"test": "./node_modules/.bin/mocha --reporter spec"
88
},

src/cshtml-razor.js renamed to src/languages/cshtml-razor.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Language: cshtml-razor
3-
* Requires: xml.js, cs.js, css.js, javascript.js
3+
* Requires: xml.js, csharp.js, css.js, javascript.js
44
* Author: Roman Resh <[email protected]>
55
*/
66

test/detect.txt renamed to test/detect/cshtml-razor/default.txt

File renamed without changes.

‎test/index.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var promisify = require("util").promisify;
33
let path = require('path');
44
let hljs = require("highlight.js");
55
const fs = require("fs");
6-
let hljsDefineCshtmlRazor = require("../src/cshtml-razor");
6+
let hljsDefineCshtmlRazor = require("../src/languages/cshtml-razor");
77

88
const readdir = promisify(fs.readdir),
99
readFile = promisify(fs.readFile);
@@ -13,10 +13,10 @@ describe("CSHTML Razor Tests", () => {
1313
hljsDefineCshtmlRazor(hljs);
1414
});
1515
it("should generate correct markup", async () => {
16-
var files = await readdir(path.join(__dirname, "markup"));
16+
var files = await readdir(path.join(__dirname, "markup", "cshtml-razor"));
1717
files = files.filter(f => !f.includes(".expect."));
1818
for(var f of files) {
19-
let fn = path.join(__dirname, "markup", f);
19+
let fn = path.join(__dirname, "markup", "cshtml-razor", f);
2020
let expectFn = fn.replace(".txt", ".expect.txt");
2121
var code = await readFile(fn, "utf-8");
2222
var exp = await readFile(expectFn, "utf-8");
@@ -25,7 +25,7 @@ describe("CSHTML Razor Tests", () => {
2525
}
2626
});
2727
it("should be detected correctly", async () => {
28-
var code = await readFile(path.join(__dirname, "detect.txt"), "utf-8");
28+
var code = await readFile(path.join(__dirname, 'detect', "cshtml-razor", "default.txt"), "utf-8");
2929
var actual = hljs.highlightAuto(code).language;
3030
actual.should.eql("cshtml-razor");
3131
});

test/markup/code-block-multiline.expect.txt renamed to test/markup/cshtml-razor/code-block-multiline.expect.txt

File renamed without changes.

test/markup/code-block-multiline.txt renamed to test/markup/cshtml-razor/code-block-multiline.txt

File renamed without changes.

test/markup/if-else-block.expect.txt renamed to test/markup/cshtml-razor/if-else-block.expect.txt

File renamed without changes.

test/markup/if-else-block.txt renamed to test/markup/cshtml-razor/if-else-block.txt

File renamed without changes.

0 commit comments

Comments
 (0)