Consider next statement when analyzing nested switch statements

dotnet · Aug 15, 2019 · c69a5d9 · c69a5d9
1 parent 1cd3268
commit c69a5d9
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 31 deletions.
diff --git a/...pTest/ConvertSwitchStatementToExpression/ConvertSwitchStatementToExpressionFixAllTests.cs b/...pTest/ConvertSwitchStatementToExpression/ConvertSwitchStatementToExpressionFixAllTests.cs
@@ -14,7 +14,7 @@ public async Task TestNested_01()
  {
  await TestInCSharp8(
 @"class Program
-{ 
+{
  int M(int i, int j)
  {
  int r;
@@ -96,7 +96,7 @@ int M(int i, int j)
  }
 }",
 @"class Program
-{ 
+{
  int M(int i, int j)
  {
  var r = i switch
@@ -126,35 +126,31 @@ int M(int i, int j)
  y = 1;
  break;
  }
- switch (i)
+ return i switch
  {
- default:
- throw null;
- case 1:
- return j switch
- {
- 10 => 10,
- 20 => 20,
- 30 => 30,
- _ => 0,
- };
- case 2:
- return j switch
- {
- 10 => 10,
- 20 => 20,
- 30 => 30,
- var _ => 0,
- };
- case 3:
- return j switch
- {
- 10 => 10,
- 20 => 20,
- 30 => 30,
- var v => 0,
- };
- }
+ 1 => j switch
+ {
+ 10 => 10,
+ 20 => 20,
+ 30 => 30,
+ _ => 0,
+ },
+ 2 => j switch
+ {
+ 10 => 10,
+ 20 => 20,
+ 30 => 30,
+ var _ => 0,
+ },
+ 3 => j switch
+ {
+ 10 => 10,
+ 20 => 20,
+ 30 => 30,
+ var v => 0,
+ },
+ _ => throw null,
+ };
  }
 }");
  }

diff --git a/...tchStatementToExpression/ConvertSwitchStatementToExpressionDiagnosticAnalyzer.Analyzer.cs b/...tchStatementToExpression/ConvertSwitchStatementToExpressionDiagnosticAnalyzer.Analyzer.cs
@@ -176,7 +176,7 @@ private SyntaxKind AnalyzeSwitchSection(SwitchSectionSyntax section)
  switch (section.Statements.Count)
  {
  case 1:
- case 2 when section.Statements[1].IsKind(SyntaxKind.BreakStatement):
+ case 2 when section.Statements[1].IsKind(SyntaxKind.BreakStatement) || section.Statements[0].IsKind(SyntaxKind.SwitchStatement):
  return Visit(section.Statements[0]);
  default:
  return default;