enh(autodetect) multiple autodetect fixes

src/languages/angelscript.js

@@ -113,6 +113,7 @@ export default function(hljs) {
 
       { // numbers
         className: 'number',
+        relevance: 0,
         begin: '(-?)(\\b0[xXbBoOdD][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?f?|\\.\\d+f?)([eE][-+]?\\d+f?)?)'
       }
     ]

src/languages/bash.js

@@ -6,6 +6,8 @@ Website: https://www.gnu.org/software/bash/
 Category: common
 */
 
+import * as regex from '../lib/regex.js';
+
 /** @type LanguageFn */
 export default function(hljs) {
   const VAR = {};
@@ -23,7 +25,10 @@ export default function(hljs) {
   Object.assign(VAR,{
     className: 'variable',
     variants: [
-      {begin: /\$[\w\d#@][\w\d_]*/},
+      {begin: regex.concat(/\$[\w\d#@][\w\d_]*/,
+        // negative look-ahead tries to avoid matching patterns that are not
+        // Perl at all like $ident$, @ident@, etc.
+        `(?![\\w\\d])(?![$])`) },
       BRACED_VAR
     ]
   });

src/languages/clojure.js

@@ -16,7 +16,7 @@ export default function(hljs) {
     'builtin-name':
       // Clojure keywords
       globals + ' ' +
-      'cond apply if-not if-let if not not= = < > <= >= == + / * - rem ' +
+      'cond apply if-not if-let if not not= =|0 <|0 >|0 <=|0 >=|0 ==|0 +|0 /|0 *|0 -|0 rem ' +
       'quot neg? pos? delay? symbol? keyword? true? false? integer? empty? coll? list? ' +
       'set? ifn? fn? associative? sequential? sorted? counted? reversible? number? decimal? ' +
       'class? distinct? isa? float? rational? reduced? ratio? odd? even? char? seq? vector? ' +
@@ -88,7 +88,9 @@ export default function(hljs) {
   };
   var NAME = {
     keywords: keywords,
-    className: 'name', begin: SYMBOL_RE,
+    className: 'name',
+    begin: SYMBOL_RE,
+    relevance: 0,
     starts: BODY
   };
   var DEFAULT_CONTAINS = [LIST, STRING, HINT, HINT_COL, COMMENT, KEY, COLLECTION, NUMBER, LITERAL, SYMBOL];

src/languages/crystal.js

@@ -158,7 +158,7 @@ export default function(hljs) {
           endsParent: true
         })
       ],
-      relevance: 5
+      relevance: 2
     },
     {
       className: 'symbol',

src/languages/csharp.js

@@ -139,7 +139,7 @@ export default function(hljs) {
     'select',
     'set',
     'unmanaged',
-    'value',
+    'value|0',
     'var',
     'when',
     'where',
@@ -274,7 +274,9 @@ export default function(hljs) {
       STRING,
       NUMBERS,
       {
-        beginKeywords: 'class interface', end: /[{;=]/,
+        beginKeywords: 'class interface',
+        relevance: 0,
+        end: /[{;=]/,
         illegal: /[^\s:,]/,
         contains: [
           { beginKeywords: "where class" },
@@ -285,7 +287,9 @@ export default function(hljs) {
         ]
       },
       {
-        beginKeywords: 'namespace', end: /[{;=]/,
+        beginKeywords: 'namespace',
+        relevance: 0,
+        end: /[{;=]/,
         illegal: /[^\s:]/,
         contains: [
           TITLE_MODE,
@@ -294,7 +298,9 @@ export default function(hljs) {
         ]
       },
       {
-        beginKeywords: 'record', end: /[{;=]/,
+        beginKeywords: 'record',
+        relevance: 0,
+        end: /[{;=]/,
         illegal: /[^\s:]/,
         contains: [
           TITLE_MODE,
@@ -324,7 +330,10 @@ export default function(hljs) {
         keywords: KEYWORDS,
         contains: [
           // prevents these from being highlighted `title`
-          { beginKeywords: FUNCTION_MODIFIERS.join(" ")},
+          {
+            beginKeywords: FUNCTION_MODIFIERS.join(" "),
+            relevance: 0
+          },
           {
             begin: hljs.IDENT_RE + '\\s*(<.+>)?\\s*\\(', returnBegin: true,
             contains: [

src/languages/css.js

@@ -49,7 +49,7 @@ export default function(hljs) {
   var AT_PROPERTY_RE = /@-?\w[\w]*(-\w+)*/ // @-webkit-keyframes
   var IDENT_RE = '[a-zA-Z-][a-zA-Z0-9_-]*';
   var RULE = {
-    begin: /(?:[A-Z_.-]+|--[a-zA-Z0-9_-]+)\s*:/, returnBegin: true, end: ';', endsWithParent: true,
+    begin: /([*]\s?)?(?:[A-Z_.\-\\]+|--[a-zA-Z0-9_-]+)\s*(\/\*\*\/)?:/, returnBegin: true, end: ';', endsWithParent: true,
     contains: [
       ATTRIBUTE
     ]
@@ -58,14 +58,14 @@ export default function(hljs) {
   return {
     name: 'CSS',
     case_insensitive: true,
-    illegal: /[=\/|'\$]/,
+    illegal: /[=|'\$]/,
     contains: [
       hljs.C_BLOCK_COMMENT_MODE,
       {
         className: 'selector-id', begin: /#[A-Za-z0-9_-]+/
       },
       {
-        className: 'selector-class', begin: /\.[A-Za-z0-9_-]+/
+        className: 'selector-class', begin: '\\.' + IDENT_RE
       },
       {
         className: 'selector-attr',
@@ -125,6 +125,7 @@ export default function(hljs) {
         illegal: /\S/,
         contains: [
           hljs.C_BLOCK_COMMENT_MODE,
+          { begin: /;/ }, // empty ; rule
           RULE,
         ]
       }

src/languages/groovy.js

@@ -78,7 +78,10 @@ export default function(hljs) {
             'throw throws try catch finally implements extends new import package return instanceof'
         },
         contains: [
-            hljs.SHEBANG(),
+            hljs.SHEBANG({
+              binary: "groovy",
+              relevance: 10
+            }),
             COMMENT,
             STRING,
             REGEXP,
@@ -93,7 +96,9 @@ export default function(hljs) {
                 ]
             },
             {
-                className: 'meta', begin: '@[A-Za-z]+'
+                className: 'meta',
+                begin: '@[A-Za-z]+',
+                relevance: 0
             },
             {
               // highlight map keys and named parameters as attrs
@@ -104,6 +109,7 @@ export default function(hljs) {
               // to avoid highlight it as a label, named parameter, or map key
               begin: /\?/,
               end: /:/,
+              relevance: 0,
               contains: [
                 COMMENT,
                 STRING,

src/languages/hy.js

@@ -86,8 +86,10 @@ export default function(hljs) {
     relevance: 0
   };
   var NAME = {
+    className: 'name',
+    relevance: 0,
     keywords: keywords,
-    className: 'name', begin: SYMBOL_RE,
+    begin: SYMBOL_RE,
     starts: BODY
   };
   var DEFAULT_CONTAINS = [LIST, STRING, HINT, HINT_COL, COMMENT, KEY, COLLECTION, NUMBER, LITERAL, SYMBOL];

src/languages/java.js

@@ -84,6 +84,12 @@ export default function(hljs) {
           ]
         }
       ),
+      // relevance boost
+      {
+        begin: /import java\.[a-z]+\./,
+        keywords: "import",
+        relevance: 2
+      },
       hljs.C_LINE_COMMENT_MODE,
       hljs.C_BLOCK_COMMENT_MODE,
       hljs.APOS_STRING_MODE,

src/languages/javascript.js

@@ -292,7 +292,8 @@ export default function(hljs) {
                 className: 'params',
                 variants: [
                   {
-                    begin: hljs.UNDERSCORE_IDENT_RE
+                    begin: hljs.UNDERSCORE_IDENT_RE,
+                    relevance: 0
                   },
                   {
                     className: null,

src/languages/lisp.js

@@ -80,7 +80,10 @@ export default function(hljs) {
     {
       className: 'name',
       variants: [
-        {begin: LISP_IDENT_RE},
+        {
+          begin: LISP_IDENT_RE,
+          relevance: 0,
+        },
         {begin: MEC_RE}
       ]
     },

src/languages/matlab.js

@@ -38,8 +38,8 @@ export default function(hljs) {
         'eye repmat rand randn linspace logspace freqspace meshgrid accumarray size length ' +
         'ndims numel disp isempty isequal isequalwithequalnans cat reshape diag blkdiag tril ' +
         'triu fliplr flipud flipdim rot90 find sub2ind ind2sub bsxfun ndgrid permute ipermute ' +
-        'shiftdim circshift squeeze isscalar isvector ans eps realmax realmin pi i inf nan ' +
-        'isnan isinf isfinite j why compan gallery hadamard hankel hilb invhilb magic pascal ' +
+        'shiftdim circshift squeeze isscalar isvector ans eps realmax realmin pi i|0 inf nan ' +
+        'isnan isinf isfinite j|0 why compan gallery hadamard hankel hilb invhilb magic pascal ' +
         'rosser toeplitz vander wilkinson max min nanmax nanmin mean nanmean type table ' +
         'readtable writetable sortrows sort figure plot plot3 scatter scatter3 cellfun ' +
         'legend intersect ismember procrustes hold num2cell '

src/languages/n1ql.js

@@ -52,14 +52,12 @@ export default function(hljs) {
           {
             className: 'string',
             begin: '\'', end: '\'',
-            contains: [hljs.BACKSLASH_ESCAPE],
-            relevance: 0
+            contains: [hljs.BACKSLASH_ESCAPE]
           },
           {
             className: 'string',
             begin: '"', end: '"',
-            contains: [hljs.BACKSLASH_ESCAPE],
-            relevance: 0
+            contains: [hljs.BACKSLASH_ESCAPE]
           },
           {
             className: 'symbol',

src/languages/ocaml.js

@@ -73,7 +73,7 @@ export default function(hljs) {
         relevance: 0
       },
       {
-        begin: /[-=]>/ // relevance booster
+        begin: /->/ // relevance booster
       }
     ]
   }

src/languages/perl.js

@@ -5,6 +5,9 @@ Website: https://www.perl.org
 Category: common
 */
 
+import * as regex from '../lib/regex.js';
+
+/** @type LanguageFn */
 export default function(hljs) {
   var PERL_KEYWORDS = {
     $pattern: /[\w.]+/,
@@ -40,7 +43,12 @@ export default function(hljs) {
   var VAR = {
     variants: [
       {begin: /\$\d/},
-      {begin: /[$%@](\^\w\b|#\w+(::\w+)*|\{\w+\}|\w+(::\w*)*)/},
+      {begin: regex.concat(
+        /[$%@](\^\w\b|#\w+(::\w+)*|\{\w+\}|\w+(::\w*)*)/,
+        // negative look-ahead tries to avoid matching patterns that are not
+        // Perl at all like $ident$, @ident@, etc.
+        `(?![A-Za-z])(?![@$%])`
+        )},
       {begin: /[$%@][^\s\w{]/, relevance: 0}
     ]
   };

src/languages/php.js

@@ -13,7 +13,10 @@ Category: common
 export default function(hljs) {
   const VARIABLE = {
     className: 'variable',
-    begin: '\\$+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*'
+    begin: '\\$+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*' +
+      // negative look-ahead tries to avoid matching patterns that are not
+      // Perl at all like $ident$, @ident@, etc.
+      `(?![A-Za-z0-9])(?![$])`
   };
   const PREPROCESSOR = {
     className: 'meta',
@@ -71,7 +74,11 @@ export default function(hljs) {
     // Other keywords:
     // <https://www.php.net/manual/en/reserved.php>
     // <https://www.php.net/manual/en/language.types.type-juggling.php>
-    'array abstract and as binary bool boolean break callable case catch class clone const continue declare default do double else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval extends final finally float for foreach from global goto if implements instanceof insteadof int integer interface isset iterable list match new object or private protected public real return string switch throw trait try unset use var void while xor yield',
+    'array abstract and as binary bool boolean break callable case catch class clone const continue declare ' +
+    'default do double else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval extends ' +
+    'final finally float for foreach from global goto if implements instanceof insteadof int integer interface ' +
+    'isset iterable list match|0 new object or private protected public real return string switch throw trait ' +
+    'try unset use var void while xor yield',
     literal: 'false null true',
     built_in:
     // Standard PHP library:
@@ -123,10 +130,14 @@ export default function(hljs) {
       },
       {
         className: 'function',
+        relevance: 0,
         beginKeywords: 'fn function', end: /[;{]/, excludeEnd: true,
         illegal: '[$%\\[]',
         contains: [
           hljs.UNDERSCORE_TITLE_MODE,
+          {
+            begin: '=>' // No markup, just a relevance booster
+          },
           {
             className: 'params',
             begin: '\\(', end: '\\)',
@@ -145,25 +156,29 @@ export default function(hljs) {
       },
       {
         className: 'class',
-        beginKeywords: 'class interface', end: /\{/, excludeEnd: true,
+        beginKeywords: 'class interface',
+        relevance: 0,
+        end: /\{/,
+        excludeEnd: true,
         illegal: /[:($"]/,
         contains: [
           {beginKeywords: 'extends implements'},
           hljs.UNDERSCORE_TITLE_MODE
         ]
       },
       {
-        beginKeywords: 'namespace', end: ';',
+        beginKeywords: 'namespace',
+        relevance: 0,
+        end: ';',
         illegal: /[.']/,
         contains: [hljs.UNDERSCORE_TITLE_MODE]
       },
       {
-        beginKeywords: 'use', end: ';',
+        beginKeywords: 'use',
+        relevance: 0,
+        end: ';',
         contains: [hljs.UNDERSCORE_TITLE_MODE]
       },
-      {
-        begin: '=>' // No markup, just a relevance booster
-      },
       STRING,
       NUMBER
     ]

src/languages/properties.js

@@ -11,7 +11,9 @@ export default function(hljs) {
   var WS0 = '[ \\t\\f]*';
   var WS1 = '[ \\t\\f]+';
   // delimiter
-  var DELIM = '(' + WS0+'[:=]'+WS0+ '|' + WS1 + ')';
+  var EQUAL_DELIM = WS0+'[:=]'+WS0;
+  var WS_DELIM = WS1;
+  var DELIM = '(' + EQUAL_DELIM + '|' + WS_DELIM + ')';
   var KEY_ALPHANUM = '([^\\\\\\W:= \\t\\f\\n]|\\\\.)+';
   var KEY_OTHER = '([^\\\\:= \\t\\f\\n]|\\\\.)+';
 
@@ -39,8 +41,11 @@ export default function(hljs) {
       // key: everything until whitespace or = or : (taking into account backslashes)
       // case of a "normal" key
       {
-        begin: KEY_ALPHANUM + DELIM,
         returnBegin: true,
+        variants: [
+          { begin: KEY_ALPHANUM + EQUAL_DELIM, relevance: 1 },
+          { begin: KEY_ALPHANUM + WS_DELIM, relevance: 0 }
+        ],
         contains: [
           {
             className: 'attr',