Tweak the @selector completion to collapse multiple informative and
typed-text blocks into one of each.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@112194 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaCodeComplete.cpp b/lib/Sema/SemaCodeComplete.cpp
index 3921526..4c06fac 100644
--- a/lib/Sema/SemaCodeComplete.cpp
+++ b/lib/Sema/SemaCodeComplete.cpp
@@ -4064,16 +4064,19 @@
continue;
}
+ std::string Accumulator;
for (unsigned I = 0, N = Sel.getNumArgs(); I != N; ++I) {
- std::string Piece = Sel.getIdentifierInfoForSlot(I)->getName().str();
- Piece += ':';
- if (I < NumSelIdents)
- Pattern->AddInformativeChunk(Piece);
- else if (I == NumSelIdents)
- Pattern->AddTypedTextChunk(Piece);
- else
- Pattern->AddTextChunk(Piece);
+ if (I == NumSelIdents) {
+ if (!Accumulator.empty()) {
+ Pattern->AddInformativeChunk(Accumulator);
+ Accumulator.clear();
+ }
+ }
+
+ Accumulator += Sel.getIdentifierInfoForSlot(I)->getName().str();
+ Accumulator += ':';
}
+ Pattern->AddTypedTextChunk(Accumulator);
Results.AddResult(Pattern);
}
Results.ExitScope();