feat: Avoid adding empty trailing comments to oneof unions (#1140)

This PR tweaks the output from #1136 slightly to avoid adding the trailing `//` after the union member separator if there isn't a documentation comment for the following oneof field (or if comments are turned off).
stephenh · Nov 25, 2024 · 5359e8d · 5359e8d
1 parent 37d3a39
commit 5359e8d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 36 deletions.
diff --git a/integration/oneof-unions-value/oneof.ts b/integration/oneof-unions-value/oneof.ts
diff --git a/integration/oneof-unions/oneof.ts b/integration/oneof-unions/oneof.ts
diff --git a/integration/use-readonly-types/use-readonly-types.ts b/integration/use-readonly-types/use-readonly-types.ts
diff --git a/src/main.ts b/src/main.ts
@@ -1193,7 +1193,9 @@ function generateOneofProperty(
       maybeAddComment(options, fieldInfo, fieldComments);
 
       const combinedComments = fieldComments.join("\n");
-      return code`| // \n ${combinedComments} { ${mbReadonly}$case: '${fieldName}', ${mbReadonly}${valueName}: ${typeName} }`;
+      return code`|${
+        combinedComments ? " // " : ""
+      }\n ${combinedComments} { ${mbReadonly}$case: '${fieldName}', ${mbReadonly}${valueName}: ${typeName} }`;
     }),
   );
 
@@ -1531,7 +1533,7 @@ function generateDecode(ctx: Context, fullName: string, messageDesc: DescriptorP
 
     chunks.push(code`
       const buf = reader.skip(tag & 7);
-      
+
       ${unknownFieldsInitializerSnippet}
       const list = message._unknownFields${maybeNonNullAssertion}[tag];