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

Merge remote-tracking branch 'origin/4.4'

Browse Source 
Change-Id: I5b12586086297b57e250bbbd9c94818623ad33f9
This commit is contained in:
Eike Ziller
2017-08-30 14:49:19 +02:00
parent d551c39faf 2ebd51fca3
commit 696a978942
13 changed files with 65 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,10 +63,10 @@ llvm::SmallString<256> absolutePath(clang::StringRef path)
return absolutePath;
}
template <typename Container>
Utils::PathString fromNativePath(Container container)
inline
Utils::PathString fromNativePath(const llvm::SmallString<256> &string)
{
Utils::PathString path(container.data(), container.size());
Utils::PathString path(string.data(), string.size());
#ifdef _WIN32
std::replace(path.begin(), path.end(), '\\', '/');
@@ -91,7 +91,7 @@ void appendSourceLocationsToSourceLocationsContainer(
const auto fileEntry = sourceManager.getFileEntryForID(fileId);
sourceLocationsContainer.insertFilePath(fileId.getHashValue(),
fromNativePath(fileEntry->tryGetRealPathName()));
fromNativePath(absolutePath(fileEntry->getName())));
sourceLocationsContainer.insertSourceLocation(fileId.getHashValue(),
fullSourceLocation.getSpellingLineNumber(),
fullSourceLocation.getSpellingColumnNumber(),

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

@@ -69,6 +69,7 @@ std::reverse_iterator<Iterator> make_reverse_iterator(Iterator iterator)
{
return std::reverse_iterator<Iterator>(iterator);
}
}
const char *SourceRangeExtractor::findStartOfLineInBuffer(llvm::StringRef buffer, uint startOffset)
@@ -152,7 +153,7 @@ FilePathIndex SourceRangeExtractor::findFileId(clang::FileID fileId, const clang
return found->second;
}
auto filePath = absolutePath(fileEntry->tryGetRealPathName());
auto filePath = absolutePath(fileEntry->getName());
return filePathCache.stringId(fromNativePath(filePath));
}
@@ -175,7 +176,7 @@ void SourceRangeExtractor::addSourceRange(const clang::SourceRange &sourceRange)
endOffset);
insertSourceRange(findFileId(fileId, fileEntry),
fromNativePath(fileEntry->tryGetRealPathName()),
fromNativePath(absolutePath(fileEntry->getName())),
startSourceLocation,
startOffset,
endSourceLocation,