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

ClangTools: Extract filtering in readSerializedDiagnostics()

Browse Source 
Change-Id: I07a4339af72d1e232eb7fe152a6af133a6a94436
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Nikolai Kosjar
2019-07-26 12:44:17 +02:00
parent c4889e9904
commit 0979a58689
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/clangtools/clangtidyclazytool.cpp
View File

@@ -468,9 +468,13 @@ Diagnostics ClangTidyClazyTool::read(const QString &logFilePath,
const QSet<Utils::FilePath> &projectFiles, const QSet<Utils::FilePath> &projectFiles,
QString *errorMessage) const QString *errorMessage) const
{ {
const auto acceptFromFilePath = [projectFiles](const Utils::FilePath &filePath) {
return projectFiles.contains(filePath);
};
return readSerializedDiagnostics(Utils::FilePath::fromString(logFilePath), return readSerializedDiagnostics(Utils::FilePath::fromString(logFilePath),
Utils::FilePath::fromString(mainFilePath), Utils::FilePath::fromString(mainFilePath),
projectFiles, acceptFromFilePath,
errorMessage); errorMessage);
} }

12
src/plugins/clangtools/clangtoolslogfilereader.cpp
View File

@@ -122,7 +122,7 @@ static ExplainingStep buildFixIt(const CXDiagnostic cxDiagnostic, unsigned index
} }
static Diagnostic buildDiagnostic(const CXDiagnostic cxDiagnostic, static Diagnostic buildDiagnostic(const CXDiagnostic cxDiagnostic,
const QSet<Utils::FilePath> &projectFiles, const AcceptDiagsFromFilePath &acceptFromFilePath,
const QString &nativeFilePath) const QString &nativeFilePath)
{ {
Diagnostic diagnostic; Diagnostic diagnostic;
@@ -136,7 +136,7 @@ static Diagnostic buildDiagnostic(const CXDiagnostic cxDiagnostic,
diagnostic.location = diagLocationFromSourceLocation(cxLocation); diagnostic.location = diagLocationFromSourceLocation(cxLocation);
const auto diagnosticFilePath = Utils::FilePath::fromString(diagnostic.location.filePath); const auto diagnosticFilePath = Utils::FilePath::fromString(diagnostic.location.filePath);
if (!projectFiles.contains(diagnosticFilePath)) if (acceptFromFilePath && !acceptFromFilePath(diagnosticFilePath))
return diagnostic; return diagnostic;
// TODO: Introduce CppTools::ProjectFile::isGenerated to filter these out properly // TODO: Introduce CppTools::ProjectFile::isGenerated to filter these out properly
@@ -184,7 +184,7 @@ static Diagnostic buildDiagnostic(const CXDiagnostic cxDiagnostic,
static Diagnostics readSerializedDiagnostics_helper(const Utils::FilePath &logFilePath, static Diagnostics readSerializedDiagnostics_helper(const Utils::FilePath &logFilePath,
const Utils::FilePath &mainFilePath, const Utils::FilePath &mainFilePath,
const QSet<Utils::FilePath> &projectFiles) const AcceptDiagsFromFilePath &acceptFromFilePath)
{ {
Diagnostics list; Diagnostics list;
CXLoadDiag_Error error; CXLoadDiag_Error error;
@@ -206,7 +206,7 @@ static Diagnostics readSerializedDiagnostics_helper(const Utils::FilePath &logFi
Utils::ExecuteOnDestruction cleanUpDiagnostic([&]() { Utils::ExecuteOnDestruction cleanUpDiagnostic([&]() {
clang_disposeDiagnostic(cxDiagnostic); clang_disposeDiagnostic(cxDiagnostic);
}); });
const Diagnostic diagnostic = buildDiagnostic(cxDiagnostic, projectFiles, nativeFilePath); const Diagnostic diagnostic = buildDiagnostic(cxDiagnostic, acceptFromFilePath, nativeFilePath);
if (!diagnostic.isValid()) if (!diagnostic.isValid())
continue; continue;
@@ -233,13 +233,13 @@ static bool checkFilePath(const Utils::FilePath &filePath, QString *errorMessage
Diagnostics readSerializedDiagnostics(const Utils::FilePath &logFilePath, Diagnostics readSerializedDiagnostics(const Utils::FilePath &logFilePath,
const Utils::FilePath &mainFilePath, const Utils::FilePath &mainFilePath,
const QSet<Utils::FilePath> &projectFiles, const AcceptDiagsFromFilePath &acceptFromFilePath,
QString *errorMessage) QString *errorMessage)
{ {
if (!checkFilePath(logFilePath, errorMessage)) if (!checkFilePath(logFilePath, errorMessage))
return {}; return {};
return readSerializedDiagnostics_helper(logFilePath, mainFilePath, projectFiles); return readSerializedDiagnostics_helper(logFilePath, mainFilePath, acceptFromFilePath);
} }
} // namespace Internal } // namespace Internal

6
src/plugins/clangtools/clangtoolslogfilereader.h
View File

@@ -27,16 +27,16 @@
#include "clangtoolsdiagnostic.h" #include "clangtoolsdiagnostic.h"
#include <QSet>
namespace Utils { class FilePath; } namespace Utils { class FilePath; }
namespace ClangTools { namespace ClangTools {
namespace Internal { namespace Internal {
using AcceptDiagsFromFilePath = std::function<bool(const Utils::FilePath &)>;
Diagnostics readSerializedDiagnostics(const Utils::FilePath &logFilePath, Diagnostics readSerializedDiagnostics(const Utils::FilePath &logFilePath,
const Utils::FilePath &mainFilePath, const Utils::FilePath &mainFilePath,
const QSet<Utils::FilePath> &projectFiles, const AcceptDiagsFromFilePath &acceptFromFilePath,
QString *errorMessage); QString *errorMessage);
} // namespace Internal } // namespace Internal