forked from qt-creator/qt-creator
Remove ClangRefactoring and ClangPchManager
This removes the plugins and tools, and removes all the tests that would fail to build because of that. Fixes: QTCREATORBUG-25659 Change-Id: I8adb5d503fc8eea313bcaada421f309dbbfa8c26 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
@@ -28,21 +28,10 @@
|
||||
#include "googletest.h"
|
||||
|
||||
#include <cpptools/usages.h>
|
||||
#include <filepathstoragesources.h>
|
||||
#include <pchpaths.h>
|
||||
#include <projectpartartefact.h>
|
||||
#include <projectpartcontainer.h>
|
||||
#include <projectpartpch.h>
|
||||
#include <projectpartstoragestructs.h>
|
||||
#include <projectstorage/projectstoragetypes.h>
|
||||
#include <projectstorage/sourcepathcachetypes.h>
|
||||
#include <projectstorageids.h>
|
||||
#include <sourceentry.h>
|
||||
#include <sourcelocations.h>
|
||||
#include <sqliteblob.h>
|
||||
#include <stringcachefwd.h>
|
||||
#include <symbol.h>
|
||||
#include <usedmacro.h>
|
||||
#include <utils/optional.h>
|
||||
#include <utils/smallstring.h>
|
||||
|
||||
@@ -52,21 +41,7 @@
|
||||
#include <tuple>
|
||||
#include <vector>
|
||||
|
||||
using ClangBackEnd::FilePathIds;
|
||||
using ClangBackEnd::SourceEntries;
|
||||
using ClangBackEnd::SourceEntry;
|
||||
using ClangBackEnd::SourceTimeStamp;
|
||||
using ClangBackEnd::SourceTimeStamps;
|
||||
using ClangRefactoring::SourceLocation;
|
||||
using ClangRefactoring::SourceLocations;
|
||||
using std::int64_t;
|
||||
namespace Sources = ClangBackEnd::Sources;
|
||||
using ClangBackEnd::PrecompiledHeaderTimeStamps;
|
||||
using ClangBackEnd::UsedMacros;
|
||||
using ClangBackEnd::Internal::ProjectPartNameId;
|
||||
using ClangBackEnd::Internal::ProjectPartNameIds;
|
||||
using ClangRefactoring::Symbol;
|
||||
using ClangRefactoring::Symbols;
|
||||
|
||||
class SqliteDatabaseMock;
|
||||
|
||||
@@ -85,24 +60,10 @@ public:
|
||||
(Utils::SmallStringView, long long),
|
||||
());
|
||||
|
||||
MOCK_METHOD(SourceLocations, valuesReturnSourceLocations, (std::size_t, int, int, int), ());
|
||||
|
||||
MOCK_METHOD(CppTools::Usages, valuesReturnSourceUsages, (std::size_t, int, int, int), ());
|
||||
|
||||
MOCK_METHOD(CppTools::Usages, valuesReturnSourceUsages, (std::size_t, int, int, int, int), ());
|
||||
|
||||
MOCK_METHOD(std::vector<Sources::Directory>, valuesReturnStdVectorDirectory, (std::size_t), ());
|
||||
|
||||
MOCK_METHOD(std::vector<Sources::Source>, valuesReturnStdVectorSource, (std::size_t), ());
|
||||
|
||||
MOCK_METHOD(SourceEntries, valuesReturnSourceEntries, (std::size_t, int, int), ());
|
||||
|
||||
MOCK_METHOD(UsedMacros, valuesReturnUsedMacros, (std::size_t, int), ());
|
||||
|
||||
MOCK_METHOD(FilePathIds, valuesReturnFilePathIds, (std::size_t, int), ());
|
||||
|
||||
MOCK_METHOD(ProjectPartNameIds, valuesReturnProjectPartNameIds, (std::size_t), ());
|
||||
|
||||
MOCK_METHOD(Utils::optional<int>, valueReturnInt32, (Utils::SmallStringView), ());
|
||||
|
||||
MOCK_METHOD(Utils::optional<int>, valueReturnInt32, (int, Utils::SmallStringView), ());
|
||||
@@ -115,54 +76,8 @@ public:
|
||||
|
||||
MOCK_METHOD(Utils::optional<Utils::PathString>, valueReturnPathString, (Utils::SmallStringView), ());
|
||||
|
||||
MOCK_METHOD(Utils::optional<ClangBackEnd::FilePath>, valueReturnFilePath, (int), ());
|
||||
|
||||
MOCK_METHOD(ClangBackEnd::FilePaths, valuesReturnFilePaths, (std::size_t), ());
|
||||
|
||||
MOCK_METHOD(Utils::optional<Utils::SmallString>, valueReturnSmallString, (int), ());
|
||||
|
||||
MOCK_METHOD(Utils::optional<Sources::SourceNameAndDirectoryId>,
|
||||
valueReturnSourceNameAndDirectoryId,
|
||||
(int) );
|
||||
|
||||
MOCK_METHOD(Utils::optional<ClangBackEnd::ProjectPartArtefact>,
|
||||
valueReturnProjectPartArtefact,
|
||||
(int) );
|
||||
|
||||
MOCK_METHOD(Utils::optional<ClangBackEnd::ProjectPartArtefact>,
|
||||
valueReturnProjectPartArtefact,
|
||||
(Utils::SmallStringView));
|
||||
MOCK_METHOD(ClangBackEnd::ProjectPartArtefacts, valuesReturnProjectPartArtefacts, (std::size_t), ());
|
||||
MOCK_METHOD(Utils::optional<ClangBackEnd::ProjectPartContainer>,
|
||||
valueReturnProjectPartContainer,
|
||||
(int) );
|
||||
MOCK_METHOD(ClangBackEnd::ProjectPartContainers,
|
||||
valuesReturnProjectPartContainers,
|
||||
(std::size_t),
|
||||
());
|
||||
MOCK_METHOD(Utils::optional<ClangBackEnd::ProjectPartPch>, valueReturnProjectPartPch, (int), ());
|
||||
|
||||
MOCK_METHOD(Utils::optional<ClangBackEnd::PchPaths>, valueReturnPchPaths, (int), ());
|
||||
|
||||
MOCK_METHOD(Symbols, valuesReturnSymbols, (std::size_t, int, Utils::SmallStringView), ());
|
||||
|
||||
MOCK_METHOD(Symbols, valuesReturnSymbols, (std::size_t, int, int, Utils::SmallStringView), ());
|
||||
|
||||
MOCK_METHOD(Symbols, valuesReturnSymbols, (std::size_t, int, int, int, Utils::SmallStringView), ());
|
||||
|
||||
MOCK_METHOD(SourceLocation, valueReturnSourceLocation, (long long, int), ());
|
||||
|
||||
MOCK_METHOD(Utils::optional<ClangBackEnd::ProjectPartId>,
|
||||
valueReturnProjectPartId,
|
||||
(Utils::SmallStringView));
|
||||
|
||||
MOCK_METHOD(SourceTimeStamps, valuesReturnSourceTimeStamps, (std::size_t), ());
|
||||
MOCK_METHOD(SourceTimeStamps, valuesReturnSourceTimeStamps, (std::size_t, int sourcePathId), ());
|
||||
|
||||
MOCK_METHOD(Utils::optional<PrecompiledHeaderTimeStamps>,
|
||||
valuesReturnPrecompiledHeaderTimeStamps,
|
||||
(int projectPartId));
|
||||
|
||||
MOCK_METHOD(QmlDesigner::TypeId, valueReturnsTypeId, (Utils::SmallStringView name), ());
|
||||
MOCK_METHOD(QmlDesigner::TypeId, valueWithTransactionReturnsTypeId, (long long, long long), ());
|
||||
MOCK_METHOD(QmlDesigner::PropertyDeclarationId,
|
||||
@@ -241,32 +156,14 @@ public:
|
||||
{
|
||||
if constexpr (std::is_same_v<ResultType, Sqlite::ByteArrayBlob>)
|
||||
return valueReturnBlob(queryValues...);
|
||||
else if constexpr (std::is_same_v<ResultType, ClangBackEnd::ProjectPartId>)
|
||||
return valueReturnProjectPartId(queryValues...);
|
||||
else if constexpr (std::is_same_v<ResultType, int>)
|
||||
return valueReturnInt32(queryValues...);
|
||||
else if constexpr (std::is_same_v<ResultType, long long>)
|
||||
return valueReturnInt64(queryValues...);
|
||||
else if constexpr (std::is_same_v<ResultType, Utils::PathString>)
|
||||
return valueReturnPathString(queryValues...);
|
||||
else if constexpr (std::is_same_v<ResultType, ClangBackEnd::FilePath>)
|
||||
return valueReturnFilePath(queryValues...);
|
||||
else if constexpr (std::is_same_v<ResultType, ClangBackEnd::ProjectPartArtefact>)
|
||||
return valueReturnProjectPartArtefact(queryValues...);
|
||||
else if constexpr (std::is_same_v<ResultType, ClangBackEnd::ProjectPartContainer>)
|
||||
return valueReturnProjectPartContainer(queryValues...);
|
||||
else if constexpr (std::is_same_v<ResultType, ClangBackEnd::ProjectPartPch>)
|
||||
return valueReturnProjectPartPch(queryValues...);
|
||||
else if constexpr (std::is_same_v<ResultType, ClangBackEnd::PchPaths>)
|
||||
return valueReturnPchPaths(queryValues...);
|
||||
else if constexpr (std::is_same_v<ResultType, Utils::SmallString>)
|
||||
return valueReturnSmallString(queryValues...);
|
||||
else if constexpr (std::is_same_v<ResultType, SourceLocation>)
|
||||
return valueReturnSourceLocation(queryValues...);
|
||||
else if constexpr (std::is_same_v<ResultType, Sources::SourceNameAndDirectoryId>)
|
||||
return valueReturnSourceNameAndDirectoryId(queryValues...);
|
||||
else if constexpr (std::is_same_v<ResultType, ClangBackEnd::PrecompiledHeaderTimeStamps>)
|
||||
return valuesReturnPrecompiledHeaderTimeStamps(queryValues...);
|
||||
else
|
||||
static_assert(!std::is_same_v<ResultType, ResultType>,
|
||||
"SqliteReadStatementMock::value does not handle result type!");
|
||||
@@ -324,30 +221,8 @@ public:
|
||||
return valuesReturnStringVector(reserveSize);
|
||||
else if constexpr (std::is_same_v<ResultType, long long>)
|
||||
return valuesReturnRowIds(reserveSize);
|
||||
else if constexpr (std::is_same_v<ResultType, SourceLocation>)
|
||||
return valuesReturnSourceLocations(reserveSize, queryValues...);
|
||||
else if constexpr (std::is_same_v<ResultType, CppTools::Usage>)
|
||||
return valuesReturnSourceUsages(reserveSize, queryValues...);
|
||||
else if constexpr (std::is_same_v<ResultType, Symbol>)
|
||||
return valuesReturnSymbols(reserveSize, queryValues...);
|
||||
else if constexpr (std::is_same_v<ResultType, ClangBackEnd::UsedMacro>)
|
||||
return valuesReturnUsedMacros(reserveSize, queryValues...);
|
||||
else if constexpr (std::is_same_v<ResultType, ClangBackEnd::FilePathId>)
|
||||
return valuesReturnFilePathIds(reserveSize, queryValues...);
|
||||
else if constexpr (std::is_same_v<ResultType, ClangBackEnd::FilePath>)
|
||||
return valuesReturnFilePaths(reserveSize);
|
||||
else if constexpr (std::is_same_v<ResultType, Sources::Directory>)
|
||||
return valuesReturnStdVectorDirectory(reserveSize);
|
||||
else if constexpr (std::is_same_v<ResultType, Sources::Source>)
|
||||
return valuesReturnStdVectorSource(reserveSize);
|
||||
else if constexpr (std::is_same_v<ResultType, ProjectPartNameId>)
|
||||
return valuesReturnProjectPartNameIds(reserveSize);
|
||||
else if constexpr (std::is_same_v<ResultType, ClangBackEnd::ProjectPartContainer>)
|
||||
return valuesReturnProjectPartContainers(reserveSize);
|
||||
else if constexpr (std::is_same_v<ResultType, SourceEntry>)
|
||||
return valuesReturnSourceEntries(reserveSize, queryValues...);
|
||||
else if constexpr (std::is_same_v<ResultType, SourceTimeStamp>)
|
||||
return valuesReturnSourceTimeStamps(reserveSize, queryValues...);
|
||||
else if constexpr (std::is_same_v<ResultType, QmlDesigner::Cache::SourceContext>)
|
||||
return valuesReturnCacheSourceContexts(reserveSize);
|
||||
else if constexpr (std::is_same_v<ResultType, QmlDesigner::Cache::Source>)
|
||||
|
||||
Reference in New Issue
Block a user