Move more classes to the Semmle.Extraction.CSharp namespace

Author: tamasvajk

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

@@ -7,11 +7,13 @@ codeql_csharp_library(
     name = "Semmle.Extraction.CSharp",
     srcs = glob([
         "_Base/**/*.cs",
+        "CodeAnalysisExtensions/**/*.cs",
         "Comments/**/*.cs",
         "Entities/**/*.cs",
         "Extractor/**/*.cs",
         "Kinds/**/*.cs",
         "Populators/**/*.cs",
+        "Trap/**/*.cs",
         "*.cs",
     ]),
     allow_unsafe_blocks = True,

csharp/extractor/Semmle.Extraction.CSharp/_Base/LocationExtensions.cs renamed to csharp/extractor/Semmle.Extraction.CSharp/CodeAnalysisExtensions/LocationExtensions.cs

@@ -3,7 +3,7 @@
 using System.Linq;
 using Microsoft.CodeAnalysis;
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     public static class LocationExtensions
     {

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

@@ -3,11 +3,11 @@ namespace Semmle.Extraction
     /// <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 : Semmle.Extraction.CachedEntity
     {
         /// <summary>
         /// Initializes the entity, but does not generate any trap code.
         /// </summary>
-        public abstract TEntity Create(Context cx, TInit init);
+        public abstract TEntity Create(Semmle.Extraction.Context cx, TInit init);
     }
 }

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

@@ -9,7 +9,7 @@ namespace Semmle.Extraction
     ///
     /// The <see cref="Entity.Id"/> property is used as label in caching.
     /// </summary>
-    public abstract class CachedEntity : LabelledEntity
+    public abstract class CachedEntity : CSharp.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 TrapStackBehaviour TrapStackBehaviour => TrapStackBehaviour.NoLabel;
+        public override CSharp.TrapStackBehaviour TrapStackBehaviour => CSharp.TrapStackBehaviour.NoLabel;
     }
 
     /// <summary>

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

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

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

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

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

@@ -1,7 +1,7 @@
 using System.IO;
 using Microsoft.CodeAnalysis;
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     /// <summary>
     /// Any program entity which has a corresponding label in the trap file.

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

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

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

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