Skip to content
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

Add support for or-pattern in IDE0010 #73574

Merged
merged 3 commits into from
May 25, 2024
Merged

Add support for or-pattern in IDE0010 #73574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a0e8da7
Add support for or-pattern in `IDE0010`
RenderMichael May 19, 2024
d862af7
rename variable
RenderMichael May 19, 2024
af4d9b2
Share a helper with the switch expression helper
RenderMichael May 24, 2024
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
120 changes: 120 additions & 0 deletions src/Analyzers/CSharp/Tests/PopulateSwitch/PopulateSwitchStatementTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1638,4 +1638,124 @@ void Method(int i)
}
""");
}

[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/73245")]
public async Task NotAllMembersExist_NotDefault_OrPattern()
{
await TestInRegularAndScriptAsync(
"""
namespace ConsoleApplication1
{
enum MyEnum
{
Fizz,
Buzz,
FizzBuzz,
FizzBuzzFizz
}

class MyClass
{
void Method()
{
var e = MyEnum.Fizz;
[||]switch (e)
{
case MyEnum.Fizz or MyEnum.Buzz or MyEnum.FizzBuzz:
break;
}
}
}
}
""",
"""
namespace ConsoleApplication1
{
enum MyEnum
{
Fizz,
Buzz,
FizzBuzz,
FizzBuzzFizz
}

class MyClass
{
void Method()
{
var e = MyEnum.Fizz;
switch (e)
{
case MyEnum.Fizz or MyEnum.Buzz or MyEnum.FizzBuzz:
break;
case MyEnum.FizzBuzzFizz:
break;
default:
break;
}
}
}
}
""", index: 2);
}

[Fact, WorkItem("https://github.com/dotnet/roslyn/issues/73245")]
public async Task NotAllMembersExist_WithDefault_OrPattern()
{
await TestInRegularAndScriptAsync(
"""
namespace ConsoleApplication1
{
enum MyEnum
{
Fizz,
Buzz,
FizzBuzz
}

class MyClass
{
void Method()
{
var e = MyEnum.Fizz;
[||]switch (e)
{
case MyEnum.Fizz or MyEnum.Buzz:
break;
default:
break;
}
}
}
}
""",
"""
namespace ConsoleApplication1
{
enum MyEnum
{
Fizz,
Buzz,
FizzBuzz
}

class MyClass
{
void Method()
{
var e = MyEnum.Fizz;
switch (e)
{
case MyEnum.Fizz or MyEnum.Buzz:
break;
case MyEnum.FizzBuzz:
break;
default:
break;
}
}
}
}
""");
}
}
2 changes: 1 addition & 1 deletion src/Analyzers/Core/Analyzers/PopulateSwitch/PopulateSwitchExpressionHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ private static void RemoveExistingEnumMembers(
}
}

private static void HandleBinaryPattern(IBinaryPatternOperation? binaryPattern, Dictionary<long, ISymbol> enumMembers)
internal static void HandleBinaryPattern(IBinaryPatternOperation? binaryPattern, Dictionary<long, ISymbol> enumMembers)
{
if (binaryPattern?.OperatorKind == BinaryOperatorKind.Or)
{
Expand Down
8 changes: 8 additions & 0 deletions src/Analyzers/Core/Analyzers/PopulateSwitch/PopulateSwitchStatementHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,14 @@ private static bool TryRemoveExistingEnumMembers(ISwitchOperation switchStatemen
var caseValue = IntegerUtilities.ToInt64(value.ConstantValue.Value);
enumValues.Remove(caseValue);

break;

case CaseKind.Pattern:
if (((IPatternCaseClauseOperation)clause).Pattern is IBinaryPatternOperation pattern)
{
PopulateSwitchExpressionHelpers.HandleBinaryPattern(pattern, enumValues);
}

break;
}
}
Expand Down
Loading