Simplify implementation of SA1600 code fix following review

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.CodeFixes/DocumentationRules/SA1600CodeFixProvider.cs

@@ -145,7 +145,7 @@ private static Task<Document> GetMethodDocumentationTransformedDocumentAsync(Doc
 
             var documentationNodes = new List<XmlNodeSyntax>();
 
-            documentationNodes.Add(XmlSyntaxFactory.EmptySummaryElement(newLineText));
+            documentationNodes.Add(XmlSyntaxFactory.SummaryElement(newLineText));
 
             if (methodDeclaration.TypeParameterList != null)
             {
@@ -185,7 +185,7 @@ private static Task<Document> GetMethodDocumentationTransformedDocumentAsync(Doc
             };
 
             documentationNodes.Add(XmlSyntaxFactory.NewLine(newLineText));
-            documentationNodes.Add(XmlSyntaxFactory.CompactReturnsElement(returnContent));
+            documentationNodes.Add(XmlSyntaxFactory.ReturnsElement(returnContent));
 
             var documentationComment =
                 XmlSyntaxFactory.DocumentationComment(

StyleCop.Analyzers/StyleCop.Analyzers.Test/DocumentationRules/SA1600UnitTests.cs

@@ -726,6 +726,7 @@ public Task<T> TestMethod6<T>(T param1, int param2)
 public {typeKeyword} Test
 {{
     /// <summary>
+    /// 
     /// </summary>
     /// <returns>A <see cref=""Task""/> representing the result of the asynchronous operation.</returns>
     public Task TestMethod1()
@@ -734,6 +735,7 @@ public Task TestMethod1()
     }}
 
     /// <summary>
+    /// 
     /// </summary>
     /// <returns>A <see cref=""Task{{TResult}}""/> representing the result of the asynchronous operation.</returns>
     public Task<int> TestMethod2()
@@ -742,6 +744,7 @@ public Task<int> TestMethod2()
     }}
 
     /// <summary>
+    /// 
     /// </summary>
     /// <typeparam name=""T""></typeparam>
     /// <returns>A <see cref=""Task{{TResult}}""/> representing the result of the asynchronous operation.</returns>
@@ -751,6 +754,7 @@ public Task<T> TestMethod3<T>()
     }}
 
     /// <summary>
+    /// 
     /// </summary>
     /// <param name=""param1""></param>
     /// <param name=""param2""></param>
@@ -761,6 +765,7 @@ public Task TestMethod4(int param1, int param2)
     }}
 
     /// <summary>
+    /// 
     /// </summary>
     /// <param name=""param1""></param>
     /// <param name=""param2""></param>
@@ -771,6 +776,7 @@ public Task<int> TestMethod5(int param1, int param2)
     }}
 
     /// <summary>
+    /// 
     /// </summary>
     /// <typeparam name=""T""></typeparam>
     /// <param name=""param1""></param>

StyleCop.Analyzers/StyleCop.Analyzers.Test/HelperTests/XmlSyntaxFactoryTests.cs

@@ -70,11 +70,8 @@ public void TestRemarksElement()
         [Fact]
         public void TestReturnsElement()
         {
-            string expected =
-                "<returns>\r\n"
-                + "/// Returns.\r\n"
-                + "/// </returns>";
-            Assert.Equal(expected, XmlSyntaxFactory.ReturnsElement("\r\n", XmlSyntaxFactory.Text("Returns.")).ToFullString());
+            string expected = "<returns>Returns.</returns>";
+            Assert.Equal(expected, XmlSyntaxFactory.ReturnsElement(XmlSyntaxFactory.Text("Returns.")).ToFullString());
         }
 
         [Fact]

StyleCop.Analyzers/StyleCop.Analyzers/Helpers/XmlSyntaxFactory.cs

@@ -171,11 +171,6 @@ public static XmlElementSyntax SummaryElement(string newLineText, SyntaxList<Xml
             return MultiLineElement(XmlCommentHelper.SummaryXmlTag, newLineText, content);
         }
 
-        public static XmlElementSyntax EmptySummaryElement(string newLineText)
-        {
-            return Element(XmlCommentHelper.SummaryXmlTag, SyntaxFactory.List(new XmlNodeSyntax[] { NewLine(newLineText) }));
-        }
-
         public static XmlElementSyntax RemarksElement(string newLineText, params XmlNodeSyntax[] content)
         {
             return RemarksElement(newLineText, List(content));
@@ -186,22 +181,12 @@ public static XmlElementSyntax RemarksElement(string newLineText, SyntaxList<Xml
             return MultiLineElement("remarks", newLineText, content);
         }
 
-        public static XmlElementSyntax ReturnsElement(string newLineText, params XmlNodeSyntax[] content)
-        {
-            return ReturnsElement(newLineText, List(content));
-        }
-
-        public static XmlElementSyntax ReturnsElement(string newLineText, SyntaxList<XmlNodeSyntax> content)
-        {
-            return MultiLineElement(XmlCommentHelper.ReturnsXmlTag, newLineText, content);
-        }
-
-        public static XmlElementSyntax CompactReturnsElement(params XmlNodeSyntax[] content)
+        public static XmlElementSyntax ReturnsElement(params XmlNodeSyntax[] content)
         {
-            return CompactReturnsElement(List(content));
+            return ReturnsElement(List(content));
         }
 
-        public static XmlElementSyntax CompactReturnsElement(SyntaxList<XmlNodeSyntax> content)
+        public static XmlElementSyntax ReturnsElement(SyntaxList<XmlNodeSyntax> content)
         {
             return Element(XmlCommentHelper.ReturnsXmlTag, content);
         }
@@ -255,7 +240,7 @@ public static XmlElementSyntax TypeParamElement(string parameterName, params Xml
 
         public static XmlElementSyntax TypeParamElement(string parameterName, SyntaxList<XmlNodeSyntax> content)
         {
-            XmlElementSyntax element = Element("typeparam", content);
+            XmlElementSyntax element = Element(XmlCommentHelper.TypeParamXmlTag, content);
             return element.WithStartTag(element.StartTag.AddAttributes(NameAttribute(parameterName)));
         }
 

StyleCop.Analyzers/StyleCop.Analyzers/StyleCop.Analyzers.csproj

@@ -37,19 +37,4 @@
     <None Include="**\*.json" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="DocumentationRules\DocumentationResources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>DocumentationResources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="DocumentationRules\DocumentationResources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>DocumentationResources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
 </Project>