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

chaitanyav · daniel-grumberg · commit 4d3ba6907cb4 · 2023-03-21T13:31:08.000Z
Fixes llvm#61480 Reviewed By: dang Differential Revision: https://reviews.llvm.org/D146354
diff --git a/clang/lib/ExtractAPI/DeclarationFragments.cpp b/clang/lib/ExtractAPI/DeclarationFragments.cpp
@@ -470,7 +470,7 @@ DeclarationFragmentsBuilder::getFragmentsForEnum(const EnumDecl *EnumDecl) {
             getFragmentsForType(IntegerType, EnumDecl->getASTContext(), After))
         .append(std::move(After));
 
-  return Fragments;
+  return Fragments.append(";", DeclarationFragments::FragmentKind::Text);
 }
 
 DeclarationFragments
@@ -493,7 +493,8 @@ DeclarationFragmentsBuilder::getFragmentsForStruct(const RecordDecl *Record) {
   if (!Record->getName().empty())
     Fragments.appendSpace().append(
         Record->getName(), DeclarationFragments::FragmentKind::Identifier);
-  return Fragments;
+
+  return Fragments.append(";", DeclarationFragments::FragmentKind::Text);
 }
 
 DeclarationFragments
@@ -743,7 +744,7 @@ DeclarationFragments DeclarationFragmentsBuilder::getFragmentsForTypedef(
       .appendSpace()
       .append(Decl->getName(), DeclarationFragments::FragmentKind::Identifier);
 
-  return Fragments;
+  return Fragments.append(";", DeclarationFragments::FragmentKind::Text);
 }
 
 template <typename FunctionT>
