doen

src/languages/angelscript.js

@@ -37,7 +37,7 @@ export default function(hljs) {
       'abstract|0 try catch protected explicit property',
 
     // avoid close detection with C# and JS
-    illegal: '(^using\\s+[A-Za-z0-9_\\.]+;$|\\bfunction\s*[^\\(])',
+    illegal: '(^using\\s+[A-Za-z0-9_\\.]+;$|\\bfunction\\s*[^\\(])',
 
     contains: [
       { // 'strings'

src/languages/basic.js

@@ -13,7 +13,7 @@ export default function(hljs) {
     illegal: '^\.',
     // Support explicitly typed variables that end with $%! or #.
     keywords: {
-        $pattern: '[a-zA-Z][a-zA-Z0-9_\$\%\!\#]*',
+        $pattern: '[a-zA-Z][a-zA-Z0-9_$%!#]*',
         keyword:
           'ABS ASC AND ATN AUTO|0 BEEP BLOAD|10 BSAVE|10 CALL CALLS CDBL CHAIN CHDIR CHR$|10 CINT CIRCLE ' +
           'CLEAR CLOSE CLS COLOR COM COMMON CONT COS CSNG CSRLIN CVD CVI CVS DATA DATE$ ' +

src/languages/gams.js

@@ -78,7 +78,7 @@ export default function (hljs) {
       ASSIGNMENT,
       {
         className: 'comment',
-        begin: /([ ]*[a-z0-9&#*=?@>\\<:\-,()$\[\]_.{}!+%^]+)+/,
+        begin: /([ ]*[a-z0-9&#*=?@><:\-,()$[\]_.{}!+%^]+)+/,
         relevance: 0
       },
     ],

src/languages/livescript.js

@@ -60,7 +60,7 @@ export default function(hljs) {
     literal: ECMAScript.LITERALS.concat(LIVESCRIPT_LITERALS).join(" "),
     built_in: ECMAScript.BUILT_INS.concat(LIVESCRIPT_BUILT_INS).join(" ")
   };
-  var JS_IDENT_RE = '[A-Za-z$_](?:\-[0-9A-Za-z$_]|[0-9A-Za-z$_])*';
+  var JS_IDENT_RE = '[A-Za-z$_](?:-[0-9A-Za-z$_]|[0-9A-Za-z$_])*';
   var TITLE = hljs.inherit(hljs.TITLE_MODE, {begin: JS_IDENT_RE});
   var SUBST = {
     className: 'subst',
@@ -69,7 +69,7 @@ export default function(hljs) {
   };
   var SUBST_SIMPLE = {
     className: 'subst',
-    begin: /#[A-Za-z$_]/, end: /(?:\-[0-9A-Za-z$_]|[0-9A-Za-z$_])*/,
+    begin: /#[A-Za-z$_]/, end: /(?:-[0-9A-Za-z$_]|[0-9A-Za-z$_])*/,
     keywords: KEYWORDS
   };
   var EXPRESSIONS = [
@@ -145,7 +145,7 @@ export default function(hljs) {
   };
 
   var SYMBOLS = {
-    begin: '(#=>|=>|\\|>>|-?->|\\!->)'
+    begin: '(#=>|=>|\\|>>|-?->|!->)'
   };
 
   return {
@@ -163,7 +163,7 @@ export default function(hljs) {
         returnBegin: true,
         variants: [
           {
-            begin: '(' + JS_IDENT_RE + '\\s*(?:=|:=)\\s*)?(\\(.*\\))?\\s*\\B\\->\\*?', end: '\\->\\*?'
+            begin: '(' + JS_IDENT_RE + '\\s*(?:=|:=)\\s*)?(\\(.*\\))?\\s*\\B->\\*?', end: '->\\*?'
           },
           {
             begin: '(' + JS_IDENT_RE + '\\s*(?:=|:=)\\s*)?!?(\\(.*\\))?\\s*\\B[-~]{1,2}>\\*?', end: '[-~]{1,2}>\\*?'

src/languages/mel.js

@@ -224,7 +224,7 @@ export default function(hljs) {
         contains: [hljs.BACKSLASH_ESCAPE]
       },
       { // eats variables
-        begin: '[\\$\\%\\@](\\^\\w\\b|#\\w+|[^\\s\\w{]|\\{\\w+\\}|\\w+)'
+        begin: /[$%@](\^\w\b|#\w+|[^\s\w{]|\{\w+\}|\w+)/
       },
       hljs.C_LINE_COMMENT_MODE,
       hljs.C_BLOCK_COMMENT_MODE

src/languages/nginx.js

@@ -12,7 +12,7 @@ export default function(hljs) {
     variants: [
       {begin: /\$\d+/},
       {begin: /\$\{/, end: /\}/},
-      {begin: '[\\$\\@]' + hljs.UNDERSCORE_IDENT_RE}
+      {begin: /[$@]/ + hljs.UNDERSCORE_IDENT_RE}
     ]
   };
   var DEFAULT = {
@@ -44,9 +44,9 @@ export default function(hljs) {
         className: 'regexp',
         contains: [hljs.BACKSLASH_ESCAPE, VAR],
         variants: [
-          {begin: "\\s\\^", end: "\\s|{|;", returnEnd: true},
+          {begin: "\\s\\^", end: "\\s|\\{|;", returnEnd: true},
           // regexp locations (~, ~*)
-          {begin: "~\\*?\\s+", end: "\\s|{|;", returnEnd: true},
+          {begin: "~\\*?\\s+", end: "\\s|\\{|;", returnEnd: true},
           // *.example.com
           {begin: "\\*(\\.[a-z\\-]+)+"},
           // sub.example.*

src/languages/nim.js

@@ -28,8 +28,8 @@ export default function(hljs) {
     },
     contains: [ {
         className: 'meta', // Actually pragma
-        begin: /{\./,
-        end: /\.}/,
+        begin: /\{\./,
+        end: /\.\}/,
         relevance: 10
       }, {
         className: 'string',

src/languages/nsis.js

@@ -14,20 +14,20 @@ export default function(hljs) {
   var DEFINES = {
     // ${defines}
     className: 'variable',
-    begin: /\$+{[\w\.:-]+}/
+    begin: /\$+\{[\w.:-]+\}/
   };
 
   var VARIABLES = {
     // $variables
     className: 'variable',
     begin: /\$+\w+/,
-    illegal: /\(\){}/
+    illegal: /\(\)\{\}/
   };
 
   var LANGUAGES = {
     // $(language_strings)
     className: 'variable',
-    begin: /\$+\([\w\^\.:-]+\)/
+    begin: /\$+\([\w^.:-]+\)/
   };
 
   var PARAMETERS = {
@@ -39,7 +39,7 @@ export default function(hljs) {
   var COMPILER = {
     // !compiler_flags
     className: 'keyword',
-    begin: /\!(addincludedir|addplugindir|appendfile|cd|define|delfile|echo|else|endif|error|execute|finalize|getdllversion|gettlbversion|if|ifdef|ifmacrodef|ifmacrondef|ifndef|include|insertmacro|macro|macroend|makensis|packhdr|searchparse|searchreplace|system|tempfile|undef|verbose|warning)/
+    begin: /!(addincludedir|addplugindir|appendfile|cd|define|delfile|echo|else|endif|error|execute|finalize|getdllversion|gettlbversion|if|ifdef|ifmacrodef|ifmacrondef|ifndef|include|insertmacro|macro|macroend|makensis|packhdr|searchparse|searchreplace|system|tempfile|undef|verbose|warning)/
   };
 
   var METACHARS = {
@@ -51,7 +51,7 @@ export default function(hljs) {
   var PLUGINS = {
     // plug::ins
     className: 'class',
-    begin: /\w+\:\:\w+/
+    begin: /\w+::\w+/
   };
 
     var STRING = {

src/languages/parser3.js

@@ -20,7 +20,7 @@ export default function(hljs) {
     contains: [
       hljs.COMMENT('^#', '$'),
       hljs.COMMENT(
-        '\\^rem{',
+        /\\^rem\{/,
         /\}/,
         {
           relevance: 10,
@@ -40,11 +40,11 @@ export default function(hljs) {
       },
       {
         className: 'variable',
-        begin: '\\$\\{?[\\w\\-\\.\\:]+\\}?'
+        begin: /\$\{?[\w\-.:]+\}?/
       },
       {
         className: 'keyword',
-        begin: '\\^[\\w\\-\\.\\:]+'
+        begin: /\^[\w\-.:]+/
       },
       {
         className: 'number',

src/languages/prolog.js

@@ -51,15 +51,13 @@ export default function(hljs) {
   };
 
   var CHAR_CODE = {
-
     className: 'string', // 0'a etc.
-    begin: /0\'(\\\'|.)/
+    begin: /0'(\\'|.)/
   };
 
   var SPACE_CODE = {
-
     className: 'string',
-    begin: /0\'\\s/ // 0'\s
+    begin: /0'\\s/ // 0'\s
   };
 
   var PRED_OP = { // relevance booster

src/languages/qml.js

@@ -90,7 +90,7 @@ export default function(hljs) {
   // Find QML object. A QML object is a QML identifier followed by { and ends at the matching }.
   // All we really care about is finding IDENT followed by { and just mark up the IDENT and ignore the {.
   var QML_OBJECT = {
-    begin: QML_IDENT_RE + '\\s*{', end: /\{/,
+    begin: QML_IDENT_RE + /\s*\{/, end: /\{/,
     returnBegin: true,
     relevance: 0,
     contains: [

src/languages/routeros.js

@@ -38,7 +38,7 @@ export default function(hljs) {
     className: 'variable',
     variants: [
       {begin: /\$[\w\d#@][\w\d_]*/},
-      {begin: /\$\{(.*?)}/}
+      {begin: /\$\{(.*?)\}/}
     ]
   };
 
@@ -82,7 +82,7 @@ export default function(hljs) {
           { begin: /^'/, end: /$/, },               // Monkey one line comment
           { begin: /^\s*\/[\w-]+=/, end: /$/, },    // jboss-cli
           { begin: /\/\//, end: /$/, },             // Stan comment
-          { begin: /^\[\</, end: /\>\]$/, },        // F# class declaration?
+          { begin: /^\[</, end: />\]$/, },        // F# class declaration?
           { begin: /<\//, end: />/, },              // HTML tags
           { begin: /^facet /, end: /\}/, },         // roboconf - лютый костыль )))
           { begin: '^1\\.\\.(\\d+)$', end: /$/, },  // tap
@@ -94,7 +94,7 @@ export default function(hljs) {
       APOS_STRING,
       VAR,
       { // attribute=value
-        begin: /[\w-]+\=([^\s\{\}\[\]\(\)]+)/,
+        begin: /[\w-]+=([^\s{}[\]()]+)/,
         relevance: 0,
         returnBegin: true,
         contains: [
@@ -131,7 +131,7 @@ export default function(hljs) {
               {
                 // Не форматировать не классифицированные значения. Необходимо для исключения подсветки значений как built_in.
                 // className: 'number',
-                begin: /("[^"]*"|[^\s\{\}\[\]]+)/,
+                begin: /("[^"]*"|[^\s{}[\]]+)/,
               }, //*/
             ]
           } //*/
@@ -144,7 +144,7 @@ export default function(hljs) {
       }, //*/
 
       {
-        begin: '\\b(' + COMMON_COMMANDS.split(' ').join('|') + ')([\\s\[\(]|\])',
+        begin: '\\b(' + COMMON_COMMANDS.split(' ').join('|') + ')([\\s[(\\]|])',
         returnBegin: true,
         contains: [
           {

src/languages/ruleslanguage.js

@@ -60,8 +60,8 @@ export default function(hljs) {
       {
         className: 'literal',
         variants: [
-          {begin: '#\\s+[a-zA-Z\\ \\.]*', relevance: 0}, // looks like #-comment
-          {begin: '#[a-zA-Z\\ \\.]+'}
+          {begin: '#\\s+[a-zA-Z .]*', relevance: 0}, // looks like #-comment
+          {begin: '#[a-zA-Z .]+'}
         ]
       }
     ]

src/languages/sas.js

@@ -92,7 +92,7 @@ export default function(hljs) {
             {
                 // Distinct highlight for proc <proc>, data, run, quit
                 className: 'keyword',
-                begin: /^\s*(proc [\w\d_]+|data|run|quit)[\s\;]/
+                begin: /^\s*(proc [\w\d_]+|data|run|quit)[\s;]/
             },
             {
                 // Macro variables

src/languages/scss.js

@@ -43,7 +43,7 @@ export default function(hljs) {
       hljs.C_LINE_COMMENT_MODE,
       hljs.C_BLOCK_COMMENT_MODE,
       {
-        className: 'selector-id', begin: '\\#[A-Za-z0-9_-]+',
+        className: 'selector-id', begin: '#[A-Za-z0-9_-]+',
         relevance: 0
       },
       {

src/languages/smali.js

@@ -41,11 +41,11 @@ export default function(hljs) {
             begin: '\\s('+smali_instr_low_prio.join('|')+')\\s'
           },
           {
-            begin: '\\s('+smali_instr_low_prio.join('|')+')((\\-|/)[a-zA-Z0-9]+)+\\s',
+            begin: '\\s('+smali_instr_low_prio.join('|')+')((-|/)[a-zA-Z0-9]+)+\\s',
             relevance: 10
           },
           {
-            begin: '\\s('+smali_instr_high_prio.join('|')+')((\\-|/)[a-zA-Z0-9]+)*\\s',
+            begin: '\\s('+smali_instr_high_prio.join('|')+')((-|/)[a-zA-Z0-9]+)*\\s',
             relevance: 10
           },
         ]

src/languages/smalltalk.js

@@ -44,7 +44,7 @@ export default function(hljs) {
         contains: [{begin: '(\\|[ ]*)?' + VAR_IDENT_RE}]
       },
       {
-        begin: '\\#\\(', end: '\\)',
+        begin: '#\\(', end: '\\)',
         contains: [
           hljs.APOS_STRING_MODE,
           CHAR,

src/languages/stylus.js

@@ -122,7 +122,7 @@ export default function(hljs) {
     'video'
   ];
 
-  var LOOKAHEAD_TAG_END = '(?=[\\.\\s\\n\\[\\:,])';
+  var LOOKAHEAD_TAG_END = '(?=[.\\s\\n\\[:,])';
 
   var ATTRIBUTES = [
     'align-content',
@@ -372,7 +372,7 @@ export default function(hljs) {
 
       // id tag
       {
-        begin: '\\#[a-zA-Z][a-zA-Z0-9_-]*' + LOOKAHEAD_TAG_END,
+        begin: '#[a-zA-Z][a-zA-Z0-9_-]*' + LOOKAHEAD_TAG_END,
         className: 'selector-id'
       },
 

src/languages/vbnet.js

@@ -30,7 +30,7 @@ export default function(hljs) {
       literal:
         'true false nothing'
     },
-    illegal: '//|{|}|endif|gosub|variant|wend|^\\$ ', /* reserved deprecated keywords */
+    illegal: '//|\\{|\\}|endif|gosub|variant|wend|^$ ', /* reserved deprecated keywords */
     contains: [
       hljs.inherit(hljs.QUOTE_STRING_MODE, {contains: [{begin: '""'}]}),
       hljs.COMMENT(

src/languages/vhdl.js

@@ -44,7 +44,7 @@ export default function(hljs) {
         'false true note warning error failure ' +  // severity_level
         'line text side width'                      // textio
     },
-    illegal: '{',
+    illegal: /\{/,
     contains: [
       hljs.C_BLOCK_COMMENT_MODE,      // VHDL-2008 block commenting.
       hljs.COMMENT('--', '$'),

src/languages/xml.js

@@ -120,7 +120,7 @@ export default function(hljs) {
         keywords: {name: 'script'},
         contains: [TAG_INTERNALS],
         starts: {
-          end: '\<\/script\>', returnEnd: true,
+          end: /<\/script>/, returnEnd: true,
           subLanguage: ['javascript', 'handlebars', 'xml']
         }
       },

src/lib/mode_compiler.js

@@ -24,7 +24,7 @@ export function compileLanguage(language) {
   function langRe(value, global) {
     return new RegExp(
       regex.source(value),
-      'um' + (language.case_insensitive ? 'i' : '') + (global ? 'g' : '')
+      'm' + (language.case_insensitive ? 'i' : '') + (global ? 'g' : '')
     );
   }