feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge CppTools into CppEditor

Browse Source 
There was no proper separation of responsibilities between these
plugins. In particular, CppTools had lots of editor-related
functionality, so it's not clear why it was separated out in the first
place.
In fact, for a lot of code, it seemed quite arbitrary where it was put
(just one example: switchHeaderSource() was in CppTools, wheras
switchDeclarationDefinition() was in CppEditor).
Merging the plugins will enable us to get rid of various convoluted
pseudo-abstractions that were only introduced to keep up the artificial
separation.

Change-Id: Iafc3bce625b4794f6d4aa03df6cddc7f2d26716a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2021-08-30 10:58:08 +02:00
parent 3e1fa0f170
commit 284817fae6
525 changed files with 3705 additions and 4179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/compilationdatabaseprojectmanager/compilationdatabasetests.cpp
View File

@@ -28,8 +28,8 @@
#include "compilationdatabaseutils.h"
#include <coreplugin/icore.h>
#include <cpptools/cpptoolstestcase.h>
#include <cpptools/projectinfo.h>
#include <cppeditor/cpptoolstestcase.h>
#include <cppeditor/projectinfo.h>
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/kitmanager.h>
#include <projectexplorer/projectexplorer.h>
@@ -39,7 +39,7 @@
#include <QtTest>
using namespace CppTools;
using namespace CppEditor;
using namespace ProjectExplorer;
namespace CompilationDatabaseProjectManager {
@@ -63,7 +63,7 @@ void CompilationDatabaseTests::initTestCase()
if (!toolchain)
QSKIP("This test requires that there is at least one C++ toolchain present.");
m_tmpDir = std::make_unique<CppTools::Tests::TemporaryCopiedDir>(":/database_samples");
m_tmpDir = std::make_unique<CppEditor::Tests::TemporaryCopiedDir>(":/database_samples");
QVERIFY(m_tmpDir->isValid());
}
@@ -76,14 +76,14 @@ void CompilationDatabaseTests::testProject()
{
QFETCH(QString, projectFilePath);
CppTools::Tests::ProjectOpenerAndCloser projectManager;
const CppTools::ProjectInfo::ConstPtr projectInfo = projectManager.open(projectFilePath, true);
CppEditor::Tests::ProjectOpenerAndCloser projectManager;
const CppEditor::ProjectInfo::ConstPtr projectInfo = projectManager.open(projectFilePath, true);
QVERIFY(projectInfo);
QVector<CppTools::ProjectPart::ConstPtr> projectParts = projectInfo->projectParts();
QVector<CppEditor::ProjectPart::ConstPtr> projectParts = projectInfo->projectParts();
QVERIFY(!projectParts.isEmpty());
const CppTools::ProjectPart &projectPart = *projectParts.first();
const CppEditor::ProjectPart &projectPart = *projectParts.first();
QVERIFY(!projectPart.headerPaths.isEmpty());
QVERIFY(!projectPart.projectMacros.isEmpty());
QVERIFY(!projectPart.toolChainMacros.isEmpty());
@@ -116,7 +116,7 @@ public:
HeaderPaths headerPaths;
Macros macros;
CppTools::ProjectFile::Kind fileKind = CppTools::ProjectFile::Unclassified;
CppEditor::ProjectFile::Kind fileKind = CppEditor::ProjectFile::Unclassified;
QStringList flags;
QString fileName;
QString workingDir;
@@ -178,7 +178,7 @@ void CompilationDatabaseTests::testFilterArguments()
QCOMPARE(testData.macros, (Macros{{"UNICODE", "1"},
{"RELATIVE_PLUGIN_PATH", "\"../lib/qtcreator/plugins\""},
{"QT_CREATOR", "1"}}));
QCOMPARE(testData.fileKind, CppTools::ProjectFile::Kind::CXXSource);
QCOMPARE(testData.fileKind, CppEditor::ProjectFile::Kind::CXXSource);
QCOMPARE(testData.sysRoot, HostOsInfo::isWindowsHost() ? QString("C:\\sysroot\\embedded")
: QString("/opt/sysroot/embedded"));
}
@@ -245,7 +245,7 @@ void CompilationDatabaseTests::testFilterCommand()
toUserHeaderPaths(QStringList{"C:/build-qt_llvm-msvc2017_64bit-Debug/tools\\clang\\lib\\Sema"}));
QCOMPARE(testData.macros, (Macros{{"UNICODE", "1"}, {"_HAS_EXCEPTIONS", "0"}, {"WIN32", "1"},
{"_WINDOWS", "1"}}));
QCOMPARE(testData.fileKind, CppTools::ProjectFile::Kind::CXXSource);
QCOMPARE(testData.fileKind, CppEditor::ProjectFile::Kind::CXXSource);
}
void CompilationDatabaseTests::testFileKindDifferentFromExtension()
@@ -255,7 +255,7 @@ void CompilationDatabaseTests::testFileKindDifferentFromExtension()
testData.flags = QStringList{"-xc++"};
testData.getFilteredFlags();
QCOMPARE(testData.fileKind, CppTools::ProjectFile::Kind::CXXSource);
QCOMPARE(testData.fileKind, CppEditor::ProjectFile::Kind::CXXSource);
}
void CompilationDatabaseTests::testFileKindDifferentFromExtension2()
@@ -265,7 +265,7 @@ void CompilationDatabaseTests::testFileKindDifferentFromExtension2()
testData.flags = QStringList{"-x", "c"};
testData.getFilteredFlags();
QCOMPARE(testData.fileKind, CppTools::ProjectFile::Kind::CSource);
QCOMPARE(testData.fileKind, CppEditor::ProjectFile::Kind::CSource);
}
void CompilationDatabaseTests::testSkipOutputFiles()