summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Lorenz <arphaman@gmail.com>2016-12-08 16:49:05 +0000
committerAlex Lorenz <arphaman@gmail.com>2016-12-08 16:49:05 +0000
commit71ecb07ed1082797267b0dd9db0552d3d9d179a1 (patch)
treef29339b33be7d6174457b9191f7e16f4b472cbe1
parent191390a85188d0780f42a42a236ce646062fbdf0 (diff)
downloadbcm5719-llvm-71ecb07ed1082797267b0dd9db0552d3d9d179a1.tar.gz
bcm5719-llvm-71ecb07ed1082797267b0dd9db0552d3d9d179a1.zip
[CodeCompletion][ObjC] Use a parameterized NSSet return type for
keyPathsForValuesAffecting* KVO completion results rdar://23791701 llvm-svn: 289068
-rw-r--r--clang/lib/Sema/SemaCodeComplete.cpp2
-rw-r--r--clang/test/Index/complete-kvc.m2
2 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaCodeComplete.cpp b/clang/lib/Sema/SemaCodeComplete.cpp
index 4bcf40515ac..d76bde57467 100644
--- a/clang/lib/Sema/SemaCodeComplete.cpp
+++ b/clang/lib/Sema/SemaCodeComplete.cpp
@@ -7199,7 +7199,7 @@ static void AddObjCKeyValueCompletions(ObjCPropertyDecl *Property,
.second) {
if (ReturnType.isNull()) {
Builder.AddChunk(CodeCompletionString::CK_LeftParen);
- Builder.AddTextChunk("NSSet *");
+ Builder.AddTextChunk("NSSet<NSString *> *");
Builder.AddChunk(CodeCompletionString::CK_RightParen);
}
diff --git a/clang/test/Index/complete-kvc.m b/clang/test/Index/complete-kvc.m
index 336d41d759a..6adea0c5751 100644
--- a/clang/test/Index/complete-kvc.m
+++ b/clang/test/Index/complete-kvc.m
@@ -97,7 +97,7 @@ typedef signed char BOOL;
// RUN: c-index-test -code-completion-at=%s:41:3 %s | FileCheck -check-prefix=CHECK-CC2 %s
// CHECK-CC2: ObjCClassMethodDecl:{LeftParen (}{Text BOOL}{RightParen )}{TypedText automaticallyNotifiesObserversOfArrayProperty} (40)
// CHECK-CC2: ObjCClassMethodDecl:{LeftParen (}{Text BOOL}{RightParen )}{TypedText automaticallyNotifiesObserversOfMutableArrayProperty} (40)
-// CHECK-CC2: ObjCClassMethodDecl:{LeftParen (}{Text NSSet *}{RightParen )}{TypedText keyPathsForValuesAffectingMutableArrayProperty} (40)
+// CHECK-CC2: ObjCClassMethodDecl:{LeftParen (}{Text NSSet<NSString *> *}{RightParen )}{TypedText keyPathsForValuesAffectingMutableArrayProperty} (40)
// RUN: c-index-test -code-completion-at=%s:52:8 %s | FileCheck -check-prefix=CHECK-CC3 %s
// CHECK-CC3: ObjCInstanceMethodDecl:{TypedText countOfIntProperty} (55)
OpenPOWER on IntegriCloud