shiboken: Handle inline namespaces

Check the attribute as returned by the clang parser and add it
to the handling of the visible attribute of namespaces.

Fixes: PYSIDE-990
Change-Id: I3428b59d6d9a5d60dd95db5fc0640772bd3985c8
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>

8 files changed, 45 insertions, 1 deletions

diff --git a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
index de856a214..70728b6a2 100644
--- a/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
+++ b/sources/shiboken2/ApiExtractor/abstractmetabuilder.cpp
@@ -757,6 +757,7 @@ AbstractMetaClass *AbstractMetaBuilderPrivate::traverseNamespace(const FileModel
             << QStringLiteral("namespace '%1' does not have a type entry").arg(namespaceName);
         return nullptr;
     }
+    type->setInlineNamespace(namespaceItem->type() == NamespaceType::Inline);
 
     // Continue populating namespace?
     AbstractMetaClass *metaClass = AbstractMetaClass::findClass(m_metaClasses, type);
diff --git a/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp b/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp
index a5b153499..edb7a58f7 100644
--- a/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp
+++ b/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp
@@ -765,6 +765,17 @@ static CodeModel::ClassType codeModelClassTypeFromCursor(CXCursorKind kind)
     return result;
 }
 
+static NamespaceType namespaceType(const CXCursor &cursor)
+{
+    if (clang_Cursor_isAnonymous(cursor))
+        return NamespaceType::Anonymous;
+#if CINDEX_VERSION_MAJOR > 0 || CINDEX_VERSION_MINOR >= 59
+    if (clang_Cursor_isInlineNamespace(cursor))
+        return NamespaceType::Inline;
+#endif
+    return NamespaceType::Default;
+}
+
 BaseVisitor::StartTokenResult Builder::startToken(const CXCursor &cursor)
 {
     switch (cursor.kind) {
@@ -890,6 +901,9 @@ BaseVisitor::StartTokenResult Builder::startToken(const CXCursor &cursor)
         d->m_scopeStack.back()->addFunction(d->m_currentFunction);
         break;
     case CXCursor_Namespace: {
+        const auto type = namespaceType(cursor);
+        if (type == NamespaceType::Anonymous)
+            return Skip;
         const QString name = getCursorSpelling(cursor);
         const NamespaceModelItem parentNamespaceItem = qSharedPointerDynamicCast<_NamespaceModelItem>(d->m_scopeStack.back());
         if (parentNamespaceItem.isNull()) {
@@ -906,6 +920,7 @@ BaseVisitor::StartTokenResult Builder::startToken(const CXCursor &cursor)
         namespaceItem.reset(new _NamespaceModelItem(d->m_model, name));
         setFileName(cursor, namespaceItem.data());
         namespaceItem->setScope(d->m_scope);
+        namespaceItem->setType(type);
         parentNamespaceItem->addNamespace(namespaceItem);
         d->pushScope(namespaceItem);
     }
diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel.cpp b/sources/shiboken2/ApiExtractor/parser/codemodel.cpp
index 099ab8860..892a20bb7 100644
--- a/sources/shiboken2/ApiExtractor/parser/codemodel.cpp
+++ b/sources/shiboken2/ApiExtractor/parser/codemodel.cpp
@@ -923,6 +923,16 @@ void  _NamespaceModelItem::appendNamespace(const _NamespaceModelItem &other)
 void _NamespaceModelItem::formatDebug(QDebug &d) const
 {
     _ScopeModelItem::formatDebug(d);
+    switch (m_type) {
+    case NamespaceType::Default:
+        break;
+    case NamespaceType::Anonymous:
+        d << ", anonymous";
+        break;
+    case NamespaceType::Inline:
+        d << ", inline";
+        break;
+    }
     formatScopeList(d, ", namespaces=", m_namespaces);
 }
 #endif // !QT_NO_DEBUG_STREAM
diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel.h b/sources/shiboken2/ApiExtractor/parser/codemodel.h
index 80db2cce5..2e33d6cd0 100644
--- a/sources/shiboken2/ApiExtractor/parser/codemodel.h
+++ b/sources/shiboken2/ApiExtractor/parser/codemodel.h
@@ -438,6 +438,9 @@ public:
 
     const NamespaceList &namespaces() const { return m_namespaces; }
 
+     NamespaceType type() const { return m_type; }
+     void setType(NamespaceType t) { m_type = t; }
+
     void addNamespace(NamespaceModelItem item);
 
     NamespaceModelItem findNamespace(const QString &name) const;
@@ -450,6 +453,7 @@ public:
 
 private:
     NamespaceList m_namespaces;
+    NamespaceType m_type = NamespaceType::Default;
 };
 
 class _FileModelItem: public _NamespaceModelItem
diff --git a/sources/shiboken2/ApiExtractor/parser/codemodel_enums.h b/sources/shiboken2/ApiExtractor/parser/codemodel_enums.h
index 1713ba42f..aebd59879 100644
--- a/sources/shiboken2/ApiExtractor/parser/codemodel_enums.h
+++ b/sources/shiboken2/ApiExtractor/parser/codemodel_enums.h
@@ -54,4 +54,11 @@ enum class ExceptionSpecification
     Throws
 };
 
+enum class NamespaceType
+{
+    Default,
+    Anonymous,
+    Inline
+};
+
 #endif // CODEMODEL_ENUMS_H
diff --git a/sources/shiboken2/ApiExtractor/typedatabase.cpp b/sources/shiboken2/ApiExtractor/typedatabase.cpp
index 8d489c65e..dd1ed35c3 100644
--- a/sources/shiboken2/ApiExtractor/typedatabase.cpp
+++ b/sources/shiboken2/ApiExtractor/typedatabase.cpp
@@ -849,6 +849,8 @@ void NamespaceTypeEntry::formatDebug(QDebug &d) const
     auto pattern = m_filePattern.pattern();
     FORMAT_NONEMPTY_STRING("pattern", pattern)
     d << ",visibility=" << m_visibility;
+    if (m_inlineNamespace)
+        d << "[inline]";
 }
 
 void ContainerTypeEntry::formatDebug(QDebug &d) const
