Skip to content

Commit 93ae97b

Browse files
committed
Rename TryGetType
1 parent 00270f0 commit 93ae97b

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

ReflectionAnalyzers.Tests/Helpers/GetXTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public Foo(Foo foo)
3737
var semanticModel = compilation.GetSemanticModel(syntaxTree);
3838
var node = syntaxTree.FindInvocation(call);
3939
var context = new SyntaxNodeAnalysisContext(null, null, semanticModel, null, null, null, CancellationToken.None);
40-
Assert.AreEqual(true, GetX.TryGetTargetType(node, context, out var type, out var instance));
40+
Assert.AreEqual(true, GetX.TryGetType(node, context, out var type, out var instance));
4141
Assert.AreEqual(expected, type.MetadataName);
4242
if (expectedInstance == null)
4343
{
@@ -78,7 +78,7 @@ public Foo(Foo foo)
7878
var semanticModel = compilation.GetSemanticModel(syntaxTree);
7979
var node = syntaxTree.FindInvocation("GetMethod");
8080
var context = new SyntaxNodeAnalysisContext(null, null, semanticModel, null, null, null, CancellationToken.None);
81-
Assert.AreEqual(true, GetX.TryGetTargetType(node, context, out var type, out var instance));
81+
Assert.AreEqual(true, GetX.TryGetType(node, context, out var type, out var instance));
8282
Assert.AreEqual(expected, type.MetadataName);
8383
if (expectedInstance == null)
8484
{
@@ -113,7 +113,7 @@ public Foo()
113113
var semanticModel = compilation.GetSemanticModel(syntaxTree);
114114
var node = syntaxTree.FindInvocation("GetMethod");
115115
var context = new SyntaxNodeAnalysisContext(null, null, semanticModel, null, null, null, CancellationToken.None);
116-
Assert.AreEqual(false, GetX.TryGetTargetType(node, context, out _, out _));
116+
Assert.AreEqual(false, GetX.TryGetType(node, context, out _, out _));
117117
}
118118

119119
[Test]

ReflectionAnalyzers/Helpers/GetX.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ internal static class GetX
3030
types = null;
3131
if (invocation.ArgumentList != null &&
3232
invocation.TryGetTarget(KnownSymbol.Type.GetConstructor, context.SemanticModel, context.CancellationToken, out var getX) &&
33-
TryGetTargetType(invocation, context, out targetType, out _) &&
33+
TryGetType(invocation, context, out targetType, out _) &&
3434
IsKnownSignature(invocation, getX) &&
3535
TryGetFlagsOrDefault(invocation, getX, context, out flagsArg, out effectiveFlags) &&
3636
TryGetTypesOrDefault(invocation, getX, context, out typesArg, out types))
@@ -72,7 +72,7 @@ internal static class GetX
7272
types = null;
7373
if (invocation.ArgumentList != null &&
7474
invocation.TryGetTarget(KnownSymbol.Type.GetMethod, context.SemanticModel, context.CancellationToken, out var getX) &&
75-
TryGetTargetType(invocation, context, out targetType, out _) &&
75+
TryGetType(invocation, context, out targetType, out _) &&
7676
IsKnownSignature(invocation, getX) &&
7777
TryGetName(invocation, getX, context, out nameArg, out targetName) &&
7878
TryGetFlagsOrDefault(invocation, getX, context, out flagsArg, out effectiveFlags) &&
@@ -99,7 +99,7 @@ internal static class GetX
9999
types = null;
100100
if (invocation.ArgumentList != null &&
101101
invocation.TryGetTarget(KnownSymbol.Type.GetMember, context.SemanticModel, context.CancellationToken, out var getX) &&
102-
TryGetTargetType(invocation, context, out targetType, out _) &&
102+
TryGetType(invocation, context, out targetType, out _) &&
103103
IsKnownSignature(invocation, getX) &&
104104
TryGetName(invocation, getX, context, out nameArg, out targetName) &&
105105
TryGetFlagsOrDefault(invocation, getX, context, out flagsArg, out effectiveFlags) &&
@@ -135,12 +135,12 @@ internal static class GetX
135135
/// <param name="result">The type.</param>
136136
/// <param name="instance">The instance the type was called GetType on. Can be null</param>
137137
/// <returns>True if the type could be determined.</returns>
138-
internal static bool TryGetTargetType(InvocationExpressionSyntax getX, SyntaxNodeAnalysisContext context, out ITypeSymbol result, out Optional<IdentifierNameSyntax> instance)
138+
internal static bool TryGetType(InvocationExpressionSyntax getX, SyntaxNodeAnalysisContext context, out ITypeSymbol result, out Optional<IdentifierNameSyntax> instance)
139139
{
140140
result = null;
141141
instance = default(Optional<IdentifierNameSyntax>);
142142
return getX.Expression is MemberAccessExpressionSyntax memberAccess &&
143-
TryGetTargetType(memberAccess.Expression, context, null, out result, out instance);
143+
TryGetType(memberAccess.Expression, context, null, out result, out instance);
144144
}
145145

146146
internal static GetXResult TryGetMember(IMethodSymbol getX, ITypeSymbol targetType, string targetMetadataName, BindingFlags flags, IReadOnlyList<ITypeSymbol> types, SyntaxNodeAnalysisContext context, out ISymbol member)
@@ -419,7 +419,7 @@ bool IsKnownArgument(IParameterSymbol parameter)
419419
effectiveFlags = 0;
420420
if (invocation.ArgumentList != null &&
421421
invocation.TryGetTarget(getXMethod, context.SemanticModel, context.CancellationToken, out var getX) &&
422-
TryGetTargetType(invocation, context, out targetType, out _) &&
422+
TryGetType(invocation, context, out targetType, out _) &&
423423
TryGetName(invocation, getX, context, out nameArg, out targetName) &&
424424
TryGetFlagsOrDefault(invocation, getX, context, out flagsArg, out effectiveFlags))
425425
{
@@ -626,7 +626,7 @@ private static bool HasVisibleMembers(ITypeSymbol type, BindingFlags effectiveFl
626626
return true;
627627
}
628628

629-
private static bool TryGetTargetType(ExpressionSyntax expression, SyntaxNodeAnalysisContext context, PooledSet<ExpressionSyntax> visited, out ITypeSymbol result, out Optional<IdentifierNameSyntax> instance)
629+
private static bool TryGetType(ExpressionSyntax expression, SyntaxNodeAnalysisContext context, PooledSet<ExpressionSyntax> visited, out ITypeSymbol result, out Optional<IdentifierNameSyntax> instance)
630630
{
631631
instance = default(Optional<IdentifierNameSyntax>);
632632
result = null;
@@ -637,7 +637,7 @@ private static bool TryGetTargetType(ExpressionSyntax expression, SyntaxNodeAnal
637637
{
638638
return AssignedValueWalker.TryGetSingle(local, context.SemanticModel, context.CancellationToken, out var assignedValue) &&
639639
visited.Add(assignedValue) &&
640-
TryGetTargetType(assignedValue, context, visited, out result, out instance);
640+
TryGetType(assignedValue, context, visited, out result, out instance);
641641
}
642642

643643
case TypeOfExpressionSyntax typeOf:

ReflectionAnalyzers/NodeAnalzers/NameofAnalyzer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ private static bool TryGetTarget(InvocationExpressionSyntax invocation, IMethodS
123123
{
124124
instance = default(Optional<IdentifierNameSyntax>);
125125
target = default(Optional<ISymbol>);
126-
if (GetX.TryGetTargetType(invocation, context, out var targetType, out instance))
126+
if (GetX.TryGetType(invocation, context, out var targetType, out instance))
127127
{
128128
_ = GetX.TryGetMember(getX, targetType, name, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.Instance | BindingFlags.FlattenHierarchy, GetX.AnyTypes, context, out var targetSymbol);
129129

0 commit comments

Comments
 (0)