Skip to content

Commit 7bbf4c3

Browse files
Bart KoelmanBart Koelman
authored andcommitted
Added missing assertion; reduced type accessibility; removed unused code
1 parent 4fb228c commit 7bbf4c3

File tree

5 files changed

+8
-13
lines changed

5 files changed

+8
-13
lines changed

src/CSharpGuidelinesAnalyzer/CSharpGuidelinesAnalyzer.Test/CSharpGuidelinesAnalysisTestFixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace CSharpGuidelinesAnalyzer.Test
55
{
66
public abstract class CSharpGuidelinesAnalysisTestFixture : AnalysisTestFixture
77
{
8-
protected void VerifyGuidelineDiagnostic([NotNull] ParsedSourceCode source,
8+
private protected void VerifyGuidelineDiagnostic([NotNull] ParsedSourceCode source,
99
[NotNull] [ItemNotNull] params string[] messages)
1010
{
1111
Guard.NotNull(source, nameof(source));

src/CSharpGuidelinesAnalyzer/CSharpGuidelinesAnalyzer.Test/ParsedSourceCode.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace CSharpGuidelinesAnalyzer.Test
55
{
6-
public sealed class ParsedSourceCode
6+
internal sealed class ParsedSourceCode
77
{
88
[NotNull]
99
public AnalyzerTestContext TestContext { get; }

src/CSharpGuidelinesAnalyzer/CSharpGuidelinesAnalyzer.Test/TestDataBuilders/ITestDataBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace CSharpGuidelinesAnalyzer.Test.TestDataBuilders
44
{
5-
public interface ITestDataBuilder<out T>
5+
internal interface ITestDataBuilder<out T>
66
{
77
[NotNull]
88
// ReSharper disable once UnusedMemberInSuper.Global

src/CSharpGuidelinesAnalyzer/CSharpGuidelinesAnalyzer/Extensions/OperationExtensions.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public override IdentifierInfo VisitLocalReference([NotNull] ILocalReferenceOper
2626
{
2727
var name = new IdentifierName(operation.Local.Name,
2828
operation.Local.ToDisplayString(SymbolDisplayFormat.CSharpShortErrorMessageFormat));
29-
return new IdentifierInfo(name, operation.Local.Type, "Variable");
29+
return new IdentifierInfo(name, operation.Local.Type);
3030
}
3131

3232
[NotNull]
@@ -36,7 +36,7 @@ public override IdentifierInfo VisitParameterReference([NotNull] IParameterRefer
3636
var name = new IdentifierName(operation.Parameter.Name,
3737
/* CSharpShortErrorMessageFormat returns 'int', ie. without parameter name */
3838
operation.Parameter.Name);
39-
return new IdentifierInfo(name, operation.Parameter.Type, operation.Parameter.Kind.ToString());
39+
return new IdentifierInfo(name, operation.Parameter.Type);
4040
}
4141

4242
[NotNull]
@@ -66,15 +66,15 @@ private IdentifierInfo CreateForMemberReferenceExpression([NotNull] IMemberRefer
6666
{
6767
var name = new IdentifierName(operation.Member.Name,
6868
operation.Member.ToDisplayString(SymbolDisplayFormat.CSharpShortErrorMessageFormat));
69-
return new IdentifierInfo(name, memberType, operation.Member.Kind.ToString());
69+
return new IdentifierInfo(name, memberType);
7070
}
7171

7272
[NotNull]
7373
public override IdentifierInfo VisitInvocation([NotNull] IInvocationOperation operation, [CanBeNull] object argument)
7474
{
7575
var name = new IdentifierName(operation.TargetMethod.Name,
7676
operation.TargetMethod.ToDisplayString(SymbolDisplayFormat.CSharpShortErrorMessageFormat));
77-
return new IdentifierInfo(name, operation.TargetMethod.ReturnType, operation.TargetMethod.GetKind());
77+
return new IdentifierInfo(name, operation.TargetMethod.ReturnType);
7878
}
7979
}
8080

src/CSharpGuidelinesAnalyzer/CSharpGuidelinesAnalyzer/IdentifierInfo.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,12 @@ internal sealed class IdentifierInfo
1010
[NotNull]
1111
public ITypeSymbol Type { get; }
1212

13-
[NotNull]
14-
public string Kind { get; }
15-
16-
public IdentifierInfo(IdentifierName name, [NotNull] ITypeSymbol type, [NotNull] string kind)
13+
public IdentifierInfo(IdentifierName name, [NotNull] ITypeSymbol type)
1714
{
1815
Guard.NotNull(type, nameof(type));
19-
Guard.NotNullNorWhiteSpace(kind, nameof(kind));
2016

2117
Name = name;
2218
Type = type;
23-
Kind = kind;
2419
}
2520
}
2621
}

0 commit comments

Comments
 (0)