Garmelon/cove
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix mention highlighting

Browse source
This commit is contained in:
Joscha 2025-02-23 21:56:18 +01:00
parent 315db43010
commit 9435fbece6
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cove/src/euph/highlight.rs
View file

@ -77,6 +77,7 @@ impl<'a> SpanFinder<'a> {
fn step(&mut self, idx: usize, char: char) { fn step(&mut self, idx: usize, char: char) {
match (char, self.span) { match (char, self.span) {
('@', Some((SpanType::Mention, _))) => {} // Continue the mention
('@', _) if self.room_or_mention_possible => self.open_span(SpanType::Mention, idx), ('@', _) if self.room_or_mention_possible => self.open_span(SpanType::Mention, idx),
('&', _) if self.room_or_mention_possible => self.open_span(SpanType::Room, idx), ('&', _) if self.room_or_mention_possible => self.open_span(SpanType::Room, idx),
(':', None) => self.open_span(SpanType::Emoji, idx), (':', None) => self.open_span(SpanType::Emoji, idx),
@ -180,8 +181,9 @@ mod tests {
#[test] #[test]
fn mentions() { fn mentions() {
assert_eq!(find_spans("@foo"), vec![(SpanType::Mention, 0..4)]); assert_eq!(find_spans("@foo"), vec![(SpanType::Mention, 0..4)]);
assert_eq!(find_spans("&@foo"), vec![(SpanType::Mention, 1..5)]);
assert_eq!(find_spans("a @foo b"), vec![(SpanType::Mention, 2..6)]); assert_eq!(find_spans("a @foo b"), vec![(SpanType::Mention, 2..6)]);
assert_eq!(find_spans("@@foo@"), vec![(SpanType::Mention, 1..6)]); assert_eq!(find_spans("@@foo@@"), vec![(SpanType::Mention, 0..7)]);
assert_eq!(find_spans("a @b@c d"), vec![(SpanType::Mention, 2..6)]); assert_eq!(find_spans("a @b@c d"), vec![(SpanType::Mention, 2..6)]);
assert_eq!( assert_eq!(
find_spans("a @b @c d"), find_spans("a @b @c d"),
@ -192,12 +194,18 @@ mod tests {
#[test] #[test]
fn rooms() { fn rooms() {
assert_eq!(find_spans("&foo"), vec![(SpanType::Room, 0..4)]); assert_eq!(find_spans("&foo"), vec![(SpanType::Room, 0..4)]);
assert_eq!(find_spans("@&foo"), vec![(SpanType::Room, 1..5)]);
assert_eq!(find_spans("a &foo b"), vec![(SpanType::Room, 2..6)]); assert_eq!(find_spans("a &foo b"), vec![(SpanType::Room, 2..6)]);
assert_eq!(find_spans("&&foo&"), vec![(SpanType::Room, 1..5)]); assert_eq!(find_spans("&&foo&&"), vec![(SpanType::Room, 1..5)]);
assert_eq!(find_spans("a &b&c d"), vec![(SpanType::Room, 2..4)]); assert_eq!(find_spans("a &b&c d"), vec![(SpanType::Room, 2..4)]);
assert_eq!( assert_eq!(
find_spans("a &b &c d"), find_spans("a &b &c d"),
vec![(SpanType::Room, 2..4), (SpanType::Room, 5..7)] vec![(SpanType::Room, 2..4), (SpanType::Room, 5..7)]
); );
} }
#[test]
fn emoji_in_mentions() {
assert_eq!(find_spans(" @a:b:c "), vec![(SpanType::Mention, 1..7)]);
}
} }