From df11522190716a40fa8214d4e78222e7c4d40723 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Thu, 20 Mar 2025 07:05:13 +1000 Subject: [PATCH] Minor refactor to `HawkSourceAnalyzer` (for BHI1110) will rebuild in later commit --- .../BizHawk.Analyzer/HawkSourceAnalyzer.cs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/ExternalProjects/BizHawk.Analyzer/HawkSourceAnalyzer.cs b/ExternalProjects/BizHawk.Analyzer/HawkSourceAnalyzer.cs index 51f6a16c51..923bedccd5 100644 --- a/ExternalProjects/BizHawk.Analyzer/HawkSourceAnalyzer.cs +++ b/ExternalProjects/BizHawk.Analyzer/HawkSourceAnalyzer.cs @@ -155,6 +155,11 @@ public class HawkSourceAnalyzer : DiagnosticAnalyzer initContext.RegisterSyntaxNodeAction( snac => { + void MaybeReportListExprSpacing(SyntaxNode listSyn, string? message) + { + if (message is null) return; + DiagListExprSpacing.ReportAt(listSyn, snac, message); + } switch (snac.Node) { case AnonymousMethodExpressionSyntax: @@ -169,15 +174,17 @@ public class HawkSourceAnalyzer : DiagnosticAnalyzer DiagNoDiscardingLocals.ReportAt(snac.Node, snac); break; case CollectionExpressionSyntax ces: - var cesError = CheckSpacingInList(ces.Elements, ces.OpenBracketToken, ces.ToString); - if (cesError is not null) DiagListExprSpacing.ReportAt(ces, snac, cesError); + MaybeReportListExprSpacing( + ces, + CheckSpacingInList(ces.Elements, ces.OpenBracketToken, ces.ToString)); break; case InterpolatedStringExpressionSyntax ises: if (ises.StringStartToken.Text[0] is '@') DiagInterpStringIsDollarAt.ReportAt(ises, snac); break; case ListPatternSyntax lps: - var lpsError = CheckSpacingInList(lps.Patterns, lps.OpenBracketToken, lps.ToString); - if (lpsError is not null) DiagListExprSpacing.ReportAt(lps, snac, lpsError); + MaybeReportListExprSpacing( + lps, + CheckSpacingInList(lps.Patterns, lps.OpenBracketToken, lps.ToString)); break; case QueryExpressionSyntax: DiagNoQueryExpression.ReportAt(snac.Node, snac);