Merge pull request #5131 from tamasvajk/feature/refactor

C# Cleanup and refactoring

Author: tamasvajk

csharp/autobuilder/Semmle.Autobuild.Shared/Solution.cs

@@ -45,6 +45,7 @@ internal class Solution : ProjectOrSolution, ISolution
         private readonly SolutionFile? solution;
 
         private readonly IEnumerable<Project> includedProjects;
+
         public override IEnumerable<IProjectOrSolution> IncludedProjects => includedProjects;
 
         public IEnumerable<SolutionConfigurationInSolution> Configurations =>
@@ -84,8 +85,12 @@ public Solution(Autobuilder builder, string path, bool allowProject) : base(buil
                 .ToArray();
         }
 
-        private IEnumerable<Version> ToolsVersions => includedProjects.Where(p => p.ValidToolsVersion).Select(p => p.ToolsVersion);
+        private IEnumerable<Version> ToolsVersions => includedProjects
+            .Where(p => p.ValidToolsVersion)
+            .Select(p => p.ToolsVersion);
 
-        public Version ToolsVersion => ToolsVersions.Any() ? ToolsVersions.Max() : new Version();
+        public Version ToolsVersion => ToolsVersions.Any()
+            ? ToolsVersions.Max()
+            : new Version();
     }
 }

csharp/extractor/Semmle.Extraction.CIL.Driver/ExtractorOptions.cs

@@ -163,7 +163,7 @@ public void ResolveReferences()
         }
 
         private readonly HashSet<string> filesAnalyzed = new HashSet<string>();
-        public HashSet<AssemblyName> MissingReferences {get;} = new HashSet<AssemblyName>();
+        public HashSet<AssemblyName> MissingReferences { get; } = new HashSet<AssemblyName>();
     }
 
     /// <summary>

csharp/extractor/Semmle.Extraction.CIL/Entities/Assembly.cs

