更改提示语

Author: xljiulang

WebApiClient.Analyzers/AttributeCtorAnalyzer.cs

@@ -2,6 +2,7 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Diagnostics;
 using System.Collections.Immutable;
+using System.Linq;
 
 namespace WebApiClient.Analyzers
 {
@@ -20,8 +21,8 @@ public class AttributeCtorAnalyzer : DiagnosticAnalyzer
         /// <summary>
         /// 方法返回类型诊断描述器
         /// </summary>
-        private static readonly DiagnosticDescriptor returnDescriptor =
-            Rule("RT1001", "不支持的返回类型", "返回类型必须为ITask<>或Task<T>");
+        private static readonly DiagnosticDescriptor returnTypeDescriptor =
+            Rule("RT1001", "不支持的返回类型", "返回类型必须为ITask<>或Task<>");
 
 
         /// <summary>
@@ -47,7 +48,7 @@ private static DiagnosticDescriptor Rule(string id, string title, string message
         /// </summary>
         public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics
         {
-            get => ImmutableArray.Create(attributeDescriptor, returnDescriptor);
+            get => ImmutableArray.Create(attributeDescriptor, returnTypeDescriptor);
         }
 
         /// <summary>
@@ -59,20 +60,20 @@ public override void Initialize(AnalysisContext context)
             context.RegisterSyntaxNodeAction(syntaxNodeContext =>
             {
                 var httpApi = new WebApiClientHtttApi(syntaxNodeContext);
-                var diagnosticReturnSyntaxs = httpApi.GetDiagnosticReturnSyntaxs();
+                var diagnosticAttributeSyntaxs = httpApi.GetDiagnosticAttributeSyntaxs();
+                var diagnosticReturnTypeSyntaxs = httpApi.GetDiagnosticReturnTypeSyntaxs();
 
-                foreach (var item in diagnosticReturnSyntaxs)
+                foreach (var node in diagnosticAttributeSyntaxs)
                 {
-                    var location = item.GetLocation();
-                    var diagnostic = Diagnostic.Create(returnDescriptor, location);
+                    var location = node.GetLocation();
+                    var diagnostic = Diagnostic.Create(attributeDescriptor, location);
                     syntaxNodeContext.ReportDiagnostic(diagnostic);
                 }
 
-                var diagnosticAttributes = httpApi.GetDiagnosticAttributes();
-                foreach (var item in diagnosticAttributes)
+                foreach (var node in diagnosticReturnTypeSyntaxs)
                 {
-                    var location = item.ApplicationSyntaxReference.GetSyntax().GetLocation();
-                    var diagnostic = Diagnostic.Create(attributeDescriptor, location);
+                    var location = node.GetLocation();
+                    var diagnostic = Diagnostic.Create(returnTypeDescriptor, location);
                     syntaxNodeContext.ReportDiagnostic(diagnostic);
                 }
             }, SyntaxKind.InterfaceDeclaration);

WebApiClient.Analyzers/WebApiClientHtttApi.cs

@@ -72,29 +72,29 @@ private bool GetIsHtttApiInterface()
         /// 获取诊断的特性
         /// </summary>
         /// <returns></returns>
-        public IEnumerable<AttributeData> GetDiagnosticAttributes()
+        public IEnumerable<SyntaxNode> GetDiagnosticAttributeSyntaxs()
         {
             if (this.IsHtttApiInterface == false)
             {
-                return Enumerable.Empty<AttributeData>();
+                return Enumerable.Empty<SyntaxNode>();
             }
 
             var interfaceSymbol = this.syntaxNodeContext.SemanticModel.GetDeclaredSymbol(this.interfaceDeclaration);
             if (interfaceSymbol == null)
             {
-                return Enumerable.Empty<AttributeData>();
+                return Enumerable.Empty<SyntaxNode>();
             }
 
             var interfaceAttributes = this.GetInterfaceDiagnosticAttributes(interfaceSymbol);
             var methodAttributes = this.GetHttpApiMethodSymbols().SelectMany(item => this.GetMethodDiagnosticAttributes(item));
-            return interfaceAttributes.Concat(methodAttributes);
+            return interfaceAttributes.Concat(methodAttributes).Select(item => item.ApplicationSyntaxReference.GetSyntax());
         }
 
         /// <summary>
-        /// 获取诊断的接口返回
+        /// 获取诊断的接口返回类型
         /// </summary>
         /// <returns></returns>
-        public IEnumerable<TypeSyntax> GetDiagnosticReturnSyntaxs()
+        public IEnumerable<SyntaxNode> GetDiagnosticReturnTypeSyntaxs()
         {
             if (this.IsHtttApiInterface == false)
             {