Skip to content

Explicitly handle switch expressions in parser #12500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
+1,244 −8
Open

Explicitly handle switch expressions in parser #12500

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ac57da1
Add switch expression tests
chsienki Nov 17, 2025
f2fd834
Explicitly handle switch expressions
chsienki Nov 17, 2025
415a150
Update baselines
chsienki Nov 17, 2025
1751716
Add test with markup
chsienki Nov 17, 2025
02a6a68
Add tests for switch expressions in explicit expressions
chsienki Nov 18, 2025
1f83024
Add extra tests for @<markup>
chsienki Nov 19, 2025
c33668d
Fix baseline due to fixed test
chsienki Nov 19, 2025
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
125 changes: 125 additions & 0 deletions src/Compiler/Microsoft.AspNetCore.Razor.Language/test/Legacy/CSharpBlockTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -931,6 +931,131 @@ public void CommentOnSameLineAsHtml()
""");
}

[Fact, WorkItem("https://github.com/dotnet/razor/issues/7230")]
public void SwitchExpression()
{
ParseDocumentTest("""
@{
var val = 0 switch
{
0 => "value",
_ => "no value"
};
}
""");
}

[Fact, WorkItem("https://github.com/dotnet/razor/issues/7230")]
public void SwitchExpression_WithLessThan()
{
ParseDocumentTest("""
@{
var val = 0 switch
{
< 9 => "less than 10"
};
}
""");
}

[Fact, WorkItem("https://github.com/dotnet/razor/issues/7230")]
public void SwitchExpression_WithGreaterThan()
{
ParseDocumentTest("""
@{
var val = 0 switch
{
> 10 => "greater than 10"
};
}
""");
}

[Fact, WorkItem("https://github.com/dotnet/razor/issues/7230")]
public void SwitchExpression_WithMultipleComparisons()
{
ParseDocumentTest("""
@{
var val = 0 switch
{
< 9 => "less than 10",
10 => "equal to 10",
> 10 => "greater than 10"
};
}
""");
}

[Fact, WorkItem("https://github.com/dotnet/razor/issues/7230")]
public void SwitchExpression_Incomplete()
{
ParseDocumentTest("""
@{
var val = 0 switch
{
0 => "value"

var val2 = "value2";
}
""");
}

[Fact, WorkItem("https://github.com/dotnet/razor/issues/7230")]
public void SwitchExpression_WithLessThan_Incomplete()
{
ParseDocumentTest("""
@{
var val = 0 switch
{
< 9 => "less than 10"

var val2 = "value2";
}
""");
}

[Fact, WorkItem("https://github.com/dotnet/razor/issues/7230")]
public void SwitchExpression_WithWrongKeyword()
{
ParseDocumentTest("""
@{
var val = 0 using
{
0 => "value"
};
}
""");
}

[Fact, WorkItem("https://github.com/dotnet/razor/issues/7230")]
public void SwitchExpression_WithWrongKeyword_AndLessThan()
{
ParseDocumentTest("""
@{
var val = 0 using
{
< 9 => "less than 10"
};
}
""");
}

[Fact, WorkItem("https://github.com/dotnet/razor/issues/7230")]
public void SwitchExpression_WithMarkupInside()
{
ParseDocumentTest("""
@{
var val = 0 switch
{
0 => <span>some <i>html</i></span>,
_ => "value"
};
}
""");
}



private void RunRazorCommentBetweenClausesTest(string preComment, string postComment, AcceptedCharactersInternal acceptedCharacters = AcceptedCharactersInternal.Any)
{
ParseDocumentTest(preComment + "@* Foo *@ @* Bar *@" + postComment);
Expand Down
6 changes: 6 additions & 0 deletions ...ore.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SwitchExpression.cspans.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Markup span at (0:0,0 [0] ) - Parent: Markup block at (0:0,0 [92] )
Transition span at (0:0,0 [1] ) - Parent: Statement block at (0:0,0 [92] )
MetaCode span at (1:0,1 [1] ) - Parent: Statement block at (0:0,0 [92] )
Code span at (2:0,2 [89] ) - Parent: Statement block at (0:0,0 [92] )
MetaCode span at (91:6,0 [1] ) - Parent: Statement block at (0:0,0 [92] )
Markup span at (92:6,1 [0] ) - Parent: Markup block at (0:0,0 [92] )
52 changes: 52 additions & 0 deletions ...Core.Razor.Language/test/TestFiles/ParserTests/CSharpBlockTest/SwitchExpression.stree.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
RazorDocument - [0..92)::92 - [@{LF var val = 0 switchLF {LF 0 => "value",LF _ => "no value"LF };LF}]
MarkupBlock - [0..92)::92
MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup>
Marker;[];
CSharpCodeBlock - [0..92)::92
CSharpStatement - [0..92)::92
CSharpTransition - [0..1)::1 - Gen<None>
Transition;[@];
CSharpStatementBody - [1..92)::91
RazorMetaCode - [1..2)::1 - Gen<None>
LeftBrace;[{];
CSharpCodeBlock - [2..91)::89
CSharpStatementLiteral - [2..91)::89 - [LF var val = 0 switchLF {LF 0 => "value",LF _ => "no value"LF };LF] - Gen<Stmt>
NewLine;[LF];
Whitespace;[ ];
Keyword;[var];
Whitespace;[ ];
Identifier;[val];
Whitespace;[ ];
Assign;[=];
Whitespace;[ ];
NumericLiteral;[0];
Whitespace;[ ];
Keyword;[switch];
NewLine;[LF];
Whitespace;[ ];
LeftBrace;[{];
NewLine;[LF];
Whitespace;[ ];
NumericLiteral;[0];
Whitespace;[ ];
CSharpOperator;[=>];
Whitespace;[ ];
StringLiteral;["value"];
Comma;[,];
NewLine;[LF];
Whitespace;[ ];
Keyword;[_];
Whitespace;[ ];
CSharpOperator;[=>];
Whitespace;[ ];
StringLiteral;["no value"];
NewLine;[LF];
Whitespace;[ ];
RightBrace;[}];
Semicolon;[;];
NewLine;[LF];
RazorMetaCode - [91..92)::1 - Gen<None>
RightBrace;[}];
MarkupTextLiteral - [92..92)::0 - [] - Gen<Markup>
Marker;[];
EndOfFile;[];
4 changes: 4 additions & 0 deletions ...anguage/test/TestFiles/ParserTests/CSharpBlockTest/SwitchExpression_Incomplete.cspans.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Markup span at (0:0,0 [0] ) - Parent: Markup block at (0:0,0 [86] )
Transition span at (0:0,0 [1] ) - Parent: Statement block at (0:0,0 [86] )
MetaCode span at (1:0,1 [1] ) - Parent: Statement block at (0:0,0 [86] )
Code span at (2:0,2 [84] ) - Parent: Statement block at (0:0,0 [86] )
1 change: 1 addition & 0 deletions ....Language/test/TestFiles/ParserTests/CSharpBlockTest/SwitchExpression_Incomplete.diag.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(1,2): Error RZ1006: The code block is missing a closing "}" character. Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
50 changes: 50 additions & 0 deletions ...Language/test/TestFiles/ParserTests/CSharpBlockTest/SwitchExpression_Incomplete.stree.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
RazorDocument - [0..86)::86 - [@{LF var val = 0 switchLF {LF 0 => "value"LFLF var val2 = "value2";LF}]
MarkupBlock - [0..86)::86
MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup>
Marker;[];
CSharpCodeBlock - [0..86)::86
CSharpStatement - [0..86)::86
CSharpTransition - [0..1)::1 - Gen<None>
Transition;[@];
CSharpStatementBody - [1..86)::85
RazorMetaCode - [1..2)::1 - Gen<None>
LeftBrace;[{];
CSharpCodeBlock - [2..86)::84
CSharpStatementLiteral - [2..86)::84 - [LF var val = 0 switchLF {LF 0 => "value"LFLF var val2 = "value2";LF}] - Gen<Stmt>
NewLine;[LF];
Whitespace;[ ];
Keyword;[var];
Whitespace;[ ];
Identifier;[val];
Whitespace;[ ];
Assign;[=];
Whitespace;[ ];
NumericLiteral;[0];
Whitespace;[ ];
Keyword;[switch];
NewLine;[LF];
Whitespace;[ ];
LeftBrace;[{];
NewLine;[LF];
Whitespace;[ ];
NumericLiteral;[0];
Whitespace;[ ];
CSharpOperator;[=>];
Whitespace;[ ];
StringLiteral;["value"];
NewLine;[LF];
NewLine;[LF];
Whitespace;[ ];
Keyword;[var];
Whitespace;[ ];
Identifier;[val2];
Whitespace;[ ];
Assign;[=];
Whitespace;[ ];
StringLiteral;["value2"];
Semicolon;[;];
NewLine;[LF];
RightBrace;[}];
RazorMetaCode - [86..86)::0 - Gen<None>
RightBrace;[<Missing>];
EndOfFile;[];
6 changes: 6 additions & 0 deletions ...ge/test/TestFiles/ParserTests/CSharpBlockTest/SwitchExpression_WithGreaterThan.cspans.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Markup span at (0:0,0 [0] ) - Parent: Markup block at (0:0,0 [79] )
Transition span at (0:0,0 [1] ) - Parent: Statement block at (0:0,0 [79] )
MetaCode span at (1:0,1 [1] ) - Parent: Statement block at (0:0,0 [79] )
Code span at (2:0,2 [76] ) - Parent: Statement block at (0:0,0 [79] )
MetaCode span at (78:5,0 [1] ) - Parent: Statement block at (0:0,0 [79] )
Markup span at (79:5,1 [0] ) - Parent: Markup block at (0:0,0 [79] )
46 changes: 46 additions & 0 deletions ...age/test/TestFiles/ParserTests/CSharpBlockTest/SwitchExpression_WithGreaterThan.stree.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
RazorDocument - [0..79)::79 - [@{LF var val = 0 switchLF {LF > 10 => "greater than 10"LF };LF}]
MarkupBlock - [0..79)::79
MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup>
Marker;[];
CSharpCodeBlock - [0..79)::79
CSharpStatement - [0..79)::79
CSharpTransition - [0..1)::1 - Gen<None>
Transition;[@];
CSharpStatementBody - [1..79)::78
RazorMetaCode - [1..2)::1 - Gen<None>
LeftBrace;[{];
CSharpCodeBlock - [2..78)::76
CSharpStatementLiteral - [2..78)::76 - [LF var val = 0 switchLF {LF > 10 => "greater than 10"LF };LF] - Gen<Stmt>
NewLine;[LF];
Whitespace;[ ];
Keyword;[var];
Whitespace;[ ];
Identifier;[val];
Whitespace;[ ];
Assign;[=];
Whitespace;[ ];
NumericLiteral;[0];
Whitespace;[ ];
Keyword;[switch];
NewLine;[LF];
Whitespace;[ ];
LeftBrace;[{];
NewLine;[LF];
Whitespace;[ ];
GreaterThan;[>];
Whitespace;[ ];
NumericLiteral;[10];
Whitespace;[ ];
CSharpOperator;[=>];
Whitespace;[ ];
StringLiteral;["greater than 10"];
NewLine;[LF];
Whitespace;[ ];
RightBrace;[}];
Semicolon;[;];
NewLine;[LF];
RazorMetaCode - [78..79)::1 - Gen<None>
RightBrace;[}];
MarkupTextLiteral - [79..79)::0 - [] - Gen<Markup>
Marker;[];
EndOfFile;[];
6 changes: 6 additions & 0 deletions ...guage/test/TestFiles/ParserTests/CSharpBlockTest/SwitchExpression_WithLessThan.cspans.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Markup span at (0:0,0 [0] ) - Parent: Markup block at (0:0,0 [75] )
Transition span at (0:0,0 [1] ) - Parent: Statement block at (0:0,0 [75] )
MetaCode span at (1:0,1 [1] ) - Parent: Statement block at (0:0,0 [75] )
Code span at (2:0,2 [72] ) - Parent: Statement block at (0:0,0 [75] )
MetaCode span at (74:5,0 [1] ) - Parent: Statement block at (0:0,0 [75] )
Markup span at (75:5,1 [0] ) - Parent: Markup block at (0:0,0 [75] )
46 changes: 46 additions & 0 deletions ...nguage/test/TestFiles/ParserTests/CSharpBlockTest/SwitchExpression_WithLessThan.stree.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
RazorDocument - [0..75)::75 - [@{LF var val = 0 switchLF {LF < 9 => "less than 10"LF };LF}]
MarkupBlock - [0..75)::75
MarkupTextLiteral - [0..0)::0 - [] - Gen<Markup>
Marker;[];
CSharpCodeBlock - [0..75)::75
CSharpStatement - [0..75)::75
CSharpTransition - [0..1)::1 - Gen<None>
Transition;[@];
CSharpStatementBody - [1..75)::74
RazorMetaCode - [1..2)::1 - Gen<None>
LeftBrace;[{];
CSharpCodeBlock - [2..74)::72
CSharpStatementLiteral - [2..74)::72 - [LF var val = 0 switchLF {LF < 9 => "less than 10"LF };LF] - Gen<Stmt>
NewLine;[LF];
Whitespace;[ ];
Keyword;[var];
Whitespace;[ ];
Identifier;[val];
Whitespace;[ ];
Assign;[=];
Whitespace;[ ];
NumericLiteral;[0];
Whitespace;[ ];
Keyword;[switch];
NewLine;[LF];
Whitespace;[ ];
LeftBrace;[{];
NewLine;[LF];
Whitespace;[ ];
LessThan;[<];
Whitespace;[ ];
NumericLiteral;[9];
Whitespace;[ ];
CSharpOperator;[=>];
Whitespace;[ ];
StringLiteral;["less than 10"];
NewLine;[LF];
Whitespace;[ ];
RightBrace;[}];
Semicolon;[;];
NewLine;[LF];
RazorMetaCode - [74..75)::1 - Gen<None>
RightBrace;[}];
MarkupTextLiteral - [75..75)::0 - [] - Gen<Markup>
Marker;[];
EndOfFile;[];
4 changes: 4 additions & 0 deletions ...TestFiles/ParserTests/CSharpBlockTest/SwitchExpression_WithLessThan_Incomplete.cspans.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Markup span at (0:0,0 [0] ) - Parent: Markup block at (0:0,0 [95] )
Transition span at (0:0,0 [1] ) - Parent: Statement block at (0:0,0 [95] )
MetaCode span at (1:0,1 [1] ) - Parent: Statement block at (0:0,0 [95] )
Code span at (2:0,2 [93] ) - Parent: Statement block at (0:0,0 [95] )
1 change: 1 addition & 0 deletions ...t/TestFiles/ParserTests/CSharpBlockTest/SwitchExpression_WithLessThan_Incomplete.diag.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
(1,2): Error RZ1006: The code block is missing a closing "}" character. Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
Loading
Loading