[clang][ExtractAPI] Add semicolons for enum, typedef, struct declaration fragments

[chaitanyav]

Summary

Fixes https://github.com/llvm/llvm-project/issues/61480

[chaitanyav]

• Update reference output in underscored.c
• combine return and append semicolon fragment

[chaitanyav]

• Update reference output in underscored.c
• combine return and append semicolon fragment

[chaitanyav]

The debian build is failing because of this https://github.com/google/llvm-premerge-checks/issues/436

The windows build is failing because of https://github.com/llvm/llvm-project/issues/61519, i see that the fix (https://reviews.llvm.org/rGd233c7b814071e8b9345b1c25411272ec7446c8d) for this is already on main but i cannot trigger a new build for my changes.

Please advice on how to trigger a new build that will run on latest main.

[dang]

LGTM! I think it's fine to go ahead and land this (premerge check are not a requirement). Have you contributed to LLVM before? If not I will need to commit it on your behalf. Once that is done you should follow the instructions at https://llvm.org/docs/DeveloperPolicy.html#obtaining-commit-access to gain commit access if you wish to continue contributing to the project and LLVM in general.

[chaitanyav]

Thank you, Please go ahead and Commit the change. I don't have commit access, Will follow the instructions on the page to get access.

[chaitanyav]

Name: NagaChaitanya Vellanki
email: [e-mail]

clang/lib/ExtractAPI/DeclarationFragments.cpp

