C#: Streamline the partial implementation for properties and events.

Author: michaelnebel

csharp/extractor/Semmle.Extraction.CSharp/CodeAnalysisExtensions/SymbolExtensions.cs

@@ -731,6 +731,12 @@ public static bool IsUnboundGenericType(this INamedTypeSymbol type) =>
         public static IMethodSymbol GetBodyDeclaringSymbol(this IMethodSymbol method) =>
             method.PartialImplementationPart ?? method;
 
+        public static IPropertySymbol GetBodyDeclaringSymbol(this IPropertySymbol property) =>
+            property.PartialImplementationPart ?? property;
+
+        public static IEventSymbol GetBodyDeclaringSymbol(this IEventSymbol symbol) =>
+            symbol.PartialImplementationPart ?? symbol;
+
         [return: NotNullIfNotNull(nameof(symbol))]
         public static IEntity? CreateEntity(this Context cx, ISymbol symbol)
         {

csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedSymbol.cs

@@ -87,8 +87,6 @@ protected void BindComments()
                 Context.BindComments(this, FullLocation);
         }
 
-        protected virtual T BodyDeclaringSymbol => Symbol;
-
         private static BlockSyntax? GetBlock(T symbol)
         {
             return symbol.DeclaringSyntaxReferences
@@ -107,10 +105,10 @@ protected void BindComments()
         }
 
         private BlockSyntax? vBlock;
-        public BlockSyntax? Block => vBlock ??= GetBlock(BodyDeclaringSymbol);
+        public BlockSyntax? Block => vBlock ??= GetBlock(Symbol);
 
         private ExpressionSyntax? vExpressionBody;
-        public ExpressionSyntax? ExpressionBody => vExpressionBody ??= GetExpressionBody(BodyDeclaringSymbol);
+        public ExpressionSyntax? ExpressionBody => vExpressionBody ??= GetExpressionBody(Symbol);
 
         private bool? vHasBody;
         public bool HasBody => vHasBody ??= Block is not null || ExpressionBody is not null;

csharp/extractor/Semmle.Extraction.CSharp/Entities/Event.cs

@@ -11,10 +11,6 @@ internal class Event : CachedSymbol<IEventSymbol>
         private Event(Context cx, IEventSymbol init)
             : base(cx, init) { }
 
-        protected override IEventSymbol BodyDeclaringSymbol => Symbol.PartialImplementationPart ?? Symbol;
-
-        public override Microsoft.CodeAnalysis.Location? ReportingLocation => BodyDeclaringSymbol.Locations.BestOrDefault();
-
         public override void WriteId(EscapingTextWriter trapFile)
         {
             trapFile.WriteSubId(ContainingType!);
@@ -31,8 +27,8 @@ public override void Populate(TextWriter trapFile)
             var type = Type.Create(Context, Symbol.Type);
             trapFile.events(this, Symbol.GetName(), ContainingType!, type.TypeRef, Create(Context, Symbol.OriginalDefinition));
 
-            var adder = BodyDeclaringSymbol.AddMethod;
-            var remover = BodyDeclaringSymbol.RemoveMethod;
+            var adder = Symbol.AddMethod;
+            var remover = Symbol.RemoveMethod;
 
             if (adder is not null)
                 Method.Create(Context, adder);
@@ -76,7 +72,7 @@ public override void Populate(TextWriter trapFile)
             }
         }
 
-        public static Event Create(Context cx, IEventSymbol symbol) => EventFactory.Instance.CreateEntityFromSymbol(cx, symbol);
+        public static Event Create(Context cx, IEventSymbol symbol) => EventFactory.Instance.CreateEntityFromSymbol(cx, symbol.GetBodyDeclaringSymbol());
 
         private class EventFactory : CachedEntityFactory<IEventSymbol, Event>
         {

csharp/extractor/Semmle.Extraction.CSharp/Entities/Indexer.cs

@@ -20,8 +20,8 @@ public override void Populate(TextWriter trapFile)
             var type = Type.Create(Context, Symbol.Type);
             trapFile.indexers(this, Symbol.GetName(useMetadataName: true), ContainingType!, type.TypeRef, OriginalDefinition);
 
-            var getter = BodyDeclaringSymbol.GetMethod;
-            var setter = BodyDeclaringSymbol.SetMethod;
+            var getter = Symbol.GetMethod;
+            var setter = Symbol.SetMethod;
 
             if (getter is null && setter is null)
                 Context.ModelError(Symbol, "No indexer accessor defined");
@@ -81,7 +81,7 @@ public override void Populate(TextWriter trapFile)
                 TypeMention.Create(Context, syntax.Type, this, type);
         }
 
-        public static new Indexer Create(Context cx, IPropertySymbol prop) => IndexerFactory.Instance.CreateEntityFromSymbol(cx, prop);
+        public static new Indexer Create(Context cx, IPropertySymbol prop) => IndexerFactory.Instance.CreateEntityFromSymbol(cx, prop.GetBodyDeclaringSymbol());
 
         public override void WriteId(EscapingTextWriter trapFile)
         {

csharp/extractor/Semmle.Extraction.CSharp/Entities/Property.cs

@@ -21,10 +21,6 @@ protected Property(Context cx, IPropertySymbol init)
 
         private Type Type => type.Value;
 
-        protected override IPropertySymbol BodyDeclaringSymbol => Symbol.PartialImplementationPart ?? Symbol;
-
-        public override Microsoft.CodeAnalysis.Location? ReportingLocation => BodyDeclaringSymbol.Locations.BestOrDefault();
-
         public override void WriteId(EscapingTextWriter trapFile)
         {
             trapFile.WriteSubId(Type);
@@ -46,8 +42,8 @@ public override void Populate(TextWriter trapFile)
             var type = Type;
             trapFile.properties(this, Symbol.GetName(), ContainingType!, type.TypeRef, Create(Context, Symbol.OriginalDefinition));
 
-            var getter = BodyDeclaringSymbol.GetMethod;
-            var setter = BodyDeclaringSymbol.SetMethod;
+            var getter = Symbol.GetMethod;
+            var setter = Symbol.SetMethod;
 
             if (getter is not null)
                 Method.Create(Context, getter);
@@ -132,7 +128,7 @@ public static Property Create(Context cx, IPropertySymbol prop)
         {
             var isIndexer = prop.IsIndexer || prop.Parameters.Any();
 
-            return isIndexer ? Indexer.Create(cx, prop) : PropertyFactory.Instance.CreateEntityFromSymbol(cx, prop);
+            return isIndexer ? Indexer.Create(cx, prop) : PropertyFactory.Instance.CreateEntityFromSymbol(cx, prop.GetBodyDeclaringSymbol());
         }
 
         private class PropertyFactory : CachedEntityFactory<IPropertySymbol, Property>