diff options
author | Douglas Gregor <dgregor@apple.com> | 2010-08-31 05:13:43 +0000 |
---|---|---|
committer | Douglas Gregor <dgregor@apple.com> | 2010-08-31 05:13:43 +0000 |
commit | e17794ffbb8d509d705207ce7140e290665ca33d (patch) | |
tree | b7890203dae223bbd8400d7102bf7e5b29758fc2 /test | |
parent | 35fe7eeb1284ed786ed647b34fa01fc18646b3c7 (diff) |
When provide code completions for a variadic Objective-C method
declaration send or a variadic function call, collapse the ", ..."
into the parameter before it, so that we don't get a second
placeholder.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@112579 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test')
-rw-r--r-- | test/CodeCompletion/functions.cpp | 2 | ||||
-rw-r--r-- | test/Index/complete-exprs.c | 2 | ||||
-rw-r--r-- | test/Index/complete-objc-message.m | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/test/CodeCompletion/functions.cpp b/test/CodeCompletion/functions.cpp index 6838de36e8..fcab3dcbe1 100644 --- a/test/CodeCompletion/functions.cpp +++ b/test/CodeCompletion/functions.cpp @@ -5,4 +5,4 @@ void test() { :: // RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:5:5 %s -o - | FileCheck -check-prefix=CC1 %s // CHECK-CC1: f(<#int i#>{#, <#int j#>{#, <#int k#>#}#}) - // CHECK-CC1: f(<#float x#>, <#float y#><#, ...#>) + // CHECK-CC1: f(<#float x#>, <#float y, ...#>) diff --git a/test/Index/complete-exprs.c b/test/Index/complete-exprs.c index 35fe40405e..2a7a1e2121 100644 --- a/test/Index/complete-exprs.c +++ b/test/Index/complete-exprs.c @@ -48,6 +48,6 @@ void f4(const char* str) { // CHECK-CC4: VarDecl:{ResultType struct X}{TypedText f1} (50) (deprecated) // RUN: c-index-test -code-completion-at=%s:19:3 -Xclang -code-completion-patterns %s | FileCheck -check-prefix=CHECK-CC6 %s -// CHECK-CC6: FunctionDecl:{ResultType void}{TypedText f3}{LeftParen (}{Placeholder char const *}{Placeholder , ...}{Text , NULL}{RightParen )} (45) +// CHECK-CC6: FunctionDecl:{ResultType void}{TypedText f3}{LeftParen (}{Placeholder char const *, ...}{Text , NULL}{RightParen )} (45) // CHECK-CC6: NotImplemented:{TypedText void} (65) // CHECK-CC6: NotImplemented:{TypedText volatile} (65) diff --git a/test/Index/complete-objc-message.m b/test/Index/complete-objc-message.m index 58445f37bb..f9d671037b 100644 --- a/test/Index/complete-objc-message.m +++ b/test/Index/complete-objc-message.m @@ -182,8 +182,8 @@ void test_ranking(B *b) { // CHECK-CCA: {ResultType Class}{TypedText self} // CHECK-CCA: {TypedText super} // RUN: c-index-test -code-completion-at=%s:103:6 %s | FileCheck -check-prefix=CHECK-CCB %s -// CHECK-CCB: ObjCInstanceMethodDecl:{ResultType int}{TypedText Method:}{Placeholder (int)}{Placeholder , ...} -// CHECK-CCB: ObjCInstanceMethodDecl:{ResultType int}{TypedText SentinelMethod:}{Placeholder (int)}{Placeholder , ...}{Text , nil} +// CHECK-CCB: ObjCInstanceMethodDecl:{ResultType int}{TypedText Method:}{Placeholder (int), ...} +// CHECK-CCB: ObjCInstanceMethodDecl:{ResultType int}{TypedText SentinelMethod:}{Placeholder (int), ...}{Text , nil} // RUN: c-index-test -code-completion-at=%s:116:14 %s | FileCheck -check-prefix=CHECK-CCC %s // CHECK-CCC: ObjCClassMethodDecl:{ResultType int}{TypedText Method} // CHECK-CCC: ObjCClassMethodDecl:{ResultType int}{TypedText Method:}{Placeholder (int)} |