DeclarationFragmentsBuilder::getFragmentsForEnum(const EnumDecl *EnumDecl) {
 
   QualType IntegerType = EnumDecl->getIntegerType();
   if (!IntegerType.isNull())
     Fragments.append(": ", DeclarationFragments::FragmentKind::Text)
         .append(
             getFragmentsForType(IntegerType, EnumDecl->getASTContext(), After))
         .append(std::move(After));
 
-  return Fragments;
+  return Fragments.append(";", DeclarationFragments::FragmentKind::Text);
 }
 
 DeclarationFragments
 DeclarationFragmentsBuilder::getFragmentsForField(const FieldDecl *Field) {
   DeclarationFragments After;
   return getFragmentsForType(Field->getType(), Field->getASTContext(), After)
       .appendSpace()
       .append(Field->getName(), DeclarationFragments::FragmentKind::Identifier)
       .append(std::move(After));
 }
 
 DeclarationFragments
 DeclarationFragmentsBuilder::getFragmentsForStruct(const RecordDecl *Record) {
   if (const auto *TypedefNameDecl = Record->getTypedefNameForAnonDecl())
     return getFragmentsForTypedef(TypedefNameDecl);
 
   DeclarationFragments Fragments;
   Fragments.append("struct", DeclarationFragments::FragmentKind::Keyword);
 
   if (!Record->getName().empty())
     Fragments.appendSpace().append(
         Record->getName(), DeclarationFragments::FragmentKind::Identifier);
-  return Fragments;
+
+  return Fragments.append(";", DeclarationFragments::FragmentKind::Text);
 }
 
 DeclarationFragments
 DeclarationFragmentsBuilder::getFragmentsForMacro(StringRef Name,
                                                   const MacroDirective *MD) {
   DeclarationFragments Fragments;
   Fragments.append("#define", DeclarationFragments::FragmentKind::Keyword)
       .appendSpace();
DeclarationFragments DeclarationFragmentsBuilder::getFragmentsForTypedef(
   Fragments.append("typedef", DeclarationFragments::FragmentKind::Keyword)
       .appendSpace()
       .append(getFragmentsForType(Decl->getUnderlyingType(),
                                   Decl->getASTContext(), After))
       .append(std::move(After))
       .appendSpace()
       .append(Decl->getName(), DeclarationFragments::FragmentKind::Identifier);
 
-  return Fragments;
+  return Fragments.append(";", DeclarationFragments::FragmentKind::Text);
 }
 
 template <typename FunctionT>
 FunctionSignature
 DeclarationFragmentsBuilder::getFunctionSignature(const FunctionT *Function) {
   FunctionSignature Signature;
 
   DeclarationFragments ReturnType, After;

clang/test/ExtractAPI/anonymous_record_no_typedef.c

"symbols": [
         {
           "kind": "text",
           "spelling": ": "
         },
         {
           "kind": "typeIdentifier",
           "preciseIdentifier": "c:i",
           "spelling": "unsigned int"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "docComment": {
         "lines": [
           {
             "range": {
               "end": {
                 "character": 29,
"symbols": [
         },
         {
           "kind": "text",
           "spelling": " "
         },
         {
           "kind": "identifier",
           "spelling": "Vehicle"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "docComment": {
         "lines": [
           {
             "range": {
               "end": {
                 "character": 14,

clang/test/ExtractAPI/enum.c

"symbols": [
         {
           "kind": "text",
           "spelling": ": "
         },
         {
           "kind": "typeIdentifier",
           "preciseIdentifier": "c:i",
           "spelling": "unsigned int"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "docComment": {
         "lines": [
           {
             "range": {
               "end": {
                 "character": 22,
"symbols": [
         {
           "kind": "text",
           "spelling": ": "
         },
         {
           "kind": "typeIdentifier",
           "preciseIdentifier": "c:c",
           "spelling": "unsigned char"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
         "interfaceLanguage": "c",
         "precise": "c:@E@Direction"
       },
       "kind": {
         "displayName": "Enumeration",
"symbols": [
         {
           "kind": "text",
           "spelling": ": "
         },
         {
           "kind": "typeIdentifier",
           "preciseIdentifier": "c:i",
           "spelling": "unsigned int"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
         "interfaceLanguage": "c",
         "precise": "c:@Ea@Constant"
       },
       "kind": {
         "displayName": "Enumeration",
"symbols": [
         {
           "kind": "text",
           "spelling": ": "
         },
         {
           "kind": "typeIdentifier",
           "preciseIdentifier": "c:i",
           "spelling": "unsigned int"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
         "interfaceLanguage": "c",
         "precise": "c:@Ea@OtherConstant"
       },
       "kind": {
         "displayName": "Enumeration",

clang/test/ExtractAPI/struct.c

"symbols": [
         },
         {
           "kind": "text",
           "spelling": " "
         },
         {
           "kind": "identifier",
           "spelling": "Color"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "docComment": {
         "lines": [
           {
             "range": {
               "end": {
                 "character": 18,

clang/test/ExtractAPI/typedef.c

"symbols": [
         },
         {
           "kind": "text",
           "spelling": " "
         },
         {
           "kind": "identifier",
           "spelling": "MyInt"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
         "interfaceLanguage": "objective-c",
         "precise": "c:input.h@T@MyInt"
       },
       "kind": {
         "displayName": "Type Alias",

clang/test/ExtractAPI/typedef_anonymous_record.c

"symbols": [
         },
         {
           "kind": "text",
           "spelling": " "
         },
         {
           "kind": "identifier",
           "spelling": "MyEnum"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
         "interfaceLanguage": "c",
         "precise": "c:@EA@MyEnum"
       },
       "kind": {
         "displayName": "Enumeration",
"symbols": [
         },
         {
           "kind": "text",
           "spelling": " "
         },
         {
           "kind": "identifier",
           "spelling": "MyStruct"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
         "interfaceLanguage": "c",
         "precise": "c:@SA@MyStruct"
       },
       "kind": {
         "displayName": "Structure",
"symbols": [
         },
         {
           "kind": "text",
           "spelling": " "
         },
         {
           "kind": "identifier",
           "spelling": "MyStructStruct"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
         "interfaceLanguage": "c",
         "precise": "c:input.h@T@MyStructStruct"
       },
       "kind": {
         "displayName": "Type Alias",
"symbols": [
         },
         {
           "kind": "text",
           "spelling": " "
         },
         {
           "kind": "identifier",
           "spelling": "MyStructStructStruct"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
         "interfaceLanguage": "c",
         "precise": "c:input.h@T@MyStructStructStruct"
       },
       "kind": {
         "displayName": "Type Alias",
"symbols": [
         },
         {
           "kind": "text",
           "spelling": " "
         },
         {
           "kind": "identifier",
           "spelling": "MyEnumEnum"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
         "interfaceLanguage": "c",
         "precise": "c:input.h@T@MyEnumEnum"
       },
       "kind": {
         "displayName": "Type Alias",
"symbols": [
         },
         {
           "kind": "text",
           "spelling": " "
         },
         {
           "kind": "identifier",
           "spelling": "MyEnumEnumEnum"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
         "interfaceLanguage": "c",
         "precise": "c:input.h@T@MyEnumEnumEnum"
       },
       "kind": {
         "displayName": "Type Alias",

clang/test/ExtractAPI/typedef_chain.c

"symbols": [
         },
         {
           "kind": "text",
           "spelling": " "
         },
         {
           "kind": "identifier",
           "spelling": "MyInt"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
         "interfaceLanguage": "objective-c",
         "precise": "c:input.h@T@MyInt"
       },
       "kind": {
         "displayName": "Type Alias",
"symbols": [
         },
         {
           "kind": "text",
           "spelling": " "
         },
         {
           "kind": "identifier",
           "spelling": "MyIntInt"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
         "interfaceLanguage": "objective-c",
         "precise": "c:input.h@T@MyIntInt"
       },
       "kind": {
         "displayName": "Type Alias",
"symbols": [
         },
         {
           "kind": "text",
           "spelling": " "
         },
         {
           "kind": "identifier",
           "spelling": "MyIntIntInt"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
         "interfaceLanguage": "objective-c",
         "precise": "c:input.h@T@MyIntIntInt"
       },
       "kind": {
         "displayName": "Type Alias",

clang/test/ExtractAPI/underscored.c

"symbols": [
         },
         {
           "kind": "text",
           "spelling": " "
         },
         {
           "kind": "identifier",
           "spelling": "ExposedRecord"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
         "interfaceLanguage": "c",
         "precise": "c:@S@ExposedRecord"
       },
       "kind": {
         "displayName": "Structure",
"symbols": [
         },
         {
           "kind": "text",
           "spelling": " "
         },
         {
           "kind": "identifier",
           "spelling": "ExposedTypedef"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
         "interfaceLanguage": "c",
         "precise": "c:input.h@T@ExposedTypedef"
       },
       "kind": {
         "displayName": "Type Alias",
"symbols": [
         },
         {
           "kind": "text",
           "spelling": " "
         },
         {
           "kind": "identifier",
           "spelling": "ExposedTypedefToHidden"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
         "interfaceLanguage": "c",
         "precise": "c:input.h@T@ExposedTypedefToHidden"
       },
       "kind": {
         "displayName": "Type Alias",