issue #8895: [bisected]Directory dependency graph has stopped working

doxygen · Dec 1, 2021 · bc90319 · bc90319
1 parent fe3b576
commit bc90319
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/src/dirdef.cpp b/src/dirdef.cpp
@@ -342,7 +342,7 @@ void DirDefImpl::writeSubDirList(OutputList &ol)
     ol.startMemberList();
     for(const auto dd : m_subdirs)
     {
-      if (dd->hasDocumentation() || dd->getFiles().empty())
+      if (dd->hasDocumentation() || !dd->getFiles().empty())
       {
         ol.startMemberDeclaration();
         ol.startMemberItem(dd->anchor(),0);
@@ -376,7 +376,12 @@ void DirDefImpl::writeFileList(OutputList &ol)
   int numFiles = 0;
   for (const auto &fd : m_fileList)
   {
-    if (fd->hasDocumentation())
+    bool genSourceFile;
+    if (fileVisibleInIndex(fd,genSourceFile))
+    {
+      numFiles++;
+    }
+    else if (genSourceFile)
     {
       numFiles++;
     }
@@ -391,7 +396,9 @@ void DirDefImpl::writeFileList(OutputList &ol)
     ol.startMemberList();
     for (const auto &fd : m_fileList)
     {
-      if (fd->hasDocumentation())
+      bool doc,src;
+      doc = fileVisibleInIndex(fd,src);
+      if (doc || src)
       {
         ol.startMemberDeclaration();
         ol.startMemberItem(fd->anchor(),0);
@@ -742,7 +749,7 @@ bool DirDefImpl::isParentOf(const DirDef *dir) const
 
 bool DirDefImpl::depGraphIsTrivial() const
 {
-  return m_usedDirs.empty();
+  return m_usedDirs.empty() && m_parent==nullptr;
 }
 
 

diff --git a/src/index.cpp b/src/index.cpp
@@ -721,16 +721,12 @@ static void writeDirHierarchy(OutputList &ol, FTVHelp* ftv,bool addToIndex)
     ol.pushGeneratorState();
     ol.disable(OutputGenerator::Html);
   }
-  bool fullPathNames = Config_getBool(FULL_PATH_NAMES);
   startIndexHierarchy(ol,0);
-  if (fullPathNames)
+  for (const auto &dd : *Doxygen::dirLinkedMap)
   {
-    for (const auto &dd : *Doxygen::dirLinkedMap)
+    if (dd->getOuterScope()==Doxygen::globalScope)
     {
-      if (dd->getOuterScope()==Doxygen::globalScope)
-      {
-        writeDirTreeNode(ol,dd.get(),0,ftv,addToIndex);
-      }
+      writeDirTreeNode(ol,dd.get(),0,ftv,addToIndex);
     }
   }
   if (ftv)
@@ -739,7 +735,7 @@ static void writeDirHierarchy(OutputList &ol, FTVHelp* ftv,bool addToIndex)
     {
       for (const auto &fd : *fn)
       {
-        if (!fullPathNames || fd->getDirDef()==0) // top level file
+        if (fd->getDirDef()==0) // top level file
         {
           bool src;
           bool doc = fileVisibleInIndex(fd.get(),src);