From 546df418531c75fb4032d723882bc0799b64cfd2 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 27 Feb 2017 14:37:41 +0100 Subject: [PATCH] ProjectPart: Add callGroupId Do not rely on the projectfile being unique anymore. Change-Id: I52e63b3ac8aeca43ef70af1d59d1d8612bd3540e Reviewed-by: Tim Jenssen Reviewed-by: Nikolai Kosjar --- .../clangstaticanalyzerruncontrol.cpp | 19 +++++++------------ .../cppeditor/cppcodemodelinspectordialog.cpp | 3 +++ .../cpptools/cppprojectinfogenerator.cpp | 1 + src/plugins/cpptools/cpprawprojectpart.cpp | 5 +++++ src/plugins/cpptools/cpprawprojectpart.h | 2 ++ src/plugins/cpptools/projectpart.h | 1 + src/plugins/qbsprojectmanager/qbsproject.cpp | 5 +++-- 7 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp index 6ebe83044cc..1a31123fc6a 100644 --- a/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp +++ b/src/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp @@ -340,7 +340,7 @@ static QStringList tweakedArguments(const ProjectPart &projectPart, } static AnalyzeUnits unitsToAnalyzeFromCompilerCallData( - const QHash &projectFileToProjectPart, + const QHash &callGroupToProjectPart, const ProjectInfo::CompilerCallData &compilerCallData, const QString &targetTriple) { @@ -350,7 +350,7 @@ static AnalyzeUnits unitsToAnalyzeFromCompilerCallData( foreach (const ProjectInfo::CompilerCallGroup &compilerCallGroup, compilerCallData) { const ProjectPart::Ptr projectPart - = projectFileToProjectPart.value(compilerCallGroup.groupId); + = callGroupToProjectPart.value(compilerCallGroup.groupId); QTC_ASSERT(projectPart, continue); QHashIterator > it(compilerCallGroup.callsPerSourceFile); @@ -398,19 +398,14 @@ static AnalyzeUnits unitsToAnalyzeFromProjectParts(const QVector generateProjectFileToProjectPartMapping( +static QHash generateCallGroupToProjectPartMapping( const QVector &projectParts) { QHash mapping; foreach (const ProjectPart::Ptr &projectPart, projectParts) { QTC_ASSERT(projectPart, continue); - QString projectFile = projectPart->projectFile; - if (projectPart->projectFileLine >= 0) - projectFile += ':' + QString::number(projectPart->projectFileLine); - if (projectPart->projectFileColumn >= 0) - projectFile += ':' + QString::number(projectPart->projectFileColumn); - mapping[projectFile] = projectPart; + mapping[projectPart->callGroupId] = projectPart; } return mapping; @@ -425,9 +420,9 @@ AnalyzeUnits ClangStaticAnalyzerRunControl::sortedUnitsToAnalyze() if (compilerCallData.isEmpty()) { units = unitsToAnalyzeFromProjectParts(m_projectInfo.projectParts()); } else { - const QHash projectFileToProjectPart - = generateProjectFileToProjectPartMapping(m_projectInfo.projectParts()); - units = unitsToAnalyzeFromCompilerCallData(projectFileToProjectPart, + const QHash callGroupToProjectPart + = generateCallGroupToProjectPartMapping(m_projectInfo.projectParts()); + units = unitsToAnalyzeFromCompilerCallData(callGroupToProjectPart, compilerCallData, m_targetTriple); } diff --git a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp index ecff5db57c4..834449847c5 100644 --- a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp +++ b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp @@ -1782,12 +1782,15 @@ void CppCodeModelInspectorDialog::updateProjectPartData(const ProjectPart::Ptr & projectFileLocation += ":" + QString::number(part->projectFileLine); if (part->projectFileColumn > 0) projectFileLocation += ":" + QString::number(part->projectFileColumn); + const QString callGroupId = part->callGroupId.isEmpty() ? QString::fromLatin1("") + : part->callGroupId; KeyValueModel::Table table = KeyValueModel::Table() << qMakePair(QString::fromLatin1("Project Part Name"), part->displayName) << qMakePair(QString::fromLatin1("Project Part File"), projectFileLocation) << qMakePair(QString::fromLatin1("Project Name"), projectName) << qMakePair(QString::fromLatin1("Project File"), projectFilePath) + << qMakePair(QString::fromLatin1("Callgroup Id"), callGroupId) << qMakePair(QString::fromLatin1("Selected For Building"), CMI::Utils::toString(part->selectedForBuilding)) << qMakePair(QString::fromLatin1("Language Version"), diff --git a/src/plugins/cpptools/cppprojectinfogenerator.cpp b/src/plugins/cpptools/cppprojectinfogenerator.cpp index 22c1d4b81ca..525cdbf284a 100644 --- a/src/plugins/cpptools/cppprojectinfogenerator.cpp +++ b/src/plugins/cpptools/cppprojectinfogenerator.cpp @@ -184,6 +184,7 @@ static ProjectPart::Ptr projectPartFromRawProjectPart(const RawProjectPart &rawP part->projectConfigFile = rawProjectPart.projectConfigFile; part->projectFileLine = rawProjectPart.projectFileLine; part->projectFileColumn = rawProjectPart.projectFileColumn; + part->callGroupId = rawProjectPart.callGroupId; part->qtVersion = rawProjectPart.qtVersion; part->projectDefines = rawProjectPart.projectDefines; part->headerPaths = rawProjectPart.headerPaths; diff --git a/src/plugins/cpptools/cpprawprojectpart.cpp b/src/plugins/cpptools/cpprawprojectpart.cpp index b6945481784..a735ac49557 100644 --- a/src/plugins/cpptools/cpprawprojectpart.cpp +++ b/src/plugins/cpptools/cpprawprojectpart.cpp @@ -66,6 +66,11 @@ void RawProjectPart::setConfigFileName(const QString &configFileName) this->projectConfigFile = configFileName; } +void RawProjectPart::setCallGroupId(const QString &id) +{ + callGroupId = id; +} + void RawProjectPart::setQtVersion(ProjectPart::QtVersion qtVersion) { this->qtVersion = qtVersion; diff --git a/src/plugins/cpptools/cpprawprojectpart.h b/src/plugins/cpptools/cpprawprojectpart.h index faa2cfb1989..41285ba22fa 100644 --- a/src/plugins/cpptools/cpprawprojectpart.h +++ b/src/plugins/cpptools/cpprawprojectpart.h @@ -62,6 +62,7 @@ public: void setProjectFile(const QString &projectFile, int line = -1, int column = -1); void setConfigFileName(const QString &configFileName); + void setCallGroupId(const QString &id); void setQtVersion(ProjectPart::QtVersion qtVersion); @@ -82,6 +83,7 @@ public: int projectFileLine = -1; int projectFileColumn = -1; QString projectConfigFile; // currently only used by the Generic Project Manager + QString callGroupId; QStringList precompiledHeaders; ProjectPartHeaderPaths headerPaths; QByteArray projectDefines; diff --git a/src/plugins/cpptools/projectpart.h b/src/plugins/cpptools/projectpart.h index f2e27830326..b01872f71b2 100644 --- a/src/plugins/cpptools/projectpart.h +++ b/src/plugins/cpptools/projectpart.h @@ -108,6 +108,7 @@ public: int projectFileLine = -1; int projectFileColumn = -1; QString projectConfigFile; // currently only used by the Generic Project Manager + QString callGroupId; ProjectFiles files; diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 22eea056647..8fa8d22e44d 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -790,7 +790,7 @@ static CppTools::ProjectFile::Kind cppFileType(const qbs::ArtifactData &sourceFi return CppTools::ProjectFile::Unsupported; } -static QString groupLocationToProjectFile(const qbs::CodeLocation &location) +static QString groupLocationToCallGroupId(const qbs::CodeLocation &location) { return QString::fromLatin1("%1:%2:%3") .arg(location.filePath()) @@ -950,6 +950,7 @@ void QbsProject::updateCppCodeModel() CppTools::RawProjectPart rpp; rpp.setQtVersion(qtVersionForPart); const qbs::PropertyMap &props = grp.properties(); + rpp.setCallGroupId(groupLocationToCallGroupId(grp.location())); QStringList cFlags; QStringList cxxFlags; @@ -1091,7 +1092,7 @@ void QbsProject::updateCppCompilerCallData() continue; CppTools::ProjectInfo::CompilerCallGroup compilerCallGroup; - compilerCallGroup.groupId = groupLocationToProjectFile(group.location()); + compilerCallGroup.groupId = groupLocationToCallGroupId(group.location()); foreach (const qbs::ArtifactData &file, group.allSourceArtifacts()) { const QString &filePath = file.filePath();