Merge d5894ef387 into 8a979690a7

client/components/editor/common/katex.js

@@ -28,120 +28,101 @@ function isValidDelim (state, pos) {
 
 export default {
   katexInline (state, silent) {
-    let start, match, token, res, pos
+    if (state.src[state.pos] !== '$') return false;
 
-    if (state.src[state.pos] !== '$') { return false }
+    if (!isValidDelim(state, state.pos).canOpen) {
-
+      return handleNoOpen(state, silent);
-    res = isValidDelim(state, state.pos)
-    if (!res.canOpen) {
-      if (!silent) { state.pending += '$' }
-      state.pos += 1
-      return true
     }
 
-    // First check for and bypass all properly escaped delimieters
+    const start = state.pos + 1;
-    // This loop will assume that the first leading backtick can not
+    const match = findClosingDelimiter(state.src, start);
-    // be the first character in state.src, which is known since
-    // we have found an opening delimieter already.
-    start = state.pos + 1
-    match = start
-    while ((match = state.src.indexOf('$', match)) !== -1) {
-      // Found potential $, look for escapes, pos will point to
-      // first non escape when complete
-      pos = match - 1
-      while (state.src[pos] === '\\') { pos -= 1 }
-
-      // Even number of escapes, potential closing delimiter found
-      if (((match - pos) % 2) === 1) { break }
-      match += 1
-    }
 
-    // No closing delimter found.  Consume $ and continue.
     if (match === -1) {
-      if (!silent) { state.pending += '$' }
+      return handleNoMatch(state, silent, start);
-      state.pos = start
-      return true
     }
 
-    // Check if we have empty content, ie: $$.  Do not parse.
     if (match - start === 0) {
-      if (!silent) { state.pending += '$$' }
+      return handleEmptyContent(state, silent, start);
-      state.pos = start + 1
-      return true
     }
 
-    // Check for valid closing delimiter
+    if (!isValidDelim(state, match).canClose) {
-    res = isValidDelim(state, match)
+      return handleNoClose(state, silent, start);
-    if (!res.canClose) {
-      if (!silent) { state.pending += '$' }
-      state.pos = start
-      return true
     }
 
     if (!silent) {
-      token = state.push('katex_inline', 'math', 0)
+      const token = state.push('katex_inline', 'math', 0);
-      token.markup = '$'
+      token.markup = '$';
-      token.content = state.src
+      token.content = escapeCurlyBraces(state.src.slice(start, match));
-        // Extract the math part without the $
-        .slice(start, match)
-        // Escape the curly braces since they will be interpreted as
-        // attributes by markdown-it-attrs (the "curly_attributes"
-        // core rule)
-        .replaceAll("{", "{{")
-        .replaceAll("}", "}}")
     }
 
-    state.pos = match + 1
+    state.pos = match + 1;
-    return true
+    return true;
   },
-
   katexBlock (state, start, end, silent) {
-    let firstLine; let lastLine; let next; let lastPos; let found = false; let token
+    let pos = state.bMarks[start] + state.tShift[start];
-    let pos = state.bMarks[start] + state.tShift[start]
+    let max = state.eMarks[start];
-    let max = state.eMarks[start]
+    if (!isValidBlockStart(pos, max, state)) return false;
-
+
-    if (pos + 2 > max) { return false }
+    pos += 2;
-    if (state.src.slice(pos, pos + 2) !== '$$') { return false }
+    let firstLine = state.src.slice(pos, max);
-
+    if (silent) return true;
-    pos += 2
+
-    firstLine = state.src.slice(pos, max)
+    let found = false;
-
+    if (isSingleLineBlock(firstLine)) {
-    if (silent) { return true }
+      firstLine = firstLine.trim().slice(0, -2);
-    if (firstLine.trim().slice(-2) === '$$') {
+      found = true;
-      // Single line expression
-      firstLine = firstLine.trim().slice(0, -2)
-      found = true
     }
 
-    for (next = start; !found;) {
+    let next = start, lastLine = '', lastPos;
-      next++
+    ({ next, lastLine, found } = findBlockEnd(state, start, end, found));
 
-      if (next >= end) { break }
+    state.line = next + 1;
+    const token = state.push('katex_block', 'math', 0);
+    token.block = true;
+    token.content = (firstLine && firstLine.trim() ? firstLine + '\n' : '') +
+      state.getLines(start + 1, next, state.tShift[start], true) +
+      (lastLine && lastLine.trim() ? lastLine : '');
+    token.map = [ start, state.line ];
+    token.markup = '$$';
+    return true;
+  }
+}
 
-      pos = state.bMarks[next] + state.tShift[next]
+function handleNoOpen(state, silent) {
-      max = state.eMarks[next]
+  if (!silent) state.pending += '$';
+  state.pos += 1;
+  return true;
+}
 
-      if (pos < max && state.tShift[next] < state.blkIndent) {
+function findClosingDelimiter(src, start) {
-        // non-empty line with negative indent should stop the list:
+  let match = start;
-        break
+  while ((match = src.indexOf('$', match)) !== -1) {
-      }
+    let pos = match - 1;
+    while (src[pos] === '\\') pos -= 1;
+    if (((match - pos) % 2) === 1) break;
+    match += 1;
+  }
+  return match;
+}
 
-      if (state.src.slice(pos, max).trim().slice(-2) === '$$') {
+function handleNoMatch(state, silent, start) {
-        lastPos = state.src.slice(0, max).lastIndexOf('$$')
+  if (!silent) state.pending += '$';
-        lastLine = state.src.slice(pos, lastPos)
+  state.pos = start;
-        found = true
+  return true;
-      }
+}
-    }
 
-    state.line = next + 1
+function handleEmptyContent(state, silent, start) {
+  if (!silent) state.pending += '$$';
+  state.pos = start + 1;
+  return true;
+}
 
-    token = state.push('katex_block', 'math', 0)
+function handleNoClose(state, silent, start) {
-    token.block = true
+  if (!silent) state.pending += '$';
-    token.content = (firstLine && firstLine.trim() ? firstLine + '\n' : '') +
+  state.pos = start;
-    state.getLines(start + 1, next, state.tShift[start], true) +
+  return true;
-    (lastLine && lastLine.trim() ? lastLine : '')
+}
-    token.map = [ start, state.line ]
+
-    token.markup = '$$'
+function escapeCurlyBraces(str) {
-    return true
+  return str.replaceAll('{', '{{').replaceAll('}', '}}');
-  }
 }