feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
f67df4f9ab1d7dc471e4156ef0116785f21fb78f
qt-creator/tests/unit/unittest/gtest-creator-printing.cpp

995 lines
25 KiB
C++
Raw Normal View History

Utils: Add offset to search results Offset are better to compute the length of a text range. The only problem is that we get them for utf8 because that is the text representation of source file. QTextDocument is Utf16 based, so it can not binary represent the source file. Actually I do not see a simple performing workaround for it. Change-Id: Id615e1ee6a6e85c6ecc4f8044e275142409d9b46 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-23 13:31:47 +01:00
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#include "gtest-creator-printing.h"
Clang: Add usage functions to symbol query Change-Id: If68a5119c863e616fea40275136d028abcf441f3 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-18 13:38:58 +02:00
#include "gtest-qt-printing.h"
Utils: Add offset to search results Offset are better to compute the length of a text range. The only problem is that we get them for utf8 because that is the text representation of source file. QTextDocument is Utf16 based, so it can not binary represent the source file. Actually I do not see a simple performing workaround for it. Change-Id: Id615e1ee6a6e85c6ecc4f8044e275142409d9b46 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-23 13:31:47 +01:00
#include <gtest/gtest-printers.h>
Clang: Add file cache The database is using file path integer ids to handle file paths because otherwise we would save many redundant data. This patch is improving it further with the introduction of a database based file path cache. The entries are now divided in a directory path and file name. This is quite handy for directory based file watching. Change-Id: I03f2e388e43f3d521d6bf8e39dfb95eb2309dc73 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-21 11:43:59 +02:00
#include <sourcelocations.h>
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 <nikolai.kosjar@qt.io>
2017-11-30 16:11:40 +01:00
#include <clangcodemodelclientmessages.h>
#include <clangcodemodelservermessages.h>
Clang: Add file cache The database is using file path integer ids to handle file paths because otherwise we would save many redundant data. This patch is improving it further with the introduction of a database based file path cache. The entries are now divided in a directory path and file name. This is quite handy for directory based file watching. Change-Id: I03f2e388e43f3d521d6bf8e39dfb95eb2309dc73 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-21 11:43:59 +02:00
#include <clangpathwatcher.h>
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 <nikolai.kosjar@qt.io>
2017-11-30 16:11:40 +01:00
#include <clangrefactoringmessages.h>
Clang: Rename FileInformation in FileStatus It's more near to the Unix convention and it has a plural too. Change-Id: I53f85911d8fcbaadba9947c70e9a375dc6995ed5 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-01 18:29:45 +01:00
#include <filestatus.h>
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 <nikolai.kosjar@qt.io>
2017-11-30 16:11:40 +01:00
#include <filepath.h>
Clang: Refactor TokenInfos Remove code duplication. Change-Id: Ib1859f2c3a04f66d0f0b669b4e93a7fc06ab8e61 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-02-06 15:48:24 +01:00
#include <fulltokeninfo.h>
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 <nikolai.kosjar@qt.io>
2017-11-30 16:11:40 +01:00
#include <nativefilepath.h>
#include <precompiledheadersupdatedmessage.h>
Clang: Improve ProjectPartArtefact Empty strings were only handled by accident and wrongly formatted ones were never handled. Now we do nothing for empty strings and throw an exception from wrongly formatted strings. The exceptions are very helpful in the test code because the show errors the the testing data. Change-Id: I87d1678eda7502fdc3f74f51fad491803d28582b Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 16:11:28 +01:00
#include <projectpartartefact.h>
Clang: Collect source dependencies It is quite easy because we track the include directives in the preprocessor callbacks. Change-Id: I2d7bd67b31f50c0d8d4a46c57e83dffa0c558dc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-31 13:53:57 +01:00
#include <sourcedependency.h>
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 <nikolai.kosjar@qt.io>
2017-11-30 16:11:40 +01:00
#include <sourcelocationentry.h>
#include <sourcelocationscontainer.h>
Clang: Refactor TokenInfos Remove code duplication. Change-Id: Ib1859f2c3a04f66d0f0b669b4e93a7fc06ab8e61 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-02-06 15:48:24 +01:00
#include <tokenprocessor.h>
UnitTests: Cleanup unit tests There was still unneeded PrintTo functions and gtest includes. It is now possible to use MockFunction for callbacks. Change-Id: Ie5875c3697069a37b48c2f2022f1f8c21f1c794f Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2017-12-27 20:44:34 +01:00
#include <filepathview.h>
Clang: Provide tooltips This includes also the query data for the help system (F1) for an identifier under cursor. Regressions (libclang changes necessary): - Function signatures do not contain default values. - Aliases are not resolved for/at: - template types - qualified name of a type Fixes/Improvements: - Resolve "auto" - On a template type, show also the template parameter. - For a typedef like typedef long long superlong; the tooltip was "long long superlong", which was confusing. Now, "long long" is shown. New: - Show first or \brief paragraph of a documentation comment. - Show size of a class at definition. - Show size of a field member in class definition. Task-number: QTCREATORBUG-11259 Change-Id: Ie1a07930d0e882015d07dc43e35bb81a685cdeb8 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-01-12 12:29:43 +01:00
#include <tooltipinfo.h>
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
#include <projectpartentry.h>
Clang: Rename defineName in macroName Change-Id: Iaf8da991032e5ed4726384c051290a77887351fa Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-25 15:20:47 +01:00
#include <usedmacro.h>
Utils: Add offset to search results Offset are better to compute the length of a text range. The only problem is that we get them for utf8 because that is the text representation of source file. QTextDocument is Utf16 based, so it can not binary represent the source file. Actually I do not see a simple performing workaround for it. Change-Id: Id615e1ee6a6e85c6ecc4f8044e275142409d9b46 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-23 13:31:47 +01:00
Clang: Add usage functions to symbol query Change-Id: If68a5119c863e616fea40275136d028abcf441f3 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-18 13:38:58 +02:00
#include <cpptools/usages.h>
Convert macros from plain QByteArray to a vector of structs The old code model expected the macros as C++ formatted text ("#define Foo 42) but newer targets like the Clang codemodel expect key value arguments like "-DFoo=42". So instead of parsing the text again and again we use an abstract data description. Task-number: QTCREATORBUG-17915 Change-Id: I0179fd13c48a581e91ee79bba9d42d501c26f19f Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-07 15:00:38 +01:00
#include <projectexplorer/projectmacro.h>
Clang: Add file cache The database is using file path integer ids to handle file paths because otherwise we would save many redundant data. This patch is improving it further with the introduction of a database based file path cache. The entries are now divided in a directory path and file name. This is quite handy for directory based file watching. Change-Id: I03f2e388e43f3d521d6bf8e39dfb95eb2309dc73 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-21 11:43:59 +02:00
#include <coreplugin/find/searchresultitem.h>
UnitTests: Fix printing of text Change-Id: I7e8ebc2932be6e01d7776e58e462935ff857b0e5 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2017-12-28 22:07:28 +01:00
void PrintTo(const Utf8String &text, ::std::ostream *os)
{
*os << text;
}
Utils: Add offset to search results Offset are better to compute the length of a text range. The only problem is that we get them for utf8 because that is the text representation of source file. QTextDocument is Utf16 based, so it can not binary represent the source file. Actually I do not see a simple performing workaround for it. Change-Id: Id615e1ee6a6e85c6ecc4f8044e275142409d9b46 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-23 13:31:47 +01:00
namespace Core {
namespace Search {
using testing::PrintToString;
class TextPosition;
class TextRange;
void PrintTo(const TextPosition &position, ::std::ostream *os)
{
*os << "("
<< position.line << ", "
<< position.column << ", "
<< position.offset << ")";
}
void PrintTo(const TextRange &range, ::std::ostream *os)
{
*os << "("
<< PrintToString(range.begin) << ", "
<< PrintToString(range.end) << ")";
}
Clang: Add file cache The database is using file path integer ids to handle file paths because otherwise we would save many redundant data. This patch is improving it further with the introduction of a database based file path cache. The entries are now divided in a directory path and file name. This is quite handy for directory based file watching. Change-Id: I03f2e388e43f3d521d6bf8e39dfb95eb2309dc73 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-21 11:43:59 +02:00
} // namespace Search
} // namespace Core
Convert macros from plain QByteArray to a vector of structs The old code model expected the macros as C++ formatted text ("#define Foo 42) but newer targets like the Clang codemodel expect key value arguments like "-DFoo=42". So instead of parsing the text again and again we use an abstract data description. Task-number: QTCREATORBUG-17915 Change-Id: I0179fd13c48a581e91ee79bba9d42d501c26f19f Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-07 15:00:38 +01:00
namespace ProjectExplorer {
static const char *typeToString(const MacroType &type)
{
switch (type) {
case MacroType::Invalid: return "MacroType::Invalid";
case MacroType::Define: return "MacroType::Define";
case MacroType::Undefine: return "MacroType::Undefine";
}
return "";
}
std::ostream &operator<<(std::ostream &out, const MacroType &type)
{
out << typeToString(type);
return out;
}
std::ostream &operator<<(std::ostream &out, const Macro &macro)
{
out << "("
<< macro.key.data() << ", "
<< macro.value.data() << ", "
<< macro.type << ")";
return out;
}
Clang: Add file cache The database is using file path integer ids to handle file paths because otherwise we would save many redundant data. This patch is improving it further with the introduction of a database based file path cache. The entries are now divided in a directory path and file name. This is quite handy for directory based file watching. Change-Id: I03f2e388e43f3d521d6bf8e39dfb95eb2309dc73 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-21 11:43:59 +02:00
} // namespace ProjectExplorer
namespace Utils {
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
std::ostream &operator<<(std::ostream &out, const LineColumn &lineColumn)
{
return out << "(" << lineColumn.line << ", " << lineColumn.column << ")";
}
Clang: Add file cache The database is using file path integer ids to handle file paths because otherwise we would save many redundant data. This patch is improving it further with the introduction of a database based file path cache. The entries are now divided in a directory path and file name. This is quite handy for directory based file watching. Change-Id: I03f2e388e43f3d521d6bf8e39dfb95eb2309dc73 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-21 11:43:59 +02:00
void PrintTo(const Utils::SmallString &text, ::std::ostream *os)
{
*os << text;
}
UnitTests: Fix printing of text Change-Id: I7e8ebc2932be6e01d7776e58e462935ff857b0e5 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2017-12-28 22:07:28 +01:00
void PrintTo(const Utils::PathString &text, ::std::ostream *os)
{
*os << text;
}
Clang: Add file cache The database is using file path integer ids to handle file paths because otherwise we would save many redundant data. This patch is improving it further with the introduction of a database based file path cache. The entries are now divided in a directory path and file name. This is quite handy for directory based file watching. Change-Id: I03f2e388e43f3d521d6bf8e39dfb95eb2309dc73 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-21 11:43:59 +02:00
} // namespace Utils
namespace ClangBackEnd {
std::ostream &operator<<(std::ostream &out, const FilePathId &id)
{
Clang: Make it more clear that the FilePathId.filePathId is not shared The name fileNameId could imply that the id shared for the same file name which is not the case. Change-Id: I27310a8994c2d9e9bb0f0aed2094bd988309c710 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-17 13:52:33 +01:00
return out << "(" << id.directoryId << ", " << id.filePathId << ")";
Clang: Add file cache The database is using file path integer ids to handle file paths because otherwise we would save many redundant data. This patch is improving it further with the introduction of a database based file path cache. The entries are now divided in a directory path and file name. This is quite handy for directory based file watching. Change-Id: I03f2e388e43f3d521d6bf8e39dfb95eb2309dc73 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-21 11:43:59 +02:00
}
UnitTests: Cleanup unit tests There was still unneeded PrintTo functions and gtest includes. It is now possible to use MockFunction for callbacks. Change-Id: Ie5875c3697069a37b48c2f2022f1f8c21f1c794f Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2017-12-27 20:44:34 +01:00
std::ostream &operator<<(std::ostream &out, const FilePathView &filePathView)
{
return out << "(" << filePathView.toStringView() << ", " << filePathView.slashIndex() << ")";
}
std::ostream &operator<<(std::ostream &out, const NativeFilePathView &nativeFilePathView)
{
return out << "(" << nativeFilePathView.toStringView() << ", " << nativeFilePathView.slashIndex() << ")";
}
Clang: Add file cache The database is using file path integer ids to handle file paths because otherwise we would save many redundant data. This patch is improving it further with the introduction of a database based file path cache. The entries are now divided in a directory path and file name. This is quite handy for directory based file watching. Change-Id: I03f2e388e43f3d521d6bf8e39dfb95eb2309dc73 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-21 11:43:59 +02:00
std::ostream &operator<<(std::ostream &out, const IdPaths &idPaths)
{
out << "("
<< idPaths.id << ", "
<< idPaths.filePathIds << ")";
return out;
}
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
#define RETURN_TEXT_FOR_CASE(enumValue) case SymbolType::enumValue: return #enumValue
static const char *symbolTypeToCStringLiteral(SymbolType type)
{
switch (type) {
RETURN_TEXT_FOR_CASE(Declaration);
RETURN_TEXT_FOR_CASE(DeclarationReference);
RETURN_TEXT_FOR_CASE(MacroDefinition);
RETURN_TEXT_FOR_CASE(MacroUsage);
UnitTests: Fix printing warning for not handled enumeration Change-Id: Ie590fff1d7a18552fadb34319a1423a6e0855df3 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-01 15:56:15 +01:00
RETURN_TEXT_FOR_CASE(MacroUndefinition);
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
}
return "";
}
#undef RETURN_TEXT_FOR_CASE
Clang: Add file cache The database is using file path integer ids to handle file paths because otherwise we would save many redundant data. This patch is improving it further with the introduction of a database based file path cache. The entries are now divided in a directory path and file name. This is quite handy for directory based file watching. Change-Id: I03f2e388e43f3d521d6bf8e39dfb95eb2309dc73 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-21 11:43:59 +02:00
std::ostream &operator<<(std::ostream &out, const SourceLocationEntry &entry)
{
out << "("
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
<< entry.symbolId << ", "
Clang: Add file cache The database is using file path integer ids to handle file paths because otherwise we would save many redundant data. This patch is improving it further with the introduction of a database based file path cache. The entries are now divided in a directory path and file name. This is quite handy for directory based file watching. Change-Id: I03f2e388e43f3d521d6bf8e39dfb95eb2309dc73 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-21 11:43:59 +02:00
<< entry.filePathId << ", "
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
<< entry.lineColumn << ", "
<< symbolTypeToCStringLiteral(entry.symbolType) << ")";
Clang: Add file cache The database is using file path integer ids to handle file paths because otherwise we would save many redundant data. This patch is improving it further with the introduction of a database based file path cache. The entries are now divided in a directory path and file name. This is quite handy for directory based file watching. Change-Id: I03f2e388e43f3d521d6bf8e39dfb95eb2309dc73 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-21 11:43:59 +02:00
return out;
}
std::ostream &operator<<(std::ostream &out, const WatcherEntry &entry)
{
out << "("
<< entry.id << ", "
<< entry.pathId
<< ")";
return out;
}
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 <nikolai.kosjar@qt.io>
2017-11-30 16:11:40 +01:00
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;
}
Clang: Provide tooltips This includes also the query data for the help system (F1) for an identifier under cursor. Regressions (libclang changes necessary): - Function signatures do not contain default values. - Aliases are not resolved for/at: - template types - qualified name of a type Fixes/Improvements: - Resolve "auto" - On a template type, show also the template parameter. - For a typedef like typedef long long superlong; the tooltip was "long long superlong", which was confusing. Now, "long long" is shown. New: - Show first or \brief paragraph of a documentation comment. - Show size of a class at definition. - Show size of a field member in class definition. Task-number: QTCREATORBUG-11259 Change-Id: Ie1a07930d0e882015d07dc43e35bb81a685cdeb8 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-01-12 12:29:43 +01:00
std::ostream &operator<<(std::ostream &os, const ToolTipMessage &message)
{
os << "("
<< message.fileContainer() << ", "
<< message.ticketNumber() << ", "
<< message.toolTipInfo() << ", "
<< ")";
return os;
}
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 <nikolai.kosjar@qt.io>
2017-11-30 16:11:40 +01:00
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() << ", "
Clang: Provide tooltips This includes also the query data for the help system (F1) for an identifier under cursor. Regressions (libclang changes necessary): - Function signatures do not contain default values. - Aliases are not resolved for/at: - template types - qualified name of a type Fixes/Improvements: - Resolve "auto" - On a template type, show also the template parameter. - For a typedef like typedef long long superlong; the tooltip was "long long superlong", which was confusing. Now, "long long" is shown. New: - Show first or \brief paragraph of a documentation comment. - Show size of a class at definition. - Show size of a field member in class definition. Task-number: QTCREATORBUG-11259 Change-Id: Ie1a07930d0e882015d07dc43e35bb81a685cdeb8 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-01-12 12:29:43 +01:00
<< container.documentRevision() << ", "
<< container.textCodecName();
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 <nikolai.kosjar@qt.io>
2017-11-30 16:11:40 +01:00
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);
Clang: introduce more data in TokenInfo Data added: - return type spelling for functions - parent spelling - access specifier for class fields and methods - storage class New highlighting types are added, therefore types are now categorized by class, struct, etc. Change-Id: I1739b94a6f777045fde655060d8b9a12b6e0889b Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-01-12 09:44:05 +01:00
RETURN_TEXT_FOR_CASE(Namespace);
RETURN_TEXT_FOR_CASE(Class);
RETURN_TEXT_FOR_CASE(Struct);
RETURN_TEXT_FOR_CASE(Enum);
RETURN_TEXT_FOR_CASE(Union);
RETURN_TEXT_FOR_CASE(TypeAlias);
RETURN_TEXT_FOR_CASE(Typedef);
Clang: Properly handle Q_PROPERTY in TokenInfo Transform Q_PROPERTY into unique AST node. Mark different parts with types and search for parent in FullTokenInfos. Change-Id: Iaa1ec0c73d34773edf5605d3682bd6a290d195de Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-01-26 15:12:38 +01:00
RETURN_TEXT_FOR_CASE(QtProperty);
Clang: Add highlighting types for ObjectiveC Builtin code model supports ObjectiveC classes, properties, etc. We can easily get the same information from clang. Change-Id: Iede5e177d4932f404e4ccb81ae356eee8faffb71 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-02-14 12:24:21 +01:00
RETURN_TEXT_FOR_CASE(ObjectiveCClass);
RETURN_TEXT_FOR_CASE(ObjectiveCCategory);
RETURN_TEXT_FOR_CASE(ObjectiveCProtocol);
RETURN_TEXT_FOR_CASE(ObjectiveCInterface);
RETURN_TEXT_FOR_CASE(ObjectiveCImplementation);
RETURN_TEXT_FOR_CASE(ObjectiveCProperty);
RETURN_TEXT_FOR_CASE(ObjectiveCMethod);
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 <nikolai.kosjar@qt.io>
2017-11-30 16:11:40 +01:00
}
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;
}
Clang: extra clangbackend job to collect full token info Limit document annotations job to only highlighting data collection and move more expensive calls into separate job that runs after it. Change-Id: Ie792a3f741ac45c81033dd5b3a20ed061604f927 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-01-19 09:18:57 +01:00
std::ostream &operator<<(std::ostream &os, const ExtraInfo &extraInfo)
{
os << "("
<< extraInfo.token << ", "
<< extraInfo.typeSpelling << ", "
<< extraInfo.resultTypeSpelling << ", "
<< extraInfo.semanticParentTypeSpelling << ", "
<< static_cast<uint>(extraInfo.accessSpecifier) << ", "
<< static_cast<uint>(extraInfo.storageClass) << ", "
<< extraInfo.identifier << ", "
<< extraInfo.includeDirectivePath << ", "
<< extraInfo.declaration << ", "
<< extraInfo.definition << ", "
<< extraInfo.signal << ", "
Clang: Properly handle Q_PROPERTY in TokenInfo Transform Q_PROPERTY into unique AST node. Mark different parts with types and search for parent in FullTokenInfos. Change-Id: Iaa1ec0c73d34773edf5605d3682bd6a290d195de Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-01-26 15:12:38 +01:00
<< extraInfo.slot
Clang: extra clangbackend job to collect full token info Limit document annotations job to only highlighting data collection and move more expensive calls into separate job that runs after it. Change-Id: Ie792a3f741ac45c81033dd5b3a20ed061604f927 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-01-19 09:18:57 +01:00
<< ")";
return os;
}
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 <nikolai.kosjar@qt.io>
2017-11-30 16:11:40 +01:00
std::ostream &operator<<(std::ostream &os, const TokenInfoContainer &container)
{
os << "("
<< container.line() << ", "
<< container.column() << ", "
<< container.length() << ", "
<< container.types() << ", "
Clang: extra clangbackend job to collect full token info Limit document annotations job to only highlighting data collection and move more expensive calls into separate job that runs after it. Change-Id: Ie792a3f741ac45c81033dd5b3a20ed061604f927 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-01-19 09:18:57 +01:00
<< container.extraInfo() << ", "
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 <nikolai.kosjar@qt.io>
2017-11-30 16:11:40 +01:00
<< ")";
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.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;
}
Clang: Provide tooltips This includes also the query data for the help system (F1) for an identifier under cursor. Regressions (libclang changes necessary): - Function signatures do not contain default values. - Aliases are not resolved for/at: - template types - qualified name of a type Fixes/Improvements: - Resolve "auto" - On a template type, show also the template parameter. - For a typedef like typedef long long superlong; the tooltip was "long long superlong", which was confusing. Now, "long long" is shown. New: - Show first or \brief paragraph of a documentation comment. - Show size of a class at definition. - Show size of a field member in class definition. Task-number: QTCREATORBUG-11259 Change-Id: Ie1a07930d0e882015d07dc43e35bb81a685cdeb8 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-01-12 12:29:43 +01:00
std::ostream &operator<<(std::ostream &out, const RequestToolTipMessage &message)
{
out << "("
<< message.fileContainer() << ", "
<< message.ticketNumber() << ", "
<< message.line() << ", "
<< message.column() << ", "
<< ")";
return out;
}
std::ostream &operator<<(std::ostream &os, const ToolTipInfo::QdocCategory category)
{
return os << qdocCategoryToString(category);
}
std::ostream &operator<<(std::ostream &out, const ToolTipInfo &info)
{
out << "("
<< info.m_text << ", "
<< info.m_briefComment << ", "
<< info.m_qdocIdCandidates << ", "
<< info.m_qdocMark << ", "
<< info.m_qdocCategory
<< info.m_sizeInBytes << ", "
<< ")";
return out;
}
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 <nikolai.kosjar@qt.io>
2017-11-30 16:11:40 +01:00
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;
}
Clang: Refactor TokenInfos Remove code duplication. Change-Id: Ib1859f2c3a04f66d0f0b669b4e93a7fc06ab8e61 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-02-06 15:48:24 +01:00
template<class T>
std::ostream &operator<<(std::ostream &out, const TokenProcessor<T> &tokenInfos)
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 <nikolai.kosjar@qt.io>
2017-11-30 16:11:40 +01:00
{
out << "[";
Clang: Refactor TokenInfos Remove code duplication. Change-Id: Ib1859f2c3a04f66d0f0b669b4e93a7fc06ab8e61 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-02-06 15:48:24 +01:00
for (const T &entry : tokenInfos)
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 <nikolai.kosjar@qt.io>
2017-11-30 16:11:40 +01:00
out << entry;
out << "]";
return out;
}
Clang: Refactor TokenInfos Remove code duplication. Change-Id: Ib1859f2c3a04f66d0f0b669b4e93a7fc06ab8e61 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-02-06 15:48:24 +01:00
template
std::ostream &operator<<(std::ostream &out, const TokenProcessor<TokenInfo> &tokenInfos);
template
std::ostream &operator<<(std::ostream &out, const TokenProcessor<FullTokenInfo> &tokenInfos);
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 <nikolai.kosjar@qt.io>
2017-11-30 16:11:40 +01:00
std::ostream &operator<<(std::ostream &out, const FilePath &filePath)
{
return out << "(" << filePath.path() << ", " << filePath.slashIndex() << ")";
}
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
std::ostream &operator<<(std::ostream &out, const ProjectPartEntry &projectPartEntry)
{
return out << "("
<< projectPartEntry.projectPathName
<< ", "
<< projectPartEntry.filePathIds
<< ")";
}
Clang: Rename defineName in macroName Change-Id: Iaf8da991032e5ed4726384c051290a77887351fa Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-25 15:20:47 +01:00
std::ostream &operator<<(std::ostream &out, const UsedMacro &usedMacro)
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
{
return out << "("
Clang: Rename defineName in macroName Change-Id: Iaf8da991032e5ed4726384c051290a77887351fa Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-25 15:20:47 +01:00
<< usedMacro.filePathId
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
<< ", "
Clang: Rename defineName in macroName Change-Id: Iaf8da991032e5ed4726384c051290a77887351fa Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-25 15:20:47 +01:00
<< usedMacro.macroName
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
<< ")";
}
Clang: Rename FileInformation in FileStatus It's more near to the Unix convention and it has a plural too. Change-Id: I53f85911d8fcbaadba9947c70e9a375dc6995ed5 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-01 18:29:45 +01:00
std::ostream &operator<<(std::ostream &out, const FileStatus &fileStatus)
Clang: Get file informations from symbols collector We need the same information like file size and the last modification time to check if a file has changed. This information will be saved to the database. Change-Id: Icf8eb9b6553945a563887e11aff9539c9b300b66 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-29 15:47:53 +01:00
{
return out << "("
Clang: Rename FileInformation in FileStatus It's more near to the Unix convention and it has a plural too. Change-Id: I53f85911d8fcbaadba9947c70e9a375dc6995ed5 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-01 18:29:45 +01:00
<< fileStatus.filePathId
Clang: Get file informations from symbols collector We need the same information like file size and the last modification time to check if a file has changed. This information will be saved to the database. Change-Id: Icf8eb9b6553945a563887e11aff9539c9b300b66 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-29 15:47:53 +01:00
<< ", "
Clang: Rename FileInformation in FileStatus It's more near to the Unix convention and it has a plural too. Change-Id: I53f85911d8fcbaadba9947c70e9a375dc6995ed5 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-01 18:29:45 +01:00
<< fileStatus.size
Clang: Get file informations from symbols collector We need the same information like file size and the last modification time to check if a file has changed. This information will be saved to the database. Change-Id: Icf8eb9b6553945a563887e11aff9539c9b300b66 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-29 15:47:53 +01:00
<< ", "
Clang: Rename FileInformation in FileStatus It's more near to the Unix convention and it has a plural too. Change-Id: I53f85911d8fcbaadba9947c70e9a375dc6995ed5 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-01 18:29:45 +01:00
<< fileStatus.lastModified
Clang: Get file informations from symbols collector We need the same information like file size and the last modification time to check if a file has changed. This information will be saved to the database. Change-Id: Icf8eb9b6553945a563887e11aff9539c9b300b66 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-29 15:47:53 +01:00
<< ")";
}
Clang: Collect source dependencies It is quite easy because we track the include directives in the preprocessor callbacks. Change-Id: I2d7bd67b31f50c0d8d4a46c57e83dffa0c558dc7 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-31 13:53:57 +01:00
std::ostream &operator<<(std::ostream &out, const SourceDependency &sourceDependency)
{
return out << "("
<< sourceDependency.filePathId
<< ", "
<< sourceDependency.dependencyFilePathId
<< ")";
}
Clang: Update symbol database if file has changed The code in the symbol indexer is quite similar, but still different enough to prevent easy reuse of the function. Change-Id: I47907d90066da922eafe8ff3cce124ea47ea4a0a Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-06 11:16:29 +01:00
std::ostream &operator<<(std::ostream &out, const ProjectPartArtefact &projectPartArtefact)
{
return out << "("
<< projectPartArtefact.compilerArguments << ", "
Clang: Introduce CompilerMacro We want not only the name but the value of the macro too. So we can compare if anything has changed. Change-Id: Ie59caf8cbf54d108f9e15299d25306a406b5c40d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-06 19:03:14 +01:00
<< projectPartArtefact.compilerMacros
Clang: Update symbol database if file has changed The code in the symbol indexer is quite similar, but still different enough to prevent easy reuse of the function. Change-Id: I47907d90066da922eafe8ff3cce124ea47ea4a0a Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-06 11:16:29 +01:00
<<")";
}
Clang: Introduce CompilerMacro We want not only the name but the value of the macro too. So we can compare if anything has changed. Change-Id: Ie59caf8cbf54d108f9e15299d25306a406b5c40d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-06 19:03:14 +01:00
std::ostream &operator<<(std::ostream &out, const CompilerMacro &compilerMacro)
{
return out << "("
<< compilerMacro.key << ", "
<< compilerMacro.value
<< ")";
}
UnitTests: Fix printing of text Change-Id: I7e8ebc2932be6e01d7776e58e462935ff857b0e5 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2017-12-28 22:07:28 +01:00
void PrintTo(const FilePath &filePath, ::std::ostream *os)
{
*os << filePath;
}
void PrintTo(const FilePathView &filePathView, ::std::ostream *os)
{
*os << filePathView;
}
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
void PrintTo(const FilePathId &filePathId, ::std::ostream *os)
{
*os << filePathId;
}
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 <nikolai.kosjar@qt.io>
2017-11-30 16:11:40 +01:00
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() << ", "
Clang: On the road to update and preprocessor support This patch has grown in a quite big change set and it is really hard to divide it in different parts. V2::ProjectPartContainer is now using FileIds instead of file paths. This cleans code up because it is a big step in the direction that internally only file ids are used. But it is depending on the file cache, so the file cache has to be provided as an argument. There is now an interface for transactions too which are ease the testing of them and enables the support of preprocessor. It adds macros as symbols and is saving used macros. The used macro support is enabling update improvements because only if a changed macro is used it needs to be recompiled. This is still in flux and can be changed in later patches. Change-Id: I492a2c9af1201d40fdd9f46a0045f7878bbbaa3d Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-22 14:21:01 +01:00
<< container.headerPathIds() << ", "
<< container.sourcePathIds()<< ")";
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 <nikolai.kosjar@qt.io>
2017-11-30 16:11:40 +01:00
return out;
}
std::ostream &operator<<(std::ostream &os, const SourceLocationContainer &container)
{
os << "(("
Clang: Make it more clear that the FilePathId.filePathId is not shared The name fileNameId could imply that the id shared for the same file name which is not the case. Change-Id: I27310a8994c2d9e9bb0f0aed2094bd988309c710 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-01-17 13:52:33 +01:00
<< container.filePathId().directoryId << ", " << container.filePathId().filePathId << "), "
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 <nikolai.kosjar@qt.io>
2017-11-30 16:11:40 +01:00
<< 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
Clang: Add file cache The database is using file path integer ids to handle file paths because otherwise we would save many redundant data. This patch is improving it further with the introduction of a database based file path cache. The entries are now divided in a directory path and file name. This is quite handy for directory based file watching. Change-Id: I03f2e388e43f3d521d6bf8e39dfb95eb2309dc73 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-21 11:43:59 +02:00
} // namespace ClangBackEnd
namespace ClangRefactoring {
std::ostream &operator<<(std::ostream &out, const SourceLocation &location)
{
return out << "(" << location.filePathId << ", " << location.line << ", " << location.column << ")";
Convert macros from plain QByteArray to a vector of structs The old code model expected the macros as C++ formatted text ("#define Foo 42) but newer targets like the Clang codemodel expect key value arguments like "-DFoo=42". So instead of parsing the text again and again we use an abstract data description. Task-number: QTCREATORBUG-17915 Change-Id: I0179fd13c48a581e91ee79bba9d42d501c26f19f Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-07 15:00:38 +01:00
}
Clang: Add file cache The database is using file path integer ids to handle file paths because otherwise we would save many redundant data. This patch is improving it further with the introduction of a database based file path cache. The entries are now divided in a directory path and file name. This is quite handy for directory based file watching. Change-Id: I03f2e388e43f3d521d6bf8e39dfb95eb2309dc73 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-21 11:43:59 +02:00
} // namespace ClangBackEnd
Clang: Add usage functions to symbol query Change-Id: If68a5119c863e616fea40275136d028abcf441f3 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-18 13:38:58 +02:00
namespace CppTools {
class Usage;
std::ostream &operator<<(std::ostream &out, const Usage &usage)
{
return out << "(" << usage.path << ", " << usage.line << ", " << usage.column <<")";
}
} // namespace CppTools
Copy Permalink