diff options
| author | Douglas Gregor <dgregor@apple.com> | 2013-01-30 07:11:43 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2013-01-30 07:11:43 +0000 |
| commit | ed1f59701e98a8a16a672e4975fba6af5eb07cbc (patch) | |
| tree | 60a6784cb1db12191895ab08c65e0ab977f0f992 /clang | |
| parent | a6f00fe0837778c45dfacb859386ee7e797d4f78 (diff) | |
| download | bcm5719-llvm-ed1f59701e98a8a16a672e4975fba6af5eb07cbc.tar.gz bcm5719-llvm-ed1f59701e98a8a16a672e4975fba6af5eb07cbc.zip | |
Add "instancetype" as a code completion result for the return type of
an Objective-C method. Fixes <rdar://problem/13069990>.
llvm-svn: 173905
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Sema/SemaCodeComplete.cpp | 5 | ||||
| -rw-r--r-- | clang/test/Index/complete-declarators.m | 11 |
2 files changed, 16 insertions, 0 deletions
diff --git a/clang/lib/Sema/SemaCodeComplete.cpp b/clang/lib/Sema/SemaCodeComplete.cpp index 48d1b61cd3a..0bd73f3c237 100644 --- a/clang/lib/Sema/SemaCodeComplete.cpp +++ b/clang/lib/Sema/SemaCodeComplete.cpp @@ -4966,6 +4966,11 @@ void Sema::CodeCompleteObjCPassingType(Scope *S, ObjCDeclSpec &DS, Builder.AddTextChunk("sender"); Results.AddResult(CodeCompletionResult(Builder.TakeString())); } + + // If we're completing the return type, provide 'instancetype'. + if (!IsParameter) { + Results.AddResult(CodeCompletionResult("instancetype")); + } // Add various builtin type names and specifiers. AddOrdinaryNameResults(PCC_Type, S, *this, Results); diff --git a/clang/test/Index/complete-declarators.m b/clang/test/Index/complete-declarators.m index 071df601b97..d42a3c7a6c4 100644 --- a/clang/test/Index/complete-declarators.m +++ b/clang/test/Index/complete-declarators.m @@ -24,6 +24,17 @@ } @end +// RUN: c-index-test -code-completion-at=%s:7:4 %s | FileCheck -check-prefix=CHECK-CC0 %s +// CHECK-CC0: NotImplemented:{TypedText IBAction}{RightParen )}{Placeholder selector}{Colon :}{LeftParen (}{Text id}{RightParen )}{Text sender} (40) +// CHECK-CC0: macro definition:{TypedText IBAction} (70) +// CHECK-CC0: macro definition:{TypedText IBOutlet} (70) +// CHECK-CC0: macro definition:{TypedText IBOutletCollection}{LeftParen (}{Placeholder ClassName}{RightParen )} (70) +// CHECK-CC0: TypedefDecl:{TypedText id} (50) +// CHECK-CC0: NotImplemented:{TypedText in} (40) +// CHECK-CC0: NotImplemented:{TypedText inout} (40) +// CHECK-CC0: NotImplemented:{TypedText instancetype} (40) +// CHECK-CC0: NotImplemented:{TypedText int} (50) +// CHECK-CC0: NotImplemented:{TypedText long} (50) // RUN: c-index-test -code-completion-at=%s:7:19 %s | FileCheck -check-prefix=CHECK-CC1 %s // CHECK-CC1-NOT: NotImplemented:{TypedText extern} (40) // CHECK-CC1: NotImplemented:{TypedText param1} (40) |
