Skip to content

Commit a50bf33

Browse files
JohanLarssonJohanLarsson
committed
Rename methods.
1 parent 813d6da commit a50bf33

5 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎IDisposableAnalyzers.Test/Helpers/DisposeMethodTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ private void ThrowIfDisposed()
4343
var compilation = CSharpCompilation.Create("test", new[] { syntaxTree }, MetadataReferences.FromAttributes());
4444
var semanticModel = compilation.GetSemanticModel(syntaxTree);
4545
var method = semanticModel.GetDeclaredSymbol(syntaxTree.FindClassDeclaration("C"));
46-
Assert.AreEqual(true, DisposeMethod.TryFindIDisposableDispose(method, compilation, search, out var match));
46+
Assert.AreEqual(true, DisposeMethod.TryFind(method, compilation, search, out var match));
4747
Assert.AreEqual("N.C.Dispose()", match.ToString());
4848
}
4949

@@ -84,7 +84,7 @@ private void ThrowIfDisposed()
8484
var compilation = CSharpCompilation.Create("test", new[] { syntaxTree }, MetadataReferences.FromAttributes());
8585
var semanticModel = compilation.GetSemanticModel(syntaxTree);
8686
var method = semanticModel.GetDeclaredSymbol(syntaxTree.FindClassDeclaration("C"));
87-
Assert.AreEqual(true, DisposeMethod.TryFindIDisposableDispose(method, compilation, search, out var match));
87+
Assert.AreEqual(true, DisposeMethod.TryFind(method, compilation, search, out var match));
8888
Assert.AreEqual("N.C.Dispose()", match.ToString());
8989
}
9090

@@ -132,7 +132,7 @@ protected virtual void ThrowIfDisposed()
132132
var compilation = CSharpCompilation.Create("test", new[] { syntaxTree }, MetadataReferences.FromAttributes());
133133
var semanticModel = compilation.GetSemanticModel(syntaxTree);
134134
var method = semanticModel.GetDeclaredSymbol(syntaxTree.FindClassDeclaration("C"));
135-
Assert.AreEqual(true, DisposeMethod.TryFindVirtualDispose(method, compilation, search, out var match));
135+
Assert.AreEqual(true, DisposeMethod.TryFindVirtual(method, compilation, search, out var match));
136136
Assert.AreEqual("N.C.Dispose(bool)", match.ToString());
137137
}
138138

