🐛 Do not process email links additionally

Author: tw93

Mac/Business/Markdown.swift

@@ -8,7 +8,7 @@ func renderMarkdownHTML(markdown: String) -> String? {
     defer { cmark_parser_free(parser) }
 
     // 附加常见的 GFM 扩展
-    let extensions = ["table", "autolink", "emoji", "footnotes", "strikethrough", "tasklist"]
+    let extensions = ["table", "emoji", "footnotes", "strikethrough", "tasklist"]
     for extName in extensions {
         if let ext = cmark_find_syntax_extension(extName) {
             cmark_parser_attach_syntax_extension(parser, ext)

Mac/Extensions/String+.swift

@@ -64,17 +64,7 @@ public extension String {
 
         return self
     }
-
-    func isValidEmail() -> Bool {
-        let pattern = "^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$"
-
-        if let regex = try? NSRegularExpression(pattern: pattern, options: .caseInsensitive) {
-            return regex.firstMatch(in: self, options: [], range: NSRange(location: 0, length: count)) != nil
-        }
-
-        return false
-    }
-
+    
     func isNumberList() -> Bool {
         let pattern = "^(( |\t)*[0-9]+\\. )"
         if let regex = try? NSRegularExpression(pattern: pattern) {

Mac/Helpers/NotesTextProcessor.swift

@@ -724,29 +724,6 @@ public class NotesTextProcessor {
             }
         }
 
-        // We detect and process inline mailto links not formatted
-        NotesTextProcessor.autolinkEmailRegex.matches(string, range: paragraphRange) { result in
-            guard let range = result?.range else { return }
-            let substring = attributedString.mutableString.substring(with: range)
-            guard substring.lengthOfBytes(using: .utf8) > 0 else { return }
-
-            attributedString.addAttribute(.foregroundColor, value: linkColor, range: range)
-
-            if substring.isValidEmail() {
-                attributedString.addAttribute(.link, value: "mailto:\(substring)", range: range)
-            } else {
-                attributedString.addAttribute(.link, value: substring, range: range)
-            }
-
-            if NotesTextProcessor.hideSyntax {
-                NotesTextProcessor.mailtoRegex.matches(string, range: range) { innerResult in
-                    guard let innerRange = innerResult?.range else { return }
-                    attributedString.addAttribute(.font, value: hiddenFont, range: innerRange)
-                    attributedString.addAttribute(.foregroundColor, value: hiddenColor, range: innerRange)
-                }
-            }
-        }
-
         NotesTextProcessor.imageInlineRegex.matches(string, range: paragraphRange) { result in
             guard let range = result?.range else { return }
 
@@ -1244,21 +1221,6 @@ public class NotesTextProcessor {
 
     public static let autolinkPrefixRegex = MarklightRegex(pattern: autolinkPrefixPattern, options: [.allowCommentsAndWhitespace, .dotMatchesLineSeparators])
 
-    fileprivate static let autolinkEmailPattern = [
-        "(?:mailto:)?",
-        "(",
-        "  [-.\\w]+",
-        "  \\@",
-        "  [-a-z0-9]+(\\.[-a-z0-9]+)*\\.[a-z]+",
-        ")"
-    ].joined(separator: "\n")
-
-    public static let autolinkEmailRegex = MarklightRegex(pattern: autolinkEmailPattern, options: [.allowCommentsAndWhitespace, .dotMatchesLineSeparators])
-
-    fileprivate static let mailtoPattern = "mailto:"
-
-    public static let mailtoRegex = MarklightRegex(pattern: mailtoPattern, options: [.allowCommentsAndWhitespace, .dotMatchesLineSeparators])
-
     /// maximum nested depth of [] and () supported by the transform;
     /// implementation detail
     fileprivate static let _nestDepth = 6

Mac/View/EditTextView.swift

@@ -937,10 +937,6 @@ class EditTextView: NSTextView, NSTextFinderClient {
     }
 
     override func clicked(onLink link: Any, at charIndex: Int) {
-        if let link = link as? String, link.isValidEmail(), let mail = URL(string: "mailto:\(link)") {
-            NSWorkspace.shared.open(mail)
-            return
-        }
 
         let range = NSRange(location: charIndex, length: 1)