Fix GH-388 handling surrounding spaces for emphasis/inline tags

mysticmind · May 4, 2024 · d145501 · d145501
1 parent 162dc63
commit d145501
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 24 deletions.
diff --git a/...n.Test/ConverterTests.When_Spaces_In_Inline_Tags_Should_Be_Retained.verified.md b/...n.Test/ConverterTests.When_Spaces_In_Inline_Tags_Should_Be_Retained.verified.md
@@ -1 +1 @@
-... example html *code *block
+... example html *code* block
diff --git a/src/ReverseMarkdown/Converters/Em.cs b/src/ReverseMarkdown/Converters/Em.cs
@@ -25,14 +25,12 @@ public override string Convert(HtmlNode node)
             {
                 return content;
             }
-            else
-            {
-                var spaceSuffix = (node.NextSibling?.Name == "i" || node.NextSibling?.Name == "em")
-                    ? " "
-                    : "";
 
-                return $"*{content.Chomp(all:true)}*{spaceSuffix}";
-            }
+            var spaceSuffix = (node.NextSibling?.Name == "i" || node.NextSibling?.Name == "em")
+                ? " "
+                : "";
+
+            return content.EmphasizeContentWhitespaceGuard("*", spaceSuffix);
         }
 
         private static bool AlreadyItalic(HtmlNode node)

diff --git a/src/ReverseMarkdown/Converters/S.cs b/src/ReverseMarkdown/Converters/S.cs
@@ -19,10 +19,8 @@ public override string Convert(HtmlNode node)
             {
                 return content;
             }
-            else
-            {
-                return $"~~{content.Chomp(all:true)}~~";
-            }
+
+            return content.EmphasizeContentWhitespaceGuard("~~");
         }
 
         private static bool AlreadyStrikethrough(HtmlNode node)

diff --git a/src/ReverseMarkdown/Converters/Strong.cs b/src/ReverseMarkdown/Converters/Strong.cs
@@ -22,14 +22,12 @@ public override string Convert(HtmlNode node)
             {
                 return content;
             }
-            else
-            {
-                var spaceSuffix = (node.NextSibling?.Name == "strong" || node.NextSibling?.Name == "b")
-                    ? " "
-                    : "";
+
+            var spaceSuffix = (node.NextSibling?.Name == "strong" || node.NextSibling?.Name == "b")
+                ? " "
+                : "";
 
-                return $"**{content.Chomp(all:true)}**{spaceSuffix}";
-            }
+            return content.EmphasizeContentWhitespaceGuard("**", spaceSuffix);
         }
 
         private static bool AlreadyBold(HtmlNode node)

diff --git a/src/ReverseMarkdown/Converters/Sup.cs b/src/ReverseMarkdown/Converters/Sup.cs
@@ -17,10 +17,8 @@ public override string Convert(HtmlNode node)
             {
                 return content;
             }
-            else
-            {
-                return $"^{content.Chomp(all:true)}^";
-            }
+
+            return $"^{content.Chomp(all:true)}^";
         }
 
         private static bool AlreadySup(HtmlNode node)

diff --git a/src/ReverseMarkdown/StringUtils.cs b/src/ReverseMarkdown/StringUtils.cs
@@ -14,7 +14,8 @@ public static string Chomp(this string content, bool all=false)
             {
                 return content
                     .Replace("\r", "")
-                    .Replace("\n", "");
+                    .Replace("\n", "")
+                    .Trim();
             }
 
             return content.Trim().TrimEnd('\r', '\n');
@@ -78,6 +79,48 @@ public static string EscapeLinkText(string rawText)
                 .ToDictionary(styleParts => styleParts[0], styleParts => styleParts[1]);
         }
 
+        public static int LeadingSpaceCount(this string content)
+        {
+            var leadingSpaces = 0;
+            foreach (var c in content)
+            {
+                if (c == ' ')
+                {
+                    leadingSpaces++;
+                }
+                else
+                {
+                    break;
+                }
+            }
+            return leadingSpaces;
+        }
+
+        public static int TrailingSpaceCount(this string content)
+        {
+            var trailingSpaces = 0;
+            for (var i = content.Length - 1; i >= 0; i--)
+            {
+                if (content[i] == ' ')
+                {
+                    trailingSpaces++;
+                }
+                else
+                {
+                    break;
+                }
+            }
+            return trailingSpaces;
+        }
+
+        public static string EmphasizeContentWhitespaceGuard(this string content, string emphasis, string nextSiblingSpaceSuffix="")
+        {
+            var leadingSpaces = new string(' ', content.LeadingSpaceCount());
+            var trailingSpaces = new string(' ', content.TrailingSpaceCount());
+
+            return $"{leadingSpaces}{emphasis}{content.Chomp(all:true)}{emphasis}{(trailingSpaces.Length > 0 ? trailingSpaces : nextSiblingSpaceSuffix)}";
+        }
+
         private static IEnumerable<T> DistinctBy<T, TKey>(this IEnumerable<T> enumerable, Func<T, TKey> keySelector)
         {
             return enumerable.GroupBy(keySelector).Select(grp => grp.First());