增加Class后缀

Author: xljiulang

WebApiClientCore.Analyzers/SourceGenerator/HttpApiProxyClass.cs

@@ -21,12 +21,12 @@ sealed class HttpApiProxyClass : IEquatable<HttpApiProxyClass>
         /// <summary>
         /// 拦截器变量名
         /// </summary>
-        private readonly string apiInterceptorFieldName = $"apiInterceptor_{(uint)Environment.TickCount}";
+        private readonly string apiInterceptorFieldName = "_apiInterceptor";
 
         /// <summary>
         /// action执行器变量名
         /// </summary>
-        private readonly string actionInvokersFieldName = $"actionInvokers_{(uint)Environment.TickCount}";
+        private readonly string actionInvokersFieldName = "_actionInvokers";
 
         /// <summary>
         /// 文件名
@@ -41,7 +41,7 @@ sealed class HttpApiProxyClass : IEquatable<HttpApiProxyClass>
         /// <summary>
         /// 类型名
         /// </summary>
-        public string ClassName => this.httpApi.Name;
+        public string ClassName => this.httpApi.Name + "Class";
 
         /// <summary>
         /// HttpApi代理类
@@ -89,13 +89,13 @@ public override string ToString()
             builder.AppendLine($"\t[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]");
             builder.AppendLine($"\t[global::System.Diagnostics.DebuggerTypeProxy(typeof({this.httpApiFullName}))]");
             builder.AppendLine($"\t[global::WebApiClientCore.HttpApiProxyClass(typeof({this.httpApiFullName}))]");
-            builder.AppendLine($"\tpartial class {this.ClassName}:{this.httpApiFullName}");
+            builder.AppendLine($"\tpartial class {this.ClassName} : {this.httpApiFullName}");
             builder.AppendLine("\t{");
 
             builder.AppendLine($"\t\tprivate readonly global::WebApiClientCore.IHttpApiInterceptor {this.apiInterceptorFieldName};");
             builder.AppendLine($"\t\tprivate readonly global::WebApiClientCore.ApiActionInvoker[] {this.actionInvokersFieldName};");
 
-            builder.AppendLine($"\t\tpublic {this.httpApi.Name}(global::WebApiClientCore.IHttpApiInterceptor apiInterceptor, global::WebApiClientCore.ApiActionInvoker[] actionInvokers)");
+            builder.AppendLine($"\t\tpublic {this.ClassName}(global::WebApiClientCore.IHttpApiInterceptor apiInterceptor, global::WebApiClientCore.ApiActionInvoker[] actionInvokers)");
             builder.AppendLine("\t\t{");
             builder.AppendLine($"\t\t\tthis.{this.apiInterceptorFieldName} = apiInterceptor;");
             builder.AppendLine($"\t\t\tthis.{this.actionInvokersFieldName} = actionInvokers;");
@@ -138,7 +138,7 @@ private string BuildMethod(INamedTypeSymbol interfaceType, IMethodSymbol method,
                 : $"new global::System.Object[] {{ {parameterNamesString} }}";
 
             var methodName = $"\"{interfaceType.ToDisplayString()}.{method.Name}\"";
-            var returnTypeString = GetFullName(method.ReturnType);
+            var returnTypeString = GetFullName(method.ReturnType); 
             builder.AppendLine($"\t\t[global::WebApiClientCore.HttpApiProxyMethod({index}, {methodName})]");
             builder.AppendLine($"\t\t{returnTypeString} {GetFullName(interfaceType)}.{method.Name}( {parametersString} )");
             builder.AppendLine("\t\t{");

WebApiClientCore.Analyzers/SourceGenerator/HttpApiProxyClassInitializer.cs

@@ -39,35 +39,30 @@ public SourceText ToSourceText()
             return SourceText.From(code, Encoding.UTF8);
         }
 
+
         public override string ToString()
         {
             var builder = new StringBuilder();
             builder.AppendLine("#if NET5_0_OR_GREATER");
-            builder.AppendLine("#pragma warning disable"); 
+            builder.AppendLine("#pragma warning disable");
             builder.AppendLine($"namespace WebApiClientCore");
             builder.AppendLine("{");
-            builder.AppendLine("    /// <summary>动态依赖初始化器</summary>");
-            builder.AppendLine("    [global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]");
-            builder.AppendLine($"    static partial class {nameof(HttpApiProxyClassInitializer)}");
-            builder.AppendLine("    {");
-
-            builder.AppendLine($"""
-                        /// <summary>
-                        /// 注册程序集{compilation.AssemblyName}的所有动态依赖
-                        /// 避免程序集在裁剪时裁剪掉由SourceGenerator生成的代理类
-                        /// </summary>
-                """);
+            builder.AppendLine("\t/// <summary>动态依赖初始化器</summary>");
+            builder.AppendLine("\t[global::System.ComponentModel.EditorBrowsable(global::System.ComponentModel.EditorBrowsableState.Never)]");
+            builder.AppendLine($"\tstatic partial class {nameof(HttpApiProxyClassInitializer)}");
+            builder.AppendLine("\t{");
 
-            builder.AppendLine("        [global::System.Runtime.CompilerServices.ModuleInitializer]");
+            builder.AppendLine($"\t\t/// <summary>初始化本程序集的动态依赖</summary> ");
+            builder.AppendLine("\t\t[global::System.Runtime.CompilerServices.ModuleInitializer]");
             foreach (var item in this.proxyClasses)
             {
-                builder.AppendLine($"        [global::System.Diagnostics.CodeAnalysis.DynamicDependency(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All, typeof(global::{item.Namespace}.{item.ClassName}))]");
+                builder.AppendLine($"\t\t[global::System.Diagnostics.CodeAnalysis.DynamicDependency(global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes.All, typeof(global::{item.Namespace}.{item.ClassName}))]");
             }
 
-            builder.AppendLine("        public static void Initialize()");
-            builder.AppendLine("        {");
-            builder.AppendLine("        }");
-            builder.AppendLine("    }");
+            builder.AppendLine("\t\tpublic static void Initialize()");
+            builder.AppendLine("\t\t{");
+            builder.AppendLine("\t\t}");
+            builder.AppendLine("\t}");
             builder.AppendLine("}");
             builder.AppendLine("#pragma warning restore");
             builder.AppendLine("#endif");