diff options
| author | Douglas Gregor <dgregor@apple.com> | 2012-07-31 15:27:48 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2012-07-31 15:27:48 +0000 |
| commit | 2d8db8fe7a46e0e91dd92f2370ea11ef4e6c35c9 (patch) | |
| tree | 98adb70eb935b17678c577df5de37ad83590a781 /clang | |
| parent | d627ec8a0594159d790e267e4757ace1f16d19a8 (diff) | |
| download | bcm5719-llvm-2d8db8fe7a46e0e91dd92f2370ea11ef4e6c35c9.tar.gz bcm5719-llvm-2d8db8fe7a46e0e91dd92f2370ea11ef4e6c35c9.zip | |
Tweak code-completion heuristics deciding between a lambda
code-completion and an Objective-C message send, based on Jordan's
feedback.
llvm-svn: 161049
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Parse/ParseExprCXX.cpp | 4 | ||||
| -rw-r--r-- | clang/test/Index/complete-lambdas.mm | 11 |
2 files changed, 14 insertions, 1 deletions
diff --git a/clang/lib/Parse/ParseExprCXX.cpp b/clang/lib/Parse/ParseExprCXX.cpp index b1ce59f28c7..592a3cc160b 100644 --- a/clang/lib/Parse/ParseExprCXX.cpp +++ b/clang/lib/Parse/ParseExprCXX.cpp @@ -646,7 +646,9 @@ llvm::Optional<unsigned> Parser::ParseLambdaIntroducer(LambdaIntroducer &Intro){ // in Objective-C, where this is Almost Surely meant to be a message // send. In that case, fail here and let the ObjC message // expression parser perform the completion. - if (Tok.is(tok::code_completion) && !getLangOpts().ObjC1) { + if (Tok.is(tok::code_completion) && + !(getLangOpts().ObjC1 && Intro.Default == LCD_None && + !Intro.Captures.empty())) { Actions.CodeCompleteLambdaIntroducer(getCurScope(), Intro, /*AfterAmpersand=*/false); ConsumeCodeCompletionToken(); diff --git a/clang/test/Index/complete-lambdas.mm b/clang/test/Index/complete-lambdas.mm index 5f33906471d..3f77dd20692 100644 --- a/clang/test/Index/complete-lambdas.mm +++ b/clang/test/Index/complete-lambdas.mm @@ -16,6 +16,8 @@ [a instanceMethod:0 withOther:1]; [self someMethod:a]; [super instanceMethod]; + [&,a ]{}; + [a,self instanceMethod:0 withOther:1]{}; } @end @@ -38,3 +40,12 @@ // CHECK-CC4: NotImplemented:{ResultType A *}{TypedText super} (40) // RUN: c-index-test -code-completion-at=%s:18:10 -x objective-c++ -std=c++11 %s | FileCheck -check-prefix=CHECK-CC1 %s + +// RUN: c-index-test -code-completion-at=%s:19:8 -x objective-c++ -std=c++11 %s | FileCheck -check-prefix=CHECK-CC5 %s +// CHECK-CC5: NotImplemented:{ResultType SEL}{TypedText _cmd} (80) +// CHECK-CC5-NEXT: NotImplemented:{ResultType B *}{TypedText self} (34) + +// RUN: c-index-test -code-completion-at=%s:20:11 -x objective-c++ -std=c++11 %s | FileCheck -check-prefix=CHECK-CC6 %s +// CHECK-CC6: ObjCInstanceMethodDecl:{ResultType id}{TypedText instanceMethod:}{Placeholder (int)}{HorizontalSpace }{TypedText withOther:}{Placeholder (int)} (37) (parent: ObjCInterfaceDecl 'A') +// CHECK-CC6-NEXT: ObjCInstanceMethodDecl:{ResultType id}{TypedText someMethod:}{Placeholder (A *)} (32) (parent: ObjCImplementationDecl 'B') + |
