From bb62fd3e566f2d54ec703dc83d9b5fddf7c24122 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Thu, 30 Nov 2017 16:11:40 +0100 Subject: [PATCH] Clang: Move printing functions in clang support to unit tests The printing functions are only used by the unit tests and they use an external API. So we can easily move them to the printing functions in the unit test project. We have to move the TokenInfo print functions too because the depend on other print functions. The rest of the print functions will be moved in other patches. Change-Id: I87c452f8ca40687ec47de675ba6bee13efa5655b Reviewed-by: Nikolai Kosjar --- src/libs/clangsupport/cancelmessage.cpp | 7 - src/libs/clangsupport/cancelmessage.h | 1 - src/libs/clangsupport/cmbalivemessage.cpp | 7 - src/libs/clangsupport/cmbalivemessage.h | 3 - .../clangsupport/cmbcodecompletedmessage.cpp | 14 - .../clangsupport/cmbcodecompletedmessage.h | 1 - .../clangsupport/cmbcompletecodemessage.cpp | 18 - .../clangsupport/cmbcompletecodemessage.h | 1 - src/libs/clangsupport/cmbechomessage.cpp | 7 - src/libs/clangsupport/cmbechomessage.h | 3 - src/libs/clangsupport/cmbendmessage.cpp | 7 - src/libs/clangsupport/cmbendmessage.h | 3 - .../cmbregisterprojectsforeditormessage.cpp | 12 - .../cmbregisterprojectsforeditormessage.h | 1 - ...gistertranslationunitsforeditormessage.cpp | 12 - ...registertranslationunitsforeditormessage.h | 1 - .../cmbunregisterprojectsforeditormessage.cpp | 11 - .../cmbunregisterprojectsforeditormessage.h | 1 - ...gistertranslationunitsforeditormessage.cpp | 11 - ...registertranslationunitsforeditormessage.h | 2 - src/libs/clangsupport/codecompletion.cpp | 13 - src/libs/clangsupport/codecompletion.h | 1 - src/libs/clangsupport/codecompletionchunk.cpp | 14 - src/libs/clangsupport/codecompletionchunk.h | 1 - src/libs/clangsupport/diagnosticcontainer.cpp | 30 - src/libs/clangsupport/diagnosticcontainer.h | 1 - .../documentannotationschangedmessage.cpp | 16 - .../documentannotationschangedmessage.h | 1 - .../dynamicastmatcherdiagnosticcontainer.cpp | 10 - .../dynamicastmatcherdiagnosticcontainer.h | 1 - ...icastmatcherdiagnosticcontextcontainer.cpp | 13 - ...amicastmatcherdiagnosticcontextcontainer.h | 1 - ...icastmatcherdiagnosticmessagecontainer.cpp | 11 - ...amicastmatcherdiagnosticmessagecontainer.h | 1 - src/libs/clangsupport/filecontainer.cpp | 19 - src/libs/clangsupport/filecontainer.h | 1 - src/libs/clangsupport/filecontainerv2.cpp | 16 - src/libs/clangsupport/filecontainerv2.h | 1 - src/libs/clangsupport/filepath.h | 5 - src/libs/clangsupport/fixitcontainer.cpp | 12 - src/libs/clangsupport/fixitcontainer.h | 1 - src/libs/clangsupport/followsymbolmessage.cpp | 13 - src/libs/clangsupport/followsymbolmessage.h | 1 - src/libs/clangsupport/nativefilepath.h | 5 - .../precompiledheadersupdatedmessage.cpp | 9 - .../precompiledheadersupdatedmessage.h | 1 - .../clangsupport/projectpartcontainer.cpp | 14 - src/libs/clangsupport/projectpartcontainer.h | 1 - .../clangsupport/projectpartcontainerv2.cpp | 11 - .../clangsupport/projectpartcontainerv2.h | 1 - src/libs/clangsupport/projectpartpch.cpp | 9 - src/libs/clangsupport/projectpartpch.h | 1 - src/libs/clangsupport/referencesmessage.cpp | 14 - src/libs/clangsupport/referencesmessage.h | 1 - .../registerunsavedfilesforeditormessage.cpp | 11 - .../registerunsavedfilesforeditormessage.h | 1 - .../removepchprojectpartsmessage.cpp | 4 - .../removepchprojectpartsmessage.h | 1 - .../requestdocumentannotations.cpp | 12 - .../clangsupport/requestdocumentannotations.h | 1 - .../requestfollowsymbolmessage.cpp | 15 - .../clangsupport/requestfollowsymbolmessage.h | 1 - .../clangsupport/requestreferencesmessage.cpp | 15 - .../clangsupport/requestreferencesmessage.h | 1 - ...equestsourcelocationforrenamingmessage.cpp | 14 - .../requestsourcelocationforrenamingmessage.h | 1 - ...rcerangesanddiagnosticsforquerymessage.cpp | 10 - ...ourcerangesanddiagnosticsforquerymessage.h | 1 - .../requestsourcerangesforquerymessage.cpp | 9 - .../requestsourcerangesforquerymessage.h | 1 - .../clangsupport/sourcelocationcontainer.cpp | 12 - .../clangsupport/sourcelocationcontainer.h | 1 - .../sourcelocationcontainerv2.cpp | 14 - .../clangsupport/sourcelocationcontainerv2.h | 1 - .../clangsupport/sourcelocationscontainer.cpp | 11 +- .../clangsupport/sourcelocationscontainer.h | 2 - .../sourcelocationsforrenamingmessage.cpp | 11 - .../sourcelocationsforrenamingmessage.h | 1 - .../clangsupport/sourcerangecontainer.cpp | 12 - src/libs/clangsupport/sourcerangecontainer.h | 1 - .../clangsupport/sourcerangecontainerv2.cpp | 12 - .../clangsupport/sourcerangecontainerv2.h | 1 - ...rcerangesanddiagnosticsforquerymessage.cpp | 10 - ...ourcerangesanddiagnosticsforquerymessage.h | 1 - .../clangsupport/sourcerangescontainer.cpp | 9 - src/libs/clangsupport/sourcerangescontainer.h | 1 - .../sourcerangesforquerymessage.cpp | 8 - .../sourcerangesforquerymessage.h | 1 - .../sourcerangewithtextcontainer.cpp | 15 - .../sourcerangewithtextcontainer.h | 1 - src/libs/clangsupport/tokeninfocontainer.cpp | 38 -- src/libs/clangsupport/tokeninfocontainer.h | 5 - ...unregisterunsavedfilesforeditormessage.cpp | 11 - .../unregisterunsavedfilesforeditormessage.h | 1 - .../updatepchprojectpartsmessage.cpp | 7 - .../updatepchprojectpartsmessage.h | 1 - ...updatetranslationunitsforeditormessage.cpp | 11 - .../updatetranslationunitsforeditormessage.h | 1 - .../updatevisibletranslationunitsmessage.cpp | 14 - .../updatevisibletranslationunitsmessage.h | 1 - src/tools/clangbackend/source/tokeninfo.cpp | 14 - src/tools/clangbackend/source/tokeninfo.h | 22 +- src/tools/clangbackend/source/tokeninfos.cpp | 12 - src/tools/clangbackend/source/tokeninfos.h | 2 - .../unit/unittest/gtest-creator-printing.cpp | 634 +++++++++++++++++- tests/unit/unittest/gtest-creator-printing.h | 114 ++++ 106 files changed, 768 insertions(+), 716 deletions(-) diff --git a/src/libs/clangsupport/cancelmessage.cpp b/src/libs/clangsupport/cancelmessage.cpp index ca5adf0ab40..dbca27725b0 100644 --- a/src/libs/clangsupport/cancelmessage.cpp +++ b/src/libs/clangsupport/cancelmessage.cpp @@ -27,8 +27,6 @@ #include -#include - namespace ClangBackEnd { QDebug operator<<(QDebug debug, const CancelMessage &) @@ -38,9 +36,4 @@ QDebug operator<<(QDebug debug, const CancelMessage &) return debug; } -std::ostream &operator<<(std::ostream &os, const CancelMessage &/*message*/) -{ - return os << "()"; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/cancelmessage.h b/src/libs/clangsupport/cancelmessage.h index eae144410be..c75076b16ae 100644 --- a/src/libs/clangsupport/cancelmessage.h +++ b/src/libs/clangsupport/cancelmessage.h @@ -49,7 +49,6 @@ public: }; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const CancelMessage &message); -std::ostream &operator<<(std::ostream &os, const CancelMessage &message); DECLARE_MESSAGE(CancelMessage) } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/cmbalivemessage.cpp b/src/libs/clangsupport/cmbalivemessage.cpp index d0ec78d6326..72a4d37bea6 100644 --- a/src/libs/clangsupport/cmbalivemessage.cpp +++ b/src/libs/clangsupport/cmbalivemessage.cpp @@ -27,8 +27,6 @@ #include -#include - namespace ClangBackEnd { QDebug operator<<(QDebug debug, const AliveMessage &/*message*/) @@ -36,9 +34,4 @@ QDebug operator<<(QDebug debug, const AliveMessage &/*message*/) return debug.nospace() << "AliveMessage()"; } -std::ostream &operator<<(std::ostream &os, const AliveMessage &/*message*/) -{ - return os << "()"; -} - } diff --git a/src/libs/clangsupport/cmbalivemessage.h b/src/libs/clangsupport/cmbalivemessage.h index 9050f5e8064..3e8f5c70f45 100644 --- a/src/libs/clangsupport/cmbalivemessage.h +++ b/src/libs/clangsupport/cmbalivemessage.h @@ -29,8 +29,6 @@ #include -#include - namespace ClangBackEnd { class AliveMessage @@ -53,7 +51,6 @@ public: }; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const AliveMessage &message); -std::ostream &operator<<(std::ostream &os, const AliveMessage &message); DECLARE_MESSAGE(AliveMessage) } diff --git a/src/libs/clangsupport/cmbcodecompletedmessage.cpp b/src/libs/clangsupport/cmbcodecompletedmessage.cpp index e5667fd04eb..42851b2b765 100644 --- a/src/libs/clangsupport/cmbcodecompletedmessage.cpp +++ b/src/libs/clangsupport/cmbcodecompletedmessage.cpp @@ -27,8 +27,6 @@ #include -#include - namespace ClangBackEnd { #define RETURN_TEXT_FOR_CASE(enumValue) case CompletionCorrection::enumValue: return #enumValue @@ -55,17 +53,5 @@ QDebug operator<<(QDebug debug, const CodeCompletedMessage &message) return debug; } -std::ostream &operator<<(std::ostream &os, const CodeCompletedMessage &message) -{ - os << "(" - << message.m_codeCompletions << ", " - << completionCorrectionToText(message.neededCorrection()) << ", " - << message.m_ticketNumber - - << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/cmbcodecompletedmessage.h b/src/libs/clangsupport/cmbcodecompletedmessage.h index e7759953e6e..b7f7959a027 100644 --- a/src/libs/clangsupport/cmbcodecompletedmessage.h +++ b/src/libs/clangsupport/cmbcodecompletedmessage.h @@ -91,7 +91,6 @@ public: } friend CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const CodeCompletedMessage &message); - friend std::ostream &operator<<(std::ostream &os, const CodeCompletedMessage &message); private: CodeCompletions m_codeCompletions; diff --git a/src/libs/clangsupport/cmbcompletecodemessage.cpp b/src/libs/clangsupport/cmbcompletecodemessage.cpp index 561391b3d5a..5bd8efd7dcf 100644 --- a/src/libs/clangsupport/cmbcompletecodemessage.cpp +++ b/src/libs/clangsupport/cmbcompletecodemessage.cpp @@ -27,8 +27,6 @@ #include -#include - namespace ClangBackEnd { quint64 CompleteCodeMessage::ticketCounter = 0; @@ -50,21 +48,5 @@ QDebug operator<<(QDebug debug, const CompleteCodeMessage &message) return debug; } -std::ostream &operator<<(std::ostream &os, const CompleteCodeMessage &message) -{ - os << "(" - << message.m_filePath.constData() << ", " - << message.m_line << ", " - << message.m_column << ", " - << message.m_projectPartId.constData() << ", " - << message.m_ticketNumber << ", " - << message.m_funcNameStartLine << ", " - << message.m_funcNameStartColumn - - << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/cmbcompletecodemessage.h b/src/libs/clangsupport/cmbcompletecodemessage.h index bf604402c91..086e70a2b10 100644 --- a/src/libs/clangsupport/cmbcompletecodemessage.h +++ b/src/libs/clangsupport/cmbcompletecodemessage.h @@ -127,7 +127,6 @@ public: } friend CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const CompleteCodeMessage &message); - friend std::ostream &operator<<(std::ostream &os, const CompleteCodeMessage &message); private: Utf8String m_filePath; diff --git a/src/libs/clangsupport/cmbechomessage.cpp b/src/libs/clangsupport/cmbechomessage.cpp index 734eb0d1033..4d221737ea8 100644 --- a/src/libs/clangsupport/cmbechomessage.cpp +++ b/src/libs/clangsupport/cmbechomessage.cpp @@ -27,8 +27,6 @@ #include -#include - namespace ClangBackEnd { QDebug operator<<(QDebug debug, const EchoMessage &) @@ -36,10 +34,5 @@ QDebug operator<<(QDebug debug, const EchoMessage &) return debug.nospace() << "EchoMessage()"; } -std::ostream &operator<<(std::ostream &os, const EchoMessage &/*message*/) -{ - return os << "()"; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/cmbechomessage.h b/src/libs/clangsupport/cmbechomessage.h index f9d81836704..728e1382d65 100644 --- a/src/libs/clangsupport/cmbechomessage.h +++ b/src/libs/clangsupport/cmbechomessage.h @@ -29,8 +29,6 @@ #include "messageenvelop.h" -#include - namespace ClangBackEnd { class EchoMessage @@ -71,7 +69,6 @@ private: }; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const EchoMessage &message); -std::ostream &operator<<(std::ostream &os, const EchoMessage &message); DECLARE_MESSAGE(EchoMessage) } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/cmbendmessage.cpp b/src/libs/clangsupport/cmbendmessage.cpp index d4535f45fac..7dbc49e41ed 100644 --- a/src/libs/clangsupport/cmbendmessage.cpp +++ b/src/libs/clangsupport/cmbendmessage.cpp @@ -27,8 +27,6 @@ #include -#include - namespace ClangBackEnd { QDebug operator<<(QDebug debug, const EndMessage &/*message*/) @@ -36,9 +34,4 @@ QDebug operator<<(QDebug debug, const EndMessage &/*message*/) return debug.nospace() << "EndMessage()"; } -std::ostream &operator<<(std::ostream &os, const EndMessage &/*message*/) -{ - return os << "()"; -} - } diff --git a/src/libs/clangsupport/cmbendmessage.h b/src/libs/clangsupport/cmbendmessage.h index 1db2e176433..8ecb2646b82 100644 --- a/src/libs/clangsupport/cmbendmessage.h +++ b/src/libs/clangsupport/cmbendmessage.h @@ -29,8 +29,6 @@ #include -#include - namespace ClangBackEnd { class EndMessage @@ -53,7 +51,6 @@ public: }; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const EndMessage &message); -std::ostream &operator<<(std::ostream &os, const EndMessage &message); DECLARE_MESSAGE(EndMessage) } diff --git a/src/libs/clangsupport/cmbregisterprojectsforeditormessage.cpp b/src/libs/clangsupport/cmbregisterprojectsforeditormessage.cpp index c18cf089802..c1e81afc6e2 100644 --- a/src/libs/clangsupport/cmbregisterprojectsforeditormessage.cpp +++ b/src/libs/clangsupport/cmbregisterprojectsforeditormessage.cpp @@ -27,9 +27,6 @@ #include -#include -#include - namespace ClangBackEnd { QDebug operator<<(QDebug debug, const RegisterProjectPartsForEditorMessage &message) @@ -44,14 +41,5 @@ QDebug operator<<(QDebug debug, const RegisterProjectPartsForEditorMessage &mess return debug; } -std::ostream &operator<<(std::ostream &os, const RegisterProjectPartsForEditorMessage &message) -{ - os << "(" - << message.projectContainers() - << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/cmbregisterprojectsforeditormessage.h b/src/libs/clangsupport/cmbregisterprojectsforeditormessage.h index 5f62150da61..8f843f1d96f 100644 --- a/src/libs/clangsupport/cmbregisterprojectsforeditormessage.h +++ b/src/libs/clangsupport/cmbregisterprojectsforeditormessage.h @@ -70,7 +70,6 @@ private: }; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RegisterProjectPartsForEditorMessage &message); -std::ostream &operator<<(std::ostream &os, const RegisterProjectPartsForEditorMessage &message); DECLARE_MESSAGE(RegisterProjectPartsForEditorMessage); } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/cmbregistertranslationunitsforeditormessage.cpp b/src/libs/clangsupport/cmbregistertranslationunitsforeditormessage.cpp index 3b3d3e5e288..b7a720070ac 100644 --- a/src/libs/clangsupport/cmbregistertranslationunitsforeditormessage.cpp +++ b/src/libs/clangsupport/cmbregistertranslationunitsforeditormessage.cpp @@ -27,8 +27,6 @@ #include -#include - namespace ClangBackEnd { QDebug operator<<(QDebug debug, const RegisterTranslationUnitForEditorMessage &message) @@ -48,15 +46,5 @@ QDebug operator<<(QDebug debug, const RegisterTranslationUnitForEditorMessage &m return debug; } -std::ostream &operator<<(std::ostream &os, const RegisterTranslationUnitForEditorMessage &message) -{ - os << "RegisterTranslationUnitForEditorMessage(" - << message.fileContainers() << ", " - << message.currentEditorFilePath() << ", " - << message.visibleEditorFilePaths() << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/cmbregistertranslationunitsforeditormessage.h b/src/libs/clangsupport/cmbregistertranslationunitsforeditormessage.h index dd1e29065dc..4cd8a95f329 100644 --- a/src/libs/clangsupport/cmbregistertranslationunitsforeditormessage.h +++ b/src/libs/clangsupport/cmbregistertranslationunitsforeditormessage.h @@ -84,7 +84,6 @@ public: && first.visibleEditorFilePaths_ == second.visibleEditorFilePaths_; } - friend std::ostream &operator<<(std::ostream &os, const RegisterTranslationUnitForEditorMessage &message); private: QVector fileContainers_; Utf8String currentEditorFilePath_; diff --git a/src/libs/clangsupport/cmbunregisterprojectsforeditormessage.cpp b/src/libs/clangsupport/cmbunregisterprojectsforeditormessage.cpp index e5099269700..d5df7075fc8 100644 --- a/src/libs/clangsupport/cmbunregisterprojectsforeditormessage.cpp +++ b/src/libs/clangsupport/cmbunregisterprojectsforeditormessage.cpp @@ -27,8 +27,6 @@ #include -#include - namespace ClangBackEnd { QDebug operator<<(QDebug debug, const UnregisterProjectPartsForEditorMessage &message) @@ -43,14 +41,5 @@ QDebug operator<<(QDebug debug, const UnregisterProjectPartsForEditorMessage &me return debug; } -std::ostream &operator<<(std::ostream &os, const UnregisterProjectPartsForEditorMessage &message) -{ - os << "(" - << message.projectPartIds() - << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/cmbunregisterprojectsforeditormessage.h b/src/libs/clangsupport/cmbunregisterprojectsforeditormessage.h index 4db038a1f4d..0b8bd4209cb 100644 --- a/src/libs/clangsupport/cmbunregisterprojectsforeditormessage.h +++ b/src/libs/clangsupport/cmbunregisterprojectsforeditormessage.h @@ -71,7 +71,6 @@ private: }; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const UnregisterProjectPartsForEditorMessage &message); -std::ostream &operator<<(std::ostream &os, const UnregisterProjectPartsForEditorMessage &message); DECLARE_MESSAGE(UnregisterProjectPartsForEditorMessage); } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/cmbunregistertranslationunitsforeditormessage.cpp b/src/libs/clangsupport/cmbunregistertranslationunitsforeditormessage.cpp index c547b94b2fc..bf326a4c2eb 100644 --- a/src/libs/clangsupport/cmbunregistertranslationunitsforeditormessage.cpp +++ b/src/libs/clangsupport/cmbunregistertranslationunitsforeditormessage.cpp @@ -27,8 +27,6 @@ #include -#include - namespace ClangBackEnd { QDebug operator<<(QDebug debug, const UnregisterTranslationUnitsForEditorMessage &message) @@ -43,14 +41,5 @@ QDebug operator<<(QDebug debug, const UnregisterTranslationUnitsForEditorMessage return debug; } -std::ostream &operator<<(std::ostream &os, const UnregisterTranslationUnitsForEditorMessage &message) -{ - os << "(" - << message.fileContainers() - << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/cmbunregistertranslationunitsforeditormessage.h b/src/libs/clangsupport/cmbunregistertranslationunitsforeditormessage.h index f9eb65c9abf..d8e33dc1eca 100644 --- a/src/libs/clangsupport/cmbunregistertranslationunitsforeditormessage.h +++ b/src/libs/clangsupport/cmbunregistertranslationunitsforeditormessage.h @@ -66,8 +66,6 @@ public: return first.m_fileContainers == second.m_fileContainers; } - friend std::ostream &operator<<(std::ostream &os, const UnregisterTranslationUnitsForEditorMessage &message); - private: QVector m_fileContainers; }; diff --git a/src/libs/clangsupport/codecompletion.cpp b/src/libs/clangsupport/codecompletion.cpp index 07b2daac0ff..12704079082 100644 --- a/src/libs/clangsupport/codecompletion.cpp +++ b/src/libs/clangsupport/codecompletion.cpp @@ -84,19 +84,6 @@ QDebug operator<<(QDebug debug, const CodeCompletion &message) return debug; } -std::ostream &operator<<(std::ostream &os, const CodeCompletion &message) -{ - os << "(" - << message.m_text << ", " - << message.m_priority << ", " - << message.m_completionKind << ", " - << message.m_availability << ", " - << message.m_hasParameters - << ")"; - - return os; -} - std::ostream &operator<<(std::ostream &os, const CodeCompletion::Kind kind) { return os << completionKindToString(kind); diff --git a/src/libs/clangsupport/codecompletion.h b/src/libs/clangsupport/codecompletion.h index 003b7c574a0..3ea4e2e6cb4 100644 --- a/src/libs/clangsupport/codecompletion.h +++ b/src/libs/clangsupport/codecompletion.h @@ -194,7 +194,6 @@ public: } friend CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const CodeCompletion &message); - friend std::ostream &operator<<(std::ostream &os, const CodeCompletion &message); private: Utf8String m_text; diff --git a/src/libs/clangsupport/codecompletionchunk.cpp b/src/libs/clangsupport/codecompletionchunk.cpp index 60a0fee2c4b..88026f91f48 100644 --- a/src/libs/clangsupport/codecompletionchunk.cpp +++ b/src/libs/clangsupport/codecompletionchunk.cpp @@ -75,20 +75,6 @@ QDebug operator<<(QDebug debug, const CodeCompletionChunk &chunk) return debug; } -std::ostream &operator<<(std::ostream &os, const CodeCompletionChunk &chunk) -{ - os << "(" - << chunk.kind() << ", " - << chunk.text(); - - if (chunk.isOptional()) - os << ", optional"; - - os << ")"; - - return os; -} - std::ostream &operator<<(std::ostream &os, const CodeCompletionChunk::Kind &kind) { return os << completionChunkKindToString(kind); diff --git a/src/libs/clangsupport/codecompletionchunk.h b/src/libs/clangsupport/codecompletionchunk.h index 0d7c043e58c..115d372820a 100644 --- a/src/libs/clangsupport/codecompletionchunk.h +++ b/src/libs/clangsupport/codecompletionchunk.h @@ -127,7 +127,6 @@ private: CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const CodeCompletionChunk &chunk); -std::ostream &operator<<(std::ostream &os, const CodeCompletionChunk &chunk); std::ostream &operator<<(std::ostream &os, const CodeCompletionChunk::Kind &kind); } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/diagnosticcontainer.cpp b/src/libs/clangsupport/diagnosticcontainer.cpp index b73114d6d0b..a8a66879706 100644 --- a/src/libs/clangsupport/diagnosticcontainer.cpp +++ b/src/libs/clangsupport/diagnosticcontainer.cpp @@ -29,23 +29,8 @@ #include -#include - namespace ClangBackEnd { -static const char *severityToText(DiagnosticSeverity severity) -{ - switch (severity) { - case DiagnosticSeverity::Ignored: return "Ignored"; - case DiagnosticSeverity::Note: return "Note"; - case DiagnosticSeverity::Warning: return "Warning"; - case DiagnosticSeverity::Error: return "Error"; - case DiagnosticSeverity::Fatal: return "Fatal"; - } - - Q_UNREACHABLE(); -} - QDebug operator<<(QDebug debug, const DiagnosticContainer &container) { debug.nospace() << "DiagnosticContainer(" @@ -62,20 +47,5 @@ QDebug operator<<(QDebug debug, const DiagnosticContainer &container) return debug; } -std::ostream &operator<<(std::ostream &os, const DiagnosticContainer &container) -{ - os << "(" - << severityToText(container.severity()) << ": " - << container.text() << ", " - << container.category() << ", " - << container.enableOption() << ", " - << container.location() << ", " - << container.ranges() << ", " - << container.fixIts() << ", " - << container.children() << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/diagnosticcontainer.h b/src/libs/clangsupport/diagnosticcontainer.h index cff34d5f9f6..c8bf81ea23d 100644 --- a/src/libs/clangsupport/diagnosticcontainer.h +++ b/src/libs/clangsupport/diagnosticcontainer.h @@ -162,6 +162,5 @@ private: }; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const DiagnosticContainer &container); -std::ostream &operator<<(std::ostream &os, const DiagnosticContainer &container); } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/documentannotationschangedmessage.cpp b/src/libs/clangsupport/documentannotationschangedmessage.cpp index dbfe48fbdac..22c595467cc 100644 --- a/src/libs/clangsupport/documentannotationschangedmessage.cpp +++ b/src/libs/clangsupport/documentannotationschangedmessage.cpp @@ -25,11 +25,8 @@ #include "documentannotationschangedmessage.h" -#include #include -#include - namespace ClangBackEnd { QDebug operator<<(QDebug debug, const DocumentAnnotationsChangedMessage &message) @@ -45,18 +42,5 @@ QDebug operator<<(QDebug debug, const DocumentAnnotationsChangedMessage &message return debug; } -std::ostream &operator<<(std::ostream &os, const DocumentAnnotationsChangedMessage &message) -{ - os << "DocumentAnnotationsChangedMessage(" - << message.fileContainer() - << "," << message.diagnostics().size() - << "," << !message.firstHeaderErrorDiagnostic().text().isEmpty() - << "," << message.tokenInfos().size() - << "," << message.skippedPreprocessorRanges().size() - << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/documentannotationschangedmessage.h b/src/libs/clangsupport/documentannotationschangedmessage.h index 48118589610..59d53627e07 100644 --- a/src/libs/clangsupport/documentannotationschangedmessage.h +++ b/src/libs/clangsupport/documentannotationschangedmessage.h @@ -118,7 +118,6 @@ private: }; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const DocumentAnnotationsChangedMessage &message); -std::ostream &operator<<(std::ostream &os, const DocumentAnnotationsChangedMessage &message); DECLARE_MESSAGE(DocumentAnnotationsChangedMessage) } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/dynamicastmatcherdiagnosticcontainer.cpp b/src/libs/clangsupport/dynamicastmatcherdiagnosticcontainer.cpp index a7e367609a4..485ed173184 100644 --- a/src/libs/clangsupport/dynamicastmatcherdiagnosticcontainer.cpp +++ b/src/libs/clangsupport/dynamicastmatcherdiagnosticcontainer.cpp @@ -37,14 +37,4 @@ QDebug operator<<(QDebug debug, const DynamicASTMatcherDiagnosticContainer &cont return debug; } -std::ostream &operator<<(std::ostream &os, const DynamicASTMatcherDiagnosticContainer &container) -{ - os << "(" - << container.messages() << ", " - << container.contexts() - << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/dynamicastmatcherdiagnosticcontainer.h b/src/libs/clangsupport/dynamicastmatcherdiagnosticcontainer.h index 1daf050e914..4b9cdb01202 100644 --- a/src/libs/clangsupport/dynamicastmatcherdiagnosticcontainer.h +++ b/src/libs/clangsupport/dynamicastmatcherdiagnosticcontainer.h @@ -99,6 +99,5 @@ private: using DynamicASTMatcherDiagnosticContainers = std::vector; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const DynamicASTMatcherDiagnosticContainer &container); -std::ostream &operator<<(std::ostream &os, const DynamicASTMatcherDiagnosticContainer &container); } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/dynamicastmatcherdiagnosticcontextcontainer.cpp b/src/libs/clangsupport/dynamicastmatcherdiagnosticcontextcontainer.cpp index 37ce0667063..8ceffba1777 100644 --- a/src/libs/clangsupport/dynamicastmatcherdiagnosticcontextcontainer.cpp +++ b/src/libs/clangsupport/dynamicastmatcherdiagnosticcontextcontainer.cpp @@ -25,8 +25,6 @@ #include "dynamicastmatcherdiagnosticcontextcontainer.h" - - namespace ClangBackEnd { QDebug operator<<(QDebug debug, const DynamicASTMatcherDiagnosticContextContainer &container) @@ -40,17 +38,6 @@ QDebug operator<<(QDebug debug, const DynamicASTMatcherDiagnosticContextContaine return debug; } -std::ostream &operator<<(std::ostream &os, const DynamicASTMatcherDiagnosticContextContainer &container) -{ - os << "(" - << container.contextTypeText() << ", " - << container.sourceRange() << ", " - << container.arguments() - << ")"; - - return os; -} - #define RETURN_CASE(name) \ case ClangQueryDiagnosticContextType::name: return #name; diff --git a/src/libs/clangsupport/dynamicastmatcherdiagnosticcontextcontainer.h b/src/libs/clangsupport/dynamicastmatcherdiagnosticcontextcontainer.h index 2cb5ec24176..0d8871c097b 100644 --- a/src/libs/clangsupport/dynamicastmatcherdiagnosticcontextcontainer.h +++ b/src/libs/clangsupport/dynamicastmatcherdiagnosticcontextcontainer.h @@ -108,6 +108,5 @@ private: using DynamicASTMatcherDiagnosticContextContainers = std::vector; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const DynamicASTMatcherDiagnosticContextContainer &container); -std::ostream &operator<<(std::ostream &os, const DynamicASTMatcherDiagnosticContextContainer &container); } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/dynamicastmatcherdiagnosticmessagecontainer.cpp b/src/libs/clangsupport/dynamicastmatcherdiagnosticmessagecontainer.cpp index 8b2decbef6f..ae6f9c98427 100644 --- a/src/libs/clangsupport/dynamicastmatcherdiagnosticmessagecontainer.cpp +++ b/src/libs/clangsupport/dynamicastmatcherdiagnosticmessagecontainer.cpp @@ -41,17 +41,6 @@ QDebug operator<<(QDebug debug, const DynamicASTMatcherDiagnosticMessageContaine return debug; } -std::ostream &operator<<(std::ostream &os, const DynamicASTMatcherDiagnosticMessageContainer &container) -{ - os << "(" - << container.errorTypeText() << ", " - << container.sourceRange() << ", " - << container.arguments() - << ")"; - - return os; -} - Utils::SmallString DynamicASTMatcherDiagnosticMessageContainer::errorTypeText() const { switch (m_errorType) { diff --git a/src/libs/clangsupport/dynamicastmatcherdiagnosticmessagecontainer.h b/src/libs/clangsupport/dynamicastmatcherdiagnosticmessagecontainer.h index 35692ec5778..ddef59b0360 100644 --- a/src/libs/clangsupport/dynamicastmatcherdiagnosticmessagecontainer.h +++ b/src/libs/clangsupport/dynamicastmatcherdiagnosticmessagecontainer.h @@ -106,6 +106,5 @@ private: using DynamicASTMatcherDiagnosticMessageContainers = std::vector; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const DynamicASTMatcherDiagnosticMessageContainer &container); -std::ostream &operator<<(std::ostream &os, const DynamicASTMatcherDiagnosticMessageContainer &container); } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/filecontainer.cpp b/src/libs/clangsupport/filecontainer.cpp index c3f484dbdf0..e2efc70b896 100644 --- a/src/libs/clangsupport/filecontainer.cpp +++ b/src/libs/clangsupport/filecontainer.cpp @@ -29,8 +29,6 @@ #include -#include - namespace ClangBackEnd { QDebug operator<<(QDebug debug, const FileContainer &container) @@ -54,22 +52,5 @@ QDebug operator<<(QDebug debug, const FileContainer &container) return debug; } -std::ostream &operator<<(std::ostream &os, const FileContainer &container) -{ - os << "(" - << container.filePath() << ", " - << container.projectPartId() << ", " - << container.fileArguments() << ", " - << container.documentRevision(); - - if (container.hasUnsavedFileContent()) - os << ", " - << container.unsavedFileContent(); - - os << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/filecontainer.h b/src/libs/clangsupport/filecontainer.h index 30565bceaa0..c7cb3f10053 100644 --- a/src/libs/clangsupport/filecontainer.h +++ b/src/libs/clangsupport/filecontainer.h @@ -147,6 +147,5 @@ private: }; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const FileContainer &container); -std::ostream &operator<<(std::ostream &os, const FileContainer &container); } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/filecontainerv2.cpp b/src/libs/clangsupport/filecontainerv2.cpp index 57b460d8429..298b86d7c1a 100644 --- a/src/libs/clangsupport/filecontainerv2.cpp +++ b/src/libs/clangsupport/filecontainerv2.cpp @@ -40,21 +40,5 @@ QDebug operator<<(QDebug debug, const FileContainer &container) return debug; } -std::ostream &operator<<(std::ostream &os, const FileContainer &container) -{ - os << "(" - << container.filePath() << ", " - << container.commandLineArguments() << ", " - << container.documentRevision(); - - if (container.unsavedFileContent().hasContent()) - os << ", \"" - << container.unsavedFileContent(); - - os << "\")"; - - return os; -} - } // namespace V2 } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/filecontainerv2.h b/src/libs/clangsupport/filecontainerv2.h index 00b9eb7c107..5ee23b1dddf 100644 --- a/src/libs/clangsupport/filecontainerv2.h +++ b/src/libs/clangsupport/filecontainerv2.h @@ -130,7 +130,6 @@ private: using FileContainers = std::vector; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const FileContainer &container); -std::ostream &operator<<(std::ostream &os, const FileContainer &container); } // namespace V2 } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/filepath.h b/src/libs/clangsupport/filepath.h index 9d127ccc308..de9fda59cc7 100644 --- a/src/libs/clangsupport/filepath.h +++ b/src/libs/clangsupport/filepath.h @@ -136,11 +136,6 @@ public: return in; } - friend std::ostream &operator<<(std::ostream &out, const FilePath &filePath) - { - return out << "(" << filePath.path() << ", " << filePath.slashIndex() << ")"; - } - friend bool operator==(const FilePath &first, const FilePath &second) { return first.m_path == second.m_path; diff --git a/src/libs/clangsupport/fixitcontainer.cpp b/src/libs/clangsupport/fixitcontainer.cpp index 05cea43ffc7..48d75bd6df3 100644 --- a/src/libs/clangsupport/fixitcontainer.cpp +++ b/src/libs/clangsupport/fixitcontainer.cpp @@ -27,8 +27,6 @@ #include -#include - namespace ClangBackEnd { QDebug operator<<(QDebug debug, const FixItContainer &container) @@ -41,15 +39,5 @@ QDebug operator<<(QDebug debug, const FixItContainer &container) return debug; } -std::ostream &operator<<(std::ostream &os, const FixItContainer &container) -{ - os << "(" - << container.text() << ", " - << container.range() - << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/fixitcontainer.h b/src/libs/clangsupport/fixitcontainer.h index cbaafbef36e..622d4d8cbb5 100644 --- a/src/libs/clangsupport/fixitcontainer.h +++ b/src/libs/clangsupport/fixitcontainer.h @@ -79,6 +79,5 @@ private: }; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const FixItContainer &container); -std::ostream &operator<<(std::ostream &os, const FixItContainer &container); } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/followsymbolmessage.cpp b/src/libs/clangsupport/followsymbolmessage.cpp index cafd22aa4bc..3186c281306 100644 --- a/src/libs/clangsupport/followsymbolmessage.cpp +++ b/src/libs/clangsupport/followsymbolmessage.cpp @@ -27,8 +27,6 @@ #include -#include - namespace ClangBackEnd { QDebug operator<<(QDebug debug, const FollowSymbolMessage &message) @@ -43,15 +41,4 @@ QDebug operator<<(QDebug debug, const FollowSymbolMessage &message) return debug; } -std::ostream &operator<<(std::ostream &os, const FollowSymbolMessage &message) -{ - os << "(" - << message.m_fileContainer << ", " - << message.m_ticketNumber << ", " - << message.m_sourceRange << ", " - << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/followsymbolmessage.h b/src/libs/clangsupport/followsymbolmessage.h index 9ad70d3c892..2d65f9f9a23 100644 --- a/src/libs/clangsupport/followsymbolmessage.h +++ b/src/libs/clangsupport/followsymbolmessage.h @@ -84,7 +84,6 @@ public: } friend CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const FollowSymbolMessage &message); - friend std::ostream &operator<<(std::ostream &os, const FollowSymbolMessage &message); private: FileContainer m_fileContainer; SourceRangeContainer m_sourceRange; diff --git a/src/libs/clangsupport/nativefilepath.h b/src/libs/clangsupport/nativefilepath.h index 520e503ac76..31b6778ed04 100644 --- a/src/libs/clangsupport/nativefilepath.h +++ b/src/libs/clangsupport/nativefilepath.h @@ -131,11 +131,6 @@ public: return in; } - friend std::ostream &operator<<(std::ostream &out, const NativeFilePath &filePath) - { - return out << "(" << filePath.path() << ", " << filePath.slashIndex() << ")"; - } - friend bool operator==(const NativeFilePath &first, const NativeFilePath &second) { return first.m_path == second.m_path; diff --git a/src/libs/clangsupport/precompiledheadersupdatedmessage.cpp b/src/libs/clangsupport/precompiledheadersupdatedmessage.cpp index 584dad3bbeb..afb4bdc03b3 100644 --- a/src/libs/clangsupport/precompiledheadersupdatedmessage.cpp +++ b/src/libs/clangsupport/precompiledheadersupdatedmessage.cpp @@ -36,13 +36,4 @@ CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const PrecompiledHeadersUpda return debug; } -std::ostream &operator<<(std::ostream &out, const PrecompiledHeadersUpdatedMessage &message) -{ - out << "(" - << message.projectPartPchs() - << ")"; - - return out; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/precompiledheadersupdatedmessage.h b/src/libs/clangsupport/precompiledheadersupdatedmessage.h index b2c60dce122..2119693e6f2 100644 --- a/src/libs/clangsupport/precompiledheadersupdatedmessage.h +++ b/src/libs/clangsupport/precompiledheadersupdatedmessage.h @@ -72,7 +72,6 @@ private: }; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const PrecompiledHeadersUpdatedMessage &message); -std::ostream &operator<<(std::ostream &out, const PrecompiledHeadersUpdatedMessage &message); DECLARE_MESSAGE(PrecompiledHeadersUpdatedMessage) diff --git a/src/libs/clangsupport/projectpartcontainer.cpp b/src/libs/clangsupport/projectpartcontainer.cpp index 9fc1e8d905a..2f35bc87cc1 100644 --- a/src/libs/clangsupport/projectpartcontainer.cpp +++ b/src/libs/clangsupport/projectpartcontainer.cpp @@ -29,8 +29,6 @@ #include -#include - namespace ClangBackEnd { namespace { @@ -60,17 +58,5 @@ QDebug operator<<(QDebug debug, const ProjectPartContainer &container) return debug; } -std::ostream &operator<<(std::ostream &os, const ProjectPartContainer &container) -{ - os << "(" - << container.projectPartId() - << "," - << container.arguments() - << ")"; - - return os; -} - - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/projectpartcontainer.h b/src/libs/clangsupport/projectpartcontainer.h index 9c735632a51..59ee4be5092 100644 --- a/src/libs/clangsupport/projectpartcontainer.h +++ b/src/libs/clangsupport/projectpartcontainer.h @@ -81,6 +81,5 @@ private: }; QDebug operator<<(QDebug debug, const ProjectPartContainer &container); -std::ostream &operator<<(std::ostream &os, const ProjectPartContainer &container); } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/projectpartcontainerv2.cpp b/src/libs/clangsupport/projectpartcontainerv2.cpp index 89b489ee5be..3d0db58c2bc 100644 --- a/src/libs/clangsupport/projectpartcontainerv2.cpp +++ b/src/libs/clangsupport/projectpartcontainerv2.cpp @@ -40,16 +40,5 @@ QDebug operator<<(QDebug debug, const ProjectPartContainer &container) return debug; } -std::ostream &operator<<(std::ostream &out, const ProjectPartContainer &container) -{ - out << "(" - << container.projectPartId() << ", " - << container.arguments() << ", " - << container.headerPaths() << ", " - << container.sourcePaths()<< ")"; - - return out; -} - } // namespace V2 } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/projectpartcontainerv2.h b/src/libs/clangsupport/projectpartcontainerv2.h index be2102fad37..0772d1399b4 100644 --- a/src/libs/clangsupport/projectpartcontainerv2.h +++ b/src/libs/clangsupport/projectpartcontainerv2.h @@ -119,6 +119,5 @@ private: using ProjectPartContainers = std::vector; QDebug operator<<(QDebug debug, const ProjectPartContainer &container); -std::ostream &operator<<(std::ostream &out, const ProjectPartContainer &container); } // namespace V2 } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/projectpartpch.cpp b/src/libs/clangsupport/projectpartpch.cpp index 0df291b3dfa..35e5aff09d8 100644 --- a/src/libs/clangsupport/projectpartpch.cpp +++ b/src/libs/clangsupport/projectpartpch.cpp @@ -36,13 +36,4 @@ QDebug operator<<(QDebug debug, const ProjectPartPch &projectPartPch) return debug; } -std::ostream &operator<<(std::ostream &out, const ProjectPartPch &projectPartPch) -{ - out << "(" - << projectPartPch.id() << ", " - << projectPartPch.path() << ")"; - - return out; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/projectpartpch.h b/src/libs/clangsupport/projectpartpch.h index 1b1b06a6102..406f47a4c7f 100644 --- a/src/libs/clangsupport/projectpartpch.h +++ b/src/libs/clangsupport/projectpartpch.h @@ -84,5 +84,4 @@ private: }; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const ProjectPartPch &projectPartPch); -std::ostream &operator<<(std::ostream &out, const ProjectPartPch &projectPartPch); } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/referencesmessage.cpp b/src/libs/clangsupport/referencesmessage.cpp index 8b994a7d7cf..f569c1bbfde 100644 --- a/src/libs/clangsupport/referencesmessage.cpp +++ b/src/libs/clangsupport/referencesmessage.cpp @@ -27,8 +27,6 @@ #include -#include - namespace ClangBackEnd { QDebug operator<<(QDebug debug, const ReferencesMessage &message) @@ -44,16 +42,4 @@ QDebug operator<<(QDebug debug, const ReferencesMessage &message) return debug; } -std::ostream &operator<<(std::ostream &os, const ReferencesMessage &message) -{ - os << "(" - << message.m_fileContainer << ", " - << message.m_ticketNumber << ", " - << message.m_isLocalVariable << ", " - << message.m_references << ", " - << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/referencesmessage.h b/src/libs/clangsupport/referencesmessage.h index efdcf2b08f0..34c139a15fa 100644 --- a/src/libs/clangsupport/referencesmessage.h +++ b/src/libs/clangsupport/referencesmessage.h @@ -97,7 +97,6 @@ public: } friend CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const ReferencesMessage &message); - friend std::ostream &operator<<(std::ostream &os, const ReferencesMessage &message); private: FileContainer m_fileContainer; diff --git a/src/libs/clangsupport/registerunsavedfilesforeditormessage.cpp b/src/libs/clangsupport/registerunsavedfilesforeditormessage.cpp index 2881382ce8e..7b2b61f199a 100644 --- a/src/libs/clangsupport/registerunsavedfilesforeditormessage.cpp +++ b/src/libs/clangsupport/registerunsavedfilesforeditormessage.cpp @@ -27,8 +27,6 @@ #include -#include - namespace ClangBackEnd { QDebug operator<<(QDebug debug, const RegisterUnsavedFilesForEditorMessage &message) @@ -43,14 +41,5 @@ QDebug operator<<(QDebug debug, const RegisterUnsavedFilesForEditorMessage &mess return debug; } -std::ostream &operator<<(std::ostream &os, const RegisterUnsavedFilesForEditorMessage &message) -{ - os << "(" - << message.fileContainers() - << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/registerunsavedfilesforeditormessage.h b/src/libs/clangsupport/registerunsavedfilesforeditormessage.h index 826bdd4e89c..93961b0f2ce 100644 --- a/src/libs/clangsupport/registerunsavedfilesforeditormessage.h +++ b/src/libs/clangsupport/registerunsavedfilesforeditormessage.h @@ -69,7 +69,6 @@ private: }; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RegisterUnsavedFilesForEditorMessage &message); -std::ostream &operator<<(std::ostream &os, const RegisterUnsavedFilesForEditorMessage &message); DECLARE_MESSAGE(RegisterUnsavedFilesForEditorMessage); } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/removepchprojectpartsmessage.cpp b/src/libs/clangsupport/removepchprojectpartsmessage.cpp index d83dfac39b6..5aae5513fe0 100644 --- a/src/libs/clangsupport/removepchprojectpartsmessage.cpp +++ b/src/libs/clangsupport/removepchprojectpartsmessage.cpp @@ -35,8 +35,4 @@ CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RemovePchProjectPartsM return debug; } -std::ostream &operator<<(std::ostream &out, const RemovePchProjectPartsMessage &message) -{ - return out << "(" << message.projectsPartIds() << ")"; -} } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/removepchprojectpartsmessage.h b/src/libs/clangsupport/removepchprojectpartsmessage.h index ca718e55d17..8589a7df490 100644 --- a/src/libs/clangsupport/removepchprojectpartsmessage.h +++ b/src/libs/clangsupport/removepchprojectpartsmessage.h @@ -77,7 +77,6 @@ private: }; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RemovePchProjectPartsMessage &message); -std::ostream &operator<<(std::ostream &out, const RemovePchProjectPartsMessage &message); DECLARE_MESSAGE(RemovePchProjectPartsMessage) diff --git a/src/libs/clangsupport/requestdocumentannotations.cpp b/src/libs/clangsupport/requestdocumentannotations.cpp index 6d3400ccc3a..ae0dcf53783 100644 --- a/src/libs/clangsupport/requestdocumentannotations.cpp +++ b/src/libs/clangsupport/requestdocumentannotations.cpp @@ -27,8 +27,6 @@ #include -#include - namespace ClangBackEnd { QDebug operator<<(QDebug debug, const RequestDocumentAnnotationsMessage &message) @@ -40,14 +38,4 @@ QDebug operator<<(QDebug debug, const RequestDocumentAnnotationsMessage &message return debug; } -std::ostream &operator<<(std::ostream &os, const RequestDocumentAnnotationsMessage &message) -{ - os << "(" - << message.fileContainer().filePath() << "," - << message.fileContainer().projectPartId() - << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/requestdocumentannotations.h b/src/libs/clangsupport/requestdocumentannotations.h index 56717f6a389..c0b9148d6d5 100644 --- a/src/libs/clangsupport/requestdocumentannotations.h +++ b/src/libs/clangsupport/requestdocumentannotations.h @@ -67,7 +67,6 @@ private: }; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RequestDocumentAnnotationsMessage &message); -std::ostream &operator<<(std::ostream &os, const RequestDocumentAnnotationsMessage &message); DECLARE_MESSAGE(RequestDocumentAnnotationsMessage); } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/requestfollowsymbolmessage.cpp b/src/libs/clangsupport/requestfollowsymbolmessage.cpp index dcb0b5cd2ef..92fe71062e8 100644 --- a/src/libs/clangsupport/requestfollowsymbolmessage.cpp +++ b/src/libs/clangsupport/requestfollowsymbolmessage.cpp @@ -27,8 +27,6 @@ #include -#include - namespace ClangBackEnd { quint64 RequestFollowSymbolMessage::ticketCounter = 0; @@ -48,17 +46,4 @@ QDebug operator<<(QDebug debug, const RequestFollowSymbolMessage &message) return debug; } -std::ostream &operator<<(std::ostream &os, const RequestFollowSymbolMessage &message) -{ - os << "(" - << message.m_fileContainer << ", " - << message.m_dependentFiles << ", " - << message.m_ticketNumber << ", " - << message.m_line << ", " - << message.m_column << ", " - << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/requestfollowsymbolmessage.h b/src/libs/clangsupport/requestfollowsymbolmessage.h index 25a8fb2b9d2..a68a6d956cb 100644 --- a/src/libs/clangsupport/requestfollowsymbolmessage.h +++ b/src/libs/clangsupport/requestfollowsymbolmessage.h @@ -107,7 +107,6 @@ public: } friend CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RequestFollowSymbolMessage &message); - friend std::ostream &operator<<(std::ostream &os, const RequestFollowSymbolMessage &message); private: FileContainer m_fileContainer; quint64 m_ticketNumber = 0; diff --git a/src/libs/clangsupport/requestreferencesmessage.cpp b/src/libs/clangsupport/requestreferencesmessage.cpp index df42d690ae7..576368aa6b2 100644 --- a/src/libs/clangsupport/requestreferencesmessage.cpp +++ b/src/libs/clangsupport/requestreferencesmessage.cpp @@ -27,8 +27,6 @@ #include -#include - namespace ClangBackEnd { quint64 RequestReferencesMessage::ticketCounter = 0; @@ -48,17 +46,4 @@ QDebug operator<<(QDebug debug, const RequestReferencesMessage &message) return debug; } -std::ostream &operator<<(std::ostream &os, const RequestReferencesMessage &message) -{ - os << "(" - << message.m_fileContainer << ", " - << message.m_ticketNumber << ", " - << message.m_line << ", " - << message.m_column << ", " - << message.m_local << ", " - << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/requestreferencesmessage.h b/src/libs/clangsupport/requestreferencesmessage.h index 004e718fd6f..615e1dc3ae0 100644 --- a/src/libs/clangsupport/requestreferencesmessage.h +++ b/src/libs/clangsupport/requestreferencesmessage.h @@ -107,7 +107,6 @@ public: } friend CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RequestReferencesMessage &message); - friend std::ostream &operator<<(std::ostream &os, const RequestReferencesMessage &message); private: FileContainer m_fileContainer; diff --git a/src/libs/clangsupport/requestsourcelocationforrenamingmessage.cpp b/src/libs/clangsupport/requestsourcelocationforrenamingmessage.cpp index 6d5d8a24a1e..ff5171c11ad 100644 --- a/src/libs/clangsupport/requestsourcelocationforrenamingmessage.cpp +++ b/src/libs/clangsupport/requestsourcelocationforrenamingmessage.cpp @@ -38,18 +38,4 @@ QDebug operator<<(QDebug debug, const RequestSourceLocationsForRenamingMessage & return debug; } -std::ostream &operator<<(std::ostream &os, const RequestSourceLocationsForRenamingMessage &message) -{ - - os << "(" - << message.filePath() << ", " - << message.line() << ", " - << message.column() << ", " - << message.unsavedContent() << ", " - << message.commandLine() - << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/requestsourcelocationforrenamingmessage.h b/src/libs/clangsupport/requestsourcelocationforrenamingmessage.h index c79165ef88f..1dc0608e728 100644 --- a/src/libs/clangsupport/requestsourcelocationforrenamingmessage.h +++ b/src/libs/clangsupport/requestsourcelocationforrenamingmessage.h @@ -133,7 +133,6 @@ private: }; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RequestSourceLocationsForRenamingMessage &message); -std::ostream &operator<<(std::ostream &os, const RequestSourceLocationsForRenamingMessage &message); DECLARE_MESSAGE(RequestSourceLocationsForRenamingMessage) } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/requestsourcerangesanddiagnosticsforquerymessage.cpp b/src/libs/clangsupport/requestsourcerangesanddiagnosticsforquerymessage.cpp index 878f11f0de4..87515141cfc 100644 --- a/src/libs/clangsupport/requestsourcerangesanddiagnosticsforquerymessage.cpp +++ b/src/libs/clangsupport/requestsourcerangesanddiagnosticsforquerymessage.cpp @@ -36,14 +36,4 @@ QDebug operator<<(QDebug debug, const RequestSourceRangesAndDiagnosticsForQueryM return debug; } -std::ostream &operator<<(std::ostream &os, const RequestSourceRangesAndDiagnosticsForQueryMessage &message) -{ - os << "(" - << message.query() << ", " - << message.source() - << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/requestsourcerangesanddiagnosticsforquerymessage.h b/src/libs/clangsupport/requestsourcerangesanddiagnosticsforquerymessage.h index fc39ae16dc7..2f24fefcb13 100644 --- a/src/libs/clangsupport/requestsourcerangesanddiagnosticsforquerymessage.h +++ b/src/libs/clangsupport/requestsourcerangesanddiagnosticsforquerymessage.h @@ -94,7 +94,6 @@ private: }; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RequestSourceRangesAndDiagnosticsForQueryMessage &message); -std::ostream &operator<<(std::ostream &os, const RequestSourceRangesAndDiagnosticsForQueryMessage &message); DECLARE_MESSAGE(RequestSourceRangesAndDiagnosticsForQueryMessage) } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/requestsourcerangesforquerymessage.cpp b/src/libs/clangsupport/requestsourcerangesforquerymessage.cpp index ab5b8d8468f..53edf4a768c 100644 --- a/src/libs/clangsupport/requestsourcerangesforquerymessage.cpp +++ b/src/libs/clangsupport/requestsourcerangesforquerymessage.cpp @@ -35,14 +35,5 @@ QDebug operator<<(QDebug debug, const RequestSourceRangesForQueryMessage &messag return debug; } -std::ostream &operator<<(std::ostream &os, const RequestSourceRangesForQueryMessage &message) -{ - os << "(" - << message.query() - << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/requestsourcerangesforquerymessage.h b/src/libs/clangsupport/requestsourcerangesforquerymessage.h index 095849ee5c4..e193a3dca64 100644 --- a/src/libs/clangsupport/requestsourcerangesforquerymessage.h +++ b/src/libs/clangsupport/requestsourcerangesforquerymessage.h @@ -111,7 +111,6 @@ private: CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RequestSourceRangesForQueryMessage &message); -std::ostream &operator<<(std::ostream &os, const RequestSourceRangesForQueryMessage &message); DECLARE_MESSAGE(RequestSourceRangesForQueryMessage) } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/sourcelocationcontainer.cpp b/src/libs/clangsupport/sourcelocationcontainer.cpp index f4c9648f563..33ee31095cf 100644 --- a/src/libs/clangsupport/sourcelocationcontainer.cpp +++ b/src/libs/clangsupport/sourcelocationcontainer.cpp @@ -28,8 +28,6 @@ #include #include -#include - namespace ClangBackEnd { SourceLocationContainer::SourceLocationContainer(const Utf8String &filePath, @@ -97,15 +95,5 @@ QDebug operator<<(QDebug debug, const SourceLocationContainer &container) return debug; } -std::ostream &operator<<(std::ostream &os, const SourceLocationContainer &container) -{ - os << "(" - << container.filePath() << ", " - << container.line() << ", " - << container.column() - << ")"; - - return os; -} } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/sourcelocationcontainer.h b/src/libs/clangsupport/sourcelocationcontainer.h index 44d674b67ad..64066d9aa5f 100644 --- a/src/libs/clangsupport/sourcelocationcontainer.h +++ b/src/libs/clangsupport/sourcelocationcontainer.h @@ -59,6 +59,5 @@ CLANGSUPPORT_EXPORT bool operator==(const SourceLocationContainer &first, const CLANGSUPPORT_EXPORT bool operator!=(const SourceLocationContainer &first, const SourceLocationContainer &second); CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceLocationContainer &container); -std::ostream &operator<<(std::ostream &os, const SourceLocationContainer &container); } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/sourcelocationcontainerv2.cpp b/src/libs/clangsupport/sourcelocationcontainerv2.cpp index 2aa2d1a3cf5..1ddc2d2bd07 100644 --- a/src/libs/clangsupport/sourcelocationcontainerv2.cpp +++ b/src/libs/clangsupport/sourcelocationcontainerv2.cpp @@ -27,8 +27,6 @@ #include -#include - namespace ClangBackEnd { namespace V2 { @@ -43,17 +41,5 @@ QDebug operator<<(QDebug debug, const SourceLocationContainer &container) return debug; } -std::ostream &operator<<(std::ostream &os, const SourceLocationContainer &container) -{ - os << "((" - << container.filePathId().directoryId << ", " << container.filePathId().fileNameId << "), " - << container.line() << ", " - << container.column() << ", " - << container.offset() - << ")"; - - return os; -} - } // namespace V2 } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/sourcelocationcontainerv2.h b/src/libs/clangsupport/sourcelocationcontainerv2.h index f944db7c81f..5e42b7afd2e 100644 --- a/src/libs/clangsupport/sourcelocationcontainerv2.h +++ b/src/libs/clangsupport/sourcelocationcontainerv2.h @@ -121,7 +121,6 @@ private: }; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceLocationContainer &container); -std::ostream &operator<<(std::ostream &os, const SourceLocationContainer &container); } // namespace V2 } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/sourcelocationscontainer.cpp b/src/libs/clangsupport/sourcelocationscontainer.cpp index 7e4bc79a5b8..dfdf79050b3 100644 --- a/src/libs/clangsupport/sourcelocationscontainer.cpp +++ b/src/libs/clangsupport/sourcelocationscontainer.cpp @@ -25,7 +25,7 @@ #include "sourcelocationscontainer.h" -#include +#include namespace ClangBackEnd { @@ -44,13 +44,4 @@ QDebug operator<<(QDebug debug, const SourceLocationsContainer &container) return debug; } -std::ostream &operator<<(std::ostream &os, const SourceLocationsContainer &container) -{ - os << "(" - << container.sourceLocationContainers() - << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/sourcelocationscontainer.h b/src/libs/clangsupport/sourcelocationscontainer.h index 008eb08649c..4fc247e0f90 100644 --- a/src/libs/clangsupport/sourcelocationscontainer.h +++ b/src/libs/clangsupport/sourcelocationscontainer.h @@ -86,9 +86,7 @@ public: std::vector m_sourceLocationContainers; }; - CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceLocationsContainer &container); -std::ostream &operator<<(std::ostream &os, const SourceLocationsContainer &container); } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/sourcelocationsforrenamingmessage.cpp b/src/libs/clangsupport/sourcelocationsforrenamingmessage.cpp index 0ce0b8f7a87..f43f0c5ca44 100644 --- a/src/libs/clangsupport/sourcelocationsforrenamingmessage.cpp +++ b/src/libs/clangsupport/sourcelocationsforrenamingmessage.cpp @@ -36,15 +36,4 @@ QDebug operator<<(QDebug debug, const SourceLocationsForRenamingMessage &message return debug; } -std::ostream &operator<<(std::ostream &os, const SourceLocationsForRenamingMessage &message) -{ - os << "(" - << message.symbolName() << ", " - << message.textDocumentRevision() << ", " - << message.sourceLocations() - << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/sourcelocationsforrenamingmessage.h b/src/libs/clangsupport/sourcelocationsforrenamingmessage.h index 5605ab56d6f..064414711a9 100644 --- a/src/libs/clangsupport/sourcelocationsforrenamingmessage.h +++ b/src/libs/clangsupport/sourcelocationsforrenamingmessage.h @@ -97,7 +97,6 @@ private: }; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceLocationsForRenamingMessage &message); -std::ostream &operator<<(std::ostream &os, const SourceLocationsForRenamingMessage &message); DECLARE_MESSAGE(SourceLocationsForRenamingMessage) } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/sourcerangecontainer.cpp b/src/libs/clangsupport/sourcerangecontainer.cpp index a2db7545eb5..42f509efde8 100644 --- a/src/libs/clangsupport/sourcerangecontainer.cpp +++ b/src/libs/clangsupport/sourcerangecontainer.cpp @@ -27,8 +27,6 @@ #include -#include - namespace ClangBackEnd { @@ -42,15 +40,5 @@ QDebug operator<<(QDebug debug, const SourceRangeContainer &container) return debug; } -std::ostream &operator<<(std::ostream &os, const SourceRangeContainer &container) -{ - os << "(" - << container.start() << ", " - << container.end() - << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/sourcerangecontainer.h b/src/libs/clangsupport/sourcerangecontainer.h index 48eb3ffdea1..bafda6ee8ae 100644 --- a/src/libs/clangsupport/sourcerangecontainer.h +++ b/src/libs/clangsupport/sourcerangecontainer.h @@ -80,6 +80,5 @@ private: }; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceRangeContainer &container); -std::ostream &operator<<(std::ostream &os, const SourceRangeContainer &container); } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/sourcerangecontainerv2.cpp b/src/libs/clangsupport/sourcerangecontainerv2.cpp index 47907beb8da..fa91bbf0c32 100644 --- a/src/libs/clangsupport/sourcerangecontainerv2.cpp +++ b/src/libs/clangsupport/sourcerangecontainerv2.cpp @@ -27,8 +27,6 @@ #include -#include - namespace ClangBackEnd { namespace V2 { @@ -42,15 +40,5 @@ QDebug operator<<(QDebug debug, const SourceRangeContainer &container) return debug; } -std::ostream &operator<<(std::ostream &os, const SourceRangeContainer &container) -{ - os << "(" - << container.start() << ", " - << container.end() - << ")"; - - return os; -} - } // namespace V2 } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/sourcerangecontainerv2.h b/src/libs/clangsupport/sourcerangecontainerv2.h index 641e75a75b4..954a84f98c7 100644 --- a/src/libs/clangsupport/sourcerangecontainerv2.h +++ b/src/libs/clangsupport/sourcerangecontainerv2.h @@ -110,6 +110,5 @@ private: using SourceRangeContainers = std::vector; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceRangeContainer &container); -std::ostream &operator<<(std::ostream &os, const SourceRangeContainer &container); } // namespace V2 } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/sourcerangesanddiagnosticsforquerymessage.cpp b/src/libs/clangsupport/sourcerangesanddiagnosticsforquerymessage.cpp index f4ac78ea438..3173fd185ee 100644 --- a/src/libs/clangsupport/sourcerangesanddiagnosticsforquerymessage.cpp +++ b/src/libs/clangsupport/sourcerangesanddiagnosticsforquerymessage.cpp @@ -36,14 +36,4 @@ QDebug operator<<(QDebug debug, const SourceRangesAndDiagnosticsForQueryMessage return debug; } -std::ostream &operator<<(std::ostream &os, const SourceRangesAndDiagnosticsForQueryMessage &message) -{ - os << "(" - << message.sourceRanges() << ", " - << message.diagnostics() - << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/sourcerangesanddiagnosticsforquerymessage.h b/src/libs/clangsupport/sourcerangesanddiagnosticsforquerymessage.h index c1cdae42fae..f88f5056e6b 100644 --- a/src/libs/clangsupport/sourcerangesanddiagnosticsforquerymessage.h +++ b/src/libs/clangsupport/sourcerangesanddiagnosticsforquerymessage.h @@ -96,7 +96,6 @@ private: }; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceRangesAndDiagnosticsForQueryMessage &message); -std::ostream &operator<<(std::ostream &os, const SourceRangesAndDiagnosticsForQueryMessage &message); DECLARE_MESSAGE(SourceRangesAndDiagnosticsForQueryMessage) diff --git a/src/libs/clangsupport/sourcerangescontainer.cpp b/src/libs/clangsupport/sourcerangescontainer.cpp index 9f2752f2866..8abcfc8d418 100644 --- a/src/libs/clangsupport/sourcerangescontainer.cpp +++ b/src/libs/clangsupport/sourcerangescontainer.cpp @@ -43,13 +43,4 @@ QDebug operator<<(QDebug debug, const SourceRangesContainer &container) return debug; } -std::ostream &operator<<(std::ostream &os, const SourceRangesContainer &container) -{ - os << "(" - << container.sourceRangeWithTextContainers() - << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/sourcerangescontainer.h b/src/libs/clangsupport/sourcerangescontainer.h index bbee91846ae..0c3b9654db4 100644 --- a/src/libs/clangsupport/sourcerangescontainer.h +++ b/src/libs/clangsupport/sourcerangescontainer.h @@ -112,6 +112,5 @@ public: CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceRangesContainer &container); -std::ostream &operator<<(std::ostream &os, const SourceRangesContainer &container); } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/sourcerangesforquerymessage.cpp b/src/libs/clangsupport/sourcerangesforquerymessage.cpp index e9227b3a66e..bd4a1e238e3 100644 --- a/src/libs/clangsupport/sourcerangesforquerymessage.cpp +++ b/src/libs/clangsupport/sourcerangesforquerymessage.cpp @@ -35,12 +35,4 @@ QDebug operator<<(QDebug debug, const SourceRangesForQueryMessage &message) return debug; } -std::ostream &operator<<(std::ostream &os, const SourceRangesForQueryMessage &message) -{ - os << "(" - << message.sourceRanges() - << ")"; - - return os; -} } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/sourcerangesforquerymessage.h b/src/libs/clangsupport/sourcerangesforquerymessage.h index 75b3e18558f..98fc31ab0f4 100644 --- a/src/libs/clangsupport/sourcerangesforquerymessage.h +++ b/src/libs/clangsupport/sourcerangesforquerymessage.h @@ -79,7 +79,6 @@ private: }; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceRangesForQueryMessage &message); -std::ostream &operator<<(std::ostream &os, const SourceRangesForQueryMessage &message); DECLARE_MESSAGE(SourceRangesForQueryMessage) } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/sourcerangewithtextcontainer.cpp b/src/libs/clangsupport/sourcerangewithtextcontainer.cpp index 82f410c8968..002538804aa 100644 --- a/src/libs/clangsupport/sourcerangewithtextcontainer.cpp +++ b/src/libs/clangsupport/sourcerangewithtextcontainer.cpp @@ -25,10 +25,6 @@ #include "sourcerangewithtextcontainer.h" -#ifdef UNIT_TESTS -#include -#endif - namespace ClangBackEnd { QDebug operator<<(QDebug debug, const SourceRangeWithTextContainer &container) @@ -42,15 +38,4 @@ QDebug operator<<(QDebug debug, const SourceRangeWithTextContainer &container) return debug; } -std::ostream &operator<<(std::ostream &os, const SourceRangeWithTextContainer &container) -{ - - os << "(" - << container.start() << ", " - << container.end() << ", " - << container.text() - << ")"; - - return os; -} } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/sourcerangewithtextcontainer.h b/src/libs/clangsupport/sourcerangewithtextcontainer.h index e72f4e650fb..79421f17cad 100644 --- a/src/libs/clangsupport/sourcerangewithtextcontainer.h +++ b/src/libs/clangsupport/sourcerangewithtextcontainer.h @@ -113,6 +113,5 @@ private: using SourceRangeWithTextContainers = std::vector; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceRangeWithTextContainer &container); -std::ostream &operator<<(std::ostream &os, const SourceRangeWithTextContainer &container); } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/tokeninfocontainer.cpp b/src/libs/clangsupport/tokeninfocontainer.cpp index beca0c5f9f1..64cb274f163 100644 --- a/src/libs/clangsupport/tokeninfocontainer.cpp +++ b/src/libs/clangsupport/tokeninfocontainer.cpp @@ -27,8 +27,6 @@ #include -#include - namespace ClangBackEnd { #define RETURN_TEXT_FOR_CASE(enumValue) case HighlightingType::enumValue: return #enumValue @@ -77,40 +75,4 @@ QDebug operator<<(QDebug debug, const TokenInfoContainer &container) return debug; } -std::ostream &operator<<(std::ostream &os, HighlightingType highlightingType) -{ - return os << highlightingTypeToCStringLiteral(highlightingType); -} - -std::ostream &operator<<(std::ostream &os, HighlightingTypes types) -{ - os << "(" - << types.mainHighlightingType; - - if (!types.mixinHighlightingTypes.empty()) - os << ", "<< types.mixinHighlightingTypes; - - os << ")"; - - return os; -} - -std::ostream &operator<<(std::ostream &os, const TokenInfoContainer &container) -{ - os << "(" - << container.line() << ", " - << container.column() << ", " - << container.length() << ", " - << container.types() << ", " - << container.token() << ", " - << container.typeSpelling() << ", " - << container.isIdentifier() << ", " - << container.isIncludeDirectivePath() << ", " - << container.isDeclaration() << ", " - << container.isDefinition() - << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/tokeninfocontainer.h b/src/libs/clangsupport/tokeninfocontainer.h index b5007b0b1d3..9d84cdade89 100644 --- a/src/libs/clangsupport/tokeninfocontainer.h +++ b/src/libs/clangsupport/tokeninfocontainer.h @@ -31,9 +31,7 @@ #include -#include #include - namespace ClangBackEnd { inline QDataStream &operator<<(QDataStream &out, HighlightingType highlightingType); @@ -264,8 +262,5 @@ inline QDataStream &operator>>(QDataStream &in, ByteSizeBitset &bits) } CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const TokenInfoContainer &container); -CLANGSUPPORT_EXPORT std::ostream &operator<<(std::ostream &os, HighlightingType highlightingType); -CLANGSUPPORT_EXPORT std::ostream &operator<<(std::ostream &os, HighlightingTypes types); -std::ostream &operator<<(std::ostream &os, const TokenInfoContainer &container); } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/unregisterunsavedfilesforeditormessage.cpp b/src/libs/clangsupport/unregisterunsavedfilesforeditormessage.cpp index 7cd14039091..231cca9bc55 100644 --- a/src/libs/clangsupport/unregisterunsavedfilesforeditormessage.cpp +++ b/src/libs/clangsupport/unregisterunsavedfilesforeditormessage.cpp @@ -27,8 +27,6 @@ #include -#include - namespace ClangBackEnd { QDebug operator<<(QDebug debug, const UnregisterUnsavedFilesForEditorMessage &message) @@ -43,14 +41,5 @@ QDebug operator<<(QDebug debug, const UnregisterUnsavedFilesForEditorMessage &me return debug; } -std::ostream &operator<<(std::ostream &os, const UnregisterUnsavedFilesForEditorMessage &message) -{ - os << "(" - << message.fileContainers() - << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/unregisterunsavedfilesforeditormessage.h b/src/libs/clangsupport/unregisterunsavedfilesforeditormessage.h index 2452ecaaf88..76b0d826f31 100644 --- a/src/libs/clangsupport/unregisterunsavedfilesforeditormessage.h +++ b/src/libs/clangsupport/unregisterunsavedfilesforeditormessage.h @@ -70,7 +70,6 @@ private: }; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const UnregisterUnsavedFilesForEditorMessage &message); -std::ostream &operator<<(std::ostream &os, const UnregisterUnsavedFilesForEditorMessage &message); DECLARE_MESSAGE(UnregisterUnsavedFilesForEditorMessage) } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/updatepchprojectpartsmessage.cpp b/src/libs/clangsupport/updatepchprojectpartsmessage.cpp index f86ef12aac1..5b93b78a02e 100644 --- a/src/libs/clangsupport/updatepchprojectpartsmessage.cpp +++ b/src/libs/clangsupport/updatepchprojectpartsmessage.cpp @@ -35,11 +35,4 @@ QDebug operator<<(QDebug debug, const UpdatePchProjectPartsMessage &message) return debug; } -std::ostream &operator<<(std::ostream &out, const UpdatePchProjectPartsMessage &message) -{ - return out << "(" - << message.projectsParts() - << ")"; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/updatepchprojectpartsmessage.h b/src/libs/clangsupport/updatepchprojectpartsmessage.h index 96d552f73bd..0cd925571cb 100644 --- a/src/libs/clangsupport/updatepchprojectpartsmessage.h +++ b/src/libs/clangsupport/updatepchprojectpartsmessage.h @@ -95,7 +95,6 @@ private: }; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const UpdatePchProjectPartsMessage &message); -std::ostream &operator<<(std::ostream &out, const UpdatePchProjectPartsMessage &message); DECLARE_MESSAGE(UpdatePchProjectPartsMessage) diff --git a/src/libs/clangsupport/updatetranslationunitsforeditormessage.cpp b/src/libs/clangsupport/updatetranslationunitsforeditormessage.cpp index 0dc0d861a7b..c74f9da5ef3 100644 --- a/src/libs/clangsupport/updatetranslationunitsforeditormessage.cpp +++ b/src/libs/clangsupport/updatetranslationunitsforeditormessage.cpp @@ -27,8 +27,6 @@ #include -#include - namespace ClangBackEnd { QDebug operator<<(QDebug debug, const UpdateTranslationUnitsForEditorMessage &message) @@ -43,14 +41,5 @@ QDebug operator<<(QDebug debug, const UpdateTranslationUnitsForEditorMessage &me return debug; } -std::ostream &operator<<(std::ostream &os, const UpdateTranslationUnitsForEditorMessage &message) -{ - os << "UpdateTranslationUnitsForEditorMessage(" - << message.fileContainers() - << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/updatetranslationunitsforeditormessage.h b/src/libs/clangsupport/updatetranslationunitsforeditormessage.h index c6fb3866130..88d2a41497c 100644 --- a/src/libs/clangsupport/updatetranslationunitsforeditormessage.h +++ b/src/libs/clangsupport/updatetranslationunitsforeditormessage.h @@ -69,7 +69,6 @@ private: }; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const UpdateTranslationUnitsForEditorMessage &message); -std::ostream &operator<<(std::ostream &os, const UpdateTranslationUnitsForEditorMessage &message); DECLARE_MESSAGE(UpdateTranslationUnitsForEditorMessage) } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/updatevisibletranslationunitsmessage.cpp b/src/libs/clangsupport/updatevisibletranslationunitsmessage.cpp index 00f154f4c83..5394fcf1cc2 100644 --- a/src/libs/clangsupport/updatevisibletranslationunitsmessage.cpp +++ b/src/libs/clangsupport/updatevisibletranslationunitsmessage.cpp @@ -27,10 +27,6 @@ #include -#include -#include -#include - namespace ClangBackEnd { QDebug operator<<(QDebug debug, const UpdateVisibleTranslationUnitsMessage &message) @@ -47,14 +43,4 @@ QDebug operator<<(QDebug debug, const UpdateVisibleTranslationUnitsMessage &mess return debug; } -std::ostream &operator<<(std::ostream &os, const UpdateVisibleTranslationUnitsMessage &message) -{ - os << "(" - << message.currentEditorFilePath() << ", " - << message.visibleEditorFilePaths() - << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/libs/clangsupport/updatevisibletranslationunitsmessage.h b/src/libs/clangsupport/updatevisibletranslationunitsmessage.h index a3618453ca0..7c1e5d94243 100644 --- a/src/libs/clangsupport/updatevisibletranslationunitsmessage.h +++ b/src/libs/clangsupport/updatevisibletranslationunitsmessage.h @@ -81,7 +81,6 @@ private: }; CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const UpdateVisibleTranslationUnitsMessage &message); -std::ostream &operator<<(std::ostream &os, const UpdateVisibleTranslationUnitsMessage &message); DECLARE_MESSAGE(UpdateVisibleTranslationUnitsMessage) } // namespace ClangBackEnd diff --git a/src/tools/clangbackend/source/tokeninfo.cpp b/src/tools/clangbackend/source/tokeninfo.cpp index 51fde96e66a..703b0f78085 100644 --- a/src/tools/clangbackend/source/tokeninfo.cpp +++ b/src/tools/clangbackend/source/tokeninfo.cpp @@ -32,9 +32,6 @@ #include "sourcerange.h" #include "sourcerangecontainer.h" -#include -#include - #include namespace ClangBackEnd { @@ -471,15 +468,4 @@ void TokenInfo::collectKinds(CXTranslationUnit cxTranslationUnit, m_isInclusion = (cursor.kind() == CXCursor_InclusionDirective); } -std::ostream &operator<<(std::ostream &os, const TokenInfo& tokenInfo) -{ - os << "(type: " << tokenInfo.m_types << ", " - << " line: " << tokenInfo.m_line << ", " - << " column: " << tokenInfo.m_column << ", " - << " length: " << tokenInfo.m_length - << ")"; - - return os; -} - } // namespace ClangBackEnd diff --git a/src/tools/clangbackend/source/tokeninfo.h b/src/tools/clangbackend/source/tokeninfo.h index a980e2e3e85..0a19a8792df 100644 --- a/src/tools/clangbackend/source/tokeninfo.h +++ b/src/tools/clangbackend/source/tokeninfo.h @@ -62,6 +62,26 @@ public: operator TokenInfoContainer() const; + const HighlightingTypes &types() const + { + return m_types; + } + + uint line () const + { + return m_line; + } + + uint column() const + { + return m_column; + } + + uint length() const + { + return m_length; + } + private: void identifierKind(const Cursor &cursor, Recursion recursion); void referencedTypeKind(const Cursor &cursor); @@ -81,8 +101,6 @@ private: void filterOutPreviousOutputArguments(); bool isArgumentInCurrentOutputArgumentLocations() const; - friend std::ostream &operator<<(std::ostream &os, const TokenInfo& tokenInfo); - private: std::vector *m_currentOutputArgumentRanges = nullptr; Cursor m_originalCursor; diff --git a/src/tools/clangbackend/source/tokeninfos.cpp b/src/tools/clangbackend/source/tokeninfos.cpp index 168601fb58d..9b1f428e87b 100644 --- a/src/tools/clangbackend/source/tokeninfos.cpp +++ b/src/tools/clangbackend/source/tokeninfos.cpp @@ -106,16 +106,4 @@ TokenInfo TokenInfos::operator[](size_t index) const currentOutputArgumentRanges); } -std::ostream &operator<<(std::ostream &out, const TokenInfos &marks) -{ - out << "["; - - for (const TokenInfo entry : marks) - out << entry; - - out << "]"; - - return out; -} - } // namespace ClangBackEnd diff --git a/src/tools/clangbackend/source/tokeninfos.h b/src/tools/clangbackend/source/tokeninfos.h index 15e3ba50c25..9f22f9c65b7 100644 --- a/src/tools/clangbackend/source/tokeninfos.h +++ b/src/tools/clangbackend/source/tokeninfos.h @@ -69,6 +69,4 @@ private: std::vector cxCursor; }; -std::ostream &operator<<(std::ostream &out, const TokenInfos &marks); - } // namespace ClangBackEnd diff --git a/tests/unit/unittest/gtest-creator-printing.cpp b/tests/unit/unittest/gtest-creator-printing.cpp index 8c63a0fbda8..710544f44d2 100644 --- a/tests/unit/unittest/gtest-creator-printing.cpp +++ b/tests/unit/unittest/gtest-creator-printing.cpp @@ -31,8 +31,16 @@ #include -#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include #include @@ -142,6 +150,577 @@ std::ostream &operator<<(std::ostream &out, const WatcherEntry &entry) return out; } +std::ostream &operator<<(std::ostream &os, const SourceLocationsContainer &container) +{ + os << "(" + << container.sourceLocationContainers() + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const RegisterProjectPartsForEditorMessage &message) +{ + os << "(" + << message.projectContainers() + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const FollowSymbolMessage &message) +{ + os << "(" + << message.fileContainer() << ", " + << message.ticketNumber() << ", " + << message.sourceRange() << ", " + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const CompleteCodeMessage &message) +{ + os << "(" + << message.filePath() << ", " + << message.line() << ", " + << message.column() << ", " + << message.projectPartId() << ", " + << message.ticketNumber() << ", " + << message.funcNameStartLine() << ", " + << message.funcNameStartColumn() + + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const RegisterTranslationUnitForEditorMessage &message) +{ + os << "RegisterTranslationUnitForEditorMessage(" + << message.fileContainers() << ", " + << message.currentEditorFilePath() << ", " + << message.visibleEditorFilePaths() << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const EndMessage &/*message*/) +{ + return os << "()"; +} + +std::ostream &operator<<(std::ostream &os, const CancelMessage &/*message*/) +{ + return os << "()"; +} + +std::ostream &operator<<(std::ostream &os, const AliveMessage &/*message*/) +{ + return os << "()"; +} + +#define RETURN_TEXT_FOR_CASE(enumValue) case CompletionCorrection::enumValue: return #enumValue +static const char *completionCorrectionToText(CompletionCorrection correction) +{ + switch (correction) { + RETURN_TEXT_FOR_CASE(NoCorrection); + RETURN_TEXT_FOR_CASE(DotToArrowCorrection); + } + + return ""; +} +#undef RETURN_TEXT_FOR_CASE + +std::ostream &operator<<(std::ostream &os, const CodeCompletedMessage &message) +{ + os << "(" + << message.codeCompletions() << ", " + << completionCorrectionToText(message.neededCorrection()) << ", " + << message.ticketNumber() + + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const DocumentAnnotationsChangedMessage &message) +{ + os << "DocumentAnnotationsChangedMessage(" + << message.fileContainer() + << "," << message.diagnostics().size() + << "," << !message.firstHeaderErrorDiagnostic().text().isEmpty() + << "," << message.tokenInfos().size() + << "," << message.skippedPreprocessorRanges().size() + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const ReferencesMessage &message) +{ + os << "(" + << message.fileContainer() << ", " + << message.ticketNumber() << ", " + << message.isLocalVariable() << ", " + << message.references() << ", " + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const EchoMessage &/*message*/) +{ + return os << "()"; +} + +std::ostream &operator<<(std::ostream &os, const UnregisterProjectPartsForEditorMessage &message) +{ + os << "(" + << message.projectPartIds() + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const UnregisterTranslationUnitsForEditorMessage &message) +{ + os << "(" + << message.fileContainers() + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const CodeCompletion &message) +{ + os << "(" + << message.text() << ", " + << message.priority() << ", " + << message.completionKind() << ", " + << message.availability() << ", " + << message.hasParameters() + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const CodeCompletionChunk &chunk) +{ + os << "(" + << chunk.kind() << ", " + << chunk.text(); + + if (chunk.isOptional()) + os << ", optional"; + + os << ")"; + + return os; +} + +static const char *severityToText(DiagnosticSeverity severity) +{ + switch (severity) { + case DiagnosticSeverity::Ignored: return "Ignored"; + case DiagnosticSeverity::Note: return "Note"; + case DiagnosticSeverity::Warning: return "Warning"; + case DiagnosticSeverity::Error: return "Error"; + case DiagnosticSeverity::Fatal: return "Fatal"; + } + + Q_UNREACHABLE(); +} + +std::ostream &operator<<(std::ostream &os, const DiagnosticContainer &container) +{ + os << "(" + << severityToText(container.severity()) << ": " + << container.text() << ", " + << container.category() << ", " + << container.enableOption() << ", " + << container.location() << ", " + << container.ranges() << ", " + << container.fixIts() << ", " + << container.children() << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const DynamicASTMatcherDiagnosticContainer &container) +{ + os << "(" + << container.messages() << ", " + << container.contexts() + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const DynamicASTMatcherDiagnosticContextContainer &container) +{ + os << "(" + << container.contextTypeText() << ", " + << container.sourceRange() << ", " + << container.arguments() + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const DynamicASTMatcherDiagnosticMessageContainer &container) +{ + os << "(" + << container.errorTypeText() << ", " + << container.sourceRange() << ", " + << container.arguments() + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const FileContainer &container) +{ + os << "(" + << container.filePath() << ", " + << container.projectPartId() << ", " + << container.fileArguments() << ", " + << container.documentRevision(); + + if (container.hasUnsavedFileContent()) + os << ", " + << container.unsavedFileContent(); + + os << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const FixItContainer &container) +{ + os << "(" + << container.text() << ", " + << container.range() + << ")"; + + return os; +} + +#define RETURN_TEXT_FOR_CASE(enumValue) case HighlightingType::enumValue: return #enumValue +static const char *highlightingTypeToCStringLiteral(HighlightingType type) +{ + switch (type) { + RETURN_TEXT_FOR_CASE(Invalid); + RETURN_TEXT_FOR_CASE(Comment); + RETURN_TEXT_FOR_CASE(Keyword); + RETURN_TEXT_FOR_CASE(StringLiteral); + RETURN_TEXT_FOR_CASE(NumberLiteral); + RETURN_TEXT_FOR_CASE(Function); + RETURN_TEXT_FOR_CASE(VirtualFunction); + RETURN_TEXT_FOR_CASE(Type); + RETURN_TEXT_FOR_CASE(LocalVariable); + RETURN_TEXT_FOR_CASE(GlobalVariable); + RETURN_TEXT_FOR_CASE(Field); + RETURN_TEXT_FOR_CASE(Enumeration); + RETURN_TEXT_FOR_CASE(Operator); + RETURN_TEXT_FOR_CASE(Preprocessor); + RETURN_TEXT_FOR_CASE(Label); + RETURN_TEXT_FOR_CASE(FunctionDefinition); + RETURN_TEXT_FOR_CASE(OutputArgument); + RETURN_TEXT_FOR_CASE(PreprocessorDefinition); + RETURN_TEXT_FOR_CASE(PreprocessorExpansion); + RETURN_TEXT_FOR_CASE(PrimitiveType); + RETURN_TEXT_FOR_CASE(Declaration); + } + + return ""; +} +#undef RETURN_TEXT_FOR_CASE + +std::ostream &operator<<(std::ostream &os, HighlightingType highlightingType) +{ + return os << highlightingTypeToCStringLiteral(highlightingType); +} + +std::ostream &operator<<(std::ostream &os, HighlightingTypes types) +{ + os << "(" + << types.mainHighlightingType; + + if (!types.mixinHighlightingTypes.empty()) + os << ", "<< types.mixinHighlightingTypes; + + os << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const TokenInfoContainer &container) +{ + os << "(" + << container.line() << ", " + << container.column() << ", " + << container.length() << ", " + << container.types() << ", " + << container.isIdentifier() << ", " + << container.isIncludeDirectivePath() + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &out, const NativeFilePath &filePath) +{ + return out << "(" << filePath.path() << ", " << filePath.slashIndex() << ")"; +} + +std::ostream &operator<<(std::ostream &out, const PrecompiledHeadersUpdatedMessage &message) +{ + out << "(" + << message.projectPartPchs() + << ")"; + + return out; +} + +std::ostream &operator<<(std::ostream &os, const ProjectPartContainer &container) +{ + os << "(" + << container.projectPartId() + << "," + << container.arguments() + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &out, const ProjectPartPch &projectPartPch) +{ + out << "(" + << projectPartPch.id() << ", " + << projectPartPch.path() << ")"; + + return out; +} + +std::ostream &operator<<(std::ostream &os, const RegisterUnsavedFilesForEditorMessage &message) +{ + os << "(" + << message.fileContainers() + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const RequestDocumentAnnotationsMessage &message) +{ + os << "(" + << message.fileContainer().filePath() << "," + << message.fileContainer().projectPartId() + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &out, const RemovePchProjectPartsMessage &message) +{ + return out << "(" << message.projectsPartIds() << ")"; +} + +std::ostream &operator<<(std::ostream &os, const RequestFollowSymbolMessage &message) +{ + os << "(" + << message.fileContainer() << ", " + << message.dependentFiles() << ", " + << message.ticketNumber() << ", " + << message.line() << ", " + << message.column() << ", " + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const RequestReferencesMessage &message) +{ + os << "(" + << message.fileContainer() << ", " + << message.ticketNumber() << ", " + << message.line() << ", " + << message.column() << ", " + << message.local() << ", " + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const RequestSourceLocationsForRenamingMessage &message) +{ + + os << "(" + << message.filePath() << ", " + << message.line() << ", " + << message.column() << ", " + << message.unsavedContent() << ", " + << message.commandLine() + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const RequestSourceRangesAndDiagnosticsForQueryMessage &message) +{ + os << "(" + << message.query() << ", " + << message.source() + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const RequestSourceRangesForQueryMessage &message) +{ + os << "(" + << message.query() + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const SourceLocationContainer &container) +{ + os << "(" + << container.filePath() << ", " + << container.line() << ", " + << container.column() + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const SourceLocationsForRenamingMessage &message) +{ + os << "(" + << message.symbolName() << ", " + << message.textDocumentRevision() << ", " + << message.sourceLocations() + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const SourceRangeContainer &container) +{ + os << "(" + << container.start() << ", " + << container.end() + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const SourceRangesAndDiagnosticsForQueryMessage &message) +{ + os << "(" + << message.sourceRanges() << ", " + << message.diagnostics() + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const SourceRangesContainer &container) +{ + os << "(" + << container.sourceRangeWithTextContainers() + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const SourceRangesForQueryMessage &message) +{ + os << "(" + << message.sourceRanges() + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const SourceRangeWithTextContainer &container) +{ + + os << "(" + << container.start() << ", " + << container.end() << ", " + << container.text() + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const UnregisterUnsavedFilesForEditorMessage &message) +{ + os << "(" + << message.fileContainers() + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &out, const UpdatePchProjectPartsMessage &message) +{ + return out << "(" + << message.projectsParts() + << ")"; +} + +std::ostream &operator<<(std::ostream &os, const UpdateTranslationUnitsForEditorMessage &message) +{ + os << "UpdateTranslationUnitsForEditorMessage(" + << message.fileContainers() + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const UpdateVisibleTranslationUnitsMessage &message) +{ + os << "(" + << message.currentEditorFilePath() << ", " + << message.visibleEditorFilePaths() + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const TokenInfo& tokenInfo) +{ + os << "(type: " << tokenInfo.types() << ", " + << " line: " << tokenInfo.line() << ", " + << " column: " << tokenInfo.column() << ", " + << " length: " << tokenInfo.length() + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &out, const TokenInfos &tokenInfos) +{ + out << "["; + + for (const TokenInfo &entry : tokenInfos) + out << entry; + + out << "]"; + + return out; +} + +std::ostream &operator<<(std::ostream &out, const FilePath &filePath) +{ + return out << "(" << filePath.path() << ", " << filePath.slashIndex() << ")"; +} + void PrintTo(const FilePathId &id, ::std::ostream *os) { *os << id; @@ -152,6 +731,59 @@ void PrintTo(const FilePath &filePath, ::std::ostream *os) *os << filePath; } +namespace V2 { + +std::ostream &operator<<(std::ostream &os, const FileContainer &container) +{ + os << "(" + << container.filePath() << ", " + << container.commandLineArguments() << ", " + << container.documentRevision(); + + if (container.unsavedFileContent().hasContent()) + os << ", \"" + << container.unsavedFileContent(); + + os << "\")"; + + return os; +} + +std::ostream &operator<<(std::ostream &out, const ProjectPartContainer &container) +{ + out << "(" + << container.projectPartId() << ", " + << container.arguments() << ", " + << container.headerPaths() << ", " + << container.sourcePaths()<< ")"; + + return out; +} + +std::ostream &operator<<(std::ostream &os, const SourceLocationContainer &container) +{ + os << "((" + << container.filePathId().directoryId << ", " << container.filePathId().fileNameId << "), " + << container.line() << ", " + << container.column() << ", " + << container.offset() + << ")"; + + return os; +} + +std::ostream &operator<<(std::ostream &os, const SourceRangeContainer &container) +{ + os << "(" + << container.start() << ", " + << container.end() + << ")"; + + return os; +} + +} // namespace V2 + } // namespace ClangBackEnd namespace ClangRefactoring { diff --git a/tests/unit/unittest/gtest-creator-printing.h b/tests/unit/unittest/gtest-creator-printing.h index 136079b3cd7..e08b4b33c0b 100644 --- a/tests/unit/unittest/gtest-creator-printing.h +++ b/tests/unit/unittest/gtest-creator-printing.h @@ -27,6 +27,8 @@ #include +#include + #include #include @@ -63,11 +65,123 @@ class IdPaths; class FilePathId; class FilePath; class WatcherEntry; +class SourceLocationsContainer; +class RegisterProjectPartsForEditorMessage; +class CancelMessage; +class AliveMessage; +class CodeCompletedMessage; +class EchoMessage; +class DocumentAnnotationsChangedMessage; +class ReferencesMessage; +class FollowSymbolMessage; +class CompleteCodeMessage; +class EndMessage; +class RegisterTranslationUnitForEditorMessage; +class UnregisterProjectPartsForEditorMessage; +class UnregisterTranslationUnitsForEditorMessage; +class CodeCompletion; +class CodeCompletionChunk; +class DiagnosticContainer; +class DynamicASTMatcherDiagnosticContainer; +class DynamicASTMatcherDiagnosticContextContainer; +class DynamicASTMatcherDiagnosticMessageContainer; +class FileContainer; +class FixItContainer; +class HighlightingMarkContainer; +class NativeFilePath; +class PrecompiledHeadersUpdatedMessage; +class ProjectPartContainer; +class ProjectPartPch; +class RegisterUnsavedFilesForEditorMessage; +class RemovePchProjectPartsMessage; +class RequestDocumentAnnotationsMessage; +class RequestFollowSymbolMessage; +class RequestReferencesMessage; +class RequestSourceLocationsForRenamingMessage; +class RequestSourceRangesAndDiagnosticsForQueryMessage; +class RequestSourceRangesForQueryMessage; +class SourceLocationContainer; +class SourceLocationsForRenamingMessage; +class SourceRangeContainer; +class SourceRangesAndDiagnosticsForQueryMessage; +class SourceRangesContainer; +class SourceRangesForQueryMessage; +class SourceRangeWithTextContainer; +class UnregisterUnsavedFilesForEditorMessage; +class UpdatePchProjectPartsMessage; +class UpdateTranslationUnitsForEditorMessage; +class UpdateVisibleTranslationUnitsMessage; +class FilePath; +class TokenInfo; +class TokenInfos; std::ostream &operator<<(std::ostream &out, const SourceLocationEntry &entry); std::ostream &operator<<(std::ostream &out, const IdPaths &idPaths); std::ostream &operator<<(std::ostream &out, const WatcherEntry &entry); std::ostream &operator<<(std::ostream &out, const FilePath &filePath); +std::ostream &operator<<(std::ostream &out, const SourceLocationsContainer &container); +std::ostream &operator<<(std::ostream &out, const RegisterProjectPartsForEditorMessage &message); +std::ostream &operator<<(std::ostream &out, const CancelMessage &message); +std::ostream &operator<<(std::ostream &out, const AliveMessage &message); +std::ostream &operator<<(std::ostream &out, const CodeCompletedMessage &message); +std::ostream &operator<<(std::ostream &out, const EchoMessage &message); +std::ostream &operator<<(std::ostream &out, const DocumentAnnotationsChangedMessage &message); +std::ostream &operator<<(std::ostream &out, const ReferencesMessage &message); +std::ostream &operator<<(std::ostream &out, const FollowSymbolMessage &message); +std::ostream &operator<<(std::ostream &out, const CompleteCodeMessage &message); +std::ostream &operator<<(std::ostream &out, const EndMessage &message); +std::ostream &operator<<(std::ostream &out, const RegisterTranslationUnitForEditorMessage &message); +std::ostream &operator<<(std::ostream &out, const UnregisterProjectPartsForEditorMessage &message); +std::ostream &operator<<(std::ostream &out, const UnregisterTranslationUnitsForEditorMessage &message); +std::ostream &operator<<(std::ostream &out, const CodeCompletion &message); +std::ostream &operator<<(std::ostream &out, const CodeCompletionChunk &chunk); +std::ostream &operator<<(std::ostream &out, const DiagnosticContainer &container); +std::ostream &operator<<(std::ostream &out, const DynamicASTMatcherDiagnosticContainer &container); +std::ostream &operator<<(std::ostream &out, const DynamicASTMatcherDiagnosticContextContainer &container); +std::ostream &operator<<(std::ostream &out, const DynamicASTMatcherDiagnosticMessageContainer &container); +std::ostream &operator<<(std::ostream &out, const FileContainer &container); +std::ostream &operator<<(std::ostream &out, const FixItContainer &container); +std::ostream &operator<<(std::ostream &out, HighlightingType highlightingType); +std::ostream &operator<<(std::ostream &out, HighlightingTypes types); +std::ostream &operator<<(std::ostream &out, const HighlightingMarkContainer &container); +std::ostream &operator<<(std::ostream &out, const NativeFilePath &filePath); +std::ostream &operator<<(std::ostream &out, const PrecompiledHeadersUpdatedMessage &message); +std::ostream &operator<<(std::ostream &out, const ProjectPartContainer &container); +std::ostream &operator<<(std::ostream &out, const ProjectPartPch &projectPartPch); +std::ostream &operator<<(std::ostream &out, const RegisterUnsavedFilesForEditorMessage &message); +std::ostream &operator<<(std::ostream &out, const RemovePchProjectPartsMessage &message); +std::ostream &operator<<(std::ostream &out, const RequestDocumentAnnotationsMessage &message); +std::ostream &operator<<(std::ostream &out, const RequestFollowSymbolMessage &message); +std::ostream &operator<<(std::ostream &out, const RequestReferencesMessage &message); +std::ostream &operator<<(std::ostream &out, const RequestSourceLocationsForRenamingMessage &message); +std::ostream &operator<<(std::ostream &out, const RequestSourceRangesAndDiagnosticsForQueryMessage &message); +std::ostream &operator<<(std::ostream &out, const RequestSourceRangesForQueryMessage &message); +std::ostream &operator<<(std::ostream &out, const SourceLocationContainer &container); +std::ostream &operator<<(std::ostream &out, const SourceLocationsForRenamingMessage &message); +std::ostream &operator<<(std::ostream &out, const SourceRangeContainer &container); +std::ostream &operator<<(std::ostream &out, const SourceRangesAndDiagnosticsForQueryMessage &message); +std::ostream &operator<<(std::ostream &out, const SourceRangesContainer &container); +std::ostream &operator<<(std::ostream &out, const SourceRangesForQueryMessage &message); +std::ostream &operator<<(std::ostream &out, const SourceRangeWithTextContainer &container); +std::ostream &operator<<(std::ostream &out, const UnregisterUnsavedFilesForEditorMessage &message); +std::ostream &operator<<(std::ostream &out, const UpdatePchProjectPartsMessage &message); +std::ostream &operator<<(std::ostream &out, const UpdateTranslationUnitsForEditorMessage &message); +std::ostream &operator<<(std::ostream &out, const UpdateVisibleTranslationUnitsMessage &message); +std::ostream &operator<<(std::ostream &out, const FilePath &filePath); +std::ostream &operator<<(std::ostream &out, const TokenInfo& tokenInfo); +std::ostream &operator<<(std::ostream &out, const TokenInfos &tokenInfos); + +namespace V2 { +class FileContainer; +class ProjectPartContainer; +class SourceRangeContainer; +class SourceLocationContainer; + +std::ostream &operator<<(std::ostream &out, const FileContainer &container); +std::ostream &operator<<(std::ostream &out, const ProjectPartContainer &container); +std::ostream &operator<<(std::ostream &out, const SourceLocationContainer &container); +std::ostream &operator<<(std::ostream &out, const SourceRangeContainer &container); +} // namespace V2 void PrintTo(const FilePathId &id, ::std::ostream *os); void PrintTo(const FilePath &filePath, ::std::ostream *os);