Merge the two CachedEntityFactory classes

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

@@ -1,13 +1,10 @@
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     /// <summary>
     /// A factory for creating cached entities.
     /// </summary>
-    public abstract class CachedEntityFactory<TInit, TEntity> where TEntity : Semmle.Extraction.CachedEntity
+    public abstract class CachedEntityFactory<TInit, TEntity> where TEntity : CachedEntity
     {
-        /// <summary>
-        /// Initializes the entity, but does not generate any trap code.
-        /// </summary>
-        public abstract TEntity Create(Semmle.Extraction.Context cx, TInit init);
+        public abstract TEntity Create(Context cx, TInit init);
     }
 }

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

@@ -1,6 +1,6 @@
 using Microsoft.CodeAnalysis;
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     public static class CachedEntityFactoryExtensions
     {

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

@@ -1,15 +1,14 @@
 using System;
 using System.IO;
 using Microsoft.CodeAnalysis;
-using Semmle.Extraction.CSharp;
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     public abstract class Entity : IEntity
     {
-        public virtual Context Context { get; }
+        public virtual Semmle.Extraction.Context Context { get; }
 
-        protected Entity(Context context)
+        protected Entity(Semmle.Extraction.Context context)
         {
             this.Context = context;
         }

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

@@ -1,6 +1,6 @@
 namespace Semmle.Extraction.CSharp
 {
-    public abstract class LabelledEntity : Semmle.Extraction.Entity
+    public abstract class LabelledEntity : Entity
     {
         protected LabelledEntity(Semmle.Extraction.Context cx) : base(cx)
         {

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

@@ -1,6 +1,6 @@
 namespace Semmle.Extraction.CSharp.Entities
 {
-    internal abstract class CachedEntity<T> : Extraction.CachedEntity<T> where T : notnull
+    public abstract class CachedEntity<T> : Extraction.CachedEntity<T> where T : notnull
     {
         public override Context Context => (Context)base.Context;
 

csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/Folder.cs

@@ -2,9 +2,9 @@
 
 namespace Semmle.Extraction.CSharp.Entities
 {
-    public sealed class Folder : Extraction.CachedEntity<PathTransformer.ITransformedPath>
+    public sealed class Folder : CachedEntity<PathTransformer.ITransformedPath>
     {
-        private Folder(Extraction.Context cx, PathTransformer.ITransformedPath init) : base(cx, init) { }
+        private Folder(Context cx, PathTransformer.ITransformedPath init) : base(cx, init) { }
 
         public override void Populate(TextWriter trapFile)
         {
@@ -21,16 +21,16 @@ public override void WriteId(EscapingTextWriter trapFile)
             trapFile.Write(";folder");
         }
 
-        public static Folder Create(Extraction.Context cx, PathTransformer.ITransformedPath folder) =>
+        public static Folder Create(Context cx, PathTransformer.ITransformedPath folder) =>
             FolderFactory.Instance.CreateEntity(cx, folder, folder);
 
         public override Microsoft.CodeAnalysis.Location? ReportingLocation => null;
 
-        private class FolderFactory : Extraction.CachedEntityFactory<PathTransformer.ITransformedPath, Folder>
+        private class FolderFactory : CachedEntityFactory<PathTransformer.ITransformedPath, Folder>
         {
             public static FolderFactory Instance { get; } = new FolderFactory();
 
-            public override Folder Create(Extraction.Context cx, PathTransformer.ITransformedPath init) => new Folder(cx, init);
+            public override Folder Create(Context cx, PathTransformer.ITransformedPath init) => new Folder(cx, init);
         }
 
         public override int GetHashCode() => Symbol.GetHashCode();

csharp/extractor/Semmle.Extraction.CSharp/Entities/Locations/GeneratedLocation.cs

@@ -28,7 +28,7 @@ public override void WriteId(EscapingTextWriter trapFile)
 
         public override bool Equals(object? obj) => obj is not null && obj.GetType() == typeof(GeneratedLocation);
 
-        public static GeneratedLocation Create(Extraction.Context cx) => GeneratedLocationFactory.Instance.CreateEntity(cx, typeof(GeneratedLocation), null);
+        public static GeneratedLocation Create(Context cx) => GeneratedLocationFactory.Instance.CreateEntity(cx, typeof(GeneratedLocation), null);
 
         private class GeneratedLocationFactory : CachedEntityFactory<string?, GeneratedLocation>
         {

csharp/extractor/Semmle.Extraction.CSharp/_Base/Context.cs

@@ -107,7 +107,7 @@ private TEntity CreateEntity<TInit, TCacheKey, TEntity>(CachedEntityFactory<TIni
             using (StackGuard)
             {
                 var label = GetNewLabel();
-                var entity = factory.Create(this, init);
+                var entity = factory.Create((CSharp.Context)this, init);
                 entity.Label = label;
 
                 dictionary[cacheKey] = entity;
@@ -493,7 +493,7 @@ public void Try(SyntaxNode? node, ISymbol? symbol, Action a)
         }
 
         public virtual CSharp.Entities.Location CreateLocation() =>
-            CSharp.Entities.GeneratedLocation.Create(this);
+            CSharp.Entities.GeneratedLocation.Create((CSharp.Context)this);
 
         public virtual CSharp.Entities.Location CreateLocation(Microsoft.CodeAnalysis.Location? location) =>
             CreateLocation();