diff --git a/GFramework.Godot.SourceGenerators/constants/PathContests.cs b/GFramework.Godot.SourceGenerators/constants/PathContests.cs deleted file mode 100644 index d439327..0000000 --- a/GFramework.Godot.SourceGenerators/constants/PathContests.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace GFramework.Godot.SourceGenerators.constants; - -public static class PathContests -{ - public const string RootAbstractionsPath = "GFramework.Godot.SourceGenerators.Abstractions"; -} \ No newline at end of file diff --git a/GFramework.Godot.SourceGenerators/logging/GodotLoggerGenerator.cs b/GFramework.Godot.SourceGenerators/logging/GodotLoggerGenerator.cs index 589cc38..7125a6f 100644 --- a/GFramework.Godot.SourceGenerators/logging/GodotLoggerGenerator.cs +++ b/GFramework.Godot.SourceGenerators/logging/GodotLoggerGenerator.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using System.Text; -using GFramework.Godot.SourceGenerators.constants; +using GFramework.SourceGenerators.Common.constants; using GFramework.SourceGenerators.Common.diagnostics; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; @@ -17,7 +17,7 @@ namespace GFramework.Godot.SourceGenerators.logging; public sealed class GodotLoggerGenerator : IIncrementalGenerator { private const string AttributeMetadataName = - $"{PathContests.RootAbstractionsPath}.logging.GodotLogAttribute"; + $"{PathContests.GodotSourceGeneratorsAbstractionsPath}.logging.GodotLogAttribute"; private const string AttributeShortNameWithoutSuffix = "GodotLog"; @@ -120,8 +120,8 @@ public sealed class GodotLoggerGenerator : IIncrementalGenerator var sb = new StringBuilder(); sb.AppendLine("// "); - sb.AppendLine("using GFramework.Core.logging;"); - sb.AppendLine("using GFramework.Godot.logging;"); + sb.AppendLine($"using {PathContests.CoreAbstractionsNamespace}.logging;"); + sb.AppendLine($"using {PathContests.GodotNamespace}.logging;"); sb.AppendLine(); if (ns is not null) diff --git a/GFramework.SourceGenerators.Common/constants/PathContests.cs b/GFramework.SourceGenerators.Common/constants/PathContests.cs new file mode 100644 index 0000000..ab96d81 --- /dev/null +++ b/GFramework.SourceGenerators.Common/constants/PathContests.cs @@ -0,0 +1,42 @@ +namespace GFramework.SourceGenerators.Common.constants; + +/// +/// 定义GFramework项目中使用的路径常量 +/// +public static class PathContests +{ + /// + /// GFramework基础命名空间 + /// + public const string BaseNamespace = "GFramework"; + + /// + /// GFramework核心模块命名空间 + /// + public const string CoreNamespace = $"{BaseNamespace}.Core"; + + /// + /// GFramework Godot模块命名空间 + /// + public const string GodotNamespace = $"{BaseNamespace}.Godot"; + + /// + /// GFramework游戏模块命名空间 + /// + public const string GameNamespace = $"{BaseNamespace}.Game"; + + /// + /// GFramework源代码生成器抽象层命名空间 + /// + public const string SourceGeneratorsAbstractionsPath = $"{BaseNamespace}.SourceGenerators.Abstractions"; + + /// + /// GFramework Godot源代码生成器抽象层命名空间 + /// + public const string GodotSourceGeneratorsAbstractionsPath = $"{GodotNamespace}.SourceGenerators.Abstractions"; + + /// + /// GFramework核心抽象层命名空间 + /// + public const string CoreAbstractionsNamespace = $"{CoreNamespace}.Abstractions"; +} \ No newline at end of file diff --git a/GFramework.SourceGenerators/constants/PathContests.cs b/GFramework.SourceGenerators/constants/PathContests.cs deleted file mode 100644 index cafb5b8..0000000 --- a/GFramework.SourceGenerators/constants/PathContests.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace GFramework.SourceGenerators.constants; - -public static class PathContests -{ - public const string BaseNamespace = "GFramework"; - public const string CoreNamespace = $"{BaseNamespace}.Core"; - public const string SourceGeneratorsAbstractionsPath = $"{BaseNamespace}.SourceGenerators.Abstractions"; - public const string CoreAbstractionsNamespace = $"{CoreNamespace}.Abstractions"; -} \ No newline at end of file diff --git a/GFramework.SourceGenerators/logging/LoggerGenerator.cs b/GFramework.SourceGenerators/logging/LoggerGenerator.cs index 81d20d5..b4d7951 100644 --- a/GFramework.SourceGenerators/logging/LoggerGenerator.cs +++ b/GFramework.SourceGenerators/logging/LoggerGenerator.cs @@ -2,8 +2,8 @@ using System.Linq; using System.Text; using GFramework.SourceGenerators.Abstractions.logging; +using GFramework.SourceGenerators.Common.constants; using GFramework.SourceGenerators.Common.generator; -using GFramework.SourceGenerators.constants; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp.Syntax; diff --git a/GFramework.SourceGenerators/rule/ContextAwareGenerator.cs b/GFramework.SourceGenerators/rule/ContextAwareGenerator.cs index cacd6ad..2a6b06e 100644 --- a/GFramework.SourceGenerators/rule/ContextAwareGenerator.cs +++ b/GFramework.SourceGenerators/rule/ContextAwareGenerator.cs @@ -3,8 +3,8 @@ using System.Linq; using System.Text; using GFramework.Core.Abstractions.rule; using GFramework.SourceGenerators.Abstractions.rule; +using GFramework.SourceGenerators.Common.constants; using GFramework.SourceGenerators.Common.generator; -using GFramework.SourceGenerators.constants; using GFramework.SourceGenerators.diagnostics; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp.Syntax;