Merge pull request doxygen#12040 from albert-github/feature/bug_129682_brief

bug 129682 Wrong function dependency is made

Author: doxygen

src/classdef.cpp

@@ -1521,6 +1521,7 @@ void ClassDefImpl::writeTemplateSpec(OutputList &ol,const Definition *d,
           getFileDef(),            // fileScope
           this,                    // self
           a.type,                  // text
+          nullptr,
           FALSE                    // autoBreak
           );
         if (!a.name.isEmpty())
@@ -1547,6 +1548,7 @@ void ClassDefImpl::writeTemplateSpec(OutputList &ol,const Definition *d,
           getFileDef(),            // fileScope
           this,                    // self
           m_requiresClause,  // text
+          nullptr,
           FALSE                    // autoBreak
           );
       ol.lineBreak();

src/memberdef.cpp

@@ -1188,7 +1188,7 @@ static bool writeDefArgumentList(OutputList &ol,const Definition *scope,const Me
         n=addTemplateNames(n,scope->name(),cName);
       }
       ol.startParameterDefVal(" = ");
-      linkifyText(TextGeneratorOLImpl(ol),scope,md->getBodyDef(),md,n,FALSE,TRUE,TRUE);
+      linkifyText(TextGeneratorOLImpl(ol),scope,md->getBodyDef(),md,n,nullptr,FALSE,TRUE,TRUE);
       ol.endParameterDefVal();
     }
     ++alIt;
@@ -1251,6 +1251,7 @@ static bool writeDefArgumentList(OutputList &ol,const Definition *scope,const Me
                 md->getBodyDef(),        // fileScope
                 md,                      // self
                 defArgList.trailingReturnType(), // text
+                nullptr,
                 FALSE                    // autoBreak
                );
 
@@ -2181,6 +2182,7 @@ void MemberDefImpl::_writeTemplatePrefix(OutputList &ol, const Definition *def,
         getFileDef(),            // fileScope
         this,                    // self
         a.type,                  // text
+        nullptr,
         FALSE                    // autoBreak
         );
     if (!a.name.isEmpty())
@@ -2206,6 +2208,7 @@ void MemberDefImpl::_writeTemplatePrefix(OutputList &ol, const Definition *def,
         getFileDef(),            // fileScope
         this,                    // self
         m_requiresClause,        // text
+        nullptr,                 // arguments for names
         TRUE,                    // autoBreak
         TRUE,                    // external
         FALSE,                   // keepSpaces
@@ -2390,11 +2393,12 @@ void MemberDefImpl::writeDeclaration(OutputList &ol,
                     getBodyDef(),            // fileScope
                     this,                    // self
                     ltype.left(i),           // text
+                    nullptr,                 // arguments for names
                     FALSE                    // autoBreak
                    );
         getAnonymousEnumType()->writeEnumDeclaration(ol,cd,nd,fd,gd,mod);
         //ol+=*getAnonymousEnumType()->enumDecl();
-        linkifyText(TextGeneratorOLImpl(ol),d,getFileDef(),this,ltype.right(ltype.length()-i-l),TRUE);
+        linkifyText(TextGeneratorOLImpl(ol),d,getFileDef(),this,ltype.right(ltype.length()-i-l),nullptr,TRUE);
       }
       else
       {
@@ -2404,6 +2408,7 @@ void MemberDefImpl::writeDeclaration(OutputList &ol,
                     getBodyDef(),            // fileScope
                     this,                    // self
                     ltype,                   // text
+                    nullptr,                 // arguments for names
                     FALSE                    // autoBreak
                    );
       }
@@ -2425,6 +2430,7 @@ void MemberDefImpl::writeDeclaration(OutputList &ol,
                 getBodyDef(),            // fileScope
                 this,                    // self
                 ltype,                   // text
+                nullptr,                 // arguments for names
                 FALSE                    // autoBreak
                );
   }
@@ -2517,6 +2523,7 @@ void MemberDefImpl::writeDeclaration(OutputList &ol,
                 isTypedef() ?
                    substitute(argsString(),")(",") (") :
                    combineArgsAndException(argsString(),excpString()), // text
+                &m_defArgList,
                 m_annMemb!=nullptr,      // autoBreak
                 TRUE,                    // external
                 FALSE,                   // keepSpaces
@@ -4082,7 +4089,7 @@ void MemberDefImpl::writeMemberDocSimple(OutputList &ol, const Definition *conta
   ol.docify(doxyName);
   if (isVariable() && !argsString().isEmpty() && !isObjCMethod() && !isFunctionPtr())
   {
-    linkifyText(TextGeneratorOLImpl(ol),getOuterScope(),getBodyDef(),this,argsString());
+    linkifyText(TextGeneratorOLImpl(ol),getOuterScope(),getBodyDef(),this,argsString(),&m_defArgList);
   }
   if (!m_bitfields.isEmpty()) // add bitfields
   {

src/util.cpp

@@ -892,13 +892,16 @@ bool leftScopeMatch(const QCString &scope, const QCString &name)
 
 void linkifyText(const TextGeneratorIntf &out, const Definition *scope,
     const FileDef *fileScope,const Definition *self,
-    const QCString &text, bool autoBreak,bool external,
+    const QCString &text,
+    const ArgumentList *al,
+    bool autoBreak,bool external,
     bool keepSpaces,int indentLevel,size_t breakThreshold)
 {
   AUTO_TRACE("scope={} fileScope={} text={} autoBreak={} external={} keepSpaces={} indentLevel={}",
       scope?scope->name():"",fileScope?fileScope->name():"",
       text,autoBreak,external,keepSpaces,indentLevel);
   if (text.isEmpty()) return;
+
   //printf("linkify='%s'\n",qPrint(text));
   std::string_view txtStr=text.view();
   size_t strLen = txtStr.length();
@@ -974,9 +977,22 @@ void linkifyText(const TextGeneratorIntf &out, const Definition *scope,
     // get word from string
     std::string_view word=txtStr.substr(newIndex,matchLen);
     QCString matchWord = substitute(substitute(word,"\\","::"),".","::");
+    bool found=false;
+    // check for argument name
+    if (al)
+    {
+      for (auto it1 = al->begin(); it1!=al->end(); ++it1)
+      {
+        if (it1->name == matchWord)
+        {
+          out.writeString(matchWord.data(),keepSpaces);
+          found = true;
+          break;
+        }
+      }
+    }
     //printf("linkifyText word=%s matchWord=%s scope=%s\n",
     //    qPrint(word),qPrint(matchWord),scope ? qPrint(scope->name()) : "<none>");
-    bool found=FALSE;
     if (!insideString)
     {
       const ClassDef     *cd=nullptr;

src/util.h

@@ -97,6 +97,7 @@ void linkifyText(const TextGeneratorIntf &ol,
                  const FileDef *fileScope,
                  const Definition *self,
                  const QCString &text,
+                 const ArgumentList *al = nullptr,
                  bool autoBreak=FALSE,
                  bool external=TRUE,
                  bool keepSpaces=FALSE,