Fix include indentation after newline

xoofx · Copilot · xoofx · commit 60ab0d94f713 · 2026-03-26T07:50:50.000+01:00
Restore the caller newline state around include rendering so auto-indent still applies to the first line returned by an include after a preceding newline. Add sync and async regression tests for issue #662. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
diff --git a/src/Scriban.Tests/TestIncludes.cs b/src/Scriban.Tests/TestIncludes.cs
@@ -193,6 +193,64 @@ This is a header
             TextAssert.AreEqual(expected, text);
         }
 
+        [Test]
+        public void TestIncludeShouldIndentFirstLineAfterNewLineInAutoIndentedBlock()
+        {
+            var template = Template.Parse("""
+                namespace Demo {
+                    {{
+                        "\n"
+                        include 'multilines'
+                    -}}
+                }
+                """);
+            var context = new TemplateContext
+            {
+                TemplateLoader = new CustomTemplateLoader(),
+                AutoIndent = true
+            };
+
+            var text = template.Render(context).Replace("\r\n", "\n");
+            var expected = """
+                namespace Demo {
+                    
+                    Line 1
+                    Line 2
+                    Line 3}
+                """.Replace("\r\n", "\n");
+
+            TextAssert.AreEqual(expected, text);
+        }
+
+        [Test]
+        public async Task TestIncludeShouldIndentFirstLineAfterNewLineInAutoIndentedBlock_Async()
+        {
+            var template = Template.Parse("""
+                namespace Demo {
+                    {{
+                        "\n"
+                        include 'multilines'
+                    -}}
+                }
+                """);
+            var context = new TemplateContext
+            {
+                TemplateLoader = new CustomTemplateLoader(),
+                AutoIndent = true
+            };
+
+            var text = (await template.RenderAsync(context)).Replace("\r\n", "\n");
+            var expected = """
+                namespace Demo {
+                    
+                    Line 1
+                    Line 2
+                    Line 3}
+                """.Replace("\r\n", "\n");
+
+            TextAssert.AreEqual(expected, text);
+        }
+
         [TestCase(false)]
         [TestCase(true)]
         public void TestIncludeNamedArguments(bool strictVariables)
diff --git a/src/Scriban/ScribanAsync.generated.cs b/src/Scriban/ScribanAsync.generated.cs
@@ -424,6 +424,7 @@ public async ValueTask<string> RenderTemplateAsync(Template template, ScriptArra
             var result = string.Empty;
             EnterRecursive(callerContext);
             var previousIndent = CurrentIndent;
+            var previousTextWasNewLine = _previousTextWasNewLine;
             CurrentIndent = null;
             PushOutput();
             // Fetch any named argument values before pushing a new local scope, i.e. use the current context for evaluating the named arguments
@@ -445,20 +446,17 @@ public async ValueTask<string> RenderTemplateAsync(Template template, ScriptArra
                 }
                 if (previousIndent is not null)
                 {
-                    // We reset before and after the fact that we have a new line
+                    // Isolate the included template output from the caller newline state.
                     ResetPreviousNewLine();
                 }
                 result = await template.RenderAsync(this).ConfigureAwait(false);
-                if (previousIndent is not null)
-                {
-                    ResetPreviousNewLine();
-                }
             }
             finally
             {
                 PopLocal();
                 PopOutput();
                 CurrentIndent = previousIndent;
+                _previousTextWasNewLine = previousTextWasNewLine;
                 ExitRecursive(callerContext);
             }
             return result;
diff --git a/src/Scriban/TemplateContext.cs b/src/Scriban/TemplateContext.cs
@@ -1443,6 +1443,7 @@ public string RenderTemplate(Template template, ScriptArray arguments, ScriptNod
             var result = string.Empty;
             EnterRecursive(callerContext);
             var previousIndent = CurrentIndent;
+            var previousTextWasNewLine = _previousTextWasNewLine;
             CurrentIndent = null;
             PushOutput();
             // Fetch any named argument values before pushing a new local scope, i.e. use the current context for evaluating the named arguments
@@ -1464,20 +1465,17 @@ public string RenderTemplate(Template template, ScriptArray arguments, ScriptNod
                 }
                 if (previousIndent is not null)
                 {
-                    // We reset before and after the fact that we have a new line
+                    // Isolate the included template output from the caller newline state.
                     ResetPreviousNewLine();
                 }
                 result = template.Render(this);
-                if (previousIndent is not null)
-                {
-                    ResetPreviousNewLine();
-                }
             }
             finally
             {
                 PopLocal();
                 PopOutput();
                 CurrentIndent = previousIndent;
+                _previousTextWasNewLine = previousTextWasNewLine;
                 ExitRecursive(callerContext);
             }
             return result;

