[CodeCompletion] Improve completion for properties declared in Objective-C protocols

[arphaman]

Summary

This patch improves code completion for properties that are declared in Objective-C protocols by making sure that properties show up in completions when they are accessed through a qualified id.

[manmanren]

Thanks for working on this!
Manman

lib/Sema/SemaCodeComplete.cpp

3723 ↗

(On Diff #74137)

I feel like the added logic belongs to here :] Both handle property reference.

The clause here handles ObjCObjectPointerType that is based on an ObjCInterfaceType. We need to handle the case where the base type is "id".

What do you think?

3756 ↗

(On Diff #74137)

Can we use "auto" here?

[arphaman]

The updated patch handles protocol properties together with the interface properties.

[arphaman]

lib/Sema/SemaCodeComplete.cpp

3723 ↗

(On Diff #74137)

Yes, that makes sense. I updated the patch to handle properties in both the interface and qualified IDs in this body of code.

[manmanren]

LGTM.

Manman

cfe/trunk/lib/Sema/SemaCodeComplete.cpp

if (getLangOpts().CPlusPlus) {
               break;
             }
         }
 
         if (IsDependent)
           Results.AddResult(Result("template"));
       }
     }
-  } else if (!IsArrow && BaseType->getAsObjCInterfacePointerType()) {
+  } else if (!IsArrow && BaseType->isObjCObjectPointerType()) {
     // Objective-C property reference.
     AddedPropertiesSet AddedProperties;
-    
+    if (const ObjCObjectPointerType *ObjCPtr =
+            BaseType->getAsObjCInterfacePointerType()) {
       // Add property results based on our interface.
-    const ObjCObjectPointerType *ObjCPtr
-      = BaseType->getAsObjCInterfacePointerType();
       assert(ObjCPtr && "Non-NULL pointer guaranteed above!");
       AddObjCProperties(CCContext, ObjCPtr->getInterfaceDecl(), true,
-                      /*AllowNullaryMethods=*/true, CurContext, 
+                        /*AllowNullaryMethods=*/true, CurContext,
                         AddedProperties, Results);
-    
+    }
     // Add properties from the protocols in a qualified interface.
-    for (auto *I : ObjCPtr->quals())
+    for (auto *I : BaseType->getAs<ObjCObjectPointerType>()->quals())
       AddObjCProperties(CCContext, I, true, /*AllowNullaryMethods=*/true,
                         CurContext, AddedProperties, Results);
   } else if ((IsArrow && BaseType->isObjCObjectPointerType()) ||
              (!IsArrow && BaseType->isObjCObjectType())) {
     // Objective-C instance variable access.
     ObjCInterfaceDecl *Class = nullptr;
     if (const ObjCObjectPointerType *ObjCPtr
                                     = BaseType->getAs<ObjCObjectPointerType>())

cfe/trunk/test/CodeCompletion/objc-protocol-member-access.m

+// Note: the run lines follow their respective tests, since line/column
+// matter in this test.
+
+@protocol Bar
+@property (readonly) int bar;
+@end
+
+@protocol Foo <Bar>
+
+@property (nonatomic, readonly) int foo;
+- (void)foobar: (int)x;
+
+@end
+
+int getFoo(id object) {
+  id<Foo> modelObject = (id<Foo>)object;
+  int foo = modelObject.;
+  return foo;
+}
+
+// RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:17:25 %s -o - | FileCheck %s
+// CHECK: bar : [#int#]bar
+// CHECK: foo : [#int#]foo
+// CHECK-NOT: foobar