This revision was automatically updated to reflect the committed changes.
Closed by commit rG32b53cf9d0c8: [ExtractAPI] Remove extra attributes in
property declaration fragments (authored by Unique_Usman, committed by zixuw).
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D146759/new/
https://reviews.llvm.org/D146759
Files:
clang/lib/ExtractAPI/DeclarationFragments.cpp
clang/test/ExtractAPI/objc_category.m
clang/test/ExtractAPI/objc_id_protocol.m
clang/test/ExtractAPI/objc_interface.m
clang/test/ExtractAPI/objc_property.m
Index: clang/test/ExtractAPI/objc_property.m
===================================================================
--- clang/test/ExtractAPI/objc_property.m
+++ clang/test/ExtractAPI/objc_property.m
@@ -161,38 +161,6 @@
"kind": "keyword",
"spelling": "class"
},
- {
- "kind": "text",
- "spelling": ", "
- },
- {
- "kind": "keyword",
- "spelling": "atomic"
- },
- {
- "kind": "text",
- "spelling": ", "
- },
- {
- "kind": "keyword",
- "spelling": "assign"
- },
- {
- "kind": "text",
- "spelling": ", "
- },
- {
- "kind": "keyword",
- "spelling": "unsafe_unretained"
- },
- {
- "kind": "text",
- "spelling": ", "
- },
- {
- "kind": "keyword",
- "spelling": "readwrite"
- },
{
"kind": "text",
"spelling": ") "
@@ -255,39 +223,7 @@
},
{
"kind": "text",
- "spelling": " ("
- },
- {
- "kind": "keyword",
- "spelling": "atomic"
- },
- {
- "kind": "text",
- "spelling": ", "
- },
- {
- "kind": "keyword",
- "spelling": "assign"
- },
- {
- "kind": "text",
- "spelling": ", "
- },
- {
- "kind": "keyword",
- "spelling": "unsafe_unretained"
- },
- {
- "kind": "text",
- "spelling": ", "
- },
- {
- "kind": "keyword",
- "spelling": "readwrite"
- },
- {
- "kind": "text",
- "spelling": ") "
+ "spelling": " "
},
{
"kind": "typeIdentifier",
@@ -353,38 +289,6 @@
"kind": "keyword",
"spelling": "class"
},
- {
- "kind": "text",
- "spelling": ", "
- },
- {
- "kind": "keyword",
- "spelling": "atomic"
- },
- {
- "kind": "text",
- "spelling": ", "
- },
- {
- "kind": "keyword",
- "spelling": "assign"
- },
- {
- "kind": "text",
- "spelling": ", "
- },
- {
- "kind": "keyword",
- "spelling": "unsafe_unretained"
- },
- {
- "kind": "text",
- "spelling": ", "
- },
- {
- "kind": "keyword",
- "spelling": "readwrite"
- },
{
"kind": "text",
"spelling": ") "
@@ -447,39 +351,7 @@
},
{
"kind": "text",
- "spelling": " ("
- },
- {
- "kind": "keyword",
- "spelling": "atomic"
- },
- {
- "kind": "text",
- "spelling": ", "
- },
- {
- "kind": "keyword",
- "spelling": "assign"
- },
- {
- "kind": "text",
- "spelling": ", "
- },
- {
- "kind": "keyword",
- "spelling": "unsafe_unretained"
- },
- {
- "kind": "text",
- "spelling": ", "
- },
- {
- "kind": "keyword",
- "spelling": "readwrite"
- },
- {
- "kind": "text",
- "spelling": ") "
+ "spelling": " "
},
{
"kind": "typeIdentifier",
@@ -595,38 +467,6 @@
"kind": "keyword",
"spelling": "class"
},
- {
- "kind": "text",
- "spelling": ", "
- },
- {
- "kind": "keyword",
- "spelling": "atomic"
- },
- {
- "kind": "text",
- "spelling": ", "
- },
- {
- "kind": "keyword",
- "spelling": "assign"
- },
- {
- "kind": "text",
- "spelling": ", "
- },
- {
- "kind": "keyword",
- "spelling": "unsafe_unretained"
- },
- {
- "kind": "text",
- "spelling": ", "
- },
- {
- "kind": "keyword",
- "spelling": "readwrite"
- },
{
"kind": "text",
"spelling": ") "
@@ -689,39 +529,7 @@
},
{
"kind": "text",
- "spelling": " ("
- },
- {
- "kind": "keyword",
- "spelling": "atomic"
- },
- {
- "kind": "text",
- "spelling": ", "
- },
- {
- "kind": "keyword",
- "spelling": "assign"
- },
- {
- "kind": "text",
- "spelling": ", "
- },
- {
- "kind": "keyword",
- "spelling": "unsafe_unretained"
- },
- {
- "kind": "text",
- "spelling": ", "
- },
- {
- "kind": "keyword",
- "spelling": "readwrite"
- },
- {
- "kind": "text",
- "spelling": ") "
+ "spelling": " "
},
{
"kind": "typeIdentifier",
Index: clang/test/ExtractAPI/objc_interface.m
===================================================================
--- clang/test/ExtractAPI/objc_interface.m
+++ clang/test/ExtractAPI/objc_interface.m
@@ -432,14 +432,6 @@
"kind": "text",
"spelling": " ("
},
- {
- "kind": "keyword",
- "spelling": "atomic"
- },
- {
- "kind": "text",
- "spelling": ", "
- },
{
"kind": "keyword",
"spelling": "readonly"
Index: clang/test/ExtractAPI/objc_id_protocol.m
===================================================================
--- clang/test/ExtractAPI/objc_id_protocol.m
+++ clang/test/ExtractAPI/objc_id_protocol.m
@@ -122,14 +122,6 @@
"kind": "text",
"spelling": " ("
},
- {
- "kind": "keyword",
- "spelling": "atomic"
- },
- {
- "kind": "text",
- "spelling": ", "
- },
{
"kind": "keyword",
"spelling": "copy"
@@ -206,30 +198,6 @@
"kind": "text",
"spelling": " ("
},
- {
- "kind": "keyword",
- "spelling": "atomic"
- },
- {
- "kind": "text",
- "spelling": ", "
- },
- {
- "kind": "keyword",
- "spelling": "assign"
- },
- {
- "kind": "text",
- "spelling": ", "
- },
- {
- "kind": "keyword",
- "spelling": "unsafe_unretained"
- },
- {
- "kind": "text",
- "spelling": ", "
- },
{
"kind": "keyword",
"spelling": "readwrite"
Index: clang/test/ExtractAPI/objc_category.m
===================================================================
--- clang/test/ExtractAPI/objc_category.m
+++ clang/test/ExtractAPI/objc_category.m
@@ -282,39 +282,7 @@
},
{
"kind": "text",
- "spelling": " ("
- },
- {
- "kind": "keyword",
- "spelling": "atomic"
- },
- {
- "kind": "text",
- "spelling": ", "
- },
- {
- "kind": "keyword",
- "spelling": "assign"
- },
- {
- "kind": "text",
- "spelling": ", "
- },
- {
- "kind": "keyword",
- "spelling": "unsafe_unretained"
- },
- {
- "kind": "text",
- "spelling": ", "
- },
- {
- "kind": "keyword",
- "spelling": "readwrite"
- },
- {
- "kind": "text",
- "spelling": ") "
+ "spelling": " "
},
{
"kind": "typeIdentifier",
Index: clang/lib/ExtractAPI/DeclarationFragments.cpp
===================================================================
--- clang/lib/ExtractAPI/DeclarationFragments.cpp
+++ clang/lib/ExtractAPI/DeclarationFragments.cpp
@@ -638,7 +638,7 @@
// Build the Objective-C property keyword.
Fragments.append("@property", DeclarationFragments::FragmentKind::Keyword);
- const auto Attributes = Property->getPropertyAttributes();
+ const auto Attributes = Property->getPropertyAttributesAsWritten();
// Build the attributes if there is any associated with the property.
if (Attributes != ObjCPropertyAttribute::kind_noattr) {
// No leading comma for the first attribute.
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
