From 29c5aeba17b325736abc004c008891b7ebfc4293 Mon Sep 17 00:00:00 2001
From: nyamatongwe <unknown>
Date: Wed, 2 Feb 2005 00:23:43 +0000
Subject: Modification to avoid triggering document comment keyword unless
 preceded by space or '*'. This prevents email addresses from highlighting
 like document comment keywords.

---
 src/LexCPP.cxx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/LexCPP.cxx b/src/LexCPP.cxx
index c6ca06505..7e83fcb62 100644
--- a/src/LexCPP.cxx
+++ b/src/LexCPP.cxx
@@ -136,8 +136,11 @@ static void ColouriseCppDoc(unsigned int startPos, int length, int initStyle, Wo
 			if (sc.Match('*', '/')) {
 				sc.Forward();
 				sc.ForwardSetState(SCE_C_DEFAULT);
-			} else if (sc.ch == '@' || sc.ch == '\\') {
-				sc.SetState(SCE_C_COMMENTDOCKEYWORD);
+			} else if (sc.ch == '@' || sc.ch == '\\') { // JavaDoc and Doxygen support
+				// Verify that we have the conditions to mark a comment-doc-keyword
+				if ((IsASpace(sc.chPrev) || sc.chPrev == '*') && (!IsASpace(sc.chNext))) {
+					sc.SetState(SCE_C_COMMENTDOCKEYWORD);
+				}
 			}
 		} else if (sc.state == SCE_C_COMMENTLINE || sc.state == SCE_C_COMMENTLINEDOC) {
 			if (sc.ch == '\r' || sc.ch == '\n') {
-- 
cgit v1.2.3