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

Clang: Handle native file in the file cache

Browse Source 
Different types are introduced for normalized and native file path. So the
compiler is warning you if you try the wrong format.

Change-Id: I1da0686b142cbf9bb7578468c2b50f90a94cebf9
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2017-11-16 17:48:53 +01:00
parent bb2f9574b4
commit a15250051d
38 changed files with 985 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/tools/clangrefactoringbackend/source/clangrefactoringbackend_global.h
View File

@@ -25,6 +25,8 @@
#pragma once
#include <utils/hostosinfo.h>
namespace llvm {
template <typename T, unsigned N>
class SmallVector;
@@ -35,10 +37,7 @@ namespace ClangBackEnd {
using USRName = llvm::SmallVector<char, 128>;
// use std::filesystem::path if it is supported by all compilers
#ifdef _WIN32
const char nativeSeperator = '\\';
#else
const char nativeSeperator = '/';
#endif
static const char nativeSeparator = Utils::HostOsInfo::isWindowsHost() ? '\\' : '/';
}

2
src/tools/clangrefactoringbackend/source/clangtool.h
View File

@@ -63,7 +63,7 @@ struct FileContent
const std::vector<std::string> &commandLine)
: directory(directory),
fileName(fileName),
filePath(directory + nativeSeperator + fileName),
filePath(directory + nativeSeparator + fileName),
content(content),
commandLine(commandLine)
{}

7
src/tools/clangrefactoringbackend/source/collectsymbolsastvisitor.h
View File

@@ -40,11 +40,6 @@
namespace ClangBackEnd {
Utils::SmallStringView toStringView(clang::StringRef stringReference)
{
return Utils::SmallStringView(stringReference.data(), stringReference.size());
}
class CollectSymbolsASTVisitor : public clang::RecursiveASTVisitor<CollectSymbolsASTVisitor>
{
public:
@@ -111,7 +106,7 @@ public:
auto filePath = m_sourceManager.getFilename(sourceLocation);
FilePathId filePathId = m_filePathCache.filePathId(toStringView(filePath));
FilePathId filePathId = m_filePathCache.filePathId(FilePath::fromNativeFilePath(filePath));
m_filePathIndices.emplace(clangFileId, filePathId);

2
src/tools/clangrefactoringbackend/source/refactoringcompilationdatabase.cpp
View File

@@ -37,7 +37,7 @@ namespace {
std::string concatFilePath(const clang::tooling::CompileCommand &compileCommand)
{
return compileCommand.Directory + nativeSeperator + compileCommand.Filename;
return compileCommand.Directory + nativeSeparator + compileCommand.Filename;
}
}

2
src/tools/clangrefactoringbackend/source/sourcelocationsutils.h
View File

@@ -79,7 +79,7 @@ void appendSourceLocationsToSourceLocationsContainer(
const auto fileId = decomposedLoction.first;
const auto offset = decomposedLoction.second;
const auto fileEntry = sourceManager.getFileEntryForID(fileId);
auto filePath = fromNativePath(absolutePath(fileEntry->getName()));
auto filePath = FilePath::fromNativeFilePath(absolutePath(fileEntry->getName()));
sourceLocationsContainer.insertSourceLocation(filePathCache.filePathId(filePath),
fullSourceLocation.getSpellingLineNumber(),

2
src/tools/clangrefactoringbackend/source/sourcerangeextractor.cpp
View File

@@ -139,7 +139,7 @@ FilePathId SourceRangeExtractor::findFileId(clang::FileID fileId, const clang::F
}
auto filePath = absolutePath(fileEntry->getName());
return filePathCache.filePathId(fromNativePath(filePath));
return filePathCache.filePathId(FilePath::fromNativeFilePath(filePath));
}
void SourceRangeExtractor::addSourceRange(const clang::SourceRange &sourceRange)