summaryrefslogtreecommitdiff
path: root/src/libs/cplusplus/SimpleLexer.cpp
diff options
context:
space:
mode:
authorRoberto Raggi <roberto.raggi@nokia.com>2009-09-29 11:34:11 +0200
committerRoberto Raggi <roberto.raggi@nokia.com>2009-09-29 11:35:43 +0200
commite40cd82f8c12ca3d0a3b0e9c89737acf940def44 (patch)
treeb5a4688f2213166dde97d575d2afbd0d7935aa23 /src/libs/cplusplus/SimpleLexer.cpp
parent1ce92c0ed6fad332c1ef7a1eb1d770fbd23932fb (diff)
downloadqt-creator-e40cd82f8c12ca3d0a3b0e9c89737acf940def44.tar.gz
Introduced T_CPP_COMMENT and T_CPP_DOXY_COMMENT to handle C++-style comments and improved CPPEditor::isInComment to handle the newly introduced tokens.
As side effect,this change should fix the regression we introduced in the "automagically" quote/brace insertion.
Diffstat (limited to 'src/libs/cplusplus/SimpleLexer.cpp')
-rw-r--r--src/libs/cplusplus/SimpleLexer.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libs/cplusplus/SimpleLexer.cpp b/src/libs/cplusplus/SimpleLexer.cpp
index 59475bc4a4..2934804f09 100644
--- a/src/libs/cplusplus/SimpleLexer.cpp
+++ b/src/libs/cplusplus/SimpleLexer.cpp
@@ -63,7 +63,8 @@ bool SimpleToken::isKeyword() const
bool SimpleToken::isComment() const
{
- return _kind == T_COMMENT || _kind == T_DOXY_COMMENT;
+ return _kind == T_COMMENT || _kind == T_DOXY_COMMENT ||
+ _kind == T_CPP_COMMENT || _kind == T_CPP_DOXY_COMMENT;
}
bool SimpleToken::isObjCAtKeyword() const