From 4048aad85a843d2b15cb8e60b2ea37f148b7b770 Mon Sep 17 00:00:00 2001
From: Zixu Wang <zixu_wang@apple.com>
Date: Wed, 6 Apr 2022 14:53:52 -0700
Subject: [PATCH] [clang][ExtractAPI] Fix declaration fragments for ObjC
methods
Objective-C methods selector parts should be considered as identifiers.
Depends on D123259
Differential Revision: https://reviews.llvm.org/D123261
---
clang/lib/ExtractAPI/DeclarationFragments.cpp | 17 +++++++++--------
clang/test/ExtractAPI/objc_category.m | 8 ++++++++
clang/test/ExtractAPI/objc_interface.m | 14 +++++++++-----
3 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/clang/lib/ExtractAPI/DeclarationFragments.cpp b/clang/lib/ExtractAPI/DeclarationFragments.cpp
index a569ff9168bc..75d360a3ba16 100644
--- a/clang/lib/ExtractAPI/DeclarationFragments.cpp
+++ b/clang/lib/ExtractAPI/DeclarationFragments.cpp
@@ -593,20 +593,21 @@ DeclarationFragments DeclarationFragmentsBuilder::getFragmentsForObjCMethod(
// For Objective-C methods that take arguments, build the selector slots.
for (unsigned i = 0, end = Method->param_size(); i != end; ++i) {
- Fragments.appendSpace()
- .append(Selector.getNameForSlot(i),
- // The first slot is the name of the method, record as an
- // identifier, otherwise as exteranl parameters.
- i == 0 ? DeclarationFragments::FragmentKind::Identifier
- : DeclarationFragments::FragmentKind::ExternalParam)
- .append(":", DeclarationFragments::FragmentKind::Text);
+ // Objective-C method selector parts are considered as identifiers instead
+ // of "external parameters" as in Swift. This is because Objective-C method
+ // symbols are referenced with the entire selector, instead of just the
+ // method name in Swift.
+ SmallString<32> ParamID(Selector.getNameForSlot(i));
+ ParamID.append(":");
+ Fragments.appendSpace().append(
+ ParamID, DeclarationFragments::FragmentKind::Identifier);
// Build the internal parameter.
const ParmVarDecl *Param = Method->getParamDecl(i);
Fragments.append(getFragmentsForParam(Param));
}
- return Fragments;
+ return Fragments.append(";", DeclarationFragments::FragmentKind::Text);
}
DeclarationFragments DeclarationFragmentsBuilder::getFragmentsForObjCProperty(
diff --git a/clang/test/ExtractAPI/objc_category.m b/clang/test/ExtractAPI/objc_category.m
index 2416e3049bd5..20eefdfbb00e 100644
--- a/clang/test/ExtractAPI/objc_category.m
+++ b/clang/test/ExtractAPI/objc_category.m
@@ -136,6 +136,10 @@
{
"kind": "identifier",
"spelling": "InstanceMethod"
+ },
+ {
+ "kind": "text",
+ "spelling": ";"
}
],
"identifier": {
@@ -190,6 +194,10 @@
{
"kind": "identifier",
"spelling": "ClassMethod"
+ },
+ {
+ "kind": "text",
+ "spelling": ";"
}
],
"identifier": {
diff --git a/clang/test/ExtractAPI/objc_interface.m b/clang/test/ExtractAPI/objc_interface.m
index a74a53c8db2c..5ca640468398 100644
--- a/clang/test/ExtractAPI/objc_interface.m
+++ b/clang/test/ExtractAPI/objc_interface.m
@@ -146,11 +146,7 @@
},
{
"kind": "identifier",
- "spelling": "getWithProperty"
- },
- {
- "kind": "text",
- "spelling": ":"
+ "spelling": "getWithProperty:"
},
{
"kind": "text",
@@ -168,6 +164,10 @@
{
"kind": "internalParam",
"spelling": "Property"
+ },
+ {
+ "kind": "text",
+ "spelling": ";"
}
],
"identifier": {
@@ -403,6 +403,10 @@
{
"kind": "identifier",
"spelling": "getIvar"
+ },
+ {
+ "kind": "text",
+ "spelling": ";"
}
],
"identifier": {
--
GitLab