‎IDisposableAnalyzers/Analyzers/ClassDeclarationAnalyzer.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ private static void Handle(SyntaxNodeAnalysisContext context)
2525
if (context.Node is ClassDeclarationSyntax { } classDeclaration &&
2626
context.ContainingSymbol is INamedTypeSymbol { IsSealed: false } type &&
2727
type.IsAssignableTo(KnownSymbol.IDisposable, context.SemanticModel.Compilation) &&
28-
DisposeMethod.TryFindIDisposableDispose(type, context.Compilation, Search.TopLevel, out var disposeMethod) &&
28+
DisposeMethod.TryFind(type, context.Compilation, Search.TopLevel, out var disposeMethod) &&
2929
disposeMethod is { IsVirtual: false, IsOverride: false } &&
30-
!DisposeMethod.TryFindVirtualDispose(type, context.Compilation, Search.TopLevel, out _))
30+
!DisposeMethod.TryFindVirtual(type, context.Compilation, Search.TopLevel, out _))
3131
{
3232
context.ReportDiagnostic(
3333
Diagnostic.Create(

‎IDisposableAnalyzers/CodeFixes/DisposeMemberFix.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ protected override async Task RegisterCodeFixesAsync(DocumentEditorCodeFixContex
3333
semanticModel.TryGetSymbol(member, context.CancellationToken, out ISymbol? symbol) &&
3434
FieldOrProperty.TryCreate(symbol, out var disposable))
3535
{
36-
if (DisposeMethod.TryFindVirtualDispose(symbol.ContainingType, semanticModel.Compilation, Search.TopLevel, out var disposeSymbol) &&
36+
if (DisposeMethod.TryFindVirtual(symbol.ContainingType, semanticModel.Compilation, Search.TopLevel, out var disposeSymbol) &&
3737
disposeSymbol.TrySingleDeclaration(context.CancellationToken, out MethodDeclarationSyntax? disposeDeclaration))
3838
{
3939
if (disposeDeclaration is { ParameterList: { Parameters: { Count: 1 } parameters }, Body: { } block })
@@ -78,7 +78,7 @@ void Dispose(DocumentEditor editor, CancellationToken cancellationToken)
7878
}
7979
}
8080
}
81-
else if (DisposeMethod.TryFindIDisposableDispose(symbol.ContainingType, semanticModel.Compilation, Search.TopLevel, out disposeSymbol) &&
81+
else if (DisposeMethod.TryFind(symbol.ContainingType, semanticModel.Compilation, Search.TopLevel, out disposeSymbol) &&
8282
disposeSymbol.TrySingleDeclaration(context.CancellationToken, out disposeDeclaration))
8383
{
8484
switch (disposeDeclaration)

‎IDisposableAnalyzers/CodeFixes/Helpers/IDisposableFactory.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ ExpressionSyntax Normalize(ExpressionSyntax e)
9191
if (semanticModel.ClassifyConversion(e, KnownSymbol.IDisposable.GetTypeSymbol(semanticModel.Compilation)).IsImplicit)
9292
{
9393
if (semanticModel.TryGetType(e, cancellationToken, out var type) &&
94-
DisposeMethod.TryFindIDisposableDispose(type, semanticModel.Compilation, Search.Recursive, out var disposeMethod) &&
94+
DisposeMethod.TryFind(type, semanticModel.Compilation, Search.Recursive, out var disposeMethod) &&
9595
disposeMethod.ExplicitInterfaceImplementations.IsEmpty)
9696
{
9797
return e.WithoutTrivia()
@@ -113,7 +113,7 @@ internal static ExpressionStatementSyntax DisposeStatement(FieldOrProperty dispo
113113
if (IsNeverNull(out var neverNull))
114114
{
115115
if (disposable.Type.IsAssignableTo(KnownSymbol.IDisposable, semanticModel.Compilation) &&
116-
DisposeMethod.TryFindIDisposableDispose(disposable.Type, semanticModel.Compilation, Search.Recursive, out var disposeMethod) &&
116+
DisposeMethod.TryFind(disposable.Type, semanticModel.Compilation, Search.Recursive, out var disposeMethod) &&
117117
disposeMethod.ExplicitInterfaceImplementations.IsEmpty)
118118
{
119119
return DisposeStatement(neverNull.WithoutTrivia()).WithLeadingElasticLineFeed();

‎IDisposableAnalyzers/Helpers/DisposeMethod.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ internal static bool TryFindFirst(ITypeSymbol type, Compilation compilation, Sea
1313
{
1414
if (search == Search.TopLevel)
1515
{
16-
return TryFindIDisposableDispose(type, compilation, search, out disposeMethod) ||
17-
TryFindVirtualDispose(type, compilation, search, out disposeMethod);
16+
return TryFind(type, compilation, search, out disposeMethod) ||
17+
TryFindVirtual(type, compilation, search, out disposeMethod);
1818
}
1919

2020
while (type.IsAssignableTo(KnownSymbol.IDisposable, compilation))
@@ -38,11 +38,11 @@ internal static bool IsAccessibleOn(ITypeSymbol type, Compilation compilation)
3838
return type.IsAssignableTo(KnownSymbol.IDisposable, compilation);
3939
}
4040

41-
return TryFindIDisposableDispose(type, compilation, Search.Recursive, out var disposeMethod) &&
41+
return TryFind(type, compilation, Search.Recursive, out var disposeMethod) &&
4242
disposeMethod.ExplicitInterfaceImplementations.IsEmpty;
4343
}
4444

45-
internal static bool TryFindIDisposableDispose(ITypeSymbol type, Compilation compilation, Search search, [NotNullWhen(true)] out IMethodSymbol? disposeMethod)
45+
internal static bool TryFind(ITypeSymbol type, Compilation compilation, Search search, [NotNullWhen(true)] out IMethodSymbol? disposeMethod)
4646
{
4747
disposeMethod = null;
4848
if (!type.IsAssignableTo(KnownSymbol.IDisposable, compilation))
@@ -52,18 +52,18 @@ internal static bool TryFindIDisposableDispose(ITypeSymbol type, Compilation com
5252

5353
if (search == Search.TopLevel)
5454
{
55-
return type.TryFindFirstMethod("Dispose", x => IsIDisposableDispose(x), out disposeMethod);
55+
return type.TryFindFirstMethod("Dispose", x => IsMatch(x), out disposeMethod);
5656
}
5757

58-
return type.TryFindFirstMethodRecursive("Dispose", x => IsIDisposableDispose(x), out disposeMethod);
58+
return type.TryFindFirstMethodRecursive("Dispose", x => IsMatch(x), out disposeMethod);
5959

60-
static bool IsIDisposableDispose(IMethodSymbol candidate)
60+
static bool IsMatch(IMethodSymbol candidate)
6161
{
6262
return candidate is { DeclaredAccessibility: Accessibility.Public, ReturnsVoid: true, Name: "Dispose", Parameters: { Length: 0 } };
6363
}
6464
}
6565

66-
internal static bool TryFindVirtualDispose(ITypeSymbol type, Compilation compilation, Search search, [NotNullWhen(true)] out IMethodSymbol? disposeMethod)
66+
internal static bool TryFindVirtual(ITypeSymbol type, Compilation compilation, Search search, [NotNullWhen(true)] out IMethodSymbol? disposeMethod)
6767
{
6868
disposeMethod = null;
6969
if (!type.IsAssignableTo(KnownSymbol.IDisposable, compilation))
@@ -73,12 +73,12 @@ internal static bool TryFindVirtualDispose(ITypeSymbol type, Compilation compila
7373

7474
if (search == Search.TopLevel)
7575
{
76-
return type.TryFindFirstMethod("Dispose", x => IsIDisposableDispose(x), out disposeMethod);
76+
return type.TryFindFirstMethod("Dispose", x => IsMatch(x), out disposeMethod);
7777
}
7878

79-
return type.TryFindFirstMethodRecursive("Dispose", x => IsIDisposableDispose(x), out disposeMethod);
79+
return type.TryFindFirstMethodRecursive("Dispose", x => IsMatch(x), out disposeMethod);
8080

81-
static bool IsIDisposableDispose(IMethodSymbol candidate)
81+
static bool IsMatch(IMethodSymbol candidate)
8282
{
8383
return IsOverrideDispose(candidate) ||
8484
IsVirtualDispose(candidate);

0 commit comments

Comments
 (0)