Merge pull request #7960 from albert-github/feature/bug_count

Improvement of line count for e.g. warnings

2 files changed, 5 insertions, 5 deletions

diff --git a/src/commentscan.l b/src/commentscan.l
index d695f0a..5a71b14 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -440,7 +440,6 @@ static void addCite(yyscan_t yyscanner);
 
 //-----------------------------------------------------------------------------
 
-
 #undef        YY_INPUT
 #define        YY_INPUT(buf,result,max_size) result=yyread(yyscanner,buf,max_size);
 
@@ -860,7 +859,7 @@ RCSTAG    "$"{ID}":"[^\n$]+"$"
                                           else // yyextra->inContext==OutputBrief
                                           { // only go to the detailed description if we have
                                             // found some brief description and not just whitespace
-                                            endBrief(yyscanner,FALSE);
+                                            endBrief(yyscanner,TRUE);
                                           }
                                           lineCount(yyscanner);
                                         }
@@ -2128,8 +2127,8 @@ static bool handleDetails(yyscan_t yyscanner,const QCString &, const QCStringLis
   struct yyguts_t *yyg = (struct yyguts_t*)yyscanner;
   if (yyextra->inContext!=OutputBrief)
   {
-    addOutput(yyscanner,"\n\n"); // treat @details outside brief description
-                       // as a new paragraph
+    addOutput(yyscanner,"\\ilinebr\\ilinebr "); // treat @details outside brief description
+                                                // as a new paragraph
   }
   setOutput(yyscanner,OutputDoc);
   return FALSE;
@@ -3235,6 +3234,7 @@ bool CommentScanner::parseCommentBlock(/* in */     OutlineParserInterface *pars
   yyextra->guards = std::stack<GuardedSection>();
   yyextra->langParser     = parser;
   yyextra->current        = curEntry;
+  yyextra->current->docLine = (lineNr > 1 ? lineNr-1: 1);
   if (comment.isEmpty()) return FALSE; // avoid empty strings
   yyextra->inputString    = comment;
   yyextra->inputString.append(" ");
diff --git a/src/util.cpp b/src/util.cpp
index 2c7af7b..fb7a8dc 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -6580,7 +6580,7 @@ QCString stripLeadingAndTrailingEmptyLines(const QCString &s,int &docLine)
   while ((c=*p))
   {
     if (c==' ' || c=='\t' || c=='\r') i++,p++;
-    else if (c=='\\' && qstrncmp(p,"\\ilinebr",8)==0) i+=8,li=i,docLine++,p+=8;
+    else if (c=='\\' && qstrncmp(p,"\\ilinebr",8)==0) i+=8,li=i,p+=8;
     else if (c=='\n') i++,li=i,docLine++,p++;
     else break;
   }