From ce8dca3631e412081b3174d8044875e58e03a9c1 Mon Sep 17 00:00:00 2001 From: GwWuYou <95328647+GeWuYou@users.noreply.github.com> Date: Tue, 23 Dec 2025 23:03:31 +0800 Subject: [PATCH] =?UTF-8?q?fix(generator):=20=E4=BF=AE=E5=A4=8D=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8=E5=B1=9E=E6=80=A7=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E5=92=8C=E5=8C=B9=E9=85=8D=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修正了枚举扩展生成器中属性的完整名称路径 - 修正了日志生成器中属性的完整名称路径 - 改进了属性匹配逻辑,添加了空值检查 - 增强了属性类名匹配,支持简短名称匹配 --- .../generator/enums/EnumExtensionsGenerator.cs | 2 +- .../generator/logging/LoggerGenerator.cs | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/GFramework.Generator/generator/enums/EnumExtensionsGenerator.cs b/GFramework.Generator/generator/enums/EnumExtensionsGenerator.cs index 709778a..f0bd865 100644 --- a/GFramework.Generator/generator/enums/EnumExtensionsGenerator.cs +++ b/GFramework.Generator/generator/enums/EnumExtensionsGenerator.cs @@ -10,7 +10,7 @@ namespace GFramework.Generator.generator.enums; [Generator] public class EnumExtensionsGenerator : IIncrementalGenerator { - private const string AttributeFullName = "GFramework.Generator.Attributes.GenerateEnumExtensionsAttribute"; + private const string AttributeFullName = "GFramework.Generator.Attributes.generator.enums.GenerateEnumExtensionsAttribute"; public void Initialize(IncrementalGeneratorInitializationContext context) { diff --git a/GFramework.Generator/generator/logging/LoggerGenerator.cs b/GFramework.Generator/generator/logging/LoggerGenerator.cs index 894d00e..7347a98 100644 --- a/GFramework.Generator/generator/logging/LoggerGenerator.cs +++ b/GFramework.Generator/generator/logging/LoggerGenerator.cs @@ -14,7 +14,7 @@ namespace GFramework.Generator.generator.logging public sealed class LoggerGenerator : IIncrementalGenerator { private const string AttributeMetadataName = - "GFramework.Generator.Attributes.LogAttribute"; + "GFramework.Generator.Attributes.generator.logging.LogAttribute"; /// /// 初始化增量生成器 @@ -85,7 +85,13 @@ namespace GFramework.Generator.generator.logging var attr = classSymbol.GetAttributes() .FirstOrDefault(a => - a.AttributeClass?.ToDisplayString() == AttributeMetadataName); + { + var c = a.AttributeClass; + if (c is null) return false; + + return c.ToDisplayString() == AttributeMetadataName + || c.Name == "LogAttribute"; + }); if (attr is null) {