reslop 0.2.4 → 0.2.6

package/lib/highlight/html.js

@@ -1,85 +1,64 @@
 'use strict';
 
 const core = require('./core.js');
-const { SQUOTE, emit, skipQuoted } = core;
+const { QUOTES, emit, scanWhile, quotedEnd } = core;
 
 const colorHtmlTag = (tag) => {
   const out = [];
   let i = 1;
-  const n = tag.length;
+  const take = (style, end) => {
+    emit(out, style, tag.slice(i, end));
+    i = end;
+  };
   emit(out, 'punct', '<');
-  if (tag[i] === '/') {
-    emit(out, 'punct', '/');
-    i += 1;
-  }
-  let j = i;
-  while (j < n && /[A-Za-z0-9:-]/.test(tag[j])) j += 1;
-  emit(out, 'tag', tag.slice(i, j));
-  i = j;
-  while (i < n) {
-    if (tag[i] === '>' || (tag[i] === '/' && tag[i + 1] === '>')) {
-      emit(out, 'punct', tag.slice(i));
-      break;
-    }
-    if (/\s/.test(tag[i])) {
-      emit(out, 'plain', tag[i]);
-      i += 1;
-      continue;
-    }
-    if (tag[i] === '"' || tag[i] === SQUOTE) {
-      const q = tag[i];
-      let k = i + 1;
-      while (k < n && tag[k] !== q) k += 1;
-      k = Math.min(k + 1, n);
-      emit(out, 'string', tag.slice(i, k));
-      i = k;
-      continue;
+  if (tag[i] === '/') take('punct', i + 1);
+  take('tag', scanWhile(tag, i, /[A-Za-z0-9:-]/));
+  while (i < tag.length) {
+    const ch = tag[i];
+    if (ch === '>' || (ch === '/' && tag[i + 1] === '>')) {
+      take('punct', tag.length);
+    } else if (/\s/.test(ch)) {
+      take('plain', i + 1);
+    } else if (QUOTES.includes(ch)) {
+      const close = tag.indexOf(ch, i + 1);
+      take('string', close < 0 ? tag.length : close + 1);
+    } else if (/[A-Za-z_:]/.test(ch)) {
+      take('attr', scanWhile(tag, i + 1, /[A-Za-z0-9_:.-]/));
+    } else {
+      take('punct', i + 1);
     }
-    if (/[A-Za-z_:]/.test(tag[i])) {
-      let k = i + 1;
-      while (k < n && /[A-Za-z0-9_:.-]/.test(tag[k])) k += 1;
-      emit(out, 'attr', tag.slice(i, k));
-      i = k;
-      continue;
-    }
-    emit(out, 'punct', tag[i]);
-    i += 1;
   }
   return out;
 };
 
+const tagEnd = (source, i) => {
+  const n = source.length;
+  let j = i + 1;
+  while (j < n && source[j] !== '>') {
+    j = QUOTES.includes(source[j]) ? quotedEnd(source, j) : j + 1;
+  }
+  return j < n ? j + 1 : j;
+};
+
 const highlight = (source) => {
   const out = [];
-  let i = 0;
   const n = source.length;
+  let i = 0;
   while (i < n) {
+    let end;
     if (source.startsWith('<!--', i)) {
-      let j = source.indexOf('-->', i + 4);
-      j = j === -1 ? n : j + 3;
-      emit(out, 'comment', source.slice(i, j));
-      i = j;
-      continue;
-    }
-    if (source[i] === '<') {
-      let j = i + 1;
-      while (j < n && source[j] !== '>') {
-        if (source[j] === '"' || source[j] === SQUOTE) {
-          j = skipQuoted(source, j);
-          continue;
-        }
-        j += 1;
-      }
-      if (j < n) j += 1;
-      for (const t of colorHtmlTag(source.slice(i, j))) out.push(t);
-      i = j;
-      continue;
-    }
-    let j = i + 1;
-    while (j < n && source[j] !== '<' && !source.startsWith('<!--', j)) {
-      j += 1;
+      const close = source.indexOf('-->', i + 4);
+      end = close < 0 ? n : close + 3;
+      emit(out, 'comment', source.slice(i, end));
+    } else if (source[i] === '<') {
+      end = tagEnd(source, i);
+      for (const token of colorHtmlTag(source.slice(i, end))) out.push(token);
+    } else {
+      const next = source.indexOf('<', i + 1);
+      end = next < 0 ? n : next;
+      emit(out, 'plain', source.slice(i, end));
     }
-    emit(out, 'plain', source.slice(i, j));
-    i = j;
+    i = end;
   }
   return out;
 };