(chore) more multi-match/beforeMatch/title clean ups

Author: joshgoebel

docs/css-classes-reference.rst

@@ -252,7 +252,7 @@ const HLJS = function(hljs) {
      */
     function emitMultiClass(mode, match) {
       let i = 1;
-      while (match[i]) {
+      while (match[i] !== undefined) {
         const klass = language.classNameAliases[mode.className[i]] || mode.className[i];
         const text = match[i];
         if (klass) { emitter.addKeyword(text, klass); } else {

src/highlight.js

@@ -114,13 +114,12 @@ export default function(hljs) {
         keywords: { 'meta-keyword': 'import include' }
       },
       {
-        className: 'function',
         beginKeywords: 'function',
         end: /[{;]/,
         excludeEnd: true,
         illegal: /\S/,
         contains: [
-          hljs.TITLE_MODE,
+          hljs.inherit(hljs.TITLE_MODE, { className: "title.function" }),
           {
             className: 'params',
             begin: /\(/,

src/languages/actionscript.js

@@ -135,12 +135,12 @@ export default function(hljs) {
         relevance: 0
       },
       {
-        className: 'function',
         beginKeywords: 'function',
         end: /\{/,
         excludeEnd: true,
         contains: [
           hljs.inherit(hljs.TITLE_MODE, {
+            className: "title.function",
             begin: IDENT_RE
           }),
           {

src/languages/arcade.js

@@ -29,7 +29,7 @@ export default function(hljs) {
     "Tidy_On",
     "Tidy_Parameters"
   ]
-  
+
   const LITERAL = 'True False And Null Not Or Default';
 
   const BUILT_IN
@@ -140,12 +140,11 @@ export default function(hljs) {
   };
 
   const FUNCTION = {
-    className: 'function',
     beginKeywords: 'Func',
     end: '$',
     illegal: '\\$|\\[|%',
     contains: [
-      hljs.UNDERSCORE_TITLE_MODE,
+      hljs.inherit(hljs.UNDERSCORE_TITLE_MODE, { className: "title.function" }),
       {
         className: 'params',
         begin: '\\(',

src/languages/autoit.js

@@ -235,7 +235,6 @@ export default function(hljs) {
   };
 
   const FUNCTION_DECLARATION = {
-    className: 'function',
     begin: '(' + FUNCTION_TYPE_RE + '[\\*&\\s]+)+' + FUNCTION_TITLE,
     returnBegin: true,
     end: /[{;=]/,
@@ -251,7 +250,9 @@ export default function(hljs) {
       {
         begin: FUNCTION_TITLE,
         returnBegin: true,
-        contains: [ TITLE_MODE ],
+        contains: [
+          hljs.inherit(TITLE_MODE, { className: "title.function" })
+        ],
         relevance: 0
       },
       {

src/languages/c.js

@@ -33,7 +33,7 @@ function recurRegex(re, substitution, depth) {
 export default function(hljs) {
   const JAVA_IDENT_RE = '[\u00C0-\u02B8a-zA-Z_$][\u00C0-\u02B8a-zA-Z_$0-9]*';
   const GENERIC_IDENT_RE = JAVA_IDENT_RE +
-    recurRegex('(<' + JAVA_IDENT_RE + '~~~(\\s*,\\s*' + JAVA_IDENT_RE + '~~~)*>)?', /~~~/g, 2);
+    recurRegex('(?:<' + JAVA_IDENT_RE + '~~~(?:\\s*,\\s*' + JAVA_IDENT_RE + '~~~)*>)?', /~~~/g, 2);
   const MAIN_KEYWORDS = [
     'synchronized',
     'abstract',
@@ -57,15 +57,13 @@ export default function(hljs) {
     'transient',
     'catch',
     'instanceof',
-    'super',
     'volatile',
     'case',
     'assert',
     'package',
     'default',
     'public',
     'try',
-    'this',
     'switch',
     'continue',
     'throws',
@@ -78,6 +76,11 @@ export default function(hljs) {
     'do'
   ];
 
+  const BUILT_INS = [
+    'super',
+    'this'
+  ];
+
   const LITERALS = [
     'false',
     'true',
@@ -98,7 +101,8 @@ export default function(hljs) {
   const KEYWORDS = {
     keyword: MAIN_KEYWORDS,
     literal: LITERALS,
-    type: TYPES
+    type: TYPES,
+    built_in: BUILT_INS
   };
 
   const ANNOTATION = {
@@ -164,6 +168,20 @@ export default function(hljs) {
         match: JAVA_IDENT_RE,
         className: "title.class"
       },
+      {
+        begin: [
+          JAVA_IDENT_RE,
+          /\s+/,
+          JAVA_IDENT_RE,
+          /\s+/,
+          /=/
+        ],
+        className: {
+          1: "type",
+          3: "variable",
+          5: "operator"
+        }
+      },
       {
         begin: [
           /record/,
@@ -187,19 +205,16 @@ export default function(hljs) {
         relevance: 0
       },
       {
-        className: 'function',
-        begin: '(' + GENERIC_IDENT_RE + '\\s+)' + hljs.UNDERSCORE_IDENT_RE + '\\s*\\(',
-        returnBegin: true,
-        end: /[{;=]/,
-        excludeEnd: true,
+        begin: [
+          '(?:' + GENERIC_IDENT_RE + '\\s+)',
+          hljs.UNDERSCORE_IDENT_RE,
+          /\s*(?=\()/
+        ],
+        className: {
+          2: "title.function"
+        },
         keywords: KEYWORDS,
         contains: [
-          {
-            begin: hljs.UNDERSCORE_IDENT_RE + '\\s*\\(',
-            returnBegin: true,
-            relevance: 0,
-            contains: [ hljs.UNDERSCORE_TITLE_MODE ]
-          },
           {
             className: 'params',
             begin: /\(/,

src/languages/java.js

@@ -6,8 +6,19 @@ Website: https://www.rust-lang.org
 Category: common, system
 */
 
+import * as regex from '../lib/regex.js';
+
 /** @type LanguageFn */
 export default function(hljs) {
+  const FUNCTION_INVOKE = {
+    className: "title.function.invoke",
+    relevance: 0,
+    begin: regex.concat(
+      /\b/,
+      /(?!let\b)/,
+      hljs.IDENT_RE,
+      regex.lookahead(/\s*\(/))
+  };
   const NUMBER_SUFFIX = '([ui](8|16|32|64|128|size)|f(32|64))\?';
   const KEYWORDS = [
     "abstract",
@@ -240,13 +251,14 @@ export default function(hljs) {
       },
       {
         begin: [
-          /let/,
-          /\s+/,
+          /let/, /\s+/,
+          /(?:mut\s+)?/,
           hljs.UNDERSCORE_IDENT_RE
         ],
         className: {
           1: "keyword",
-          3: "variable"
+          3: "keyword",
+          4: "variable"
         }
       },
       // must come before impl/for rule later
@@ -296,7 +308,8 @@ export default function(hljs) {
       {
         className: "punctuation",
         begin: '->'
-      }
+      },
+      FUNCTION_INVOKE
     ]
   };
 }