Merge pull request #4672 from tamasvajk/feature/extract-anon-types

C#: Extract anonymous types explicitly

Author: tamasvajk

csharp/extractor/Semmle.Extraction.CSharp/Entities/Types/NamedType.cs

@@ -87,6 +87,11 @@ public override void Populate(TextWriter trapFile)
                 foreach (var l in Locations)
                     trapFile.type_location(this, l);
             }
+
+            if (symbol.IsAnonymousType)
+            {
+                trapFile.anonymous_types(this);
+            }
         }
 
         private readonly Lazy<Type[]> typeArgumentsLazy;

csharp/extractor/Semmle.Extraction.CSharp/Tuples.cs

@@ -271,6 +271,11 @@ internal static void extend(this TextWriter trapFile, Type type, Type super)
             trapFile.WriteTuple("extend", type, super);
         }
 
+        internal static void anonymous_types(this TextWriter trapFile, Type type)
+        {
+            trapFile.WriteTuple("anonymous_types", type);
+        }
+
         internal static void field_location(this TextWriter trapFile, Field field, Location location)
         {
             trapFile.WriteTuple("field_location", field, location);

csharp/ql/src/semmle/code/csharp/Type.qll

@@ -746,7 +746,7 @@ class Class extends RefType, @class_type {
  * ```
  */
 class AnonymousClass extends Class {
-  AnonymousClass() { this.getName().matches("<%") }
+  AnonymousClass() { anonymous_types(this) }
 }
 
 /**

csharp/ql/src/semmlecode.csharp.dbscheme

@@ -413,6 +413,9 @@ extend(
   unique int sub: @type ref,
   int super: @type_or_ref ref);
 
+anonymous_types(
+  unique int id: @type ref);
+
 @interface_or_ref = @interface_type | @typeref;
 
 implement(