enh(parser) multi-class in a single mode

highlightjs · Mar 27, 2021 · 75bc34f · 75bc34f
1 parent 8e024dd
commit 75bc34f
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 6 deletions.
diff --git a/src/highlight.js b/src/highlight.js
@@ -246,11 +246,30 @@ const HLJS = function(hljs) {
       modeBuffer = '';
     }
 
+    /**
+     * @param {Mode} mode
+     * @param {EnhancedMatch} match
+     */
+    function emitMultiClass(mode, match) {
+      let i = 1;
+      while (match[i]) {
+        const klass = mode.className[i];
+        const text = match[i];
+        if (klass) { emitter.addKeyword(text, klass); } else { emitter.addText(text); }
+        i++;
+      }
+    }
+
     /**
      * @param {Mode} mode - new mode to start
+     * @param {EnhancedMatch} match
      */
-    function startNewMode(mode) {
-      if (mode.className) {
+    function startNewMode(mode, match) {
+      if (mode.isMultiClass) {
+        // at this point modeBuffer should just be the match
+        modeBuffer = "";
+        emitMultiClass(mode, match);
+      } else if (mode.className) {
         emitter.openNode(language.classNameAliases[mode.className] || mode.className);
       }
       top = Object.create(mode, { parent: { value: top } });
@@ -340,7 +359,7 @@ const HLJS = function(hljs) {
           modeBuffer = lexeme;
         }
       }
-      startNewMode(newMode);
+      startNewMode(newMode, match);
       // if (mode["after:begin"]) {
       //   let resp = new Response(mode);
       //   mode["after:begin"](match, resp);

diff --git a/src/languages/vim.js b/src/languages/vim.js
@@ -6,6 +6,8 @@ Website: https://www.vim.org
 Category: scripting
 */
 
+import * as regex from '../lib/regex.js';
+
 export default function(hljs) {
   return {
     name: 'Vim Script',
@@ -99,8 +101,15 @@ export default function(hljs) {
         begin: /[bwtglsav]:[\w\d_]+/
       },
       {
-        className: 'function',
-        beginKeywords: 'function function!',
+        begin: [
+          /function|function!/,
+          /\s+/,
+          hljs.IDENT_RE
+        ],
+        className: {
+          1: "keyword",
+          3: "title"
+        },
         end: '$',
         relevance: 0,
         contains: [

diff --git a/src/lib/ext/multi_class.js b/src/lib/ext/multi_class.js
@@ -0,0 +1,27 @@
+/* eslint-disable no-throw-literal */
+import * as regex from "../regex.js";
+
+const MultiClassError = new Error();
+
+/**
+ *
+ * @param {CompiledMode} mode
+ */
+export function MultiClass(mode) {
+  if (!Array.isArray(mode.begin)) return;
+
+  if (mode.skip || mode.excludeBegin || mode.returnBegin) {
+    console.error("skip, excludeBegin, returnBegin not compatible with multi-class")
+    throw MultiClassError;
+  }
+
+  if (typeof mode.className !== "object") {
+    console.error("className must be object or array");
+    throw MultiClassError;
+  }
+
+  const items = mode.begin.map(x => regex.concat("(", x, ")"));
+  mode.begin = regex.concat(...items);
+  mode.isMultiClass = true;
+
+}
diff --git a/src/lib/mode_compiler.js b/src/lib/mode_compiler.js
@@ -2,6 +2,7 @@ import * as regex from './regex.js';
 import { inherit } from './utils.js';
 import * as EXT from "./compiler_extensions.js";
 import { compileKeywords } from "./compile_keywords.js";
+import { MultiClass } from "./ext/multi_class.js";
 
 // compilation
 
@@ -284,7 +285,8 @@ export function compileLanguage(language, { plugins }) {
     [
       // do this early so compiler extensions generally don't have to worry about
       // the distinction between match/begin
-      EXT.compileMatch
+      EXT.compileMatch,
+      MultiClass
     ].forEach(ext => ext(mode, parent));
 
     language.compilerExtensions.forEach(ext => ext(mode, parent));