Skip to content

Fix mention detection inside email addresses #2290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ch4og wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −2
Open

Fix mention detection inside email addresses #2290

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions submodules/TextFormat/Sources/GenerateTextEntities.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ private let identifierDelimiterSet: CharacterSet = {
set.insert("/")
return set
}()
private let mentionDelimiterSet: CharacterSet = {
var set = CharacterSet.whitespacesAndNewlines
set.insert("(")
return set
}()
private let externalIdentifierDelimiterSet: CharacterSet = {
var set = identifierDelimiterSet
set.remove(".")
Expand Down Expand Up @@ -329,14 +334,20 @@ public func generateTextEntities(_ text: String, enabledTypes: EnabledEntityType
}
} else if scalar == "@" {
notFound = false
let isMentionBoundary: Bool
if let previousScalar = previousScalar {
isMentionBoundary = mentionDelimiterSet.contains(previousScalar)
} else {
isMentionBoundary = true
}
if let (type, range) = currentEntity {
if case .command = type {
currentEntity = (type, range.lowerBound ..< utf16.index(after: index))
} else {
commitEntity(utf16, type, range, enabledTypes, &entities)
currentEntity = (.mention, index ..< index)
currentEntity = isMentionBoundary ? (.mention, index ..< index) : nil
}
} else {
} else if isMentionBoundary {
currentEntity = (.mention, index ..< index)
}
} else if scalar == "#" {
Expand Down