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

ClangToolsUtils: Reuse ClangToolType enum

Browse Source 
Change-Id: Iee95a014d634a99c6e10582f8e942a12ebf1bd74
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Jarek Kobus
2023-01-10 16:36:59 +01:00
parent 0ba3dbf1be
commit c4882a5a7a
8 changed files with 46 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/plugins/clangtools/clangtoolsutils.cpp
View File

@@ -145,22 +145,6 @@ void showHintAboutBuildBeforeAnalysis()
"ClangToolsDisablingBuildBeforeAnalysisHint");
}
FilePath shippedClangTidyExecutable()
{
const FilePath shippedExecutable = Core::ICore::clangTidyExecutable(CLANG_BINDIR);
if (shippedExecutable.isExecutableFile())
return shippedExecutable;
return {};
}
FilePath shippedClazyStandaloneExecutable()
{
const FilePath shippedExecutable = Core::ICore::clazyStandaloneExecutable(CLANG_BINDIR);
if (shippedExecutable.isExecutableFile())
return shippedExecutable;
return {};
}
FilePath fullPath(const FilePath &executable)
{
FilePath candidate = executable;
@@ -190,36 +174,30 @@ static FilePath findValidExecutable(const FilePaths &candidates)
return {};
}
FilePath clangTidyFallbackExecutable()
FilePath toolShippedExecutable(ClangToolType tool)
{
return findValidExecutable({
shippedClangTidyExecutable(),
Constants::CLANG_TIDY_EXECUTABLE_NAME,
});
const FilePath shippedExecutable = tool == ClangToolType::Tidy
? Core::ICore::clangTidyExecutable(CLANG_BINDIR)
: Core::ICore::clazyStandaloneExecutable(CLANG_BINDIR);
if (shippedExecutable.isExecutableFile())
return shippedExecutable;
return {};
}
FilePath clangTidyExecutable()
FilePath toolExecutable(ClangToolType tool)
{
const FilePath fromSettings = ClangToolsSettings::instance()->executable(ClangToolType::Tidy);
const FilePath fromSettings = ClangToolsSettings::instance()->executable(tool);
if (!fromSettings.isEmpty())
return fullPath(fromSettings);
return clangTidyFallbackExecutable();
return toolFallbackExecutable(tool);
}
FilePath clazyStandaloneFallbackExecutable()
FilePath toolFallbackExecutable(ClangToolType tool)
{
return findValidExecutable({
shippedClazyStandaloneExecutable(),
Constants::CLAZY_STANDALONE_EXECUTABLE_NAME,
});
}
FilePath clazyStandaloneExecutable()
{
const FilePath fromSettings = ClangToolsSettings::instance()->executable(ClangToolType::Clazy);
if (!fromSettings.isEmpty())
return fullPath(fromSettings);
return clazyStandaloneFallbackExecutable();
const FilePath fallback = tool == ClangToolType::Tidy
? FilePath(Constants::CLANG_TIDY_EXECUTABLE_NAME)
: FilePath(Constants::CLAZY_STANDALONE_EXECUTABLE_NAME);
return findValidExecutable({toolShippedExecutable(tool), fallback});
}
static void addBuiltinConfigs(ClangDiagnosticConfigsModel &model)