From f2437bb0465ed1c7ed7ae25c715680123fbffde6 Mon Sep 17 00:00:00 2001 From: Andreas Weizel Date: Sat, 20 Jul 2024 00:34:14 +0200 Subject: [PATCH] Allow to collect analyzers annotated with ExportAnalyzerAttribute without MEF This helps users of ILSpyX not using MEF. Currently only ILSpyX assembly itself is searched for annotated analyzer types. --- .../Analyzers/ExportAnalyzerAttribute.cs | 15 +++++++ .../Analyzers/ExportAnalyzerAttributeTests.cs | 41 +++++++++++++++++++ ILSpy.Tests/ILSpy.Tests.csproj | 1 + 3 files changed, 57 insertions(+) create mode 100644 ILSpy.Tests/Analyzers/ExportAnalyzerAttributeTests.cs diff --git a/ICSharpCode.ILSpyX/Analyzers/ExportAnalyzerAttribute.cs b/ICSharpCode.ILSpyX/Analyzers/ExportAnalyzerAttribute.cs index fbd4b3a724..2f07859211 100644 --- a/ICSharpCode.ILSpyX/Analyzers/ExportAnalyzerAttribute.cs +++ b/ICSharpCode.ILSpyX/Analyzers/ExportAnalyzerAttribute.cs @@ -17,7 +17,10 @@ // DEALINGS IN THE SOFTWARE. using System; +using System.Collections.Generic; using System.ComponentModel.Composition; +using System.Linq; +using System.Reflection; namespace ICSharpCode.ILSpyX.Analyzers { @@ -31,5 +34,17 @@ public ExportAnalyzerAttribute() : base("Analyzer", typeof(IAnalyzer)) public required string Header { get; init; } public int Order { get; set; } + + public static IEnumerable<(ExportAnalyzerAttribute AttributeData, Type AnalyzerType)> GetAnnotatedAnalyzers() + { + foreach (var type in typeof(ExportAnalyzerAttribute).Assembly.GetTypes()) + { + var exportAnalyzerAttribute = type.GetCustomAttribute(typeof(ExportAnalyzerAttribute), false) as ExportAnalyzerAttribute; + if (exportAnalyzerAttribute is not null) + { + yield return (exportAnalyzerAttribute, type); + } + } + } } } diff --git a/ILSpy.Tests/Analyzers/ExportAnalyzerAttributeTests.cs b/ILSpy.Tests/Analyzers/ExportAnalyzerAttributeTests.cs new file mode 100644 index 0000000000..6c800da9de --- /dev/null +++ b/ILSpy.Tests/Analyzers/ExportAnalyzerAttributeTests.cs @@ -0,0 +1,41 @@ +// Copyright (c) 2024 Andreas Weizel +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of this +// software and associated documentation files (the "Software"), to deal in the Software +// without restriction, including without limitation the rights to use, copy, modify, merge, +// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all copies or +// substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR +// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE +// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. + +using System.Linq; + +using ICSharpCode.ILSpyX.Analyzers; + +using NUnit.Framework; + +namespace ICSharpCode.ILSpy.Tests.Analyzers +{ + [TestFixture] + public class ExportAnalyzerAttributeTests + { + [Test] + public void CollectAnalyzers() + { + var analyzerNames = ExportAnalyzerAttribute.GetAnnotatedAnalyzers().Select(analyzer => analyzer.AnalyzerType.Name); + Assert.That(analyzerNames.Contains("AttributeAppliedToAnalyzer")); + Assert.That(analyzerNames.Contains("EventImplementedByAnalyzer")); + Assert.That(analyzerNames.Contains("MethodUsedByAnalyzer")); + Assert.That(analyzerNames.Contains("PropertyOverriddenByAnalyzer")); + Assert.That(analyzerNames.Contains("TypeInstantiatedByAnalyzer")); + } + } +} diff --git a/ILSpy.Tests/ILSpy.Tests.csproj b/ILSpy.Tests/ILSpy.Tests.csproj index 17337e7b24..0f44621f67 100644 --- a/ILSpy.Tests/ILSpy.Tests.csproj +++ b/ILSpy.Tests/ILSpy.Tests.csproj @@ -34,6 +34,7 @@ +