Bugfix: marktext#152 emoji error

Author: Jocs

src/editor/index.css

@@ -396,8 +396,8 @@ span.ag-image-marked-text, span.ag-link-in-bracket, span.ag-link-in-bracket .ag-
   text-decoration: none;
   color: rgb(51, 51, 51);
 }
-.ag-warn {
-  color: #000;
+span.ag-warn.ag-emoji-marked-text {
+  color: rgba(242, 134, 94, .7);
   text-decoration: none;
 }
 

src/editor/parser/parse.js

@@ -1,6 +1,7 @@
 import { beginRules, inlineRules } from './rules'
 import { isLengthEven, union } from '../utils'
 import { punctuation } from '../config'
+// import { validEmoji } from '../emojis'
 
 const CAN_NEST_RULES = ['strong', 'em', 'link', 'del', 'image', 'a_link'] // image can not nest but it has children
 
@@ -21,6 +22,20 @@ const getSrcAlt = text => {
   return { src, alt }
 }
 
+const lowerPriority = (src, offset) => {
+  let i
+  for (i = 0; i < offset; i++) {
+    const text = src.substring(i)
+    for (const rule of Object.keys(validateRules)) {
+      const to = validateRules[rule].exec(text)
+      if (to && to[0].length > offset - i) {
+        return false
+      }
+    }
+  }
+  return true
+}
+
 const validateEmphasize = (src, offset, marker, pending) => {
   /**
    * Intraword emphasis is disallowed for _
@@ -62,17 +77,7 @@ const validateEmphasize = (src, offset, marker, pending) => {
    * and one that does not, the former always wins. Thus, for example, *[foo*](bar) is parsed
    * as *<a href="bar">foo*</a> rather than as <em>[foo</em>](bar).
    */
-  let i
-  for (i = 0; i < offset; i++) {
-    const text = src.substring(i)
-    for (const rule of Object.keys(validateRules)) {
-      const to = validateRules[rule].exec(text)
-      if (to && to[0].length > offset - i) {
-        return false
-      }
-    }
-  }
-  return true
+  return lowerPriority(src, offset)
 }
 
 const tokenizerFac = (src, beginRules, inlineRules, pos = 0, top) => {
@@ -180,6 +185,7 @@ const tokenizerFac = (src, beginRules, inlineRules, pos = 0, top) => {
     for (const rule of chunks) {
       const to = inlineRules[rule].exec(src)
       if (to && isLengthEven(to[3])) {
+        if (rule === 'emoji' && !lowerPriority(src, to[0].length)) break
         inChunk = true
         pushPending()
         const range = {

src/editor/parser/rules.js

@@ -13,7 +13,7 @@ export const inlineRules = {
   'inline_code': /^(`{1,3})([^`]+?|.{2,})\1/,
   'image': /^(\!\[)(.*?)(\\*)\]\((.*?)(\\*)\)/,
   'link': /^(\[)((?:\[[^\]]*\]|[^\[\]]|\](?=[^\[]*\]))*?)(\\*)\]\((.*?)(\\*)\)/, // can nest
-  'emoji': /^(:)([^:\\]+?)\1/,
+  'emoji': /^(:)([a-z_]+?)\1/,
   'del': /^(~{2})(?=\S)([\s\S]*?\S)(\\*)\1/, // can nest
   'auto_link': /^(https?:\/\/[^\s]+)(?=\s|$)/,
   'inline_math': /^(\$)([^\$]*?[^\$\\])(\\*)\1(?!\1)/,