Skip to content
This repository was archived by the owner on Dec 19, 2018. It is now read-only.

Extra newline no longer rendered at the end of a code block #507

Merged
merged 1 commit into from
Sep 10, 2015
Merged

Extra newline no longer rendered at the end of a code block #507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/Microsoft.AspNet.Razor/Parser/CSharpCodeParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,12 +316,16 @@ private void VerbatimBlock()
Span.ChunkGenerator = SpanChunkGenerator.Null;
}

if (!At(CSharpSymbolType.WhiteSpace) && !At(CSharpSymbolType.NewLine))
if (!IsNested)
{
PutCurrentBack();
EnsureCurrent();
if (At(CSharpSymbolType.NewLine) ||
(At(CSharpSymbolType.WhiteSpace) && NextIs(CSharpSymbolType.NewLine)))
{
Context.NullGenerateWhitespaceAndNewLine = true;
}
}

CompleteBlock(insertMarkerIfNecessary: false);
Output(SpanKind.MetaCode);
}

Expand Down
14 changes: 13 additions & 1 deletion src/Microsoft.AspNet.Razor/Parser/HtmlMarkupParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,19 @@ protected void SkipToAndParseCode(Func<HtmlSymbol, bool> condition)
var startOfLine = false;
while (!EndOfFile && !condition(CurrentSymbol))
{
if (At(HtmlSymbolType.NewLine))
if (Context.NullGenerateWhitespaceAndNewLine)
{
Context.NullGenerateWhitespaceAndNewLine = false;
Span.ChunkGenerator = SpanChunkGenerator.Null;
AcceptWhile(symbol => symbol.Type == HtmlSymbolType.WhiteSpace);
if (At(HtmlSymbolType.NewLine))
{
AcceptAndMoveNext();
}

Output(SpanKind.Markup);
}
else if (At(HtmlSymbolType.NewLine))
{
if (last != null)
{
Expand Down
2 changes: 2 additions & 0 deletions src/Microsoft.AspNet.Razor/Parser/ParserContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ public BlockBuilder CurrentBlock
public Span LastSpan { get; private set; }
public bool WhiteSpaceIsSignificantToAncestorBlock { get; set; }

public bool NullGenerateWhitespaceAndNewLine { get; set; }

public AcceptedCharacters LastAcceptedCharacters
{
get
Expand Down
128 changes: 128 additions & 0 deletions test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlDocumentTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,134 @@ public void ParseDocumentIgnoresTagsInContentsOfScriptTag()
BlockFactory.MarkupTagBlock("</script>")));
}

[Fact]
public void ParseDocumentDoesNotRenderExtraNewLineAtTheEndOfVerbatimBlock()
{
ParseDocumentTest("@{\r\n}\r\n<html>",
new MarkupBlock(
Factory.EmptyHtml(),
new StatementBlock(
Factory.CodeTransition(),
Factory.MetaCode("{").Accepts(AcceptedCharacters.None),
Factory.Code("\r\n").AsStatement().AutoCompleteWith(null, false),
Factory.MetaCode("}").Accepts(AcceptedCharacters.None)),
Factory.Markup("\r\n").With(SpanChunkGenerator.Null),
BlockFactory.MarkupTagBlock("<html>")));
}

[Fact]
public void ParseDocumentDoesNotRenderExtraWhitespaceAndNewLineAtTheEndOfVerbatimBlock()
{
ParseDocumentTest("@{\r\n} \t\r\n<html>",
new MarkupBlock(
Factory.EmptyHtml(),
new StatementBlock(
Factory.CodeTransition(),
Factory.MetaCode("{").Accepts(AcceptedCharacters.None),
Factory.Code("\r\n").AsStatement().AutoCompleteWith(null, false),
Factory.MetaCode("}").Accepts(AcceptedCharacters.None)),
Factory.Markup(" \t\r\n").With(SpanChunkGenerator.Null),
BlockFactory.MarkupTagBlock("<html>")));
}

[Fact]
public void ParseDocumentDoesNotIgnoreNewLineAtTheEndOfMarkupBlock()
{
ParseDocumentTest("@{\r\n}\r\n<html>\r\n",
new MarkupBlock(
Factory.EmptyHtml(),
new StatementBlock(
Factory.CodeTransition(),
Factory.MetaCode("{").Accepts(AcceptedCharacters.None),
Factory.Code("\r\n").AsStatement().AutoCompleteWith(null, false),
Factory.MetaCode("}").Accepts(AcceptedCharacters.None)),
Factory.Markup("\r\n").With(SpanChunkGenerator.Null),
BlockFactory.MarkupTagBlock("<html>"),
Factory.Markup("\r\n")));
}

[Fact]
public void ParseDocumentDoesNotIgnoreWhitespaceAtTheEndOfVerbatimBlockIfNoNewlinePresent()
{
ParseDocumentTest("@{\r\n} \t<html>\r\n",
new MarkupBlock(
Factory.EmptyHtml(),
new StatementBlock(
Factory.CodeTransition(),
Factory.MetaCode("{").Accepts(AcceptedCharacters.None),
Factory.Code("\r\n").AsStatement().AutoCompleteWith(null, false),
Factory.MetaCode("}").Accepts(AcceptedCharacters.None)),
Factory.Markup(" \t"),
BlockFactory.MarkupTagBlock("<html>"),
Factory.Markup("\r\n")));
}

[Fact]
public void ParseDocumentHandlesNewLineInNestedBlock()
{
ParseDocumentTest("@{\r\n@if(true){\r\n} \r\n}\r\n<html>",
new MarkupBlock(
Factory.EmptyHtml(),
new StatementBlock(
Factory.CodeTransition(),
Factory.MetaCode("{").Accepts(AcceptedCharacters.None),
Factory.Code("\r\n").AsStatement().AutoCompleteWith(null, false),
new StatementBlock(
Factory.CodeTransition(),
Factory.Code("if(true){\r\n}").AsStatement()),
Factory.Code(" \r\n").AsStatement(),
Factory.MetaCode("}").Accepts(AcceptedCharacters.None)),
Factory.Markup("\r\n").With(SpanChunkGenerator.Null),
BlockFactory.MarkupTagBlock("<html>")));
}

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Few more tests

  • @{\r\n} \t\r\n<html>
  • @{\r\n@if(true){\r\n} <input> }
  • @{\r\n@if(true){\r\n} \r\n<input> \r\n}<html>

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added.

[Fact]
public void ParseDocumentHandlesNewLineAndMarkupInNestedBlock()
{
ParseDocumentTest("@{\r\n@if(true){\r\n} <input> }",
new MarkupBlock(
Factory.EmptyHtml(),
new StatementBlock(
Factory.CodeTransition(),
Factory.MetaCode("{").Accepts(AcceptedCharacters.None),
Factory.Code("\r\n").AsStatement().AutoCompleteWith(null, false),
new StatementBlock(
Factory.CodeTransition(),
Factory.Code("if(true){\r\n}").AsStatement()),
new MarkupBlock(
Factory.Markup(" "),
new MarkupTagBlock(
Factory.Markup("<input>").Accepts(AcceptedCharacters.None)),
Factory.Markup(" ").Accepts(AcceptedCharacters.None)),
Factory.EmptyCSharp().AsStatement(),
Factory.MetaCode("}").Accepts(AcceptedCharacters.None)),
Factory.EmptyHtml()));
}

[Fact]
public void ParseDocumentHandlesExtraNewLineBeforeMarkupInNestedBlock()
{
ParseDocumentTest("@{\r\n@if(true){\r\n} \r\n<input> \r\n}<html>",
new MarkupBlock(
Factory.EmptyHtml(),
new StatementBlock(
Factory.CodeTransition(),
Factory.MetaCode("{").Accepts(AcceptedCharacters.None),
Factory.Code("\r\n").AsStatement().AutoCompleteWith(null, false),
new StatementBlock(
Factory.CodeTransition(),
Factory.Code("if(true){\r\n}").AsStatement()),
Factory.Code(" \r\n").AsStatement(),
new MarkupBlock(
new MarkupTagBlock(
Factory.Markup("<input>").Accepts(AcceptedCharacters.None)),
Factory.Markup(" \r\n").Accepts(AcceptedCharacters.None)),
Factory.EmptyCSharp().AsStatement(),
Factory.MetaCode("}").Accepts(AcceptedCharacters.None)),
new MarkupTagBlock(
Factory.Markup("<html>"))));
}

[Fact]
public void ParseSectionIgnoresTagsInContentsOfScriptTag()
{
Expand Down
4 changes: 2 additions & 2 deletions test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/Blocks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ public override async Task ExecuteAsync()
#line default
#line hidden

Instrumentation.BeginContext(21, 4, true);
WriteLiteral("\r\n\r\n");
Instrumentation.BeginContext(23, 2, true);
WriteLiteral("\r\n");
Instrumentation.EndContext();
#line 5 "Blocks.cshtml"
while(i <= 10) {
Expand Down
3 changes: 0 additions & 3 deletions test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/CodeBlockWithTextElement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@ public override async Task ExecuteAsync()
#line default
#line hidden

Instrumentation.BeginContext(83, 2, true);
WriteLiteral("\r\n");
Instrumentation.EndContext();
}
#pragma warning restore 1998
}
Expand Down
4 changes: 2 additions & 2 deletions test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,8 @@ public override async Task ExecuteAsync()
#line default
#line hidden

Instrumentation.BeginContext(805, 14, true);
WriteLiteral("\r\n ");
Instrumentation.BeginContext(807, 12, true);
WriteLiteral(" ");
Instrumentation.EndContext();
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.StartTagOnly, "test", async() => {
}
Expand Down
4 changes: 2 additions & 2 deletions test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ExpressionsInCode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ public override async Task ExecuteAsync()
#line default
#line hidden

Instrumentation.BeginContext(54, 4, true);
WriteLiteral("\r\n\r\n");
Instrumentation.BeginContext(56, 2, true);
WriteLiteral("\r\n");
Instrumentation.EndContext();
#line 6 "ExpressionsInCode.cshtml"
if(foo != null) {
Expand Down
4 changes: 2 additions & 2 deletions test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/Instrumented.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ public override async Task ExecuteAsync()
#line default
#line hidden

Instrumentation.BeginContext(94, 4, true);
WriteLiteral("\r\n\r\n");
Instrumentation.BeginContext(96, 2, true);
WriteLiteral("\r\n");
Instrumentation.EndContext();
#line 8 "Instrumented.cshtml"
while(i <= 10) {
Expand Down
3 changes: 0 additions & 3 deletions test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/MarkupInCodeBlock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ public override async Task ExecuteAsync()
#line default
#line hidden

Instrumentation.BeginContext(96, 2, true);
WriteLiteral("\r\n");
Instrumentation.EndContext();
}
#pragma warning restore 1998
}
Expand Down
4 changes: 2 additions & 2 deletions test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NoLinePragmas.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ public override async Task ExecuteAsync()
#line default
#line hidden

Instrumentation.BeginContext(21, 4, true);
WriteLiteral("\r\n\r\n");
Instrumentation.BeginContext(23, 2, true);
WriteLiteral("\r\n");
Instrumentation.EndContext();
#line 5 ""
while(i <= 10) {
Expand Down
4 changes: 2 additions & 2 deletions .../Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NullConditionalExpressions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ public override async Task ExecuteAsync()
#line default
#line hidden

Instrumentation.BeginContext(135, 4, true);
WriteLiteral("\r\n\r\n");
Instrumentation.BeginContext(137, 2, true);
WriteLiteral("\r\n");
Instrumentation.EndContext();
Instrumentation.BeginContext(140, 13, false);
#line 8 "NullConditionalExpressions.cshtml"
Expand Down
4 changes: 2 additions & 2 deletions ....AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.Reversed.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ public override async Task ExecuteAsync()
#line default
#line hidden

Instrumentation.BeginContext(280, 51, true);
WriteLiteral("\r\n\r\n<div class=\"randomNonTagHelperAttribute\">\r\n ");
Instrumentation.BeginContext(282, 49, true);
WriteLiteral("\r\n<div class=\"randomNonTagHelperAttribute\">\r\n ");
Instrumentation.EndContext();
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => {
}
Expand Down
4 changes: 2 additions & 2 deletions ...Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ public override async Task ExecuteAsync()
#line default
#line hidden

Instrumentation.BeginContext(280, 51, true);
WriteLiteral("\r\n\r\n<div class=\"randomNonTagHelperAttribute\">\r\n ");
Instrumentation.BeginContext(282, 49, true);
WriteLiteral("\r\n<div class=\"randomNonTagHelperAttribute\">\r\n ");
Instrumentation.EndContext();
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("input", TagMode.SelfClosing, "test", async() => {
}
Expand Down
8 changes: 4 additions & 4 deletions test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/RazorComments.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@ public override async Task ExecuteAsync()
#line default
#line hidden

Instrumentation.BeginContext(232, 4, true);
WriteLiteral("\r\n\r\n");
Instrumentation.BeginContext(234, 2, true);
WriteLiteral("\r\n");
Instrumentation.EndContext();
#line 12 "RazorComments.cshtml"
var bar = "@* bar *@";

#line default
#line hidden

Instrumentation.BeginContext(263, 46, true);
WriteLiteral("\r\n<p>But this should show the comment syntax: ");
Instrumentation.BeginContext(265, 44, true);
WriteLiteral("<p>But this should show the comment syntax: ");
Instrumentation.EndContext();
Instrumentation.BeginContext(310, 3, false);
#line 13 "RazorComments.cshtml"
Expand Down
4 changes: 2 additions & 2 deletions test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/Sections.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ public override async Task ExecuteAsync()
#line default
#line hidden

Instrumentation.BeginContext(47, 33, true);
WriteLiteral("\r\n\r\n<div>This is in the Body>\r\n\r\n");
Instrumentation.BeginContext(49, 31, true);
WriteLiteral("\r\n<div>This is in the Body>\r\n\r\n");
Instrumentation.EndContext();
DefineSection("Section2", async(__razor_template_writer) => {
Instrumentation.BeginContext(99, 39, true);
Expand Down
4 changes: 2 additions & 2 deletions test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersInSection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ public override async Task ExecuteAsync()
#line default
#line hidden

Instrumentation.BeginContext(69, 4, true);
WriteLiteral("\r\n\r\n");
Instrumentation.BeginContext(71, 2, true);
WriteLiteral("\r\n");
Instrumentation.EndContext();
DefineSection("MySection", async(__razor_template_writer) => {
Instrumentation.BeginContext(93, 21, true);
Expand Down
8 changes: 4 additions & 4 deletions test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/Templates.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ public override async Task ExecuteAsync()
#line default
#line hidden

Instrumentation.BeginContext(367, 10, true);
WriteLiteral("\r\n\r\n<ul>\r\n");
Instrumentation.BeginContext(369, 8, true);
WriteLiteral("\r\n<ul>\r\n");
Instrumentation.EndContext();
Instrumentation.BeginContext(379, 11, false);
#line 17 "Templates.cshtml"
Expand Down Expand Up @@ -156,8 +156,8 @@ public override async Task ExecuteAsync()
#line default
#line hidden

Instrumentation.BeginContext(574, 79, true);
WriteLiteralTo(__razor_template_writer, "\r\n <ul>\r\n <li>Child Items... ?</li>\r\n </ul>\r\n </li>");
Instrumentation.BeginContext(576, 77, true);
WriteLiteralTo(__razor_template_writer, " <ul>\r\n <li>Child Items... ?</li>\r\n </ul>\r\n </li>");
Instrumentation.EndContext();
}
)
Expand Down
4 changes: 2 additions & 2 deletions ...soft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ public override async Task ExecuteAsync()
#line default
#line hidden

Instrumentation.BeginContext(95, 4, true);
WriteLiteral("\r\n\r\n");
Instrumentation.BeginContext(97, 2, true);
WriteLiteral("\r\n");
Instrumentation.EndContext();
__tagHelperExecutionContext = __tagHelperScopeManager.Begin("p", TagMode.StartTagAndEndTag, "test", async() => {
Instrumentation.BeginContext(128, 11, true);
Expand Down