diff options
| -rw-r--r-- | clang/include/clang/Parse/Action.h | 8 | ||||
| -rw-r--r-- | clang/lib/Parse/ParseObjc.cpp | 19 | ||||
| -rw-r--r-- | clang/lib/Sema/Sema.h | 2 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaCodeComplete.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Index/complete-properties.m | 16 |
5 files changed, 32 insertions, 15 deletions
diff --git a/clang/include/clang/Parse/Action.h b/clang/include/clang/Parse/Action.h index 3165b0eb2f4..0c1335cb70b 100644 --- a/clang/include/clang/Parse/Action.h +++ b/clang/include/clang/Parse/Action.h @@ -2408,12 +2408,12 @@ public: IdentifierInfo *ClassName) { } - /// \brief Code completion for the property names when synthesizing an + /// \brief Code completion for the property names when defining an /// Objective-C property. /// - /// This code completion action is invoked after the @synthesized and after - /// each "," in an @synthesized definition. - virtual void CodeCompleteObjCPropertySynthesize(Scope *S, + /// This code completion action is invoked after @synthesize or @dynamic and + /// after each "," within one of those definitions. + virtual void CodeCompleteObjCPropertyDefinition(Scope *S, DeclPtrTy ObjCImpDecl) { } diff --git a/clang/lib/Parse/ParseObjc.cpp b/clang/lib/Parse/ParseObjc.cpp index 305ed16a193..216d9345cb0 100644 --- a/clang/lib/Parse/ParseObjc.cpp +++ b/clang/lib/Parse/ParseObjc.cpp @@ -1234,7 +1234,7 @@ Parser::DeclPtrTy Parser::ParseObjCPropertySynthesize(SourceLocation atLoc) { while (true) { if (Tok.is(tok::code_completion)) { - Actions.CodeCompleteObjCPropertySynthesize(CurScope, ObjCImpDecl); + Actions.CodeCompleteObjCPropertyDefinition(CurScope, ObjCImpDecl); ConsumeToken(); } @@ -1290,11 +1290,18 @@ Parser::DeclPtrTy Parser::ParseObjCPropertyDynamic(SourceLocation atLoc) { assert(Tok.isObjCAtKeyword(tok::objc_dynamic) && "ParseObjCPropertyDynamic(): Expected '@dynamic'"); SourceLocation loc = ConsumeToken(); // consume dynamic - if (Tok.isNot(tok::identifier)) { - Diag(Tok, diag::err_expected_ident); - return DeclPtrTy(); - } - while (Tok.is(tok::identifier)) { + while (true) { + if (Tok.is(tok::code_completion)) { + Actions.CodeCompleteObjCPropertyDefinition(CurScope, ObjCImpDecl); + ConsumeToken(); + } + + if (Tok.isNot(tok::identifier)) { + Diag(Tok, diag::err_expected_ident); + SkipUntil(tok::semi); + return DeclPtrTy(); + } + IdentifierInfo *propertyId = Tok.getIdentifierInfo(); SourceLocation propertyLoc = ConsumeToken(); // consume property name Actions.ActOnPropertyImplDecl(atLoc, propertyLoc, false, ObjCImpDecl, diff --git a/clang/lib/Sema/Sema.h b/clang/lib/Sema/Sema.h index a4ff26669e2..2c50b88ddce 100644 --- a/clang/lib/Sema/Sema.h +++ b/clang/lib/Sema/Sema.h @@ -3661,7 +3661,7 @@ public: IdentifierInfo *ClassName); virtual void CodeCompleteObjCImplementationCategory(Scope *S, IdentifierInfo *ClassName); - virtual void CodeCompleteObjCPropertySynthesize(Scope *S, + virtual void CodeCompleteObjCPropertyDefinition(Scope *S, DeclPtrTy ObjCImpDecl); virtual void CodeCompleteObjCPropertySynthesizeIvar(Scope *S, IdentifierInfo *PropertyName, diff --git a/clang/lib/Sema/SemaCodeComplete.cpp b/clang/lib/Sema/SemaCodeComplete.cpp index 0090e24a0f8..6ba0591dd09 100644 --- a/clang/lib/Sema/SemaCodeComplete.cpp +++ b/clang/lib/Sema/SemaCodeComplete.cpp @@ -2026,7 +2026,7 @@ void Sema::CodeCompleteObjCImplementationCategory(Scope *S, HandleCodeCompleteResults(this, CodeCompleter, Results.data(),Results.size()); } -void Sema::CodeCompleteObjCPropertySynthesize(Scope *S, DeclPtrTy ObjCImpDecl) { +void Sema::CodeCompleteObjCPropertyDefinition(Scope *S, DeclPtrTy ObjCImpDecl) { typedef CodeCompleteConsumer::Result Result; ResultBuilder Results(*this); diff --git a/clang/test/Index/complete-properties.m b/clang/test/Index/complete-properties.m index 5b567dfc005..a99b1d1413d 100644 --- a/clang/test/Index/complete-properties.m +++ b/clang/test/Index/complete-properties.m @@ -6,25 +6,35 @@ id StoredProp3; int RandomIVar; } +@property int Prop0; @property int Prop1; @property float Prop2; @end @interface I2 : I1 @property id Prop3; +@property id Prop4; @end @implementation I2 @synthesize Prop2, Prop1, Prop3 = StoredProp3; +@dynamic Prop4; @end -// RUN: c-index-test -code-completion-at=%s:18:13 %s | FileCheck -check-prefix=CHECK-CC1 %s +// RUN: c-index-test -code-completion-at=%s:20:13 %s | FileCheck -check-prefix=CHECK-CC1 %s +// CHECK-CC1: ObjCPropertyDecl:{TypedText Prop0} // CHECK-CC1: ObjCPropertyDecl:{TypedText Prop1} // CHECK-CC1: ObjCPropertyDecl:{TypedText Prop2} // CHECK-CC1: ObjCPropertyDecl:{TypedText Prop3} -// RUN: c-index-test -code-completion-at=%s:18:20 %s | FileCheck -check-prefix=CHECK-CC2 %s +// CHECK-CC1: ObjCPropertyDecl:{TypedText Prop4} +// RUN: c-index-test -code-completion-at=%s:20:20 %s | FileCheck -check-prefix=CHECK-CC2 %s +// CHECK-CC2: ObjCPropertyDecl:{TypedText Prop0} // CHECK-CC2: ObjCPropertyDecl:{TypedText Prop1} // CHECK-CC2-NEXT: ObjCPropertyDecl:{TypedText Prop3} -// RUN: c-index-test -code-completion-at=%s:18:35 %s | FileCheck -check-prefix=CHECK-CC3 %s +// CHECK-CC2: ObjCPropertyDecl:{TypedText Prop4} +// RUN: c-index-test -code-completion-at=%s:20:35 %s | FileCheck -check-prefix=CHECK-CC3 %s // CHECK-CC3: ObjCIvarDecl:{TypedText RandomIVar} // CHECK-CC3: ObjCIvarDecl:{TypedText StoredProp3} +// RUN: c-index-test -code-completion-at=%s:21:10 %s | FileCheck -check-prefix=CHECK-CC4 %s +// CHECK-CC4: ObjCPropertyDecl:{TypedText Prop0} +// CHECK-CC4-NEXT: ObjCPropertyDecl:{TypedText Prop4} |
