✂ Don't chop non-whitespace when trimming text

Fixes #33
devlooped · Jan 28, 2021 · b29aa5f · b29aa5f
1 parent ad4e732
commit b29aa5f
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 3 deletions.
diff --git a/src/NuDoq.Tests/ReaderFixture.cs b/src/NuDoq.Tests/ReaderFixture.cs
@@ -676,6 +676,19 @@ public void when_reading_indexer_property_then_succeeds()
             Assert.Equal("indexed", method.ToText());
         }
 
+        [Fact]
+        public void when_reading_weird_indenting_then_preserves_text()
+        {
+            var member = DocReader.Read(Assembly.GetExecutingAssembly(), new ReaderOptions { KeepNewLinesInText = true });
+            var method = member.Elements.OfType<Method>()
+                .FirstOrDefault(m => m.Info?.DeclaringType == typeof(CustomXml) && m.Info?.Name == nameof(CustomXml.WeirdIndenting));
+
+            Assert.NotNull(method);
+            Assert.Equal(@"Begin
+End", method.ToText());
+        }
+
+
         class CountingVisitor : Visitor
         {
             readonly string platform;
@@ -724,6 +737,12 @@ protected override void VisitElement(Element element)
         /// </remarks>
         public class CustomXml
         {
+            ///     <summary>
+            ///   Begin
+            ///  End
+            ///     </summary>
+            public void WeirdIndenting() { }
+
             /// <preliminary />
             public void Preliminary() { }
 

diff --git a/src/NuDoq/DocReader.cs b/src/NuDoq/DocReader.cs
@@ -290,7 +290,23 @@ string TrimText(string content)
         /// <summary>
         /// Trims the code by removing extra indent.
         /// </summary>
-        string TrimCode(string content) => TrimLines(content, StringSplitOptions.None, Environment.NewLine);
+        string TrimCode(string content)
+            => TrimLines(content, StringSplitOptions.None, Environment.NewLine);
+
+        string TrimWhitespaceTo(string content, int index)
+        {
+            if (string.IsNullOrEmpty(content))
+                return content;
+
+            for (var i = 0; i < index; i++)
+            {
+                // Check for end of whitespace
+                if (!char.IsWhiteSpace(content[i]))
+                    return content.Substring(i);
+            }
+
+            return content.Substring(index);
+        }
 
         string TrimLines(string content, StringSplitOptions splitOptions, string joinWith)
         {
@@ -330,9 +346,9 @@ string TrimLines(string content, StringSplitOptions splitOptions, string joinWit
                         else if (line.Length < indent)
                             return string.Empty;
                         else
-                            return line.Substring(indent);
+                            return TrimWhitespaceTo(line, indent);
                     })
                 .ToArray());
         }
     }
-}
+}