Original file line number	Diff line number	Diff line change
`@@ -424,6 +424,7 @@ public async ValueTask<string> RenderTemplateAsync(Template template, ScriptArra`
`424`	`424`	`var result = string.Empty;`
`425`	`425`	`EnterRecursive(callerContext);`
`426`	`426`	`var previousIndent = CurrentIndent;`
	`427`	`+ var previousTextWasNewLine = _previousTextWasNewLine;`
`427`	`428`	`CurrentIndent = null;`
`428`	`429`	`PushOutput();`
`429`	`430`	`// Fetch any named argument values before pushing a new local scope, i.e. use the current context for evaluating the named arguments`
`@@ -445,20 +446,17 @@ public async ValueTask<string> RenderTemplateAsync(Template template, ScriptArra`
`445`	`446`	`}`
`446`	`447`	`if (previousIndent is not null)`
`447`	`448`	`{`
`448`		`- // We reset before and after the fact that we have a new line`
	`449`	`+ // Isolate the included template output from the caller newline state.`
`449`	`450`	`ResetPreviousNewLine();`
`450`	`451`	`}`
`451`	`452`	`result = await template.RenderAsync(this).ConfigureAwait(false);`
`452`		`- if (previousIndent is not null)`
`453`		`- {`
`454`		`- ResetPreviousNewLine();`
`455`		`- }`
`456`	`453`	`}`
`457`	`454`	`finally`
`458`	`455`	`{`
`459`	`456`	`PopLocal();`
`460`	`457`	`PopOutput();`
`461`	`458`	`CurrentIndent = previousIndent;`
	`459`	`+ _previousTextWasNewLine = previousTextWasNewLine;`
`462`	`460`	`ExitRecursive(callerContext);`
`463`	`461`	`}`
`464`	`462`	`return result;`
Original file line number	Diff line number	Diff line change
`@@ -1443,6 +1443,7 @@ public string RenderTemplate(Template template, ScriptArray arguments, ScriptNod`
`1443`	`1443`	`var result = string.Empty;`
`1444`	`1444`	`EnterRecursive(callerContext);`
`1445`	`1445`	`var previousIndent = CurrentIndent;`
	`1446`	`+ var previousTextWasNewLine = _previousTextWasNewLine;`
`1446`	`1447`	`CurrentIndent = null;`
`1447`	`1448`	`PushOutput();`
`1448`	`1449`	`// Fetch any named argument values before pushing a new local scope, i.e. use the current context for evaluating the named arguments`
`@@ -1464,20 +1465,17 @@ public string RenderTemplate(Template template, ScriptArray arguments, ScriptNod`
`1464`	`1465`	`}`
`1465`	`1466`	`if (previousIndent is not null)`
`1466`	`1467`	`{`
`1467`		`- // We reset before and after the fact that we have a new line`
	`1468`	`+ // Isolate the included template output from the caller newline state.`
`1468`	`1469`	`ResetPreviousNewLine();`
`1469`	`1470`	`}`
`1470`	`1471`	`result = template.Render(this);`
`1471`		`- if (previousIndent is not null)`
`1472`		`- {`
`1473`		`- ResetPreviousNewLine();`
`1474`		`- }`
`1475`	`1472`	`}`
`1476`	`1473`	`finally`
`1477`	`1474`	`{`
`1478`	`1475`	`PopLocal();`
`1479`	`1476`	`PopOutput();`
`1480`	`1477`	`CurrentIndent = previousIndent;`
	`1478`	`+ _previousTextWasNewLine = previousTextWasNewLine;`
`1481`	`1479`	`ExitRecursive(callerContext);`
`1482`	`1480`	`}`
`1483`	`1481`	`return result;`