When providing a block literal as a code completion for a

function/method argument, include the parameter name and always
include parentheses (even for zero-parameter blocks). Otherwise, the
block literal placeholder '^' can look very weird.

llvm-svn: 115444

1 files changed, 5 insertions, 0 deletions

diff --git a/clang/lib/Sema/SemaCodeComplete.cpp b/clang/lib/Sema/SemaCodeComplete.cpp
index 64a96dbff7a..ae82ceb334a 100644
--- a/clang/lib/Sema/SemaCodeComplete.cpp
+++ b/clang/lib/Sema/SemaCodeComplete.cpp
@@ -1910,6 +1910,8 @@ static std::string FormatFunctionParameter(ASTContext &Context,
   if (Block->getNumArgs() == 0) {
     if (Block->getTypePtr()->isVariadic())
       Result += "(...)";
+    else
+      Result += "(void)";
   } else {
     Result += "(";
     for (unsigned I = 0, N = Block->getNumArgs(); I != N; ++I) {
@@ -1923,6 +1925,9 @@ static std::string FormatFunctionParameter(ASTContext &Context,
     Result += ")";
   }
   
+  if (Param->getIdentifier())
+    Result += Param->getIdentifier()->getName();
+
   return Result;
 }