Move extraction context classes to the Semmle.Extraction.CSharp namespace

tamasvajk · tamasvajk · commit 46da5960ee43 · 2024-11-13T14:28:04.000+01:00
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/BinaryLogExtractionContext.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/BinaryLogExtractionContext.cs
@@ -4,7 +4,7 @@
 using Microsoft.CodeAnalysis;
 using Semmle.Util.Logging;
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     public class BinaryLogExtractionContext : ExtractionContext
     {
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/ExtractionContext.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/ExtractionContext.cs
@@ -2,7 +2,7 @@
 using Semmle.Util.Logging;
 using CompilationInfo = (string key, string value);
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     /// <summary>
     /// Implementation of the main extractor state.
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Extractor/ExtractorMode.cs b/csharp/extractor/Semmle.Extraction.CSharp/Extractor/ExtractorMode.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Semmle.Extraction
+namespace Semmle.Extraction.CSharp
 {
     /// <summary>
     /// The mode in which a file is extracted.
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/_Base/Context.cs b/csharp/extractor/Semmle.Extraction.CSharp/_Base/Context.cs
@@ -18,7 +18,7 @@ public class Context
         /// <summary>
         /// Access various extraction functions, e.g. logger, trap writer.
         /// </summary>
-        public ExtractionContext ExtractionContext { get; }
+        public CSharp.ExtractionContext ExtractionContext { get; }
 
         /// <summary>
         /// Access to the trap file.
@@ -190,7 +190,7 @@ public void PopulateAll()
             }
         }
 
-        protected Context(ExtractionContext extractionContext, TrapWriter trapWriter, bool shouldAddAssemblyTrapPrefix = false)
+        protected Context(CSharp.ExtractionContext extractionContext, TrapWriter trapWriter, bool shouldAddAssemblyTrapPrefix = false)
         {
             ExtractionContext = extractionContext;
             TrapWriter = trapWriter;
@@ -274,7 +274,7 @@ private void Populate(ISymbol? optionalSymbol, CachedEntity entity)
 
             bool duplicationGuard, deferred;
 
-            if (ExtractionContext.Mode is ExtractorMode.Standalone)
+            if (ExtractionContext.Mode is CSharp.ExtractorMode.Standalone)
             {
                 duplicationGuard = false;
                 deferred = false;
@@ -408,7 +408,7 @@ private void ExtractionError(InternalError error)
 
         private void ReportError(InternalError error)
         {
-            if (!ExtractionContext.Mode.HasFlag(ExtractorMode.Standalone))
+            if (!ExtractionContext.Mode.HasFlag(CSharp.ExtractorMode.Standalone))
                 throw error;
 
             ExtractionError(error);

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`using Microsoft.CodeAnalysis;`
`5`	`5`	`using Semmle.Util.Logging;`
`6`	`6`
`7`		`-namespace Semmle.Extraction`
	`7`	`+namespace Semmle.Extraction.CSharp`
`8`	`8`	`{`
`9`	`9`	`public class BinaryLogExtractionContext : ExtractionContext`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using Semmle.Util.Logging;`
`3`	`3`	`using CompilationInfo = (string key, string value);`
`4`	`4`
`5`		`-namespace Semmle.Extraction`
	`5`	`+namespace Semmle.Extraction.CSharp`
`6`	`6`	`{`
`7`	`7`	`/// <summary>`
`8`	`8`	`/// Implementation of the main extractor state.`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`
`3`		`-namespace Semmle.Extraction`
	`3`	`+namespace Semmle.Extraction.CSharp`
`4`	`4`	`{`
`5`	`5`	`/// <summary>`
`6`	`6`	`/// The mode in which a file is extracted.`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public class Context`
`18`	`18`	`/// <summary>`
`19`	`19`	`/// Access various extraction functions, e.g. logger, trap writer.`
`20`	`20`	`/// </summary>`
`21`		`- public ExtractionContext ExtractionContext { get; }`
	`21`	`+ public CSharp.ExtractionContext ExtractionContext { get; }`
`22`	`22`
`23`	`23`	`/// <summary>`
`24`	`24`	`/// Access to the trap file.`
`@@ -190,7 +190,7 @@ public void PopulateAll()`
`190`	`190`	`}`
`191`	`191`	`}`
`192`	`192`
`193`		`- protected Context(ExtractionContext extractionContext, TrapWriter trapWriter, bool shouldAddAssemblyTrapPrefix = false)`
	`193`	`+ protected Context(CSharp.ExtractionContext extractionContext, TrapWriter trapWriter, bool shouldAddAssemblyTrapPrefix = false)`
`194`	`194`	`{`
`195`	`195`	`ExtractionContext = extractionContext;`
`196`	`196`	`TrapWriter = trapWriter;`
`@@ -274,7 +274,7 @@ private void Populate(ISymbol? optionalSymbol, CachedEntity entity)`
`274`	`274`
`275`	`275`	`bool duplicationGuard, deferred;`
`276`	`276`
`277`		`- if (ExtractionContext.Mode is ExtractorMode.Standalone)`
	`277`	`+ if (ExtractionContext.Mode is CSharp.ExtractorMode.Standalone)`
`278`	`278`	`{`
`279`	`279`	`duplicationGuard = false;`
`280`	`280`	`deferred = false;`
`@@ -408,7 +408,7 @@ private void ExtractionError(InternalError error)`
`408`	`408`
`409`	`409`	`private void ReportError(InternalError error)`
`410`	`410`	`{`
`411`		`- if (!ExtractionContext.Mode.HasFlag(ExtractorMode.Standalone))`
	`411`	`+ if (!ExtractionContext.Mode.HasFlag(CSharp.ExtractorMode.Standalone))`
`412`	`412`	`throw error;`
`413`	`413`
`414`	`414`	`ExtractionError(error);`