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

Clang: Test for file path RequestSourceLocationsForRenamingMessage

Browse Source 
Change-Id: Ia384deb60e644d8894d7c56f81b3deb8b7706c11
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2016-08-08 15:58:48 +02:00
parent ba8939926b
commit f56ec53fa1
3 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,14 +43,26 @@
namespace ClangBackEnd {
inline
Utils::SmallString absolutePath(const char *path)
llvm::SmallString<256> absolutePath(const char *path)
{
llvm::SmallString<256> absolutePath(path);
if (!llvm::sys::path::is_absolute(absolutePath))
llvm::sys::fs::make_absolute(absolutePath);
return Utils::SmallString(absolutePath.begin(), absolutePath.end());
return absolutePath;
}
template <typename Container>
Utils::SmallString fromNativePath(Container container)
{
Utils::SmallString path(container.data(), container.size());
#ifdef WIN32
std::replace(path.begin(), path.end(), '\\', '/');
#endif
return path;
}
inline
@@ -65,12 +77,13 @@ void appendSourceLocationsToSourceLocationsContainer(
clang::FullSourceLoc fullSourceLocation(sourceLocation, sourceManager);
auto fileId = fullSourceLocation.getFileID();
auto fileEntry = sourceManager.getFileEntryForID(fileId);
auto fileName = fileEntry->getName();
auto fileDirectoryPath = absolutePath(fileEntry->getDir()->getName());
auto filePath = absolutePath(fileEntry->getName());
auto fileName = llvm::sys::path::filename(filePath);
llvm::sys::path::remove_filename(filePath);
sourceLocationsContainer.insertFilePath(fileId.getHashValue(),
std::move(fileDirectoryPath),
fileName);
fromNativePath(filePath),
fromNativePath(fileName));
sourceLocationsContainer.insertSourceLocation(fileId.getHashValue(),
fullSourceLocation.getSpellingLineNumber(),
fullSourceLocation.getSpellingColumnNumber());