Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move ExceptWhen, And, and Or to SyntaxTrackerBase #8951

Merged
merged 1 commit into from
Mar 20, 2024
Merged

Move ExceptWhen, And, and Or to SyntaxTrackerBase #8951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions analyzers/src/SonarAnalyzer.Common/Trackers/InvocationTracker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,6 @@ public abstract class InvocationTracker<TSyntaxKind> : SyntaxTrackerBase<TSyntax
public Condition IsInvalidBuilderInitialization<TInvocationSyntax>(BuilderPatternCondition<TSyntaxKind, TInvocationSyntax> condition) where TInvocationSyntax : SyntaxNode =>
condition.IsInvalidBuilderInitialization;

public Condition ExceptWhen(Condition condition) =>
value => !condition(value);

public Condition And(Condition condition1, Condition condition2) =>
value => condition1(value) && condition2(value);

public Condition Or(Condition condition1, Condition condition2) =>
value => condition1(value) || condition2(value);

public Condition Or(Condition condition1, Condition condition2, Condition condition3) =>
value => condition1(value) || condition2(value) || condition3(value);

internal Condition MethodReturnTypeIs(KnownType returnType) =>
context => context.MethodSymbol.Value != null
&& context.MethodSymbol.Value.ReturnType.DerivesFrom(returnType);
Expand Down
12 changes: 0 additions & 12 deletions analyzers/src/SonarAnalyzer.Common/Trackers/ObjectCreationTracker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,6 @@ public abstract class ObjectCreationTracker<TSyntaxKind> : SyntaxTrackerBase<TSy
internal abstract Condition ArgumentAtIndexIsConst(int index);
internal abstract object ConstArgumentForParameter(ObjectCreationContext context, string parameterName);

public Condition ExceptWhen(Condition condition) =>
value => !condition(value);

public Condition And(Condition condition1, Condition condition2) =>
value => condition1(value) && condition2(value);

public Condition Or(Condition condition1, Condition condition2) =>
value => condition1(value) || condition2(value);

public Condition Or(Condition condition1, Condition condition2, Condition condition3) =>
value => condition1(value) || condition2(value) || condition3(value);

internal Condition ArgumentIsBoolConstant(string parameterName, bool expectedValue) =>
context => ConstArgumentForParameter(context, parameterName) is bool boolValue && boolValue == expectedValue;

Expand Down
12 changes: 0 additions & 12 deletions analyzers/src/SonarAnalyzer.Common/Trackers/PropertyAccessTracker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,6 @@ public abstract class PropertyAccessTracker<TSyntaxKind> : SyntaxTrackerBase<TSy
public Condition MatchProperty(bool checkOverridenProperties, params MemberDescriptor[] properties) =>
context => MemberDescriptor.MatchesAny(context.PropertyName, context.PropertySymbol, checkOverridenProperties, Language.NameComparison, properties);

public Condition ExceptWhen(Condition condition) =>
value => !condition(value);

public Condition And(Condition condition1, Condition condition2) =>
value => condition1(value) && condition2(value);

public Condition Or(Condition condition1, Condition condition2) =>
value => condition1(value) || condition2(value);

public Condition Or(Condition condition1, Condition condition2, Condition condition3) =>
value => condition1(value) || condition2(value) || condition3(value);

protected override PropertyAccessContext CreateContext(SonarSyntaxNodeReportingContext context)
{
// We register for both MemberAccess and IdentifierName and we want to
Expand Down
12 changes: 12 additions & 0 deletions analyzers/src/SonarAnalyzer.Common/Trackers/SyntaxTrackerBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,17 @@ void TrackAndReportIfNecessary(SonarSyntaxNodeReportingContext c)
}
}
}

public Condition ExceptWhen(Condition condition) =>
value => !condition(value);

public Condition And(Condition condition1, Condition condition2) =>
value => condition1(value) && condition2(value);

public Condition Or(Condition condition1, Condition condition2) =>
value => condition1(value) || condition2(value);

public Condition Or(Condition condition1, Condition condition2, Condition condition3) =>
value => condition1(value) || condition2(value) || condition3(value);
}
}
Loading