manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2025-01-09 12:19:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

CatchClauseAnalyzer: Simplify and fix ContainsIdentifier()

Browse source
This commit is contained in:
TSR Berry 2024-01-16 13:05:47 +01:00
parent 8e2b479a70
commit 40bceebacb
No known key found for this signature in database
GPG key ID: 52353C0A4CCA15E2
1 changed files with 6 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
src/Ryujinx.Analyzers/CatchClauseAnalyzer.cs
View file

@ -3,6 +3,7 @@ using Microsoft.CodeAnalysis.CSharp;
using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.CSharp.Syntax;
using Microsoft.CodeAnalysis.Diagnostics; using Microsoft.CodeAnalysis.Diagnostics;
using System.Collections.Immutable; using System.Collections.Immutable;
using System.Linq;
namespace Ryujinx.Analyzers namespace Ryujinx.Analyzers
{ {
@ -98,63 +99,11 @@ namespace Ryujinx.Analyzers
return false; return false;
} }
private static bool ContainsIdentifier(ArgumentSyntax argument, string identifierText) private static bool ContainsIdentifier(ExpressionSyntax expression, string identifierText)
{ {
foreach (var argChild in argument.ChildNodes()) return expression.DescendantNodes().Any(
{ x => x is IdentifierNameSyntax identifierName
switch (argChild) && identifierName.ToString() == identifierText);
{
case IdentifierNameSyntax identifierName when identifierName.ToString() == identifierText:
return true;
case InterpolatedStringExpressionSyntax interpolatedStringExpression:
{
foreach (var interpolatedStringChild in interpolatedStringExpression.ChildNodes())
{
if (interpolatedStringChild is not InterpolationSyntax interpolation)
{
continue;
}
foreach (var interpolationChild in interpolation.ChildNodes())
{
if (interpolationChild is not IdentifierNameSyntax interpolationIdentifier)
{
continue;
}
if (interpolationIdentifier.ToString() == identifierText)
{
return true;
}
}
}
break;
}
}
}
return false;
}
private static bool InvocationContainsIdentifier(ExpressionSyntax expression, string identifierText)
{
foreach (var expressionChild in expression.ChildNodes())
{
if (expressionChild is not InvocationExpressionSyntax invocationExpression)
{
continue;
}
foreach (var argument in invocationExpression.ArgumentList.Arguments)
{
if (ContainsIdentifier(argument, identifierText))
{
return true;
}
}
}
return false;
} }
/// <summary> /// <summary>
@ -208,7 +157,7 @@ namespace Ryujinx.Analyzers
if (EndsWithExpressionText(expressionStatement.Expression, LoggerIdentifier) && ContainsInvocationArgText(expressionStatement.Expression, LogClassIdentifier)) if (EndsWithExpressionText(expressionStatement.Expression, LoggerIdentifier) && ContainsInvocationArgText(expressionStatement.Expression, LogClassIdentifier))
{ {
// Find catchDeclarationIdentifier in Logger invocation // Find catchDeclarationIdentifier in Logger invocation
if (InvocationContainsIdentifier(expressionStatement.Expression, catchDeclarationIdentifier.Text)) if (ContainsIdentifier(expressionStatement.Expression, catchDeclarationIdentifier.Text))
{ {
exceptionLogged = true; exceptionLogged = true;
} }