Merge branch 'main' into alert-autofix-14

Signed-off-by: Phileco <[email protected]>

Author: krishnprakash

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

@@ -107,10 +107,10 @@ public override void Populate(TextWriter trapFile)
         private Expression AddInitializerAssignment(TextWriter trapFile, ExpressionSyntax initializer, Location loc,
             string? constValue, ref int child)
         {
-            var type = Symbol.GetAnnotatedType();
-            var simpleAssignExpr = new Expression(new ExpressionInfo(Context, type, loc, ExprKind.SIMPLE_ASSIGN, this, child++, isCompilerGenerated: true, constValue));
+            var annotatedType = Symbol.GetAnnotatedType();
+            var simpleAssignExpr = new Expression(new ExpressionInfo(Context, annotatedType, loc, ExprKind.SIMPLE_ASSIGN, this, child++, isCompilerGenerated: true, constValue));
             Expression.CreateFromNode(new ExpressionNodeInfo(Context, initializer, simpleAssignExpr, 0));
-            var access = new Expression(new ExpressionInfo(Context, type, Location, ExprKind.FIELD_ACCESS, simpleAssignExpr, 1, isCompilerGenerated: true, constValue));
+            var access = new Expression(new ExpressionInfo(Context, annotatedType, Location, ExprKind.FIELD_ACCESS, simpleAssignExpr, 1, isCompilerGenerated: true, constValue));
             trapFile.expr_access(access, this);
             return access;
         }

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

@@ -44,8 +44,8 @@ public override void Populate(TextWriter trapFile)
             PopulateNullability(trapFile, Symbol.GetAnnotatedType());
             PopulateRefKind(trapFile, Symbol.RefKind);
 
-            var type = Type;
-            trapFile.properties(this, Symbol.GetName(), ContainingType!, type.TypeRef, Create(Context, Symbol.OriginalDefinition));
+            var propertyType = Type;
+            trapFile.properties(this, Symbol.GetName(), ContainingType!, propertyType.TypeRef, Create(Context, Symbol.OriginalDefinition));
 
             var getter = BodyDeclaringSymbol.GetMethod;
             var setter = BodyDeclaringSymbol.SetMethod;

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

@@ -22,9 +22,9 @@ private TypeMention(Context cx, TypeSyntax syntax, IEntity parent, Type type, Mi
             this.loc = loc;
         }
 
-        private TypeSyntax GetArrayElementType(TypeSyntax type)
+        private TypeSyntax GetArrayElementType(TypeSyntax typeSyntax)
         {
-            switch (type)
+            switch (typeSyntax)
             {
                 case ArrayTypeSyntax ats:
                     return GetArrayElementType(ats.ElementType);
@@ -37,7 +37,7 @@ private TypeSyntax GetArrayElementType(TypeSyntax type)
                 case PointerTypeSyntax pts:
                     return GetArrayElementType(pts.ElementType);
                 default:
-                    return type;
+                    return typeSyntax;
             }
         }
 
@@ -117,13 +117,6 @@ protected override void Populate(TextWriter trapFile)
                     return;
             }
         }
-
-        private void Emit(TextWriter trapFile, Microsoft.CodeAnalysis.Location loc, IEntity parent, Type localType)
-        {
-            trapFile.type_mention(this, localType.TypeRef, parent);
-            trapFile.type_mention_location(this, Context.CreateLocation(loc));
-        }
-
         public static TypeMention Create(Context cx, TypeSyntax syntax, IEntity parent, Type type, Microsoft.CodeAnalysis.Location? loc = null)
         {
             var ret = new TypeMention(cx, syntax, parent, type, loc);