mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-29 03:56:06 +00:00
Code Issues Projects Releases Wiki Activity

If fixits appear to overlap, move the second one over in the output.

Browse Source 
This occurs when you have two insertions and the first one is so long that the
second fixit's column is before the first fixit ends. The edits themselves
don't actually overlap, but our command-line preview does.

llvm-svn: 158229
This commit is contained in:
Jordan Rose 2012-06-08 21:14:19 +00:00
parent 12f247f43f
commit b5a94f45d2
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
clang/lib/Frontend/TextDiagnostic.cpp
View File

@ -1090,6 +1090,7 @@ std::string TextDiagnostic::buildFixItInsertionLine(
std::string FixItInsertionLine;
if (Hints.empty() || !DiagOpts.ShowFixits)
return FixItInsertionLine;
unsigned PrevHintEnd = 0;
for (ArrayRef<FixItHint>::iterator I = Hints.begin(), E = Hints.end();
I != E; ++I) {
@ -1107,6 +1108,16 @@ std::string TextDiagnostic::buildFixItInsertionLine(
assert(HintColNo<static_cast<unsigned>(map.bytes())+1);
HintColNo = map.byteToColumn(HintColNo);
// If we inserted a long previous hint, push this one forwards, and add
// an extra space to show that this is not part of the previous
// completion. This is sort of the best we can do when two hints appear
// to overlap.
//
// Note that if this hint is located immediately after the previous
// hint, no space will be added, since the location is more important.
if (HintColNo < PrevHintEnd)
HintColNo = PrevHintEnd + 1;
// FIXME: if the fixit includes tabs or other characters that do not
// take up a single column per byte when displayed then
// I->CodeToInsert.size() is not a column number and we're mixing
@ -1115,19 +1126,16 @@ std::string TextDiagnostic::buildFixItInsertionLine(
unsigned LastColumnModified
= HintColNo + I->CodeToInsert.size();
if (LastColumnModified > static_cast<unsigned>(map.bytes())) {
unsigned LastExistingColumn = map.byteToColumn(map.bytes());
unsigned AddedColumns = LastColumnModified-LastExistingColumn;
LastColumnModified = LastExistingColumn + AddedColumns;
} else {
if (LastColumnModified <= static_cast<unsigned>(map.bytes()))
LastColumnModified = map.byteToColumn(LastColumnModified);
}
if (LastColumnModified > FixItInsertionLine.size())
FixItInsertionLine.resize(LastColumnModified, ' ');
assert(HintColNo+I->CodeToInsert.size() <= FixItInsertionLine.size());
std::copy(I->CodeToInsert.begin(), I->CodeToInsert.end(),
FixItInsertionLine.begin() + HintColNo);
PrevHintEnd = LastColumnModified;
} else {
FixItInsertionLine.clear();
break;