issue doxygen#11373 Code examples in Python docstrings rendered in HTML with wrong indentation beyond 8 spaces

Ignore the line after """! when determining the indentation to
strip.

Author: doxygen

src/pyscanner.l

@@ -804,14 +804,17 @@ ID        [a-z_A-Z%]+{IDSYM}*
                         yyextra->current->program << yytext;
                       }
     ^{BB}             { // something at indent >0
-                        yyextra->current->program << yytext;
                         yyextra->curIndent = computeIndent(yytext);
                         if (yyextra->curIndent<=yyextra->indent)
                           // jumped out of the function
                         {
                           endOfDef(yyscanner,1);
                           BEGIN(Search);
                         }
+                        else
+                        {
+                          yyextra->current->program << yytext;
+                        }
                       }
     "'"               { // start of a single quoted string
                         yyextra->current->program << yytext;
@@ -2020,7 +2023,8 @@ static void handleCommentBlock(yyscan_t yyscanner,const QCString &doc,bool brief
   int lineNr = brief ? yyextra->current->briefLine : yyextra->current->docLine;
   Markdown markdown(yyextra->fileName,lineNr);
   GuardedSectionStack guards;
-  QCString strippedDoc = stripIndentation(doc);
+  QCString strippedDoc = stripIndentation(doc,true);
+  //printf("stippedDoc=[%s]\n",qPrint(strippedDoc));
   QCString processedDoc = Config_getBool(MARKDOWN_SUPPORT) ? markdown.process(strippedDoc,lineNr) : strippedDoc;
   while (yyextra->commentScanner.parseCommentBlock(
         yyextra->thisParser,
@@ -2080,10 +2084,6 @@ static void initTriDoubleQuoteBlock(yyscan_t yyscanner)
   yyextra->docBlock.clear();
   yyextra->commentIndent = yyextra->curIndent;
   yyextra->doubleQuote = TRUE;
-  if (yyextra->docBlockSpecial)
-  {
-    yyextra->docBlock.fill(' ',yyextra->indent);
-  }
   startCommentBlock(yyscanner,FALSE);
 }
 
@@ -2097,10 +2097,6 @@ static void initTriSingleQuoteBlock(yyscan_t yyscanner)
   yyextra->docBlock.clear();
   yyextra->commentIndent = yyextra->curIndent;
   yyextra->doubleQuote = FALSE;
-  if (yyextra->docBlockSpecial)
-  {
-    yyextra->docBlock.fill(' ',yyextra->indent);
-  }
   startCommentBlock(yyscanner,FALSE);
 }
 

src/util.cpp

@@ -6402,7 +6402,7 @@ bool protectionLevelVisible(Protection prot)
 
 //---------------------------------------------------------------------------
 
-QCString stripIndentation(const QCString &s)
+QCString stripIndentation(const QCString &s,bool skipFirstLine)
 {
   if (s.isEmpty()) return s; // empty string -> we're done
 
@@ -6412,16 +6412,17 @@ QCString stripIndentation(const QCString &s)
   char c=0;
   int indent=0;
   int minIndent=1000000; // "infinite"
-  bool searchIndent=TRUE;
+  bool searchIndent=true;
   int tabSize=Config_getInt(TAB_SIZE);
+  bool skipFirst = skipFirstLine;
   while ((c=*p++))
   {
     if      (c=='\t') indent+=tabSize - (indent%tabSize);
-    else if (c=='\n') indent=0,searchIndent=TRUE;
+    else if (c=='\n') indent=0,searchIndent=true,skipFirst=false;
     else if (c==' ')  indent++;
-    else if (searchIndent)
+    else if (searchIndent && !skipFirst)
     {
-      searchIndent=FALSE;
+      searchIndent=false;
       if (indent<minIndent) minIndent=indent;
     }
   }
@@ -6433,14 +6434,16 @@ QCString stripIndentation(const QCString &s)
   TextStream result;
   p=s.data();
   indent=0;
+  skipFirst=skipFirstLine;
   while ((c=*p++))
   {
     if (c=='\n') // start of new line
     {
       indent=0;
       result << c;
+      skipFirst=false;
     }
-    else if (indent<minIndent) // skip until we reach minIndent
+    else if (indent<minIndent && !skipFirst) // skip until we reach minIndent
     {
       if (c=='\t')
       {

src/util.h

@@ -433,7 +433,7 @@ QCString processMarkup(const QCString &s);
 
 bool protectionLevelVisible(Protection prot);
 
-QCString stripIndentation(const QCString &s);
+QCString stripIndentation(const QCString &s,bool skipFirstLine=false);
 void stripIndentationVerbatim(QCString &doc,const int indentationLevel);
 
 QCString getDotImageExtension();