diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/include/clang/Sema/CodeCompleteConsumer.h | 1 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaCodeComplete.cpp | 14 | ||||
| -rw-r--r-- | clang/test/Index/complete-documentation-properties.m | 4 |
3 files changed, 19 insertions, 0 deletions
diff --git a/clang/include/clang/Sema/CodeCompleteConsumer.h b/clang/include/clang/Sema/CodeCompleteConsumer.h index 307dd57e109..a1ddec7520a 100644 --- a/clang/include/clang/Sema/CodeCompleteConsumer.h +++ b/clang/include/clang/Sema/CodeCompleteConsumer.h @@ -632,6 +632,7 @@ public: /// \brief Add the parent context information to this code completion. void addParentContext(const DeclContext *DC); + const char *getBriefComment() const { return BriefComment; } void addBriefComment(StringRef Comment); StringRef getParentName() const { return ParentName; } diff --git a/clang/lib/Sema/SemaCodeComplete.cpp b/clang/lib/Sema/SemaCodeComplete.cpp index 6bb954315ab..1cb264265aa 100644 --- a/clang/lib/Sema/SemaCodeComplete.cpp +++ b/clang/lib/Sema/SemaCodeComplete.cpp @@ -2541,6 +2541,20 @@ CodeCompletionResult::CreateCodeCompletionString(ASTContext &Ctx, if (Declaration) { Result.addParentContext(Declaration->getDeclContext()); Pattern->ParentName = Result.getParentName(); + // Provide code completion comment for self.GetterName where + // GetterName is the getter method for a property with name + // different from the property name (declared via a property + // getter attribute. + const NamedDecl *ND = Declaration; + if (const ObjCMethodDecl *M = dyn_cast<ObjCMethodDecl>(ND)) + if (M->isPropertyAccessor()) + if (const ObjCPropertyDecl *PDecl = M->findPropertyDecl()) + if (PDecl->getGetterName() == M->getSelector() && + PDecl->getIdentifier() != M->getIdentifier()) + if (const RawComment *RC = Ctx.getRawCommentForAnyRedecl(PDecl)) { + Result.addBriefComment(RC->getBriefText(Ctx)); + Pattern->BriefComment = Result.getBriefComment(); + } } return Pattern; diff --git a/clang/test/Index/complete-documentation-properties.m b/clang/test/Index/complete-documentation-properties.m index d423f84d227..ea41d958da1 100644 --- a/clang/test/Index/complete-documentation-properties.m +++ b/clang/test/Index/complete-documentation-properties.m @@ -49,6 +49,7 @@ p = [self PropertyInPrimaryClass]; p = [self Record]; [self setThisRecord : (id)0 ]; + p = self.GetterInClassExtension; return 0; } @end @@ -66,3 +67,6 @@ // RUN: env CINDEXTEST_COMPLETION_BRIEF_COMMENTS=1 c-index-test -code-completion-at=%s:51:9 %s | FileCheck -check-prefix=CC5 %s // CHECK-CC5: {TypedText setThisRecord:}{Placeholder (id)}{{.*}}(brief comment: This is Record) + +// RUN: env CINDEXTEST_COMPLETION_BRIEF_COMMENTS=1 c-index-test -code-completion-at=%s:52:12 %s | FileCheck -check-prefix=CC6 %s +// CHECK-CC6: {TypedText GetterInClassExtension}{{.*}}(brief comment: This is PropertyInClassExtension) |
