1 files changed, 28 insertions, 16 deletions

diff --git a/lib/Sema/CodeCompleteConsumer.cpp b/lib/Sema/CodeCompleteConsumer.cpp
index 1e505090fb..f490a2b523 100644
--- a/lib/Sema/CodeCompleteConsumer.cpp
+++ b/lib/Sema/CodeCompleteConsumer.cpp
@@ -26,14 +26,19 @@ using namespace clang;
 //===----------------------------------------------------------------------===//
 // Code completion string implementation
 //===----------------------------------------------------------------------===//
-CodeCompletionString::Chunk
-CodeCompletionString::Chunk::CreateText(const char *Text) {
-  Chunk Result;
-  Result.Kind = CK_Text;
+CodeCompletionString::Chunk::Chunk(ChunkKind Kind, const char *Text) 
+  : Kind(Kind), Text(0)
+{
+  assert((Kind == CK_Text || Kind == CK_Placeholder || Kind == CK_Informative)
+         && "Invalid text chunk kind");
   char *New = new char [std::strlen(Text) + 1];
   std::strcpy(New, Text);
-  Result.Text = New;
-  return Result;  
+  this->Text = New;
+}
+
+CodeCompletionString::Chunk
+CodeCompletionString::Chunk::CreateText(const char *Text) {
+  return Chunk(CK_Text, Text);
 }
 
 CodeCompletionString::Chunk 
@@ -47,20 +52,26 @@ CodeCompletionString::Chunk::CreateOptional(
 
 CodeCompletionString::Chunk 
 CodeCompletionString::Chunk::CreatePlaceholder(const char *Placeholder) {
-  Chunk Result;
-  Result.Kind = CK_Placeholder;
-  char *New = new char [std::strlen(Placeholder) + 1];
-  std::strcpy(New, Placeholder);
-  Result.Placeholder = New;
-  return Result;
+  return Chunk(CK_Placeholder, Placeholder);
+}
+
+CodeCompletionString::Chunk 
+CodeCompletionString::Chunk::CreateInformative(const char *Informative) {
+  return Chunk(CK_Informative, Informative);
 }
 
 void
 CodeCompletionString::Chunk::Destroy() {
   switch (Kind) {
-  case CK_Text: delete [] Text; break;
-  case CK_Optional: delete Optional; break;
-  case CK_Placeholder: delete [] Placeholder; break;
+  case CK_Optional: 
+    delete Optional; 
+    break;
+      
+  case CK_Text: 
+  case CK_Placeholder:
+  case CK_Informative:
+    delete [] Text; 
+    break;
   }
 }
 
@@ -77,7 +88,8 @@ std::string CodeCompletionString::getAsString() const {
     switch (C->Kind) {
     case CK_Text: OS << C->Text; break;
     case CK_Optional: OS << "{#" << C->Optional->getAsString() << "#}"; break;
-    case CK_Placeholder: OS << "<#" << C->Placeholder << "#>"; break;
+    case CK_Placeholder: OS << "<#" << C->Text << "#>"; break;
+    case CK_Informative: OS << "[#" << C->Text << "#]"; break;
     }
   }