Hide inline namespace in html output

addon/doxywizard/wizard.cpp

@@ -75,6 +75,7 @@
 #define STR_HTML_COLORSTYLE_HUE   QString::fromLatin1("HTML_COLORSTYLE_HUE")
 #define STR_HTML_COLORSTYLE_SAT   QString::fromLatin1("HTML_COLORSTYLE_SAT")
 #define STR_HTML_COLORSTYLE_GAMMA QString::fromLatin1("HTML_COLORSTYLE_GAMMA")
+#define STR_HIDE_INLINE_NAMESPACE QString::fromLatin1("HIDE_INLINE_NAMESPACE")
 
 static bool g_optimizeMapping[7][7] =
 {

src/classdef.cpp

@@ -2423,6 +2423,7 @@ void ClassDefImpl::writeDeclarationLink(OutputList &ol,bool &found,const QCStrin
   //bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN);
   //bool vhdlOpt    = Config_getBool(OPTIMIZE_OUTPUT_VHDL);
   bool sliceOpt   = Config_getBool(OPTIMIZE_OUTPUT_SLICE);
+  bool hideInlineNamespaces = Config_getBool(HIDE_INLINE_NAMESPACE);
   SrcLangExt lang = getLanguage();
   if (visibleInParentsDeclList())
   {
@@ -2474,6 +2475,16 @@ void ClassDefImpl::writeDeclarationLink(OutputList &ol,bool &found,const QCStrin
     QCString ctype = compoundTypeString();
     QCString cname = displayName(!localNames);
 
+    Definition* outDef = getOuterScope();
+    if (hideInlineNamespaces && outDef && outDef->definitionType() == Definition::DefType::TypeNamespace)
+    {
+      NamespaceDef* outDefReal = reinterpret_cast<NamespaceDef*>(outDef);
+      if (outDefReal->isInline())
+      {
+        return;
+      }
+    }
+
     if (lang!=SrcLangExt::VHDL) // for VHDL we swap the name and the type
     {
       if (isSliceLocal())

src/config.xml

@@ -1265,6 +1265,15 @@ Go to the <a href="commands.html">next</a> section or return to the
  Set the \c SHOW_NAMESPACES tag to \c NO to disable the generation of the
  Namespaces page. This will remove the Namespaces entry from the Quick Index
  and from the Folder Tree View (if specified).
+]]>
+      </docs>
+    </option>
+    <option type='bool' id='HIDE_INLINE_NAMESPACE' defval='0'>
+      <docs>
+<![CDATA[
+ Set the \c HIDE_INLINE_NAMESPACE tag to \c YES to hide inline namespaces and
+ classes inside inline namespaces in Class, Namespace, File page, search index,
+ and from the Folder Tree View (if specified).
 ]]>
       </docs>
     </option>

src/definition.cpp

@@ -1298,11 +1298,35 @@ void DefinitionImpl::addInnerCompound(Definition *)
 
 static std::recursive_mutex g_qualifiedNameMutex;
 
+// foo::_v1 => foo
+// suitable for namespace
+static QCString rStripInlineNamespaceScope(const QCString& name)
+{
+  QCString newName = name;
+  int pos = name.find("::");
+  if (pos != -1)
+  {
+    newName = name.str().substr(0, pos);
+  }
+  return newName;
+}
+
 QCString DefinitionImpl::qualifiedName() const
 {
   std::lock_guard<std::recursive_mutex> lock(g_qualifiedNameMutex);
   if (!m_impl->qualifiedName.isEmpty())
   {
+    bool hideInlineNamespaces = Config_getBool(HIDE_INLINE_NAMESPACE);
+    if (hideInlineNamespaces && m_impl->def->definitionType() == Definition::DefType::TypeNamespace)
+    {
+      DefinitionMutable* defMut = m_impl->def->toDefinitionMutable_();
+      Definition* def = toDefinition(defMut);
+      NamespaceDef* nsDef = reinterpret_cast<NamespaceDef*>(def);
+      if (nsDef->isInline())
+      {
+        return rStripInlineNamespaceScope(m_impl->qualifiedName);
+      }
+    }
     return m_impl->qualifiedName;
   }
 
@@ -1464,6 +1488,18 @@ QCString DefinitionImpl::navigationPathAsString() const
   {
     result+=(toFileDef(m_impl->def))->getDirDef()->navigationPathAsString();
   }
+  bool hideInlineNamespaces = Config_getBool(HIDE_INLINE_NAMESPACE);
+  if (hideInlineNamespaces && m_impl->def->definitionType() == Definition::DefType::TypeNamespace)
+  {
+    DefinitionMutable* defMut = m_impl->def->toDefinitionMutable_();
+    Definition* def = toDefinition(defMut);
+    NamespaceDef* nsDef = reinterpret_cast<NamespaceDef*>(def);
+    if (nsDef->isInline())
+    {
+      return result;
+    }
+  }
+
   result+="<li class=\"navelem\">";
   if (m_impl->def->isLinkableInProject())
   {
@@ -1875,6 +1911,16 @@ QCString DefinitionImpl::externalReference(const QCString &relPath) const
 
 const QCString &DefinitionImpl::name() const
 {
+  Definition* outerDef = getOuterScope();
+  bool hideInlineNamespaces = Config_getBool(HIDE_INLINE_NAMESPACE);
+  if (hideInlineNamespaces && outerDef && outerDef->definitionType() == Definition::DefType::TypeNamespace)
+  {
+    NamespaceDef* outerDefReal = reinterpret_cast<NamespaceDef*>(outerDef);
+    if (outerDefReal->isInline())
+    {
+      return outerDefReal->getOuterScope()->name();
+    }
+  }
   return m_impl->name;
 }
 

src/index.cpp

@@ -1821,6 +1821,9 @@ static void writeNamespaceTreeElement(const NamespaceDef *nd,FTVHelp *ftv,
     bool isDir = hasChildren || visibleMembers>0;
     if (isLinkable || isDir)
     {
+      bool hideInlineNamespaces = Config_getBool(HIDE_INLINE_NAMESPACE);
+      if (hideInlineNamespaces && nd->isModule() && nd->isInline())
+        return;
       ftv->addContentsItem(hasChildren,nd->localName(),ref,file,QCString(),FALSE,nd->partOfGroups().empty(),nd);
 
       if (addToIndex)
@@ -1903,6 +1906,11 @@ static void writeClassTreeInsideNamespaceElement(const NamespaceDef *nd,FTVHelp
 
     if (isDir)
     {
+      // feature: skip inline namespace
+      if (nd->isModule() && nd->isInline())
+      {
+        return;
+      }
       ftv->addContentsItem(isDir,nd->localName(),ref,file,QCString(),FALSE,TRUE,nd);
 
       if (addToIndex)

src/namespacedef.cpp

@@ -1391,10 +1391,14 @@ void NamespaceLinkedRefMap::writeDeclaration(OutputList &ol,const QCString &titl
   ol.parseText(title);
   ol.endMemberHeader();
   ol.startMemberList();
+  bool hideInlineNamespaces = Config_getBool(HIDE_INLINE_NAMESPACE);
   for (const auto &nd : *this)
   {
     if (nd->isLinkable() && nd->hasDocumentation())
     {
+      if (hideInlineNamespaces && nd->isInline())
+        continue;
+
       SrcLangExt lang = nd->getLanguage();
       if (lang==SrcLangExt::IDL && (isConstantGroup != nd->isConstantGroup()))
           continue; // will be output in another pass, see layout_default.xml

src/searchindex_js.cpp

@@ -306,11 +306,19 @@ static void addMemberToSearchIndex(const MemberDef *md)
 
 void createJavaScriptSearchIndex()
 {
+  bool hideInlineNamespaces = Config_getBool(HIDE_INLINE_NAMESPACE);
   // index classes
   for (const auto &cd : *Doxygen::classLinkedMap)
   {
     if (cd->isLinkable())
     {
+      Definition* outerDef = cd->getOuterScope();
+      if (hideInlineNamespaces && outerDef && outerDef->definitionType() == Definition::DefType::TypeNamespace)
+      {
+        NamespaceDef* outerDefReal = reinterpret_cast<NamespaceDef*>(outerDef);
+        if (outerDefReal->isInline())
+          continue;
+      }
       QCString n = cd->localName();
       g_searchIndexInfo[SEARCH_INDEX_ALL].add(SearchTerm(n,cd.get()));
       if (Config_getBool(OPTIMIZE_OUTPUT_SLICE))

testing/102/102__hide__inline__namespace_8cpp.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="" xml:lang="en-US">
+  <compounddef id="102__hide__inline__namespace_8cpp" kind="file" language="C++">
+    <compoundname>102_hide_inline_namespace.cpp</compoundname>
+    <innerclass refid="structfoo_1_1v1_1_1_size" prot="public">foo</innerclass>
+    <innerclass refid="structfoo_1_1v1_1_1cv_1_1_image" prot="public">foo::v1::cv::Image</innerclass>
+    <innerclass refid="structfoo_1_1v1_1_1nn_1_1_tensor" prot="public">foo::v1::nn::Tensor</innerclass>
+    <innerclass refid="structfoo_1_1v1_1_1nn_1_1v1_1_1_conv_param" prot="public">foo</innerclass>
+    <innernamespace refid="namespacefoo">foo</innernamespace>
+    <innernamespace refid="namespacefoo_1_1v1" inline="yes">foo::v1</innernamespace>
+    <innernamespace refid="namespacefoo_1_1v1_1_1cv">foo</innernamespace>
+    <innernamespace refid="namespacefoo_1_1v1_1_1nn">foo</innernamespace>
+    <innernamespace refid="namespacefoo_1_1v1_1_1nn_1_1v1" inline="yes">foo::v1::nn::v1</innernamespace>
+    <briefdescription>
+    </briefdescription>
+    <detaileddescription>
+    </detaileddescription>
+    <location file="102_hide_inline_namespace.cpp"/>
+  </compounddef>
+</doxygen>

testing/102_hide_inline_namespace.cpp

@@ -0,0 +1,53 @@
+// objective: test collapse of inline namespace
+// check: 102__hide__inline__namespace_8cpp.xml
+// config: HIDE_INLINE_NAMESPACE = YES
+// config: EXTRACT_ALL = YES
+
+namespace foo {
+
+inline namespace v1 {
+
+struct Size
+{
+    int width;
+    int height;
+};
+
+namespace cv {
+
+struct Image
+{
+    int height;
+    int width;
+    unsigned char* data;
+};
+
+} // namespace cv
+
+namespace nn {
+
+struct Tensor
+{
+    int width;
+    int height;
+    int channel;
+    float* data;
+};
+
+inline namespace v1 {
+
+struct ConvParam
+{
+    int pad;
+    int stride;
+    int kernel_len;
+};
+
+} // namespace v1
+
+} // namespace nn
+
+} // namespace v1
+
+} // namespace foo
+