diff --git a/clang/test/ExtractAPI/anonymous_record_no_typedef.c b/clang/test/ExtractAPI/anonymous_record_no_typedef.c
@@ -94,6 +94,10 @@ struct Vehicle {
           "kind": "typeIdentifier",
           "preciseIdentifier": "c:i",
           "spelling": "unsigned int"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "docComment": {
@@ -241,6 +245,10 @@ struct Vehicle {
         {
           "kind": "identifier",
           "spelling": "Vehicle"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "docComment": {
diff --git a/clang/test/ExtractAPI/enum.c b/clang/test/ExtractAPI/enum.c
@@ -153,6 +153,10 @@ enum {
           "kind": "typeIdentifier",
           "preciseIdentifier": "c:i",
           "spelling": "unsigned int"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "docComment": {
@@ -461,6 +465,10 @@ enum {
           "kind": "typeIdentifier",
           "preciseIdentifier": "c:c",
           "spelling": "unsigned char"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
@@ -684,6 +692,10 @@ enum {
           "kind": "typeIdentifier",
           "preciseIdentifier": "c:i",
           "spelling": "unsigned int"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
@@ -772,6 +784,10 @@ enum {
           "kind": "typeIdentifier",
           "preciseIdentifier": "c:i",
           "spelling": "unsigned int"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
diff --git a/clang/test/ExtractAPI/struct.c b/clang/test/ExtractAPI/struct.c
@@ -89,6 +89,10 @@ struct Color {
         {
           "kind": "identifier",
           "spelling": "Color"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "docComment": {
diff --git a/clang/test/ExtractAPI/typedef.c b/clang/test/ExtractAPI/typedef.c
@@ -66,6 +66,10 @@ typedef int MyInt;
         {
           "kind": "identifier",
           "spelling": "MyInt"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
diff --git a/clang/test/ExtractAPI/typedef_anonymous_record.c b/clang/test/ExtractAPI/typedef_anonymous_record.c
@@ -75,6 +75,10 @@ typedef MyEnumEnum MyEnumEnumEnum;
         {
           "kind": "identifier",
           "spelling": "MyEnum"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
@@ -170,6 +174,10 @@ typedef MyEnumEnum MyEnumEnumEnum;
         {
           "kind": "identifier",
           "spelling": "MyStruct"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
@@ -223,6 +231,10 @@ typedef MyEnumEnum MyEnumEnumEnum;
         {
           "kind": "identifier",
           "spelling": "MyStructStruct"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
@@ -283,6 +295,10 @@ typedef MyEnumEnum MyEnumEnumEnum;
         {
           "kind": "identifier",
           "spelling": "MyStructStructStruct"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
@@ -343,6 +359,10 @@ typedef MyEnumEnum MyEnumEnumEnum;
         {
           "kind": "identifier",
           "spelling": "MyEnumEnum"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
@@ -403,6 +423,10 @@ typedef MyEnumEnum MyEnumEnumEnum;
         {
           "kind": "identifier",
           "spelling": "MyEnumEnumEnum"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
diff --git a/clang/test/ExtractAPI/typedef_chain.c b/clang/test/ExtractAPI/typedef_chain.c
@@ -68,6 +68,10 @@ typedef MyIntInt MyIntIntInt;
         {
           "kind": "identifier",
           "spelling": "MyInt"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
@@ -128,6 +132,10 @@ typedef MyIntInt MyIntIntInt;
         {
           "kind": "identifier",
           "spelling": "MyIntInt"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
@@ -188,6 +196,10 @@ typedef MyIntInt MyIntIntInt;
         {
           "kind": "identifier",
           "spelling": "MyIntIntInt"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
diff --git a/clang/test/ExtractAPI/underscored.c b/clang/test/ExtractAPI/underscored.c
@@ -135,6 +135,10 @@ typedef _HiddenTypedef ExposedTypedefToHidden;
         {
           "kind": "identifier",
           "spelling": "ExposedRecord"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
@@ -296,6 +300,10 @@ typedef _HiddenTypedef ExposedTypedefToHidden;
         {
           "kind": "identifier",
           "spelling": "ExposedTypedef"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {
@@ -356,6 +364,10 @@ typedef _HiddenTypedef ExposedTypedefToHidden;
         {
           "kind": "identifier",
           "spelling": "ExposedTypedefToHidden"
+        },
+        {
+          "kind": "text",
+          "spelling": ";"
         }
       ],
       "identifier": {

Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,10 @@ struct Color {`
`89`	`89`	`{`
`90`	`90`	`"kind": "identifier",`
`91`	`91`	`"spelling": "Color"`
	`92`	`+ },`
	`93`	`+ {`
	`94`	`+ "kind": "text",`
	`95`	`+ "spelling": ";"`
`92`	`96`	`}`
`93`	`97`	`],`
`94`	`98`	`"docComment": {`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,10 @@ typedef int MyInt;`
`66`	`66`	`{`
`67`	`67`	`"kind": "identifier",`
`68`	`68`	`"spelling": "MyInt"`
	`69`	`+ },`
	`70`	`+ {`
	`71`	`+ "kind": "text",`
	`72`	`+ "spelling": ";"`
`69`	`73`	`}`
`70`	`74`	`],`
`71`	`75`	`"identifier": {`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,10 @@ typedef MyEnumEnum MyEnumEnumEnum;`
`75`	`75`	`{`
`76`	`76`	`"kind": "identifier",`
`77`	`77`	`"spelling": "MyEnum"`
	`78`	`+ },`
	`79`	`+ {`
	`80`	`+ "kind": "text",`
	`81`	`+ "spelling": ";"`
`78`	`82`	`}`
`79`	`83`	`],`
`80`	`84`	`"identifier": {`
`@@ -170,6 +174,10 @@ typedef MyEnumEnum MyEnumEnumEnum;`
`170`	`174`	`{`
`171`	`175`	`"kind": "identifier",`
`172`	`176`	`"spelling": "MyStruct"`
	`177`	`+ },`
	`178`	`+ {`
	`179`	`+ "kind": "text",`
	`180`	`+ "spelling": ";"`
`173`	`181`	`}`
`174`	`182`	`],`
`175`	`183`	`"identifier": {`
`@@ -223,6 +231,10 @@ typedef MyEnumEnum MyEnumEnumEnum;`
`223`	`231`	`{`
`224`	`232`	`"kind": "identifier",`
`225`	`233`	`"spelling": "MyStructStruct"`
	`234`	`+ },`
	`235`	`+ {`
	`236`	`+ "kind": "text",`
	`237`	`+ "spelling": ";"`
`226`	`238`	`}`
`227`	`239`	`],`
`228`	`240`	`"identifier": {`
`@@ -283,6 +295,10 @@ typedef MyEnumEnum MyEnumEnumEnum;`
`283`	`295`	`{`
`284`	`296`	`"kind": "identifier",`
`285`	`297`	`"spelling": "MyStructStructStruct"`
	`298`	`+ },`
	`299`	`+ {`
	`300`	`+ "kind": "text",`
	`301`	`+ "spelling": ";"`
`286`	`302`	`}`
`287`	`303`	`],`
`288`	`304`	`"identifier": {`
`@@ -343,6 +359,10 @@ typedef MyEnumEnum MyEnumEnumEnum;`
`343`	`359`	`{`
`344`	`360`	`"kind": "identifier",`
`345`	`361`	`"spelling": "MyEnumEnum"`
	`362`	`+ },`
	`363`	`+ {`
	`364`	`+ "kind": "text",`
	`365`	`+ "spelling": ";"`
`346`	`366`	`}`
`347`	`367`	`],`
`348`	`368`	`"identifier": {`
`@@ -403,6 +423,10 @@ typedef MyEnumEnum MyEnumEnumEnum;`
`403`	`423`	`{`
`404`	`424`	`"kind": "identifier",`
`405`	`425`	`"spelling": "MyEnumEnumEnum"`
	`426`	`+ },`
	`427`	`+ {`
	`428`	`+ "kind": "text",`
	`429`	`+ "spelling": ";"`
`406`	`430`	`}`
`407`	`431`	`],`
`408`	`432`	`"identifier": {`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,10 @@ typedef MyIntInt MyIntIntInt;`
`68`	`68`	`{`
`69`	`69`	`"kind": "identifier",`
`70`	`70`	`"spelling": "MyInt"`
	`71`	`+ },`
	`72`	`+ {`
	`73`	`+ "kind": "text",`
	`74`	`+ "spelling": ";"`
`71`	`75`	`}`
`72`	`76`	`],`
`73`	`77`	`"identifier": {`
`@@ -128,6 +132,10 @@ typedef MyIntInt MyIntIntInt;`
`128`	`132`	`{`
`129`	`133`	`"kind": "identifier",`
`130`	`134`	`"spelling": "MyIntInt"`
	`135`	`+ },`
	`136`	`+ {`
	`137`	`+ "kind": "text",`
	`138`	`+ "spelling": ";"`
`131`	`139`	`}`
`132`	`140`	`],`
`133`	`141`	`"identifier": {`
`@@ -188,6 +196,10 @@ typedef MyIntInt MyIntIntInt;`
`188`	`196`	`{`
`189`	`197`	`"kind": "identifier",`
`190`	`198`	`"spelling": "MyIntIntInt"`
	`199`	`+ },`
	`200`	`+ {`
	`201`	`+ "kind": "text",`
	`202`	`+ "spelling": ";"`
`191`	`203`	`}`
`192`	`204`	`],`
`193`	`205`	`"identifier": {`
Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,10 @@ typedef _HiddenTypedef ExposedTypedefToHidden;`
`135`	`135`	`{`
`136`	`136`	`"kind": "identifier",`
`137`	`137`	`"spelling": "ExposedRecord"`
	`138`	`+ },`
	`139`	`+ {`
	`140`	`+ "kind": "text",`
	`141`	`+ "spelling": ";"`
`138`	`142`	`}`
`139`	`143`	`],`
`140`	`144`	`"identifier": {`
`@@ -296,6 +300,10 @@ typedef _HiddenTypedef ExposedTypedefToHidden;`
`296`	`300`	`{`
`297`	`301`	`"kind": "identifier",`
`298`	`302`	`"spelling": "ExposedTypedef"`
	`303`	`+ },`
	`304`	`+ {`
	`305`	`+ "kind": "text",`
	`306`	`+ "spelling": ";"`
`299`	`307`	`}`
`300`	`308`	`],`
`301`	`309`	`"identifier": {`
`@@ -356,6 +364,10 @@ typedef _HiddenTypedef ExposedTypedefToHidden;`
`356`	`364`	`{`
`357`	`365`	`"kind": "identifier",`
`358`	`366`	`"spelling": "ExposedTypedefToHidden"`
	`367`	`+ },`
	`368`	`+ {`
	`369`	`+ "kind": "text",`
	`370`	`+ "spelling": ";"`
`359`	`371`	`}`
`360`	`372`	`],`
`361`	`373`	`"identifier": {`