[clang][ExtractAPI] Fix declaration fragments for ObjC methods

[zixuw]

Summary

Objective-C methods selector parts should be considered as identifiers.

Depends on D123259

[QuietMisdreavus]

LGTM

[dang]

LGTM

clang/lib/ExtractAPI/DeclarationFragments.cpp

if (Selector.getNumArgs() == 0)
     // For Objective-C methods that don't take arguments, the first (and only)
     // slot of the selector is the method name.
     Fragments.appendSpace().append(
         Selector.getNameForSlot(0),
         DeclarationFragments::FragmentKind::Identifier);
 
   // 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(
     const ObjCPropertyDecl *Property) {
   DeclarationFragments Fragments, After;
 
   // Build the Objective-C property keyword.
   Fragments.append("@property", DeclarationFragments::FragmentKind::Keyword);

clang/test/ExtractAPI/objc_category.m

"symbols": [
         },
         {
           "kind": "text",
           "spelling": ") "
         },
         {
           "kind": "identifier",
           "spelling": "InstanceMethod"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
         "interfaceLanguage": "objective-c",
         "precise": "c:objc(cs)Interface(im)InstanceMethod"
       },
       "kind": {
         "displayName": "Instance Method",
"symbols": [
         },
         {
           "kind": "text",
           "spelling": ") "
         },
         {
           "kind": "identifier",
           "spelling": "ClassMethod"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
         "interfaceLanguage": "objective-c",
         "precise": "c:objc(cs)Interface(cm)ClassMethod"
       },
       "kind": {
         "displayName": "Type Method",

clang/test/ExtractAPI/objc_interface.m

"symbols": [
           "spelling": "id"
         },
         {
           "kind": "text",
           "spelling": ") "
         },
         {
           "kind": "identifier",
-          "spelling": "getWithProperty"
-        },
-        {
-          "kind": "text",
-          "spelling": ":"
+          "spelling": "getWithProperty:"
         },
         {
           "kind": "text",
           "spelling": "("
         },
         {
           "kind": "typeIdentifier",
           "preciseIdentifier": "c:i",
           "spelling": "unsigned int"
         },
         {
           "kind": "text",
           "spelling": ") "
         },
         {
           "kind": "internalParam",
           "spelling": "Property"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
         "interfaceLanguage": "objective-c",
         "precise": "c:objc(cs)Super(cm)getWithProperty:"
       },
       "kind": {
         "displayName": "Type Method",
"symbols": [
         },
         {
           "kind": "text",
           "spelling": ") "
         },
         {
           "kind": "identifier",
           "spelling": "getIvar"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
         "interfaceLanguage": "objective-c",
         "precise": "c:objc(cs)Derived(im)getIvar"
       },
       "kind": {
         "displayName": "Instance Method",