Respond to feedback

Respond to doe review feedback.
dotnet · Feb 12, 2024 · 6fb6163 · 6fb6163
1 parent bfe7c76
commit 6fb6163
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/tools/MarkdownConverter.Tests/MarkdownConverter.Tests.csproj b/tools/MarkdownConverter.Tests/MarkdownConverter.Tests.csproj
@@ -12,11 +12,6 @@
     <EmbeddedResource Include="*.md" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Remove="emphasis-with-plural.md" />
-    <None Remove="emphasis-with-plural.xml" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageReference Include="XMLUnit.Core" Version="2.9.2" />

diff --git a/tools/MarkdownConverter.Tests/emphasis-with-plural.md b/tools/MarkdownConverter.Tests/emphasis-with-plural.md
@@ -2,4 +2,4 @@
 
 Rules:
 
-Otherwise, if the namespaces imported by the *using_namespace_directive*s of the namespace declaration contain exactly one type having name `I` and `x` type parameters, then the *namespace_or_type_name* refers to that type constructed with the given type arguments.
+Otherwise, if the namespaces imported by the *using_namespace_directive*s of the namespace declaration contain exactly one type having name `I` and `x` type parameters, then the *namespace_or_type_name* refers to that type constructed with the given type arguments.
diff --git a/tools/MarkdownConverter.Tests/emphasis-with-plural.xml b/tools/MarkdownConverter.Tests/emphasis-with-plural.xml
@@ -28,7 +28,7 @@
       <t space="preserve">using_namespace_directive</t>
     </r>
     <r>
-      <t space="preserve">s of the namespace declaration contain exactly one type having name�</t>
+      <t space="preserve">s of the namespace declaration contain exactly one type having name </t>
     </r>
     <r>
       <rPr>
@@ -46,7 +46,7 @@
       <t space="preserve">x</t>
     </r>
     <r>
-      <t space="preserve">�type parameters, then the</t>
+      <t space="preserve"> type parameters, then the</t>
     </r>
     <r>
       <t space="preserve"> </t>

diff --git a/tools/MarkdownConverter/Converter/MarkdownSourceConverter.cs b/tools/MarkdownConverter/Converter/MarkdownSourceConverter.cs
@@ -425,7 +425,7 @@ IEnumerable<OpenXmlCompositeElement> Paragraph2Paragraphs(MarkdownParagraph md)
                     var cell = new TableCell();
 
                     // This logic deals with the special case where
-                    // the cell is meant to cntain bold inline code text.
+                    // the cell is meant to contain bold inline code text.
                     // The formatter parses it as emphasis, but surrounded
                     // by single asterisks. We'll detect that and rewrite
                     // it as the bold we intended.
@@ -434,7 +434,7 @@ IEnumerable<OpenXmlCompositeElement> Paragraph2Paragraphs(MarkdownParagraph md)
                     var span2 = para?.body.Skip(1).FirstOrDefault() as MarkdownSpan.Emphasis;
                     var cellText = span2?.body.FirstOrDefault() as MarkdownSpan.InlineCode;
                     var trailingAsterisk = span2?.body.Skip(1).FirstOrDefault() as MarkdownSpan.Literal;
-                    if (leadingAsterisk?.text == "*" &&  cellText != null && trailingAsterisk?.text == "*")
+                    if (leadingAsterisk?.text == "*" && cellText != null && trailingAsterisk?.text == "*")
                     {
                         var span = cellText as MarkdownSpan;
                         var boldSpan = MarkdownSpan.NewStrong(ListModule.OfSeq([span]), default);
@@ -943,7 +943,9 @@ IEnumerable<OpenXmlElement> Literal2Elements(string literal, bool isNested, bool
         }
     }
 
-    // Note for future PR: "function_members", "format_strings_1", and "format_strings_2" are the
+    // Note: See issue https://github.com/dotnet/csharpstandard/issues/1046.
+    // In PR https://github.com/dotnet/csharpstandard/pull/584, most of the custom tables were removed.
+    // "function_members", "format_strings_1", and "format_strings_2" are the
     // only special cases still used. The others can be safely removed in a future PR.
     IEnumerable<OpenXmlCompositeElement> GenerateCustomBlockElements(string customBlockId, MarkdownParagraph.InlineHtmlBlock block) => customBlockId switch
     {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		Rules:

		Otherwise, if the namespaces imported by the using_namespace_directives of the namespace declaration contain exactly one type having name `I` and `x` type parameters, then the namespace_or_type_name refers to that type constructed with the given type arguments.
		Otherwise, if the namespaces imported by the using_namespace_directives of the namespace declaration contain exactly one type having name `I` and `x` type parameters, then the namespace_or_type_name refers to that type constructed with the given type arguments.