Fix CodeQL issues (#278)

PublicApiGenerator · Feb 26, 2023 · 10564ed · 10564ed
1 parent 83927e6
commit 10564ed
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/src/PublicApiGenerator.sln b/src/PublicApiGenerator.sln
@@ -22,6 +22,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PublicApiGenerator.Tool", "
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{FDD9792D-8E91-41C6-B42A-9E69831F61DF}"
 	ProjectSection(SolutionItems) = preProject
+		..\.github\codecov.yml = ..\.github\codecov.yml
 		..\.github\dependabot.yml = ..\.github\dependabot.yml
 		..\.github\labeler.yml = ..\.github\labeler.yml
 	EndProjectSection

diff --git a/src/PublicApiGenerator/ApiGenerator.cs b/src/PublicApiGenerator/ApiGenerator.cs
@@ -449,17 +449,14 @@ bool IsSpecialConstraint(GenericParameterConstraint constraint)
         PopulateAttributesThatDontAppearInCustomAttributes(type, attributes);
     }
 
-    static void PopulateAttributesThatDontAppearInCustomAttributes(ICustomAttributeProvider type,
+    private static void PopulateAttributesThatDontAppearInCustomAttributes(ICustomAttributeProvider type,
         CodeAttributeDeclarationCollection attributes)
     {
-        if (type is TypeDefinition typeDefinition)
+        if (type is TypeDefinition typeDefinition && typeDefinition.Attributes.HasFlag(Mono.Cecil.TypeAttributes.Serializable))
         {
-            if (typeDefinition.Attributes.HasFlag(Mono.Cecil.TypeAttributes.Serializable))
-            {
-                var attribute = new CodeAttributeDeclaration("System.SerializableAttribute");
-                attribute.Name = AttributeNameBuilder.Get(attribute.Name);
-                attributes.Add(attribute);
-            }
+            var attribute = new CodeAttributeDeclaration("System.SerializableAttribute");
+            attribute.Name = AttributeNameBuilder.Get(attribute.Name);
+            attributes.Add(attribute);
         }
     }
 
@@ -565,8 +562,9 @@ private static CodeExpression CreateInitialiserExpression(CustomAttributeArgumen
         {
             // CodeDOM outputs a verbatim string. Any string with \n is treated as such, so normalize
             // it to make it easier for comparisons
-            value = Regex.Replace(s, @"\n", "\\n");
-            value = Regex.Replace(s, @"\r\n|\r\\n", "\\r\\n");
+            s = Regex.Replace(s, @"\n", "\\n");
+            s = Regex.Replace(s, @"\r\n|\r\\n", "\\r\\n");
+            value = s;
         }
 
         return new CodePrimitiveExpression(value);

diff --git a/src/PublicApiGenerator/CodeTypeReferenceBuilder.cs b/src/PublicApiGenerator/CodeTypeReferenceBuilder.cs
@@ -138,10 +138,9 @@ private static string GetTypeNameCore(TypeReference type, IEnumerator<bool?>? nu
 
         if (type is ArrayType array)
         {
-            if (nullable)
-                return CSharpTypeKeyword.Get(GetTypeName(array.ElementType, nullabilityMap, NullableMode.Default, disableNested)) + "[]";
-            else
-                return GetTypeName(array.ElementType, nullabilityMap, NullableMode.Default, disableNested) + "[]";
+            return nullable
+                ? CSharpTypeKeyword.Get(GetTypeName(array.ElementType, nullabilityMap, NullableMode.Default, disableNested)) + "[]"
+                : GetTypeName(array.ElementType, nullabilityMap, NullableMode.Default, disableNested) + "[]";
         }
 
         if (type is PointerType pointer)