diff options
| author | Douglas Gregor <dgregor@apple.com> | 2013-01-30 06:58:39 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2013-01-30 06:58:39 +0000 |
| commit | 5824b803bb964247d2633ae893af409f915c80b1 (patch) | |
| tree | 6d512aed2b03d2ce02f37e6436866841f3f194fa | |
| parent | 48cb74adac0acb5681ba12e9202adc1d9cb2d523 (diff) | |
The instance methods of the root class of an Objective-C hieararchy
can be messaged via the metaclass. Provide code completions for this
case. Fixes <rdar://problem/12560296>.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@173903 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Sema/SemaCodeComplete.cpp | 8 | ||||
| -rw-r--r-- | test/Index/complete-objc-message.m | 1 | ||||
| -rw-r--r-- | test/Index/complete-super.m | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/lib/Sema/SemaCodeComplete.cpp b/lib/Sema/SemaCodeComplete.cpp index ce580ceea3..48d1b61cd3 100644 --- a/lib/Sema/SemaCodeComplete.cpp +++ b/lib/Sema/SemaCodeComplete.cpp @@ -4769,10 +4769,15 @@ static void AddObjCMethods(ObjCContainerDecl *Container, bool InOriginalClass = true) { typedef CodeCompletionResult Result; Container = getContainerDef(Container); + ObjCInterfaceDecl *IFace = dyn_cast<ObjCInterfaceDecl>(Container); + bool isRootClass = IFace && !IFace->getSuperClass(); for (ObjCContainerDecl::method_iterator M = Container->meth_begin(), MEnd = Container->meth_end(); M != MEnd; ++M) { - if (M->isInstanceMethod() == WantInstanceMethods) { + // The instance methods on the root class can be messaged via the + // metaclass. + if (M->isInstanceMethod() == WantInstanceMethods || + (isRootClass && !WantInstanceMethods)) { // Check whether the selector identifiers we've been given are a // subset of the identifiers for this particular method. if (!isAcceptableObjCMethod(*M, WantKind, SelIdents, NumSelIdents, @@ -4805,7 +4810,6 @@ static void AddObjCMethods(ObjCContainerDecl *Container, } } - ObjCInterfaceDecl *IFace = dyn_cast<ObjCInterfaceDecl>(Container); if (!IFace || !IFace->hasDefinition()) return; diff --git a/test/Index/complete-objc-message.m b/test/Index/complete-objc-message.m index aa10ea2445..776a0490ef 100644 --- a/test/Index/complete-objc-message.m +++ b/test/Index/complete-objc-message.m @@ -193,6 +193,7 @@ void test_DO(DO *d, A* a) { // CHECK-CC1: {TypedText categoryClassMethod} (35) // CHECK-CC1: {TypedText classMethod1:}{Placeholder (id)}{HorizontalSpace }{TypedText withKeyword:}{Placeholder (int)} (35) // CHECK-CC1: {TypedText classMethod2} (35) +// CHECK-CC1: {TypedText instanceMethod1} (35) // CHECK-CC1: {TypedText new} (35) // CHECK-CC1: {TypedText protocolClassMethod} (37) // CHECK-CC1: Completion contexts: diff --git a/test/Index/complete-super.m b/test/Index/complete-super.m index 6c2daa8082..be7edfdef8 100644 --- a/test/Index/complete-super.m +++ b/test/Index/complete-super.m @@ -53,8 +53,7 @@ typedef int Bool; // CHECK-ADD-ADD: ObjCInstanceMethodDecl:{ResultType void}{TypedText last} (35) // RUN: c-index-test -code-completion-at=%s:24:10 %s | FileCheck -check-prefix=CHECK-SELECTOR-SELECTOR %s -// CHECK-SELECTOR-SELECTOR-NOT: x -// CHECK-SELECTOR-SELECTOR: ObjCClassMethodDecl:{ResultType void}{TypedText last} (35) +// CHECK-SELECTOR-SELECTOR: ObjCInstanceMethodDecl:{ResultType void}{TypedText last} (35) // CHECK-SELECTOR-SELECTOR: ObjCClassMethodDecl:{ResultType void}{TypedText select:}{Placeholder condition}{HorizontalSpace }{Text first:}{Placeholder a}{HorizontalSpace }{Text second:}{Placeholder b} (20) // Check "super" completion at the second identifier |