averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[gardening] convert ByteBasedSourceRange to CharSourceRange rather than SourceRange

Browse Source 
The only client of the 'toSourceRange' method immediately constructs a
CharSourceRange from it, and ByteBasedSourceRange's EndLoc isn't the start of
the last token in the range (as SourceRange expects).
This commit is contained in:
Nathan Hawes
2018-10-11 14:36:09 -07:00
parent efa2c5475d
commit 9003d83ffe
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/swift-syntax-test/swift-syntax-test.cpp
View File

@@ -246,10 +246,10 @@ struct ByteBasedSourceRange {
bool empty() { return Start == End; }
SourceRange toSourceRange(SourceManager &SourceMgr, unsigned BufferID) {
CharSourceRange toCharSourceRange(SourceManager &SourceMgr, unsigned BufferID) {
auto StartLoc = SourceMgr.getLocForOffset(BufferID, Start);
auto EndLoc = SourceMgr.getLocForOffset(BufferID, End);
return SourceRange(StartLoc, EndLoc);
return CharSourceRange(SourceMgr, StartLoc, EndLoc);
}
};
@@ -538,12 +538,11 @@ bool verifyReusedRegions(ByteBasedSourceRangeSet ExpectedReparseRegions,
bool NoUnexpectedParse = true;
for (auto ReparseRegion : UnexpectedReparseRegions.Ranges) {
auto ReparseRange = ReparseRegion.toSourceRange(SourceMgr, BufferID);
auto ReparseRange = ReparseRegion.toCharSourceRange(SourceMgr, BufferID);
// To improve the ergonomics when writing tests we do not want to complain
// about reparsed whitespaces.
auto RangeStr =
CharSourceRange(SourceMgr, ReparseRange.Start, ReparseRange.End).str();
auto RangeStr = ReparseRange.str();
llvm::Regex WhitespaceOnlyRegex("^[ \t\r\n]*$");
if (WhitespaceOnlyRegex.match(RangeStr)) {
continue;