diff options
author | Douglas Gregor <dgregor@apple.com> | 2009-11-18 00:06:18 +0000 |
---|---|---|
committer | Douglas Gregor <dgregor@apple.com> | 2009-11-18 00:06:18 +0000 |
commit | a3329fa05e2b32e40e956301748c0aaa89cad0c6 (patch) | |
tree | f1c4f28216939048d00630a166f6bdfcabf3a4f4 /clang/lib/Sema/SemaCodeComplete.cpp | |
parent | 4797e58d6b41aa7f04b01c98a83f81bd2014eeb6 (diff) | |
download | bcm5719-llvm-a3329fa05e2b32e40e956301748c0aaa89cad0c6.tar.gz bcm5719-llvm-a3329fa05e2b32e40e956301748c0aaa89cad0c6.zip |
Finish code completion for Objective-C message sends
llvm-svn: 89168
Diffstat (limited to 'clang/lib/Sema/SemaCodeComplete.cpp')
-rw-r--r-- | clang/lib/Sema/SemaCodeComplete.cpp | 46 |
1 files changed, 32 insertions, 14 deletions
diff --git a/clang/lib/Sema/SemaCodeComplete.cpp b/clang/lib/Sema/SemaCodeComplete.cpp index 563ba6b7641..e9b00e0361e 100644 --- a/clang/lib/Sema/SemaCodeComplete.cpp +++ b/clang/lib/Sema/SemaCodeComplete.cpp @@ -1704,24 +1704,42 @@ void Sema::CodeCompleteObjCInstanceMessage(Scope *S, ExprTy *Receiver) { return; } - const ObjCObjectPointerType* OCOPT - = ReceiverType->getAs<ObjCObjectPointerType>(); - if (!OCOPT) - return; - - // FIXME: handle 'id', 'Class', and qualified types. - // Build the set of methods we can see. ResultBuilder Results(*this); Results.EnterNewScope(); - - ObjCInterfaceDecl *CDecl = OCOPT->getInterfaceDecl(); - if (!CDecl) - return; - AddObjCMethods(CDecl, true, CurContext, Results); - Results.ExitScope(); + // Handle messages to Class. This really isn't a message to an instance + // method, so we treat it the same way we would treat a message send to a + // class method. + if (ReceiverType->isObjCClassType() || + ReceiverType->isObjCQualifiedClassType()) { + if (ObjCMethodDecl *CurMethod = getCurMethodDecl()) { + if (ObjCInterfaceDecl *ClassDecl = CurMethod->getClassInterface()) + AddObjCMethods(ClassDecl, false, CurContext, Results); + } + } + // Handle messages to a qualified ID ("id<foo>"). + else if (const ObjCObjectPointerType *QualID + = ReceiverType->getAsObjCQualifiedIdType()) { + // Search protocols for instance methods. + for (ObjCObjectPointerType::qual_iterator I = QualID->qual_begin(), + E = QualID->qual_end(); + I != E; ++I) + AddObjCMethods(*I, true, CurContext, Results); + } + // Handle messages to a pointer to interface type. + else if (const ObjCObjectPointerType *IFacePtr + = ReceiverType->getAsObjCInterfacePointerType()) { + // Search the class, its superclasses, etc., for instance methods. + AddObjCMethods(IFacePtr->getInterfaceDecl(), true, CurContext, Results); + + // Search protocols for instance methods. + for (ObjCObjectPointerType::qual_iterator I = IFacePtr->qual_begin(), + E = IFacePtr->qual_end(); + I != E; ++I) + AddObjCMethods(*I, true, CurContext, Results); + } - // This also suppresses remaining diagnostics. + Results.ExitScope(); HandleCodeCompleteResults(this, CodeCompleter, Results.data(),Results.size()); } |