Fix for regression no longer being enable to resolve \ref ::A::f

doxygen · doxygen · commit 41a489c1e832 · 2025-08-23T20:22:46.000+02:00
diff --git a/src/util.cpp b/src/util.cpp
@@ -2275,6 +2275,8 @@ GetDefResult getDefsNew(const GetDefInput &input)
 {
   GetDefResult result;
   if (input.memberName.isEmpty()) return result;
+  AUTO_TRACE("getDefsNew(scopeName={},memberName={},forceEmptyScope={})",
+      input.scopeName,input.memberName,input.forceEmptyScope);
 
   //printf("@@ --- getDefsNew(%s,%s)-----------\n",qPrint(scName),qPrint(mbName));
   const Definition *scope = Doxygen::globalScope;
@@ -3101,7 +3103,7 @@ bool resolveRef(/* in */  const QCString &scName,
   }
 
   QCString scopeStr=scName;
-  if (nameStr.length()>scopeStr.length() && leftScopeMatch(scopeStr,nameStr))
+  if (!explicitScope && nameStr.length()>scopeStr.length() && leftScopeMatch(scopeStr,nameStr))
   {
     nameStr=nameStr.mid(scopeStr.length()+2);
   }

Original file line number	Diff line number	Diff line change
`@@ -2275,6 +2275,8 @@ GetDefResult getDefsNew(const GetDefInput &input)`
`2275`	`2275`	`{`
`2276`	`2276`	`GetDefResult result;`
`2277`	`2277`	`if (input.memberName.isEmpty()) return result;`
	`2278`	`+ AUTO_TRACE("getDefsNew(scopeName={},memberName={},forceEmptyScope={})",`
	`2279`	`+ input.scopeName,input.memberName,input.forceEmptyScope);`
`2278`	`2280`
`2279`	`2281`	`//printf("@@ --- getDefsNew(%s,%s)-----------\n",qPrint(scName),qPrint(mbName));`
`2280`	`2282`	`const Definition *scope = Doxygen::globalScope;`
`@@ -3101,7 +3103,7 @@ bool resolveRef(/* in */ const QCString &scName,`
`3101`	`3103`	`}`
`3102`	`3104`
`3103`	`3105`	`QCString scopeStr=scName;`
`3104`		`- if (nameStr.length()>scopeStr.length() && leftScopeMatch(scopeStr,nameStr))`
	`3106`	`+ if (!explicitScope && nameStr.length()>scopeStr.length() && leftScopeMatch(scopeStr,nameStr))`
`3105`	`3107`	`{`
`3106`	`3108`	`nameStr=nameStr.mid(scopeStr.length()+2);`
`3107`	`3109`	`}`