MM-11109 Properly highlight mentions followed by an underscore (matte…

…rmost#1417)
jespino · Jul 12, 2018 · d892459 · d892459
1 parent 19c0c7d
commit d892459
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/utils/text_formatting.jsx b/utils/text_formatting.jsx
@@ -275,7 +275,7 @@ function highlightCurrentMentions(text, tokens, mentionKeys = []) {
  }
 
  // look for self mentions in the text
- function replaceCurrentMentionWithToken(fullMatch, prefix, mention) {
+ function replaceCurrentMentionWithToken(fullMatch, prefix, mention, suffix = '') {
  const index = tokens.size;
  const alias = `$MM_SELFMENTION${index}`;
 
@@ -284,7 +284,7 @@ function highlightCurrentMentions(text, tokens, mentionKeys = []) {
  originalText: mention,
  });
 
- return prefix + alias;
+ return prefix + alias + suffix;
  }
 
  for (const mention of mentionKeys) {
@@ -297,7 +297,7 @@ function highlightCurrentMentions(text, tokens, mentionKeys = []) {
  flags += 'i';
  }
 
- const pattern = new RegExp(`(^|\\W)(${escapeRegex(mention.key)})\\b`, flags);
+ const pattern = new RegExp(`(^|\\W)(${escapeRegex(mention.key)})(\\b|_+\\b)`, flags);
 
  output = output.replace(pattern, replaceCurrentMentionWithToken);
  }