Fixing Regex. Also allowing '.@mention'

optonaut · Jan 8, 2016 · b66b029 · b66b029
1 parent 151f250
commit b66b029
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 5 deletions.
diff --git a/ActiveLabel/ActiveType.swift b/ActiveLabel/ActiveType.swift
@@ -31,7 +31,10 @@ struct ActiveBuilder {
 
         for mention in mentions where mention.range.length > 2 {
             let range = NSRange(location: mention.range.location + 1, length: mention.range.length - 1)
-            let word = nsstring.substringWithRange(range)
+            var word = nsstring.substringWithRange(range)
+            if word.hasPrefix("@") {
+                word.removeAtIndex(word.startIndex)
+            }
             let element = ActiveElement.Mention(word)
             elements.append((mention.range, element))
         }
@@ -45,7 +48,10 @@ struct ActiveBuilder {
 
         for hashtag in hashtags where hashtag.range.length > 2 {
             let range = NSRange(location: hashtag.range.location + 1, length: hashtag.range.length - 1)
-            let word = nsstring.substringWithRange(range)
+            var word = nsstring.substringWithRange(range)
+            if word.hasPrefix("#") {
+                word.removeAtIndex(word.startIndex)
+            }
             let element = ActiveElement.Hashtag(word)
             elements.append((hashtag.range, element))
         }

diff --git a/ActiveLabel/RegexParser.swift b/ActiveLabel/RegexParser.swift
@@ -9,8 +9,8 @@
 import Foundation
 
 struct RegexParser {
-    static let hashtagRegex = try? NSRegularExpression(pattern: "#[a-z0-9_]*", options: [.CaseInsensitive])
-    static let mentionRegex = try? NSRegularExpression(pattern: "@[a-z0-9_]*", options: [.CaseInsensitive])
+    static let hashtagRegex = try? NSRegularExpression(pattern: "(?:^|\\s|$)#[a-z0-9_]*", options: [.CaseInsensitive])
+    static let mentionRegex = try? NSRegularExpression(pattern: "(?:^|\\s|$|[.])@[a-z0-9_]*", options: [.CaseInsensitive])
     static let urlDetector = try? NSDataDetector(types: NSTextCheckingType.Link.rawValue)
 
     static func getMentions(fromText text: String, range: NSRange) -> [NSTextCheckingResult] {

diff --git a/ActiveLabelTests/ActiveTypeTests.swift b/ActiveLabelTests/ActiveTypeTests.swift
@@ -95,7 +95,34 @@ class ActiveTypeTests: XCTestCase {
         XCTAssertEqual(activeElements.count, 1)
         XCTAssertEqual(currentElementString, "_with_underscores_")
         XCTAssertEqual(currentElementType, ActiveType.Mention)
+
+        label.text = " . @userhandle"
+        XCTAssertEqual(activeElements.count, 1)
+        XCTAssertEqual(currentElementString, "userhandle")
+        XCTAssertEqual(currentElementType, ActiveType.Mention)
+
+        label.text = "@user#hashtag"
+        XCTAssertEqual(activeElements.count, 1)
+        XCTAssertEqual(currentElementString, "user")
+        XCTAssertEqual(currentElementType, ActiveType.Mention)
+
+        label.text = "@user@mention"
+        XCTAssertEqual(activeElements.count, 1)
+        XCTAssertEqual(currentElementString, "user")
+        XCTAssertEqual(currentElementType, ActiveType.Mention)
+
+        label.text = ".@userhandle"
+        XCTAssertEqual(activeElements.count, 1)
+        XCTAssertEqual(currentElementString, "userhandle")
+        XCTAssertEqual(currentElementType, ActiveType.Mention)
+
+        label.text = " .@userhandle"
+        XCTAssertEqual(activeElements.count, 1)
+        XCTAssertEqual(currentElementString, "userhandle")
+        XCTAssertEqual(currentElementType, ActiveType.Mention)
 
+        label.text = "word@mention"
+        XCTAssertEqual(activeElements.count, 0)
         label.text = "@u"
         XCTAssertEqual(activeElements.count, 0)
         label.text = "@."
@@ -119,7 +146,28 @@ class ActiveTypeTests: XCTestCase {
         XCTAssertEqual(activeElements.count, 1)
         XCTAssertEqual(currentElementString, "_with_underscores_")
         XCTAssertEqual(currentElementType, ActiveType.Hashtag)
-
+
+        label.text = " . #somehashtag"
+        XCTAssertEqual(activeElements.count, 1)
+        XCTAssertEqual(currentElementString, "somehashtag")
+        XCTAssertEqual(currentElementType, ActiveType.Hashtag)
+
+        label.text = "#some#hashtag"
+        XCTAssertEqual(activeElements.count, 1)
+        XCTAssertEqual(currentElementString, "some")
+        XCTAssertEqual(currentElementType, ActiveType.Hashtag)
+
+        label.text = "#some@mention"
+        XCTAssertEqual(activeElements.count, 1)
+        XCTAssertEqual(currentElementString, "some")
+        XCTAssertEqual(currentElementType, ActiveType.Hashtag)
+
+        label.text = ".#somehashtag"
+        XCTAssertEqual(activeElements.count, 0)
+        label.text = " .#somehashtag"
+        XCTAssertEqual(activeElements.count, 0)
+        label.text = "word#hashtag"
+        XCTAssertEqual(activeElements.count, 0)
         label.text = "#h"
         XCTAssertEqual(activeElements.count, 0)
         label.text = "#."