shiboken6: Consolidate debug operators for clang types

clangutils.cpp had debug operators for the clang types CXType and
CXCursor in namespace "clang", duplicating the ones in
clangdebugutils.cpp. Consolidate and brush up the code.

Task-number: PYSIDE-323
Change-Id: Icd72df1859d7ca45a6090d5e91b43981e2f37d9b
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
(cherry picked from commit 5825ede9b93bdfe55959a2239e36dab04d1c2d9b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

4 files changed, 70 insertions, 71 deletions

diff --git a/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp b/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp
index 3a9dfde40..3e096307e 100644
--- a/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp
+++ b/sources/shiboken6/ApiExtractor/clangparser/clangbuilder.cpp
@@ -4,6 +4,7 @@
 #include "clangbuilder.h"
 #include "compilersupport.h"
 #include "clangutils.h"
+#include "clangdebugutils.h"
 
 #include <codemodel.h>
 #include <reporthandler.h>
diff --git a/sources/shiboken6/ApiExtractor/clangparser/clangdebugutils.cpp b/sources/shiboken6/ApiExtractor/clangparser/clangdebugutils.cpp
index 80f439e49..3c002da9c 100644
--- a/sources/shiboken6/ApiExtractor/clangparser/clangdebugutils.cpp
+++ b/sources/shiboken6/ApiExtractor/clangparser/clangdebugutils.cpp
@@ -47,59 +47,99 @@ QDebug operator<<(QDebug s, CX_CXXAccessSpecifier ac)
     return s;
 }
 
-QDebug operator<<(QDebug s, const CXType &t)
+struct formatCXTypeName
 {
-    CXString typeSpelling = clang_getTypeSpelling(t);
-    s << typeSpelling;
+    explicit formatCXTypeName(const CXType &type) : m_type(type) {}
+
+    const CXType &m_type;
+};
+
+QDebug operator<<(QDebug debug, const formatCXTypeName &ft)
+{
+    CXString typeSpelling = clang_getTypeSpelling(ft.m_type);
+    debug << typeSpelling;
     clang_disposeString(typeSpelling);
-    return s;
+    return debug;
 }
 
-QDebug operator<<(QDebug s, const CXCursor &cursor)
+QDebug operator<<(QDebug debug, const CXType &type)
 {
-    QDebugStateSaver saver(s);
-    s.nospace();
-    s.noquote();
+    QDebugStateSaver saver(debug);
+    debug.nospace();
+    debug.noquote();
+    debug << "CXType(";
+    if (type.kind == CXType_Invalid) {
+        debug << "invalid)";
+        return debug;
+    }
+
+    debug << type.kind;
+    switch (type.kind) {
+    case CXType_Unexposed:
+        debug << " [unexposed]";
+        break;
+    case CXType_Elaborated:
+        debug << " [elaborated]";
+        break;
+    default:
+        break;
+    }
+    debug << ", " << formatCXTypeName(type) << ')';
+    return debug;
+}
+
+QDebug operator<<(QDebug debug, const CXCursor &cursor)
+{
+    QDebugStateSaver saver(debug);
+    debug.nospace();
+    debug.noquote();
     const CXCursorKind kind = clang_getCursorKind(cursor);
-    s << kind;
-    if (kind >= CXCursor_FirstInvalid && kind <= CXCursor_LastInvalid)
-        return s;
+    debug << "CXCursor(";
+    if (kind >= CXCursor_FirstInvalid && kind <= CXCursor_LastInvalid) {
+        debug << "invalid)";
+        return debug;
+    }
+
+    const QString cursorSpelling = clang::getCursorSpelling(cursor);
+    debug << '"' << cursorSpelling << '"';
+    CXString cursorDisplay = clang_getCursorDisplayName(cursor);
+    if (const char *dpy = clang_getCString(cursorDisplay)) {
+        const QString display = QString::fromUtf8(dpy);
+        if (display != cursorSpelling)
+            debug << ", display=\"" << dpy << '"';
+    }
+    clang_disposeString(cursorDisplay);
+
+    debug << ", kind=" << kind;
+
     const CXType type = clang_getCursorType(cursor);
     switch (kind) {
         case CXCursor_CXXAccessSpecifier:
-        s << ' ' << clang_getCXXAccessSpecifier(cursor);
+        debug << ", " << clang_getCXXAccessSpecifier(cursor);
         break;
     case CXCursor_CXXBaseSpecifier:
-         s << ", inherits=\"" << clang::getCursorSpelling(clang_getTypeDeclaration(type)) << '"';
+         debug << ", inherits=\"" << clang::getCursorSpelling(clang_getTypeDeclaration(type)) << '"';
          break;
     case CXCursor_CXXMethod:
     case CXCursor_FunctionDecl:
     case CXCursor_ConversionFunction:
-        s << ", result type=\"" << clang_getCursorResultType(cursor) << '"';
+         debug << ", result type=\""
+            << formatCXTypeName(clang_getCursorResultType(cursor)) << '"';
         break;
     case CXCursor_TypedefDecl:
-        s << ", underlyingType=\"" << clang_getTypedefDeclUnderlyingType(cursor) << '"';
+        debug << ", underlyingType=\""
+            << formatCXTypeName(clang_getTypedefDeclUnderlyingType(cursor)) << '"';
         break;
     default:
         break;
     }
 
-    if (type.kind != CXType_Invalid)
-        s  << ", type=\"" << type << '"';
+    debug << ", type=\"" << formatCXTypeName(type) << '"';
     if (clang_Cursor_hasAttrs(cursor))
-        s  << ", [attrs]";
+        debug << ", [attrs]";
 
-    const QString cursorSpelling = clang::getCursorSpelling(cursor);
-    if (!cursorSpelling.isEmpty())
-        s << ", spelling=\"" << cursorSpelling << '"';
-    CXString cursorDisplay = clang_getCursorDisplayName(cursor);
-    if (const char *dpy = clang_getCString(cursorDisplay)) {
-        const QString display = QString::fromUtf8(dpy);
-        if (display != cursorSpelling)
-            s << ", display=\"" << dpy << '"';
-    }
-    clang_disposeString(cursorDisplay);
-    return s;
+    debug << ')';
+    return debug;
 }
 
 QDebug operator<<(QDebug s, const CXSourceLocation &location)
