Move location creation to instance method on context

Author: tamasvajk

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/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));
         }
     }
 }

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

@@ -60,7 +60,7 @@ protected override void ExtractInitializers(TextWriter trapFile)
 
             var initInfo = new ExpressionInfo(Context,
                 AnnotatedTypeSymbol.CreateNotAnnotated(initializerType),
-                Context.Create(initializer.ThisOrBaseKeyword.GetLocation()),
+                Context.CreateLocation(initializer.ThisOrBaseKeyword.GetLocation()),
                 Kinds.ExprKind.CONSTRUCTOR_INIT,
                 this,
                 -1,

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

@@ -118,7 +118,7 @@ public Extraction.Entities.Location Location
             get
             {
                 if (cachedLocation == null)
-                    cachedLocation = Context.Create(CodeAnalysisLocation);
+                    cachedLocation = Context.CreateLocation(CodeAnalysisLocation);
                 return cachedLocation;
             }
 

csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Discard.cs

@@ -12,7 +12,7 @@ public Discard(ExpressionNodeInfo info) : base(info.SetKind(ExprKind.DISCARD))
         }
 
         private Discard(Context cx, CSharpSyntaxNode syntax, IExpressionParentEntity parent, int child) :
-            base(new ExpressionInfo(cx, cx.GetType(syntax), cx.Create(syntax.GetLocation()), ExprKind.DISCARD, parent, child, false, null))
+            base(new ExpressionInfo(cx, cx.GetType(syntax), cx.CreateLocation(syntax.GetLocation()), ExprKind.DISCARD, parent, child, false, null))
         {
         }
 

csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/Initializer.cs

@@ -137,7 +137,7 @@ protected override void PopulateExpression(TextWriter trapFile)
                 var addMethod = Method.Create(cx, collectionInfo.Symbol as IMethodSymbol);
                 var voidType = AnnotatedTypeSymbol.CreateNotAnnotated(cx.Compilation.GetSpecialType(SpecialType.System_Void));
 
-                var invocation = new Expression(new ExpressionInfo(cx, voidType, cx.Create(i.GetLocation()), ExprKind.METHOD_INVOCATION, this, child++, false, null));
+                var invocation = new Expression(new ExpressionInfo(cx, voidType, cx.CreateLocation(i.GetLocation()), ExprKind.METHOD_INVOCATION, this, child++, false, null));
 
                 if (addMethod != null)
                     trapFile.expr_call(invocation, addMethod);

csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/InterpolatedString.cs

@@ -27,7 +27,7 @@ protected override void PopulateExpression(TextWriter trapFile)
                     case SyntaxKind.InterpolatedStringText:
                         // Create a string literal
                         var interpolatedText = (InterpolatedStringTextSyntax)c;
-                        new Expression(new ExpressionInfo(cx, Type, cx.Create(c.GetLocation()), ExprKind.STRING_LITERAL, this, child++, false, interpolatedText.TextToken.Text));
+                        new Expression(new ExpressionInfo(cx, Type, cx.CreateLocation(c.GetLocation()), ExprKind.STRING_LITERAL, this, child++, false, interpolatedText.TextToken.Text));
                         break;
                     default:
                         throw new InternalError(c, $"Unhandled interpolation kind {c.Kind()}");

csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/ObjectCreation/AnonymousObjectCreation.cs

@@ -36,7 +36,7 @@ protected override void PopulateExpression(TextWriter trapFile)
                 var property = cx.GetModel(init).GetDeclaredSymbol(init);
                 var propEntity = Property.Create(cx, property);
                 var type = property.GetAnnotatedType();
-                var loc = cx.Create(init.GetLocation());
+                var loc = cx.CreateLocation(init.GetLocation());
 
                 var assignment = new Expression(new ExpressionInfo(cx, type, loc, ExprKind.SIMPLE_ASSIGN, objectInitializer, child++, false, null));
                 Create(cx, init.Expression, assignment, 0);