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

Clang: Extend ClangTool and CommandLineBuilder

Browse Source 
We now support source file and not only header files and the file path is
now automatically added to the end. This removes quite some clutter.

Change-Id: I74eabd262e6c7e5f4d523e3a3cd194bd3efe1ef3
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Ivan Donchevskii
2019-01-30 13:59:30 +01:00
committed by Marco Bubke
parent d6a6d356bb
commit 7fe65851d9
16 changed files with 196 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/tools/clangrefactoringbackend/source/clangtool.cpp
View File

@@ -52,6 +52,9 @@ void ClangTool::addFile(FilePath &&filePath,
{
NativeFilePath nativeFilePath{filePath};
if (commandLine.back() != nativeFilePath.path())
commandLine.emplace_back(nativeFilePath.path());
m_compilationDatabase.addFile(nativeFilePath, std::move(commandLine));
m_sourceFilePaths.push_back(Utils::SmallStringView{nativeFilePath});
@@ -60,15 +63,8 @@ void ClangTool::addFile(FilePath &&filePath,
void ClangTool::addFiles(const FilePaths &filePaths, const Utils::SmallStringVector &arguments)
{
for (const FilePath &filePath : filePaths) {
std::string filePathStr(filePath.path());
auto commandLine = arguments;
NativeFilePath nativeFilePath{filePath};
commandLine.push_back(nativeFilePath.path());
addFile(filePath.clone(), {}, std::move(commandLine));
}
for (const FilePath &filePath : filePaths)
addFile(filePath.clone(), {}, arguments.clone());
}
void ClangTool::addUnsavedFiles(const V2::FileContainers &unsavedFiles)
@@ -104,13 +100,14 @@ clang::tooling::ClangTool ClangTool::createTool() const
clang::tooling::ClangTool tool(m_compilationDatabase, m_sourceFilePaths);
for (const auto &fileContent : m_fileContents) {
if (!fileContent.content.empty())
tool.mapVirtualFile(toStringRef(fileContent.filePath), fileContent.content);
if (fileContent.content.hasContent())
tool.mapVirtualFile(toStringRef(fileContent.filePath), toStringRef(fileContent.content));
}
for (const auto &unsavedFileContent : m_unsavedFileContents)
tool.mapVirtualFile(toStringRef(unsavedFileContent.filePath),
toStringRef(unsavedFileContent.content));
for (const auto &unsavedFileContent : m_unsavedFileContents) {
tool.mapVirtualFile(toStringRef(unsavedFileContent.filePath),
toStringRef(unsavedFileContent.content));
}
tool.mapVirtualFile("/dummyFile", "#pragma once");