@@ -136,7 +136,7 @@ public static void ExtractCIL(Layout layout, string assemblyPath, ILogger logger
                 trapFile = trapWriter.TrapFile;
                 if (nocache || !System.IO.File.Exists(trapFile))
                 {
-                    var cx = extractor.CreateContext(null, trapWriter, null, false);
+                    var cx = new Extraction.Context(extractor, trapWriter);
                     ExtractCIL(cx, assemblyPath, extractPdbs);
                     extracted = true;
                 }

csharp/extractor/Semmle.Extraction.CIL/PDB/MdProvider.cs

@@ -2,6 +2,8 @@
 using Microsoft.DiaSymReader;
 using System.Reflection;
 
+#pragma warning disable IDE0060, CA1822
+
 namespace Semmle.Extraction.PDB
 {
     /// <summary>
@@ -31,3 +33,5 @@ public bool TryGetTypeReferenceInfo(int typeReferenceToken, out string namespace
             throw new NotImplementedException();
     }
 }
+
+#pragma warning restore

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

@@ -17,7 +17,7 @@ namespace Semmle.Extraction.CSharp
     /// </summary>
     public sealed class Analyser : IDisposable
     {
-        private IExtractor extractor;
+        private Extraction.Extractor extractor;
         private CSharpCompilation compilation;
         private Layout layout;
         private bool init;
@@ -230,7 +230,7 @@ private void DoAnalyseCompilation()
                 var projectLayout = layout.LookupProjectOrDefault(transformedAssemblyPath);
                 var trapWriter = projectLayout.CreateTrapWriter(Logger, transformedAssemblyPath, options.TrapCompression, discardDuplicates: false);
                 compilationTrapFile = trapWriter;  // Dispose later
-                var cx = extractor.CreateContext(compilation.Clone(), trapWriter, new AssemblyScope(assembly, assemblyPath), AddAssemblyTrapPrefix);
+                var cx = new Context(extractor, compilation.Clone(), trapWriter, new AssemblyScope(assembly, assemblyPath), AddAssemblyTrapPrefix);
 
                 compilationEntity = Entities.Compilation.Create(cx);
             }
@@ -285,7 +285,7 @@ private void DoAnalyseReferenceAssembly(PortableExecutableReference r)
 
                     if (c.GetAssemblyOrModuleSymbol(r) is IAssemblySymbol assembly)
                     {
-                        var cx = extractor.CreateContext(c, trapWriter, new AssemblyScope(assembly, assemblyPath), AddAssemblyTrapPrefix);
+                        var cx = new Context(extractor, c, trapWriter, new AssemblyScope(assembly, assemblyPath), AddAssemblyTrapPrefix);
 
                         foreach (var module in assembly.Modules)
                         {
@@ -371,7 +371,7 @@ private void DoExtractTree(SyntaxTree tree)
 
                     if (!upToDate)
                     {
-                        var cx = extractor.CreateContext(compilation.Clone(), trapWriter, new SourceScope(tree), AddAssemblyTrapPrefix);
+                        var cx = new Context(extractor, compilation.Clone(), trapWriter, new SourceScope(tree), AddAssemblyTrapPrefix);
                         // Ensure that the file itself is populated in case the source file is totally empty
                         var root = tree.GetRoot();
                         Extraction.Entities.File.Create(cx, root.SyntaxTree.FilePath);

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

@@ -118,7 +118,7 @@ private Expression CreateExpressionFromArgument(TypedConstant constant, Expressi
 
         private Semmle.Extraction.Entities.Location location;
         private Semmle.Extraction.Entities.Location Location =>
-            location ?? (location = Semmle.Extraction.Entities.Location.Create(Context, attributeSyntax is null ? entity.ReportingLocation : attributeSyntax.Name.GetLocation()));
+            location ?? (location = Context.CreateLocation(attributeSyntax is null ? entity.ReportingLocation : attributeSyntax.Name.GetLocation()));
 
         public override bool NeedsPopulation => true;
 

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

@@ -0,0 +1,27 @@
+using Semmle.Extraction.Kinds;
+
+namespace Semmle.Extraction.CSharp.Entities
+{
+    internal static class CallTypeExtensions
+    {
+        /// <summary>
+        /// Adjust the expression kind <paramref name="k"/> to match this call type.
+        /// </summary>
+        public static ExprKind AdjustKind(this Expression.CallType ct, ExprKind k)
+        {
+            if (k == ExprKind.ADDRESS_OF)
+            {
+                return k;
+            }
+
+            switch (ct)
+            {
+                case Expression.CallType.Dynamic:
+                case Expression.CallType.UserOperator:
+                    return ExprKind.OPERATOR_INVOCATION;
+                default:
+                    return k;
+            }
+        }
+    }
+}

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

@@ -13,7 +13,7 @@ public override void Populate(TextWriter trapFile)
         {
             trapFile.commentblock(this);
             var child = 0;
-            trapFile.commentblock_location(this, Context.Create(symbol.Location));
+            trapFile.commentblock_location(this, Context.CreateLocation(symbol.Location));
             foreach (var l in symbol.CommentLines)
             {
                 trapFile.commentblock_child(this, (CommentLine)l, child++);
@@ -24,7 +24,7 @@ public override void Populate(TextWriter trapFile)
 
         public override void WriteId(TextWriter trapFile)
         {
-            trapFile.WriteSubId(Context.Create(symbol.Location));
+            trapFile.WriteSubId(Context.CreateLocation(symbol.Location));
             trapFile.Write(";commentblock");
         }
 

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

@@ -23,7 +23,7 @@ private CommentLine(Context cx, Microsoft.CodeAnalysis.Location loc, CommentLine
 
         public override void Populate(TextWriter trapFile)
         {
-            location = Context.Create(Location);
+            location = Context.CreateLocation(Location);
             trapFile.commentline(this, Type == CommentLineType.MultilineContinuation ? CommentLineType.Multiline : Type, Text, RawText);
             trapFile.commentline_location(this, location);
         }
@@ -34,7 +34,7 @@ public override void Populate(TextWriter trapFile)
 
         public override void WriteId(TextWriter trapFile)
         {
-            trapFile.WriteSubId(Context.Create(Location));
+            trapFile.WriteSubId(Context.CreateLocation(Location));
             trapFile.Write(";commentline");
         }
 

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

@@ -17,7 +17,7 @@ public Diagnostic(Context cx, Microsoft.CodeAnalysis.Diagnostic diag) : base(cx)
         protected override void Populate(TextWriter trapFile)
         {
             trapFile.diagnostics(this, (int)diagnostic.Severity, diagnostic.Id, diagnostic.Descriptor.Title.ToString(),
-                diagnostic.GetMessage(), Extraction.Entities.Location.Create(cx, diagnostic.Location));
+                diagnostic.GetMessage(), cx.CreateLocation(diagnostic.Location));
         }
     }
 }