Merge pull request doxygen#11561 from nwellnhof/only-linkable

Fix links not being generated

Author: doxygen

src/symbolresolver.cpp

@@ -144,6 +144,7 @@ struct SymbolResolver::Private
                            const QCString &args,        // in
                            bool checkCV,                // in
                            bool insideCode,             // in
+                           bool onlyLinkable,           // in
                            const MemberDef **pTypeDef,  // out
                            QCString *pTemplSpec,        // out
                            QCString *pResolvedType);    // out
@@ -393,6 +394,7 @@ const Definition *SymbolResolver::Private::getResolvedSymbolRec(
            const QCString &args,
            bool checkCV,
            bool insideCode,
+           bool onlyLinkable,
            const MemberDef **pTypeDef,
            QCString *pTemplSpec,
            QCString *pResolvedType)
@@ -523,7 +525,15 @@ const Definition *SymbolResolver::Private::getResolvedSymbolRec(
 
     for (Definition *d : range)
     {
-      if (isCodeSymbol(d->definitionType()))
+      if (isCodeSymbol(d->definitionType()) &&
+          (!onlyLinkable ||
+           d->isLinkable() ||
+           d->isLinkableInProject() ||
+           (d->definitionType()==Definition::TypeFile &&
+            (toFileDef(d))->generateSourceFile()
+           ) // undocumented file that has source code we can link to
+          )
+         )
       {
          getResolvedSymbol(visitedKeys,scope,d,args,checkCV,insideCode,explicitScopePart,strippedTemplateParams,false,
             minDistance,bestMatch,bestTypedef,bestTemplSpec,bestResolvedType);
@@ -1658,14 +1668,15 @@ const Definition *SymbolResolver::resolveSymbol(const Definition *scope,
                                                 const QCString &name,
                                                 const QCString &args,
                                                 bool checkCV,
-                                                bool insideCode)
+                                                bool insideCode,
+                                                bool onlyLinkable)
 {
   AUTO_TRACE("scope={} name={} args={} checkCV={} insideCode={}",
              scope?scope->name():QCString(), name, args, checkCV, insideCode);
   p->reset();
   if (scope==nullptr) scope=Doxygen::globalScope;
   VisitedKeys visitedKeys;
-  const Definition *result = p->getResolvedSymbolRec(visitedKeys,scope,name,args,checkCV,insideCode,&p->typeDef,&p->templateSpec,&p->resolvedType);
+  const Definition *result = p->getResolvedSymbolRec(visitedKeys,scope,name,args,checkCV,insideCode,onlyLinkable,&p->typeDef,&p->templateSpec,&p->resolvedType);
   AUTO_TRACE_EXIT("result={}{}", qPrint(result?result->qualifiedName():QCString()),
                                  qPrint(result && result->definitionType()==Definition::TypeMember ? toMemberDef(result)->argsString() : QCString()));
   return result;

src/symbolresolver.h

@@ -68,12 +68,14 @@ class SymbolResolver
      *  @param args    Argument list associated with the symbol (for functions)
      *  @param checkCV Check const/volatile qualifiers (for methods)
      *  @param insideCode Is the symbol found in a code fragment
+     *  @param onlyLinkable Only search linkable definitions
      */
     const Definition *resolveSymbol(const Definition *scope,
                                     const QCString &name,
                                     const QCString &args=QCString(),
                                     bool checkCV=false,
-                                    bool insideCode=false
+                                    bool insideCode=false,
+                                    bool onlyLinkable=false
                                    );
 
     /** Checks if symbol \a item is accessible from within \a scope.

src/util.cpp

@@ -2289,7 +2289,7 @@ GetDefResult getDefsNew(const GetDefInput &input)
   }
   //printf("@@  -> found scope scope=%s member=%s out=%s\n",qPrint(input.scopeName),qPrint(input.memberName),qPrint(scope?scope->name():""));
   //
-  const Definition *symbol = resolver.resolveSymbol(scope,input.memberName,input.args,input.checkCV,input.insideCode);
+  const Definition *symbol = resolver.resolveSymbol(scope,input.memberName,input.args,input.checkCV,input.insideCode,true);
   //printf("@@  -> found symbol in=%s out=%s\n",qPrint(input.memberName),qPrint(symbol?symbol->qualifiedName():QCString()));
   if (symbol && symbol->definitionType()==Definition::TypeMember)
   {