ExportAnalyzerAttribute: Simplify pattern matching and avoid multiple…

… enumeration
icsharpcode · Jul 20, 2024 · fe87986 · fe87986
1 parent 427fbcd
commit fe87986
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/ICSharpCode.ILSpyX/Analyzers/ExportAnalyzerAttribute.cs b/ICSharpCode.ILSpyX/Analyzers/ExportAnalyzerAttribute.cs
@@ -39,8 +39,7 @@ public ExportAnalyzerAttribute() : base("Analyzer", typeof(IAnalyzer))
 		{
 			foreach (var type in typeof(ExportAnalyzerAttribute).Assembly.GetTypes())
 			{
-				var exportAnalyzerAttribute = type.GetCustomAttribute(typeof(ExportAnalyzerAttribute), false) as ExportAnalyzerAttribute;
-				if (exportAnalyzerAttribute is not null)
+				if (type.GetCustomAttribute(typeof(ExportAnalyzerAttribute), false) is ExportAnalyzerAttribute exportAnalyzerAttribute)
 				{
 					yield return (exportAnalyzerAttribute, type);
 				}

diff --git a/ILSpy.Tests/Analyzers/ExportAnalyzerAttributeTests.cs b/ILSpy.Tests/Analyzers/ExportAnalyzerAttributeTests.cs
@@ -30,7 +30,9 @@ public class ExportAnalyzerAttributeTests
 		[Test]
 		public void CollectAnalyzers()
 		{
-			var analyzerNames = ExportAnalyzerAttribute.GetAnnotatedAnalyzers().Select(analyzer => analyzer.AnalyzerType.Name);
+			var analyzerNames = ExportAnalyzerAttribute.GetAnnotatedAnalyzers()
+				.Select(analyzer => analyzer.AnalyzerType.Name)
+				.ToArray();
 			Assert.That(analyzerNames.Contains("AttributeAppliedToAnalyzer"));
 			Assert.That(analyzerNames.Contains("EventImplementedByAnalyzer"));
 			Assert.That(analyzerNames.Contains("MethodUsedByAnalyzer"));