Move all classes to the Semmle.Extraction.CSharp namespace

csharp/extractor/Semmle.Extraction.CSharp/BUILD.bazel

@@ -6,7 +6,6 @@ load(
 codeql_csharp_library(
     name = "Semmle.Extraction.CSharp",
     srcs = glob([
-        "_Base/**/*.cs",
         "CodeAnalysisExtensions/**/*.cs",
         "Comments/**/*.cs",
         "Entities/**/*.cs",

csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedEntity`1.cs → csharp/extractor/Semmle.Extraction.CSharp/Entities/Base/CachedEntity.cs

@@ -2,14 +2,14 @@
 using System.IO;
 using Microsoft.CodeAnalysis;
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp.Entities
 {
     /// <summary>
     /// A cached entity.
     ///
     /// The <see cref="Entity.Id"/> property is used as label in caching.
     /// </summary>
-    public abstract class CachedEntity : CSharp.LabelledEntity
+    public abstract class CachedEntity : LabelledEntity
     {
         protected CachedEntity(Context context) : base(context)
         {
@@ -62,7 +62,7 @@ public override bool Equals(object? obj)
             return other?.GetType() == GetType() && Equals(other.Symbol, Symbol);
         }
 
-        public override CSharp.TrapStackBehaviour TrapStackBehaviour => CSharp.TrapStackBehaviour.NoLabel;
+        public override TrapStackBehaviour TrapStackBehaviour => TrapStackBehaviour.NoLabel;
     }
 
     /// <summary>

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

@@ -3,7 +3,7 @@ namespace Semmle.Extraction.CSharp
     /// <summary>
     /// A factory for creating cached entities.
     /// </summary>
-    public abstract class CachedEntityFactory<TInit, TEntity> where TEntity : CachedEntity
+    public abstract class CachedEntityFactory<TInit, TEntity> where TEntity : Entities.CachedEntity
     {
         public abstract TEntity Create(Context cx, TInit init);
     }

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

@@ -16,7 +16,7 @@ public static class CachedEntityFactoryExtensions
         /// <param name="init">The initializer for the entity.</param>
         /// <returns>The entity.</returns>
         public static TEntity CreateEntity<TInit, TEntity>(this CachedEntityFactory<TInit, TEntity> factory, Context cx, object cacheKey, TInit init)
-            where TEntity : CachedEntity => cx.CreateEntity(factory, cacheKey, init);
+            where TEntity : Entities.CachedEntity => cx.CreateEntity(factory, cacheKey, init);
 
         /// <summary>
         /// Creates and populates a new entity from an `ISymbol`, or returns the existing one
@@ -30,6 +30,6 @@ public static TEntity CreateEntity<TInit, TEntity>(this CachedEntityFactory<TIni
         /// <returns>The entity.</returns>
         public static TEntity CreateEntityFromSymbol<TSymbol, TEntity>(this CachedEntityFactory<TSymbol, TEntity> factory, Context cx, TSymbol init)
             where TSymbol : ISymbol
-            where TEntity : CachedEntity => cx.CreateEntityFromSymbol(factory, init);
+            where TEntity : Entities.CachedEntity => cx.CreateEntityFromSymbol(factory, init);
     }
 }

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

@@ -1,8 +1,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Reflection.Metadata;
-using System.Reflection.Metadata.Ecma335;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 

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

@@ -6,9 +6,9 @@ namespace Semmle.Extraction.CSharp
 {
     public abstract class Entity : IEntity
     {
-        public virtual Semmle.Extraction.Context Context { get; }
+        public virtual Context Context { get; }
 
-        protected Entity(Semmle.Extraction.Context context)
+        protected Entity(Context context)
         {
             this.Context = context;
         }

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

@@ -1,11 +1,11 @@
 using System.IO;
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp.Entities
 {
     /// <summary>
     /// An entity which has a default "*" ID assigned to it.
     /// </summary>
-    public abstract class FreshEntity : CSharp.UnlabelledEntity
+    public abstract class FreshEntity : UnlabelledEntity
     {
         protected FreshEntity(Context cx) : base(cx)
         {
@@ -33,6 +33,6 @@ public string DebugContents
 
         public override Microsoft.CodeAnalysis.Location? ReportingLocation => null;
 
-        public override CSharp.TrapStackBehaviour TrapStackBehaviour => CSharp.TrapStackBehaviour.NoLabel;
+        public override TrapStackBehaviour TrapStackBehaviour => TrapStackBehaviour.NoLabel;
     }
 }

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

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

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

@@ -2,7 +2,7 @@ namespace Semmle.Extraction.CSharp
 {
     public abstract class UnlabelledEntity : Entity
     {
-        protected UnlabelledEntity(Extraction.Context cx) : base(cx)
+        protected UnlabelledEntity(Context cx) : base(cx)
         {
             cx.AddFreshLabel(this);
         }

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

@@ -1,5 +1,4 @@
 using System.IO;
-using Semmle.Extraction.Entities;
 
 namespace Semmle.Extraction.CSharp.Entities
 {

csharp/extractor/Semmle.Extraction.CSharp/Entities/Compilations/Compilation.cs

@@ -3,7 +3,6 @@
 using System.IO;
 using System.Linq;
 using Microsoft.CodeAnalysis;
-using Semmle.Extraction.Entities;
 using Semmle.Util;
 
 namespace Semmle.Extraction.CSharp.Entities

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

@@ -2,9 +2,8 @@
 using System.IO;
 using System.Threading;
 using Semmle.Util;
-using Semmle.Extraction.CSharp;
 
-namespace Semmle.Extraction.Entities
+namespace Semmle.Extraction.CSharp.Entities
 {
     internal class ExtractionMessage : FreshEntity
     {
@@ -41,7 +40,7 @@ protected override void Populate(TextWriter trapFile)
                     if (val == limit + 1)
                     {
                         Context.ExtractionContext.Logger.LogWarning($"Stopped logging extractor messages after reaching {limit}");
-                        _ = new ExtractionMessage(Context, new Message($"Stopped logging extractor messages after reaching {limit}", null, null, null, Util.Logging.Severity.Warning), bypassLimit: true);
+                        _ = new ExtractionMessage(Context, new Message($"Stopped logging extractor messages after reaching {limit}", null, null, null, Semmle.Util.Logging.Severity.Warning), bypassLimit: true);
                     }
                     return;
                 }

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

@@ -4,7 +4,6 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Semmle.Extraction.CSharp.Entities.Expressions;
-using Semmle.Extraction.Entities;
 using Semmle.Extraction.Kinds;
 
 namespace Semmle.Extraction.CSharp.Entities

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

@@ -6,7 +6,7 @@
 
 namespace Semmle.Extraction.CSharp.Entities
 {
-    public class File : Extraction.CachedEntity<string>
+    public class File : CachedEntity<string>
     {
         protected readonly string originalPath;
         private readonly Lazy<PathTransformer.ITransformedPath> transformedPathLazy;

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

@@ -1,7 +1,7 @@
 namespace Semmle.Extraction.CSharp.Entities
 {
 #nullable disable warnings
-    public abstract class Location : Extraction.CachedEntity<Microsoft.CodeAnalysis.Location?>
+    public abstract class Location : CachedEntity<Microsoft.CodeAnalysis.Location?>
     {
 #nullable restore warnings
         protected Location(Context cx, Microsoft.CodeAnalysis.Location? init)

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

@@ -3,7 +3,7 @@
 
 namespace Semmle.Extraction.CSharp.Entities
 {
-    internal class Modifier : Extraction.CachedEntity<string>
+    internal class Modifier : CachedEntity<string>
     {
         private Modifier(Context cx, string init)
             : base(cx, init) { }

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

@@ -4,7 +4,6 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Semmle.Extraction.CSharp.Populators;
-using Semmle.Extraction.Entities;
 
 namespace Semmle.Extraction.CSharp.Entities
 {

csharp/extractor/Semmle.Extraction.CSharp/Entities/Statement`1.cs

@@ -1,7 +1,6 @@
 using System.IO;
 using Microsoft.CodeAnalysis.CSharp;
 using Semmle.Extraction.CSharp.Populators;
-using Semmle.Extraction.Entities;
 
 namespace Semmle.Extraction.CSharp.Entities
 {

csharp/extractor/Semmle.Extraction.CSharp/Entities/Statements/SyntheticEmptyBlock.cs

@@ -1,7 +1,6 @@
 using System.IO;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Semmle.Extraction.Entities;
 using Semmle.Extraction.Kinds;
 
 namespace Semmle.Extraction.CSharp.Entities.Statements