Merge pull request #339 from krishnprakash/alert-autofix-4

krishnprakash · web-flow · commit 775b3ebd4111 · 2025-03-11T15:19:52.000+05:30
Potential fix for code scanning alert no. 4: Missed opportunity to use Where
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Populators/TypeContainerVisitor.cs b/csharp/extractor/Semmle.Extraction.CSharp/Populators/TypeContainerVisitor.cs
@@ -25,10 +25,10 @@ public TypeContainerVisitor(Context cx, TextWriter trapFile, IEntity parent)
             attributeLookup = new Lazy<Func<SyntaxNode, AttributeData?>>(() =>
                 {
                     var dict = new Dictionary<SyntaxNode, AttributeData?>();
-                    foreach (var attributeData in cx.Compilation.Assembly.GetAttributes().Concat(cx.Compilation.Assembly.Modules.SelectMany(m => m.GetAttributes())))
+                    foreach (var attributeData in cx.Compilation.Assembly.GetAttributes().Concat(cx.Compilation.Assembly.Modules.SelectMany(m => m.GetAttributes())).Where(attributeData => attributeData.ApplicationSyntaxReference?.GetSyntax() is SyntaxNode syntax))
                     {
-                        if (attributeData.ApplicationSyntaxReference?.GetSyntax() is SyntaxNode syntax)
-                            dict.Add(syntax, attributeData);
+                        var syntax = attributeData.ApplicationSyntaxReference?.GetSyntax() as SyntaxNode;
+                        dict.Add(syntax, attributeData);
                     }
                     return dict.GetValueOrDefault;
                 });

Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,10 @@ public TypeContainerVisitor(Context cx, TextWriter trapFile, IEntity parent)`
`25`	`25`	`attributeLookup = new Lazy<Func<SyntaxNode, AttributeData?>>(() =>`
`26`	`26`	`{`
`27`	`27`	`var dict = new Dictionary<SyntaxNode, AttributeData?>();`
`28`		`- foreach (var attributeData in cx.Compilation.Assembly.GetAttributes().Concat(cx.Compilation.Assembly.Modules.SelectMany(m => m.GetAttributes())))`
	`28`	`+ foreach (var attributeData in cx.Compilation.Assembly.GetAttributes().Concat(cx.Compilation.Assembly.Modules.SelectMany(m => m.GetAttributes())).Where(attributeData => attributeData.ApplicationSyntaxReference?.GetSyntax() is SyntaxNode syntax))`
`29`	`29`	`{`
`30`		`- if (attributeData.ApplicationSyntaxReference?.GetSyntax() is SyntaxNode syntax)`
`31`		`- dict.Add(syntax, attributeData);`
	`30`	`+ var syntax = attributeData.ApplicationSyntaxReference?.GetSyntax() as SyntaxNode;`
	`31`	`+ dict.Add(syntax, attributeData);`
`32`	`32`	`}`
`33`	`33`	`return dict.GetValueOrDefault;`
`34`	`34`	`});`