diff --git a/tools/generator/SourceWriters/BoundProperty.cs b/tools/generator/SourceWriters/BoundProperty.cs index 329a30a9d..df2c87c09 100644 --- a/tools/generator/SourceWriters/BoundProperty.cs +++ b/tools/generator/SourceWriters/BoundProperty.cs @@ -179,6 +179,7 @@ void AddJavadocs (Property property) MergeSummary (memberDocs, setterDocs); MergeRemarks (memberDocs, setterDocs); + MergeReturns (memberDocs, setterDocs); memberDocs.Add (setterDocs.Nodes ()); } @@ -223,5 +224,20 @@ static void MergeRemarks (XElement mergeInto, XElement mergeFrom) toContent.Add (fromContent.Nodes ()); } } + + static void MergeReturns (XElement mergeInto, XElement mergeFrom) + { + var toContent = mergeInto.Element ("returns"); + var fromContent = mergeFrom.Element ("returns"); + + if (toContent != null && fromContent != null) { + if (toContent.Value == fromContent.Value) { + fromContent.Remove (); + } else { + toContent.Add (" "); + toContent.Add (fromContent.Nodes ()); + } + } + } } }