Skip to content

Commit 4c23442

Browse files
committed
update
1 parent 0e8fde2 commit 4c23442

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

src/Analyzers/CSharp/Analysis/UseConditionalAccessAnalyzer.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,8 @@ private static void AnalyzeBinaryExpression(SyntaxNodeAnalysisContext context)
126126
if (left is null)
127127
return;
128128

129-
bool avoidNegativeBooleanComparison = context.GetAvoidNegativeBooleanComparison();
130-
131-
if (avoidNegativeBooleanComparison
132-
&& ShouldBeNegativeBooleanComparison(binaryExpression, right))
129+
if (context.GetConfigOptions().AvoidNegativeBooleanComparison()
130+
&& WillBeConvertedToNegativeBooleanComparison(binaryExpression, right))
133131
{
134132
return;
135133
}
@@ -465,7 +463,7 @@ bool IsFirstChild(SyntaxNode node)
465463
}
466464
}
467465

468-
private static bool ShouldBeNegativeBooleanComparison(ExpressionSyntax binaryExpression, ExpressionSyntax rightExpression)
466+
private static bool WillBeConvertedToNegativeBooleanComparison(ExpressionSyntax binaryExpression, ExpressionSyntax rightExpression)
469467
{
470468
switch (rightExpression.Kind())
471469
{

src/Common/CSharp/Extensions/CodeStyleExtensions.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -211,12 +211,6 @@ public static BlankLineStyle GetBlankLineBetweenSingleLineAccessors(this SyntaxN
211211
return BlankLineStyle.None;
212212
}
213213

214-
public static bool GetAvoidNegativeBooleanComparison(this SyntaxNodeAnalysisContext context)
215-
{
216-
AnalyzerConfigOptions configOptions = context.GetConfigOptions();
217-
218-
return ConfigOptions.TryGetValueAsBool(configOptions, ConfigOptions.NullConditionalOperator_AvoidNegativeBooleanComparison, out bool value) && value;
219-
}
220214
public static bool? PreferAnonymousFunctionOrMethodGroup(this SyntaxNodeAnalysisContext context)
221215
{
222216
AnalyzerConfigOptions configOptions = context.GetConfigOptions();
@@ -627,4 +621,9 @@ private static bool TryGetNewLinePosition(
627621
newLinePosition = NewLinePosition.None;
628622
return false;
629623
}
624+
625+
public static bool AvoidNegativeBooleanComparison(this AnalyzerConfigOptions configOptions)
626+
{
627+
return ConfigOptions.TryGetValueAsBool(configOptions, ConfigOptions.NullConditionalOperator_AvoidNegativeBooleanComparison, out bool value) && value;
628+
}
630629
}

0 commit comments

Comments
 (0)