diff --git a/sources/shiboken6/ApiExtractor/clangparser/clangutils.cpp b/sources/shiboken6/ApiExtractor/clangparser/clangutils.cpp
index aafa79cca..fbea76b41 100644
--- a/sources/shiboken6/ApiExtractor/clangparser/clangutils.cpp
+++ b/sources/shiboken6/ApiExtractor/clangparser/clangutils.cpp
@@ -322,46 +322,6 @@ QDebug operator<<(QDebug s, const Diagnostic &d)
     return s;
 }
 
-QDebug operator<<(QDebug debug, const CXCursor &cursor)
-{
-    QDebugStateSaver saver(debug);
-    debug.nospace();
-    debug.noquote();
-    debug << "CXCursor(" << cursor.kind;
-    if (cursor.kind >= CXCursor_FirstInvalid && cursor.kind <= CXCursor_LastInvalid)
-        debug << " [invalid]";
-    else
-        debug << ", " << getCursorSpelling(cursor);
-    debug << ')';
-    return debug;
-}
-
-QDebug operator<<(QDebug debug, const CXType &type)
-{
-    QDebugStateSaver saver(debug);
-    debug.nospace();
-    debug.noquote();
-    debug << "CXType(";
-    if (type.kind == CXType_Invalid) {
-        debug << " [invalid]";
-    } else {
-        debug << type.kind;
-        switch (type.kind) {
-        case CXType_Unexposed:
-            debug << " [unexposed]";
-            break;
-        case CXType_Elaborated:
-            debug << " [elaborated]";
-            break;
-        default:
-            break;
-        }
-        debug << ", " << getTypeName(type);
-    }
-    debug << ')';
-    return debug;
-}
-
 #endif // QT_NO_DEBUG_STREAM
 
 } // namespace clang
diff --git a/sources/shiboken6/ApiExtractor/clangparser/clangutils.h b/sources/shiboken6/ApiExtractor/clangparser/clangutils.h
index 5cd46812d..532807362 100644
--- a/sources/shiboken6/ApiExtractor/clangparser/clangutils.h
+++ b/sources/shiboken6/ApiExtractor/clangparser/clangutils.h
@@ -100,8 +100,6 @@ QPair<qsizetype, qsizetype>
 #ifndef QT_NO_DEBUG_STREAM
 QDebug operator<<(QDebug, const SourceLocation &);
 QDebug operator<<(QDebug, const Diagnostic &);
-QDebug operator<<(QDebug debug, const CXCursor &cursor);
-QDebug operator<<(QDebug debug, const CXType &type);
 #endif // QT_NO_DEBUG_STREAM
 } // namespace clang