diff --git a/sources/shiboken2/ApiExtractor/typesystem.cpp b/sources/shiboken2/ApiExtractor/typesystem.cpp
index 02c553a3b..854728711 100644
--- a/sources/shiboken2/ApiExtractor/typesystem.cpp
+++ b/sources/shiboken2/ApiExtractor/typesystem.cpp
@@ -964,7 +964,7 @@ bool NamespaceTypeEntry::matchesFile(const QString &needle) const
 bool NamespaceTypeEntry::isVisible() const
 {
     return m_visibility == TypeSystem::Visibility::Visible
-        || m_visibility == TypeSystem::Visibility::Auto;
+        || (m_visibility == TypeSystem::Visibility::Auto && !m_inlineNamespace);
 }
 
 bool NamespaceTypeEntry::isVisibleScope(const TypeEntry *e)
diff --git a/sources/shiboken2/ApiExtractor/typesystem.h b/sources/shiboken2/ApiExtractor/typesystem.h
index 89618d5be..7f5eaac4b 100644
--- a/sources/shiboken2/ApiExtractor/typesystem.h
+++ b/sources/shiboken2/ApiExtractor/typesystem.h
@@ -1538,6 +1538,10 @@ public:
     bool isVisible() const;
     void setVisibility(TypeSystem::Visibility v) { m_visibility = v; }
 
+    // C++ 11 inline namespace, from code model
+    bool isInlineNamespace() const { return m_inlineNamespace; }
+    void setInlineNamespace(bool i) { m_inlineNamespace = i; }
+
     static bool isVisibleScope(const TypeEntry *e);
 
 #ifndef QT_NO_DEBUG_STREAM
@@ -1552,6 +1556,7 @@ private:
     const NamespaceTypeEntry *m_extends = nullptr;
     TypeSystem::Visibility m_visibility = TypeSystem::Visibility::Auto;
     bool m_hasPattern = false;
+    bool m_inlineNamespace = false;
 };
 
 class ValueTypeEntry : public ComplexTypeEntry