(cleanup) better boolean naming

Author: joshgoebel

src/highlight.js

@@ -249,7 +249,7 @@ const HLJS = function(hljs) {
         if (mode["on:end"]) {
           const resp = new Response(mode);
           mode["on:end"](match, resp);
-          if (resp.ignore) matched = false;
+          if (resp.isMatchIgnored) matched = false;
         }
 
         if (matched) {
@@ -301,7 +301,7 @@ const HLJS = function(hljs) {
       for (const cb of beforeCallbacks) {
         if (!cb) continue;
         cb(match, resp);
-        if (resp.ignore) return doIgnore(lexeme);
+        if (resp.isMatchIgnored) return doIgnore(lexeme);
       }
 
       if (newMode && newMode.endSameAsBegin) {

src/lib/mode_compiler.js

@@ -279,7 +279,7 @@ export function compileLanguage(language, { plugins }) {
    */
   function compileMode(mode, parent) {
     const cmode = /** @type CompiledMode */ (mode);
-    if (mode.compiled) return cmode;
+    if (mode.isCompiled) return cmode;
 
     [
       // do this early so compiler extensions generally don't have to worry about
@@ -301,7 +301,7 @@ export function compileLanguage(language, { plugins }) {
       EXT.compileRelevance
     ].forEach(ext => ext(mode, parent));
 
-    mode.compiled = true;
+    mode.isCompiled = true;
 
     let keywordPattern = null;
     if (typeof mode.keywords === "object") {

src/lib/response.js

@@ -1,3 +1,4 @@
+/** @implements CallbackResponse */
 export default class Response {
   /**
    * @param {CompiledMode} mode
@@ -7,9 +8,10 @@ export default class Response {
     if (mode.data === undefined) mode.data = {};
 
     this.data = mode.data;
+    this.isMatchIgnored = false;
   }
 
   ignoreMatch() {
-    this.ignore = true;
+    this.isMatchIgnored = true;
   }
 }

types/index.d.ts

@@ -125,6 +125,7 @@ interface HLJSOptions {
 interface CallbackResponse {
     data: Record<string, any>
     ignoreMatch: () => void
+    isMatchIgnored: boolean
 }
 
 /************
@@ -170,7 +171,7 @@ interface LanguageDetail {
     contains: (Mode)[]
     case_insensitive?: boolean
     keywords?: Record<string, any> | string
-    compiled?: boolean,
+    isCompiled?: boolean,
     exports?: any,
     classNameAliases?: Record<string, string>
     compilerExtensions?: CompilerExt[]
@@ -180,7 +181,7 @@ interface LanguageDetail {
 type Language = LanguageDetail & Partial<Mode>
 
 interface CompiledLanguage extends LanguageDetail, CompiledMode {
-    compiled: true
+    isCompiled: true
     contains: CompiledMode[]
     keywords: Record<string, any>
 }
@@ -199,7 +200,7 @@ type CompiledMode = Omit<Mode, 'contains'> &
         endRe: RegExp
         illegalRe: RegExp
         matcher: any
-        compiled: true
+        isCompiled: true
         starts?: CompiledMode
         parent?: CompiledMode
     }
@@ -230,7 +231,7 @@ interface ModeDetails {
     cachedVariants?: Mode[]
     // parsed
     subLanguage?: string | string[]
-    compiled?: boolean
+    isCompiled?: boolean
     label?: string
 }