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

CompilationDatabase: Use QJsonDocument for separate objects

Browse Source 
It is pretty easy to split objects without QJsonDocument help.

Due to the QJsonObject data size restriction use it
only for the already split objects inside the database.

Change-Id: Ice7c7407ad00aaac151a767f4d943fdcecf6a6b8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Ivan Donchevskii
2018-11-01 13:05:34 +01:00
parent 7f67e987ea
commit 06162c1aa5
1 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp
View File

@@ -302,26 +302,51 @@ void createFolders(FolderNode *root, const Utils::FileName &rootPath)
}
}
std::vector<QJsonObject> readJsonObjects(const QString &filePath)
{
std::vector<QJsonObject> result;
QFile file(filePath);
if (!file.open(QIODevice::ReadOnly))
return result;
const QByteArray contents = file.readAll();
int objectStart = contents.indexOf('{');
int objectEnd = contents.indexOf('}', objectStart + 1);
while (objectStart >= 0 && objectEnd >= 0) {
const QJsonDocument document = QJsonDocument::fromJson(
contents.mid(objectStart, objectEnd - objectStart + 1));
if (document.isNull()) {
// The end was found incorrectly, search for the next one.
objectEnd = contents.indexOf('}', objectEnd + 1);
continue;
}
result.push_back(document.object());
objectStart = contents.indexOf('{', objectEnd + 1);
objectEnd = contents.indexOf('}', objectStart + 1);
}
return result;
}
} // anonymous namespace
void CompilationDatabaseProject::buildTreeAndProjectParts(const Utils::FileName &projectFile)
{
QFile file(projectFilePath().toString());
if (!file.open(QIODevice::ReadOnly)) {
std::vector<QJsonObject> array = readJsonObjects(projectFilePath().toString());
if (array.empty()) {
emitParsingFinished(false);
return;
}
const QJsonArray array = QJsonDocument::fromJson(file.readAll()).array();
auto root = std::make_unique<DBProjectNode>(projectDirectory());
CppTools::RawProjectParts rpps;
Utils::FileName commonPath;
ToolChain *cToolchain = nullptr;
ToolChain *cxxToolchain = nullptr;
for (const QJsonValue &element : array) {
const QJsonObject object = element.toObject();
for (const QJsonObject &object : array) {
Utils::FileName fileName = jsonObjectFilename(object);
const QStringList flags = jsonObjectFlags(object);