Fixing bug with directive following a trailing comment getting extra …

…indentation closes #216
belav · May 26, 2021 · 4f5919c · 4f5919c
1 parent 8e8f5b3
commit 4f5919c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/Src/CSharpier.Tests/DocPrinterTests.cs b/Src/CSharpier.Tests/DocPrinterTests.cs
@@ -362,6 +362,22 @@ public void TrailingComment_Does_Not_Get_Extra_Space_From_Line()
             PrintedDocShouldBe(doc, $"x // comment{NewLine}y");
         }
 
+        [Test]
+        public void TrailingComment_Does_Affect_Trim()
+        {
+            var doc = Doc.Concat(
+                Doc.TrailingComment("// trailing", CommentType.SingleLine),
+                Doc.HardLine,
+                Doc.Indent(
+                    Doc.HardLineIfNoPreviousLineSkipBreakIfFirstInGroup,
+                    Doc.Trim,
+                    "    #endregion"
+                )
+            );
+            var result = Print(doc);
+            result.Should().Be($" // trailing{NewLine}    #endregion");
+        }
+
         [Test]
         public void HardLineIfNoPreviousLine_Should_Insert_Line_If_There_Is_Not_One()
         {

diff --git a/Src/CSharpier.Tests/TestFiles/Directives/Directives.cst b/Src/CSharpier.Tests/TestFiles/Directives/Directives.cst
@@ -20,6 +20,10 @@ class ClassName { }
 
 public class ClassName
 {
+    #region Trailing comment does not indent more than it should #endregion
+    private int x; // trailing comment
+    #endregion
+
     void MethodWithOnlyDisabled()
     {
 #if DEBUG

diff --git a/Src/CSharpier/DocPrinter/DocPrinter.cs b/Src/CSharpier/DocPrinter/DocPrinter.cs
@@ -215,6 +215,7 @@ void Push(Doc doc, PrintMode printMode, Indent indent)
                         break;
                     case Trim:
                         currentWidth -= TrimOutput(output);
+                        newLineNextStringValue = false;
                         break;
                     case Group group:
                         switch (command.Mode)