MarkdownCommonElements must now start with a whitespace or a string t…

…o avoid changing URLs
bmoliveira · Aug 1, 2016 · 94f0767 · 94f0767
1 parent 4ff46e3
commit 94f0767
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/MarkdownKit/Classes/Elements/MarkdownBold.swift b/MarkdownKit/Classes/Elements/MarkdownBold.swift
@@ -10,7 +10,7 @@ import UIKit
 
 public class MarkdownBold: MarkdownCommonElement {
 
-  private static let regex = "(\\*\\*|__)(.+?)(\\1)"
+  private static let regex = "(\\s+|^)(\\*\\*|__)(.+?)(\\2)"
 
   public var font: UIFont?
   public var color: UIColor?

diff --git a/MarkdownKit/Classes/Elements/MarkdownCode.swift b/MarkdownKit/Classes/Elements/MarkdownCode.swift
@@ -10,8 +10,8 @@ import UIKit
 
 public class MarkdownCode: MarkdownCommonElement {
 
-    private static let regex = "(`+)(\\s*.*?[^`]\\s*)(\\1)(?!`)"
-    
+    private static let regex = "(\\s+|^)(`+)(\\s*.*?[^`]\\s*)(\\1)(?!`)"
+
     public var font: UIFont?
     public var color: UIColor?
 

diff --git a/MarkdownKit/Classes/Elements/MarkdownItalic.swift b/MarkdownKit/Classes/Elements/MarkdownItalic.swift
@@ -10,7 +10,7 @@ import UIKit
 
 public class MarkdownItalic: MarkdownCommonElement {
 
-  private static let regex = "(\\*|_)(.+?)(\\1)"
+  private static let regex = "(\\s+|^)(\\*|_)(.+?)(\\2)"
 
   public var font: UIFont?
   public var color: UIColor?

diff --git a/MarkdownKit/Classes/Protocols/MarkdownCommonElement.swift b/MarkdownKit/Classes/Protocols/MarkdownCommonElement.swift
@@ -27,10 +27,10 @@ public extension MarkdownCommonElement {
 
   func match(match: NSTextCheckingResult, attributedString: NSMutableAttributedString) {
     // deleting trailing markdown
-    attributedString.deleteCharactersInRange(match.rangeAtIndex(3))
+    attributedString.deleteCharactersInRange(match.rangeAtIndex(4))
     // formatting string (may alter the length)
-    addAttributes(attributedString, range: match.rangeAtIndex(2))
+    addAttributes(attributedString, range: match.rangeAtIndex(3))
     // deleting leading markdown
-    attributedString.deleteCharactersInRange(match.rangeAtIndex(1))
+    attributedString.deleteCharactersInRange(match.rangeAtIndex(2))
   }
 }