Skip to content

Commit 273aa78

Browse files
committed
- apply review changes
1 parent e0bd5dd commit 273aa78

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

src/WTG.Analyzers.Test/TestData/VisibilityAnalyzer/Partial/Diagnostics.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<diagnostics severity="Hidden">
33
<languageVersion>9.0</languageVersion>
4-
<suppressId justtification="To ignore when only one method in one class have the code fix removing 'private' applied.">CS8799</suppressId>
4+
<suppressId>CS8799</suppressId>
55
<diagnostic id="WTG1001" message="Our convention is to omit the 'private' modifier where it is already the default.">
66
<location>Test0.cs: (9,3-10)</location>
77
</diagnostic>

src/WTG.Analyzers.Test/TestData/VisibilityAnalyzer/Partial/Result.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ partial class Foo
1414
{
1515
private partial int Bar() { return default; }
1616
public partial void FooBar() { }
17-
private partial int FooBarBaz(out int value) { value = default; return default; }
17+
private partial int FooBarBaz(out int value) => throw null;
1818

1919
partial void Qux() { }
2020
private partial void Quux(out int value) { value = default; }

src/WTG.Analyzers.Test/TestData/VisibilityAnalyzer/Partial/Source.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ partial class Foo
1414
{
1515
private partial int Bar() { return default; }
1616
public partial void FooBar() { }
17-
private partial int FooBarBaz(out int value) { value = default; return default; }
17+
private partial int FooBarBaz(out int value) => throw null;
1818

1919
private partial void Qux() { }
2020
private partial void Quux(out int value) { value = default; }

src/WTG.Analyzers/Analyzers/Visibility/VisibilityAnalyzer.cs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ static void Analyze(SyntaxNodeAnalysisContext context, FileDetailCache cache)
5050

5151
case SyntaxKind.ProtectedKeyword:
5252
case SyntaxKind.PublicKeyword:
53-
case SyntaxKind.PartialKeyword when (DoesMethodHaveReturnValueOrOutKeyword(currentNode)):
53+
case SyntaxKind.PartialKeyword when (PartialMethodRequiresAccessibilityModifier(currentNode)):
5454
return;
5555
case SyntaxKind.InternalKeyword:
5656
if (IsTopLevel(currentNode))
@@ -67,21 +67,24 @@ static void Analyze(SyntaxNodeAnalysisContext context, FileDetailCache cache)
6767
}
6868
}
6969

70-
static bool DoesMethodHaveReturnValueOrOutKeyword(SyntaxNode node)
70+
static bool PartialMethodRequiresAccessibilityModifier(SyntaxNode node)
7171
{
7272
if (!node.IsKind(SyntaxKind.MethodDeclaration))
7373
{
7474
return false;
7575
}
7676

7777
var methodNode = (MethodDeclarationSyntax)node;
78-
if (methodNode.ReturnType is PredefinedTypeSyntax predefinedTypeSyntax
79-
&& !predefinedTypeSyntax.Keyword.IsKind(SyntaxKind.VoidKeyword))
78+
if (methodNode.ReturnType.IsKind(SyntaxKind.PredefinedType))
8079
{
81-
return true;
80+
var returnType = (PredefinedTypeSyntax)methodNode.ReturnType;
81+
if (!returnType.Keyword.IsKind(SyntaxKind.VoidKeyword))
82+
{
83+
return true;
84+
}
8285
}
8386

84-
if (methodNode.ParameterList?.Parameters.Any(c => c.Modifiers.Any(SyntaxKind.OutKeyword)) == true)
87+
if (methodNode.ParameterList?.Parameters.Any(static p => p.Modifiers.Any(SyntaxKind.OutKeyword)) == true)
8588
{
8689
return true;
8790
}

0 commit comments

Comments
 (0)