Skip to content

Commit 4f43b41

Browse files
committed
C#: Cleanup the extractor code.
1 parent 07d82e8 commit 4f43b41

File tree

2 files changed

+1
-17
lines changed

2 files changed

+1
-17
lines changed

csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Invocation.cs

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,12 @@ private Invocation(ExpressionNodeInfo info)
2626

2727
private bool IsOperatorCall() => Kind == ExprKind.OPERATOR_INVOCATION;
2828

29-
private bool IsAccessorInvocation() => Kind == ExprKind.ACCESSOR_INVOCATION;
30-
3129
private bool IsValidMemberAccessKind()
3230
{
3331
return Kind == ExprKind.METHOD_INVOCATION ||
3432
IsEventDelegateCall() ||
3533
IsExplicitDelegateInvokeCall() ||
36-
IsOperatorCall() ||
37-
IsAccessorInvocation();
34+
IsOperatorCall();
3835
}
3936

4037
protected override void PopulateExpression(TextWriter trapFile)
@@ -133,14 +130,6 @@ private static bool IsOperatorLikeCall(ExpressionNodeInfo info)
133130
original!.MethodKind == MethodKind.UserDefinedOperator;
134131
}
135132

136-
private static bool IsAccessorLikeInvocation(ExpressionNodeInfo info)
137-
{
138-
return info.SymbolInfo.Symbol is IMethodSymbol method &&
139-
method.TryGetExtensionMethod(out var original) &&
140-
(original!.MethodKind == MethodKind.PropertyGet ||
141-
original!.MethodKind == MethodKind.PropertySet);
142-
}
143-
144133
public IMethodSymbol? TargetSymbol
145134
{
146135
get
@@ -252,10 +241,6 @@ private static ExprKind GetKind(ExpressionNodeInfo info)
252241
{
253242
return ExprKind.OPERATOR_INVOCATION;
254243
}
255-
if (IsAccessorLikeInvocation(info))
256-
{
257-
return ExprKind.ACCESSOR_INVOCATION;
258-
}
259244
return ExprKind.METHOD_INVOCATION;
260245
}
261246

csharp/extractor/Semmle.Extraction.CSharp/Kinds/ExprKind.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ public enum ExprKind
133133
COLLECTION = 136,
134134
SPREAD_ELEMENT = 137,
135135
INTERPOLATED_STRING_INSERT = 138,
136-
ACCESSOR_INVOCATION = 139,
137136
DEFINE_SYMBOL = 999,
138137
}
139138
}

0 commit comments

Comments
 (0)