From 4c1795fc79b5e20a3d7d51009b1118c849356715 Mon Sep 17 00:00:00 2001 From: Ajay Bhargav Baaskaran Date: Thu, 1 Jun 2017 15:52:43 -0700 Subject: [PATCH] [Fixes #1394] Fix unexpected indentation when autoformatting in VS --- .../Legacy/CSharpCodeParser.cs | 2 +- .../Legacy/CSharpDirectivesTest.cs | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpCodeParser.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpCodeParser.cs index 91ce56bffe..cba978ff84 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpCodeParser.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpCodeParser.cs @@ -1674,7 +1674,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy CurrentSymbol.Content.Length); } - Output(SpanKind.Markup, AcceptedCharacters.WhiteSpace); + Output(SpanKind.MetaCode, AcceptedCharacters.WhiteSpace); break; case DirectiveKind.RazorBlock: AcceptWhile(IsSpacingToken(includeNewLines: true, includeComments: true)); diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpDirectivesTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpDirectivesTest.cs index cb32fa4f23..4759dffea6 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpDirectivesTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpDirectivesTest.cs @@ -420,8 +420,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy Factory.Span(SpanKind.Code, " ", markup: false).Accepts(AcceptedCharacters.WhiteSpace), Factory.Span(SpanKind.Code, "Some_Member", markup: false).AsDirectiveToken(descriptor.Tokens[1]), - Factory.Span(SpanKind.Markup, " ", markup: false) - .Accepts(AcceptedCharacters.WhiteSpace))); + Factory.MetaCode(" ").Accepts(AcceptedCharacters.WhiteSpace))); } [Fact] @@ -469,7 +468,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy Factory.MetaCode("custom").Accepts(AcceptedCharacters.None), Factory.Span(SpanKind.Markup, " ", markup: false).Accepts(AcceptedCharacters.WhiteSpace), Factory.Span(SpanKind.Code, "\"hello\"", markup: false).AsDirectiveToken(descriptor.Tokens[0]), - Factory.Span(SpanKind.Markup, " ; ", markup: false).Accepts(AcceptedCharacters.WhiteSpace))); + Factory.MetaCode(" ; ").Accepts(AcceptedCharacters.WhiteSpace))); } [Fact] @@ -497,7 +496,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy Factory.Span(SpanKind.Markup, " ", markup: false).Accepts(AcceptedCharacters.WhiteSpace), Factory.Span(SpanKind.Code, "\"hello\"", markup: false).AsDirectiveToken(descriptor.Tokens[0]), - Factory.Span(SpanKind.Markup, " ", markup: false).Accepts(AcceptedCharacters.WhiteSpace)), + Factory.MetaCode(" ").Accepts(AcceptedCharacters.WhiteSpace)), expectedErorr); }