6e0f393e12
Now when completing blocks properties that return void the block call completion result shows up before the setter, otherwise the setter completion shows up before the block call completion. We normally want to use the result of the block call, so one typically wouldn't call a block that returns a non-void type in a standalone statement. rdar://28846153 Differential Revision: https://reviews.llvm.org/D26034 llvm-svn: 291232
73 lines
3.4 KiB
Objective-C
73 lines
3.4 KiB
Objective-C
// Note: the run lines follow their respective tests, since line/column
|
|
// matter in this test.
|
|
|
|
// rdar://28481726
|
|
|
|
void func(int x);
|
|
typedef int Foo;
|
|
typedef void (^FooBlock)(Foo *someParameter);
|
|
|
|
@interface Obj
|
|
@property (readwrite, nonatomic, copy) void (^onAction)(Obj *object);
|
|
@property (readwrite, nonatomic) int foo;
|
|
@end
|
|
|
|
@interface Test : Obj
|
|
@property (readwrite, nonatomic, copy) FooBlock onEventHandler;
|
|
@property (readonly, nonatomic, copy) void (^onReadonly)(int *someParameter);
|
|
@property (readwrite, nonatomic, copy) int (^processEvent)(int eventCode);
|
|
@property (readonly, nonatomic, strong) Obj *obj;
|
|
@end
|
|
|
|
@implementation Test
|
|
|
|
#define SELFY self
|
|
|
|
- (void)test {
|
|
self.foo = 2;
|
|
[self takeInt: 2]; self.foo = 2;
|
|
/* Comment */ self.foo = 2;
|
|
SELFY.foo = 2
|
|
}
|
|
|
|
// RUN: c-index-test -code-completion-at=%s:27:8 %s | FileCheck -check-prefix=CHECK-CC1 %s
|
|
// RUN: c-index-test -code-completion-at=%s:28:27 %s | FileCheck -check-prefix=CHECK-CC1 %s
|
|
// RUN: c-index-test -code-completion-at=%s:29:22 %s | FileCheck -check-prefix=CHECK-CC1 %s
|
|
// RUN: c-index-test -code-completion-at=%s:30:9 %s | FileCheck -check-prefix=CHECK-CC1 %s
|
|
// CHECK-CC1: ObjCPropertyDecl:{ResultType int}{TypedText foo} (35)
|
|
// CHECK-CC1-NEXT: ObjCPropertyDecl:{ResultType Obj *}{TypedText obj} (35)
|
|
// CHECK-CC1-NEXT: ObjCPropertyDecl:{ResultType void}{TypedText onAction}{LeftParen (}{Placeholder Obj *object}{RightParen )} (35)
|
|
// CHECK-CC1-NEXT: ObjCPropertyDecl:{ResultType void (^)(Obj *)}{TypedText onAction}{Equal = }{Placeholder ^(Obj *object)} (38)
|
|
// CHECK-CC1-NEXT: ObjCPropertyDecl:{ResultType void}{TypedText onEventHandler}{LeftParen (}{Placeholder Foo *someParameter}{RightParen )} (35)
|
|
// CHECK-CC1-NEXT: ObjCPropertyDecl:{ResultType FooBlock}{TypedText onEventHandler}{Equal = }{Placeholder ^(Foo *someParameter)} (38)
|
|
// CHECK-CC1-NEXT: ObjCPropertyDecl:{ResultType void}{TypedText onReadonly}{LeftParen (}{Placeholder int *someParameter}{RightParen )} (35)
|
|
// CHECK-CC1-NEXT: ObjCPropertyDecl:{ResultType int}{TypedText processEvent}{LeftParen (}{Placeholder int eventCode}{RightParen )} (35)
|
|
// CHECK-CC1-NEXT: ObjCPropertyDecl:{ResultType int (^)(int)}{TypedText processEvent}{Equal = }{Placeholder ^int(int eventCode)} (32)
|
|
|
|
- (void) takeInt:(int)x { }
|
|
|
|
- (int) testFailures {
|
|
(self.foo);
|
|
int x = self.foo;
|
|
[self takeInt: self.foo];
|
|
if (self.foo) {
|
|
func(self.foo);
|
|
}
|
|
return self.foo;
|
|
}
|
|
|
|
// RUN: c-index-test -code-completion-at=%s:50:9 %s | FileCheck -check-prefix=CHECK-NO %s
|
|
// RUN: c-index-test -code-completion-at=%s:51:16 %s | FileCheck -check-prefix=CHECK-NO %s
|
|
// RUN: c-index-test -code-completion-at=%s:52:23 %s | FileCheck -check-prefix=CHECK-NO %s
|
|
// RUN: c-index-test -code-completion-at=%s:53:12 %s | FileCheck -check-prefix=CHECK-NO %s
|
|
// RUN: c-index-test -code-completion-at=%s:54:15 %s | FileCheck -check-prefix=CHECK-NO %s
|
|
// RUN: c-index-test -code-completion-at=%s:56:15 %s | FileCheck -check-prefix=CHECK-NO %s
|
|
// CHECK-NO: ObjCPropertyDecl:{ResultType int}{TypedText foo} (35)
|
|
// CHECK-NO-NEXT: ObjCPropertyDecl:{ResultType Obj *}{TypedText obj} (35)
|
|
// CHECK-NO-NEXT: ObjCPropertyDecl:{ResultType void (^)(Obj *)}{TypedText onAction} (35)
|
|
// CHECK-NO-NEXT: ObjCPropertyDecl:{ResultType FooBlock}{TypedText onEventHandler} (35)
|
|
// CHECK-NO-NEXT: ObjCPropertyDecl:{ResultType void (^)(int *)}{TypedText onReadonly} (35)
|
|
// CHECK-NO-NEXT: ObjCPropertyDecl:{ResultType int (^)(int)}{TypedText processEvent} (35)
|
|
|
|
@end
|