# HG changeset patch # User Mads Kiilerich # Date 2015-05-13 01:16:48 # Node ID beeb69476cc4a02b5d5f6f7d024c24b2e17c6ba7 # Parent 1cc64983363a5e669bf146504b0fd3103a4212a7 comments: don't eat character before @mention when rendering to rst The character before @ should not only be ungrouped it should also not be eaten so re.sub still works as expected. diff --git a/kallithea/lib/utils2.py b/kallithea/lib/utils2.py --- a/kallithea/lib/utils2.py +++ b/kallithea/lib/utils2.py @@ -564,9 +564,9 @@ def time_to_datetime(tm): return datetime.datetime.fromtimestamp(tm) # Must match regexp in kallithea/public/js/base.js MentionsAutoComplete() -# Eat char before @ - it must not look like we are in an email addresses. +# Check char before @ - it must not look like we are in an email addresses. # Matching is gready so we don't have to look beyond the end. -MENTIONS_REGEX = re.compile(r'(?:^|[^a-zA-Z0-9])@([a-zA-Z0-9][-_.a-zA-Z0-9]*[a-zA-Z0-9])') +MENTIONS_REGEX = re.compile(r'(?:^|(?<=[^a-zA-Z0-9]))@([a-zA-Z0-9][-_.a-zA-Z0-9]*[a-zA-Z0-9])') def extract_mentioned_users(s): r"""