feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

C++: Consider '^//[/!][^\n]*' as doxygen comment

Browse Source 
Now everything following '///' or '//!' is a doxygen comment.

This simplification fixes also the bug ('\n' was considered as part of
the doxygen comment and led to strange highlighting).

Task-number: QTCREATORBUG-8921

Change-Id: I6dae3b80ec11400f2f623897257782a80860a7f3
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This commit is contained in:
Nikolai Kosjar
2013-03-11 15:01:10 +01:00
parent 29055f9f43
commit 47d60ae89a
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/3rdparty/cplusplus/Lexer.cpp vendored
View File

@@ -368,12 +368,8 @@ void Lexer::scan_helper(Token *tok)
if (_yychar == '/' || _yychar == '!') { if (_yychar == '/' || _yychar == '!') {
yyinp(); yyinp();
if (_yychar == '<' || _yychar != '/') {
yyinp();
doxy = true; doxy = true;
} }
}
while (_yychar && _yychar != '\n') while (_yychar && _yychar != '\n')
yyinp(); yyinp();

11
tests/auto/cplusplus/lexer/tst_lexer.cpp
View File

@@ -65,7 +65,7 @@ void tst_SimpleLexer::doxygen_comments()
Token expectedToken; // Create a Token in order to spell the token kind Token expectedToken; // Create a Token in order to spell the token kind
expectedToken.f.kind = expectedTokenKind; expectedToken.f.kind = expectedTokenKind;
// qDebug("Comparing (i=%d): \"%s\" \"%s\"", i, token.spell(), expectedToken.spell()); // qDebug("Comparing (i=%d): \"%s\" \"%s\"", i, token.spell(), expectedToken.spell());
QCOMPARE(token.spell(), expectedToken.spell()); QCOMPARE(token.kind(), expectedTokenKind);
} }
QVERIFY2(i == expectedTokenKindList.size(), "Less tokens than expected."); QVERIFY2(i == expectedTokenKindList.size(), "Less tokens than expected.");
} }
@@ -83,7 +83,7 @@ void tst_SimpleLexer::doxygen_comments_data()
QTest::newRow(source) << source << expectedTokenKindList; QTest::newRow(source) << source << expectedTokenKindList;
source = "//// comment"; source = "//// comment";
expectedTokenKindList = QList<unsigned>() << T_CPP_COMMENT; expectedTokenKindList = QList<unsigned>() << T_CPP_DOXY_COMMENT;
QTest::newRow(source) << source << expectedTokenKindList; QTest::newRow(source) << source << expectedTokenKindList;
source = "/// comment"; source = "/// comment";
@@ -105,6 +105,13 @@ void tst_SimpleLexer::doxygen_comments_data()
source = "///\n"; source = "///\n";
expectedTokenKindList = QList<unsigned>() << T_CPP_DOXY_COMMENT; expectedTokenKindList = QList<unsigned>() << T_CPP_DOXY_COMMENT;
QTest::newRow(source) << source << expectedTokenKindList; QTest::newRow(source) << source << expectedTokenKindList;
source = "///\n"
"int i;";
expectedTokenKindList = QList<unsigned>()
<< T_CPP_DOXY_COMMENT
<< T_INT << T_IDENTIFIER << T_SEMICOLON;
QTest::newRow(source) << source << expectedTokenKindList;
} }
QTEST_APPLESS_MAIN(tst_SimpleLexer) QTEST_APPLESS_MAIN(tst_SimpleLexer)