dist folder, reorganize

Author: romanresh

dist/cshtml-razor.min.js

@@ -0,0 +1,69 @@
+hljs.registerLanguage("cshtml-razor",(()=>{"use strict";var n=n||{}
+;function e(n){var e="built_in",s={},a={begin:"}",className:e,endsParent:!0},i={
+begin:"{",end:"}",contains:[n.QUOTE_STRING_MODE,"self"]
+},r=n.COMMENT("@\\*","\\*@",{relevance:10}),t={begin:"@[A-Za-z0-9\\._:-]+",
+returnBegin:!0,end:"(\\r|\\n|<|\\s|\"|')",subLanguage:"csharp",contains:[{
+begin:"@",className:e},{begin:"\\[",end:"\\]",skip:!0},{begin:"\\(",end:"\\)",
+skip:!0}],returnEnd:!0},g={begin:"[@]{0,1}<text>",returnBegin:!0,end:"</text>",
+returnEnd:!0,subLanguage:"cshtml-razor",contains:[{begin:"[@]{0,1}<text>",
+className:e},{begin:"</text>",className:e,endsParent:!0}]},c={begin:"@\\(",
+end:"\\)",returnBegin:!0,returnEnd:!0,subLanguage:"csharp",contains:[{
+begin:"@\\(",className:e},{begin:"\\(",end:"\\)",subLanguage:"csharp",
+contains:[n.QUOTE_STRING_MODE,"self",g]},g,{begin:"\\)",className:e,
+endsParent:!0}]},b=((n,e)=>{var s={endsWithParent:!0,illegal:/</,relevance:0,
+contains:[{className:"attr",begin:"[A-Za-z0-9\\._:-]+",relevance:0},{
+begin:/=\s*/,relevance:0,contains:[{className:"string",variants:[{begin:/"/,
+end:/"/,contains:e},{begin:/'/,end:/'/,contains:e},{begin:/[^\s"'=<>`]+/}]}]}]}
+;return[{className:"meta",begin:"<!DOCTYPE",end:">",relevance:10,contains:[{
+begin:"\\[",end:"\\]"}]},n.COMMENT("\x3c!--","--\x3e",{relevance:10}),{
+begin:"<\\!\\[CDATA\\[",end:"\\]\\]>",relevance:10},{className:"meta",
+begin:/<\?xml/,end:/\?>/,relevance:10},{className:"tag",
+begin:"<style(?=\\s|>|$)",end:">",keywords:{name:"style"},contains:[s],starts:{
+end:"</style>",returnEnd:!0,subLanguage:["css","xml"]}},{className:"tag",
+begin:"<script(?=\\s|>|$)",end:">",keywords:{name:"script"},contains:[s],
+starts:{end:"<\/script>",returnEnd:!0,
+subLanguage:["actionscript","javascript","handlebars","xml"]}},{className:"tag",
+begin:"</?",end:"/?>",contains:[{className:"name",begin:/[^\/><\s]+/,relevance:0
+},s]}].concat(e)
+})(n,[t,c]),l="^\\s*@(page|model|using|inherits|inject|layout)",u={
+begin:l+"[^\\r\\n{\\(]*$",end:"$",returnBegin:!0,returnEnd:!0,contains:[{
+begin:l,className:e},{variants:[{begin:"\\r|\\n",endsParent:!0},{
+begin:"\\s[^\\r\\n]+",end:"$"},{begin:"$"}],className:"type",endsParent:!0}]
+},d={variants:[{begin:"@\\{",end:"}"},{begin:"@code\\s*\\{",end:"}"}],
+returnBegin:!0,returnEnd:!0,subLanguage:"csharp",contains:[{
+begin:"@(code\\s*)?\\{",className:e},s,{begin:"{",end:"}",contains:["self"],
+skip:!0},a]},o={begin:"^\\s*@helper[\\s]*[^{]+[\\s]*{",returnBegin:!0,
+returnEnd:!0,end:"}",subLanguage:"cshtml-razor",contains:[{begin:"@helper",
+className:e},{begin:"{",className:e},a]},m=[{begin:"@for[\\s]*\\([^{]+[\\s]*{",
+end:"}"},{begin:"@if[\\s]*\\([^{]+[\\s]*{",end:"}"},{
+begin:"@switch[\\s]*\\([^{]+[\\s]*{",end:"}"},{
+begin:"@while[\\s]*\\([^{]+[\\s]*{",end:"}"},{
+begin:"@using[\\s]*\\([^{]+[\\s]*{",end:"}"},{
+begin:"@lock[\\s]*\\([^{]+[\\s]*{",end:"}"},{
+begin:"@foreach[\\s]*\\([^{]+[\\s]*{",end:"}"}],p={variants:m,returnBegin:!0,
+returnEnd:!0,subLanguage:"csharp",contains:[{variants:m.map((n=>({begin:n.begin
+}))),returnBegin:!0,contains:[{begin:"@",className:e},{variants:m.map((n=>({
+begin:n.begin.substr(1,n.begin.length-2)}))),subLanguage:"csharp"},{begin:"{",
+className:e}]},s,{variants:[{begin:"}[\\s]*else\\sif[\\s]*\\([^{]+[\\s]*{"},{
+begin:"}[\\s]*else[\\s]*{"}],returnBegin:!0,contains:[{begin:"}",className:e},{
+variants:[{begin:"[\\s]*else\\sif[\\s]*\\([^{]+[\\s]*{"},{
+begin:"[\\s]*else[\\s]*"}],subLanguage:"csharp"},{begin:"{",className:e}]},i,a]
+},N={begin:"@try[\\s]*{",end:"}",returnBegin:!0,returnEnd:!0,
+subLanguage:"csharp",contains:[{begin:"@",className:e},{begin:"try[\\s]*{",
+subLanguage:"csharp"},{variants:[{begin:"}[\\s]*catch[\\s]*\\([^\\)]+\\)[\\s]*{"
+},{begin:"}[\\s]*finally[\\s]*{"}],returnBegin:!0,contains:[{begin:"}",
+className:e},{variants:[{begin:"[\\s]*catch[\\s]*\\([^\\)]+\\)[\\s]*"},{
+begin:"[\\s]*finally[\\s]*"}],subLanguage:"csharp"},{begin:"{",className:e}]
+},s,i,a]},h="@section[\\s]+[a-zA-Z0-9]+[\\s]*{",v={
+aliases:["cshtml","razor","razor-cshtml"],contains:[u,o,d,p,{begin:h,
+returnBegin:!0,returnEnd:!0,end:"}",subLanguage:"cshtml-razor",contains:[{
+begin:h,className:e},i,a]},{begin:"@await ",returnBegin:!0,subLanguage:"csharp",
+end:"(\\r|\\n|<|\\s)",contains:[{begin:"@await ",className:e},{
+begin:"[<\\r\\n]",endsParent:!0}]},N,{variants:[{begin:"@@"},{begin:"[a-zA-Z]+@"
+}],skip:!0},g,r,c,{className:"meta",begin:"<!DOCTYPE",end:">",relevance:10,
+contains:[{begin:"\\[",end:"\\]"}]},{begin:"<\\!\\[CDATA\\[",end:"\\]\\]>",
+relevance:10}]};return v.contains=v.contains.concat(b),[d,p,N].forEach((n=>{
+var e=v.contains.filter((e=>e!==n)),a=n.contains.indexOf(s)
+;n.contains.splice.apply(n.contains,[a,1].concat(e))})),v}return n.exports=n=>{
+n.registerLanguage("cshtml-razor",e)
+},n.exports.definer=e,n.exports.definer||n.exports})());

package-lock.json

@@ -2,7 +2,7 @@
   "name": "highlightjs-cshtml-razor",
   "version": "2.1.0",
   "description": "highlight.js syntax definition for ASP.NET Razor CSHTML language",
-  "main": "src/cshtml-razor.js",
+  "main": "src/languages/cshtml-razor.js",
   "scripts": {
     "test": "./node_modules/.bin/mocha --reporter spec"
   },

package.json

@@ -1,6 +1,6 @@
 /*
  * Language: cshtml-razor
- * Requires: xml.js, cs.js, css.js, javascript.js
+ * Requires: xml.js, csharp.js, css.js, javascript.js
  * Author: Roman Resh <[email protected]>
 */
 

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

@@ -3,7 +3,7 @@ var promisify = require("util").promisify;
 let path = require('path');
 let hljs = require("highlight.js");
 const fs = require("fs");
-let hljsDefineCshtmlRazor = require("../src/cshtml-razor");
+let hljsDefineCshtmlRazor = require("../src/languages/cshtml-razor");
 
 const readdir = promisify(fs.readdir),
       readFile = promisify(fs.readFile);
@@ -13,10 +13,10 @@ describe("CSHTML Razor Tests", () => {
         hljsDefineCshtmlRazor(hljs);
     });
     it("should generate correct markup", async () => {
-        var files = await readdir(path.join(__dirname, "markup"));
+        var files = await readdir(path.join(__dirname, "markup", "cshtml-razor"));
         files = files.filter(f => !f.includes(".expect."));
         for(var f of files) {
-            let fn = path.join(__dirname, "markup", f);
+            let fn = path.join(__dirname, "markup", "cshtml-razor", f);
             let expectFn = fn.replace(".txt", ".expect.txt");
             var code = await readFile(fn, "utf-8");
             var exp = await readFile(expectFn, "utf-8");
@@ -25,7 +25,7 @@ describe("CSHTML Razor Tests", () => {
         }
     });
     it("should be detected correctly", async () => {
-        var code = await readFile(path.join(__dirname, "detect.txt"), "utf-8");
+        var code = await readFile(path.join(__dirname, 'detect', "cshtml-razor", "default.txt"), "utf-8");
         var actual = hljs.highlightAuto(code).language;
         actual.should.eql("cshtml-razor");
     });