Fixing bug with range ignore + regions

closes #1197
belav · Mar 24, 2024 · 668e166 · 668e166
1 parent 88f8193
commit 668e166
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/Directives_Regions.test b/Src/CSharpier.Tests/FormattingTests/TestFiles/cs/Directives_Regions.test
@@ -40,3 +40,12 @@ public class ClassName
         #endregion one
     ;
 }
+
+class ClassName
+{    
+    #region Region
+    // csharpier-ignore-start
+    public string   Field;
+    // csharpier-ignore-end
+    #endregion
+}
diff --git a/Src/CSharpier/DocPrinter/DocPrinter.cs b/Src/CSharpier/DocPrinter/DocPrinter.cs
@@ -14,7 +14,7 @@ internal class DocPrinter
     protected readonly string EndOfLine;
     protected readonly PrinterOptions PrinterOptions;
     protected readonly Indenter Indenter;
-    protected Stack<Indent> RegionIndents = new();
+    protected readonly Stack<Indent> RegionIndents = new();
 
     protected DocPrinter(Doc doc, PrinterOptions printerOptions, string endOfLine)
     {
@@ -156,8 +156,17 @@ private void ProcessNextCommand()
         {
             if (region.IsEnd)
             {
-                var regionIndent = this.RegionIndents.Pop();
-                this.Output.Append(regionIndent.Value);
+                // in the case where regions are combined with ignored ranges, the start region
+                // ends up printing inside the unformatted nodes, so we don't have a matching
+                // start region to go with this end region
+                if (this.RegionIndents.TryPop(out var regionIndent))
+                {
+                    this.Output.Append(regionIndent.Value);
+                }
+                else
+                {
+                    this.Output.Append(indent.Value);
+                }
             }
             else
             {