Skip to content

Commit 2f7747d

Browse files
committed
issue doxygen#10900 [1.9.5+] Inline comments on single-line classes with @copydoc create 'TK_COMMAND_BS' warnings
1 parent 6c2768f commit 2f7747d

1 file changed

Lines changed: 15 additions & 2 deletions

File tree

src/scanner.l

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3091,7 +3091,20 @@ NONLopt [^\n]*
30913091
yyextra->docBlockContext = YY_START;
30923092
yyextra->docBlockInBody = FALSE;
30933093
yyextra->docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
3094-
( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
3094+
( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
3095+
if (YY_START==MemberSpec && yyextra->memspecEntry && yyextra->memspecEntry->briefFile.isEmpty()) // see issue #10900
3096+
{
3097+
if (yytext[yyleng-3]=='/')
3098+
{
3099+
yyextra->memspecEntry->briefFile = yyextra->fileName;
3100+
yyextra->memspecEntry->briefLine = yyextra->yyLineNr;
3101+
}
3102+
else
3103+
{
3104+
yyextra->memspecEntry->docFile = yyextra->fileName;
3105+
yyextra->memspecEntry->docLine = yyextra->yyLineNr;
3106+
}
3107+
}
30953108

30963109
QCString indent;
30973110
indent.fill(' ',computeIndent(yytext,yyextra->column));
@@ -3128,7 +3141,7 @@ NONLopt [^\n]*
31283141
yyextra->docBlockContext = YY_START;
31293142
yyextra->docBlockInBody = FALSE;
31303143
yyextra->docBlockAutoBrief = ( yytext[yyleng-2]=='*' && Config_getBool(JAVADOC_AUTOBRIEF) ) ||
3131-
( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
3144+
( yytext[yyleng-2]=='!' && Config_getBool(QT_AUTOBRIEF) );
31323145

31333146
QCString indent;
31343147
indent.fill(' ',computeIndent(yytext,yyextra->column));

0 commit comments

Comments
 (0)