Merge branch 'main' of https://github.com/Nyrest/FastGenericNew

Nyrest · Aug 15, 2024 · 955c4d2 · 955c4d2
2 parents 72a802d + 13e69b3
commit 955c4d2
Show file tree

Hide file tree

Showing 24 changed files with 107 additions and 333 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -28,7 +28,6 @@ jobs:
           6.0.x
           8.0.x
           9.0.x
-        include-prerelease: true
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
@@ -51,7 +50,6 @@ jobs:
             6.0.x
             8.0.x
             9.0.x
-          include-prerelease: true
       - name: Restore dependencies
         run: dotnet restore
       - name: Build

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -32,7 +32,6 @@ jobs:
           7.0.x
           8.0.x
           9.0.x
-        include-prerelease: true
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2022 Boring3
+Copyright (c) 2020-2024 Boring3
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ 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.
+SOFTWARE.
diff --git a/README.md b/README.md
@@ -37,24 +37,24 @@
 ### Pre-Compiled Version
 
 ```powershell
-dotnet add package FastGenericNew --version 3.1.0-preview1
+dotnet add package FastGenericNew --version 3.3.0
 ```
 
 ```xml
 <ItemGroup>
-  <PackageReference Include="FastGenericNew" Version="3.1.0-preview1" />
+  <PackageReference Include="FastGenericNew" Version="3.3.0" />
 </ItemGroup>
 ```
 
 ### SourceGenerator Version
 
 ```powershell
-dotnet add package FastGenericNew.SourceGenerator --version 3.1.0-preview1
+dotnet add package FastGenericNew.SourceGenerator --version 3.3.0
 ```
 
 ```xml
 <ItemGroup>
-  <PackageReference Include="FastGenericNew.SourceGenerator" Version="3.1.0-preview1" />
+  <PackageReference Include="FastGenericNew.SourceGenerator" Version="3.3.0" />
 </ItemGroup>
 ```
 #### SourceGeneratorV2 requires

diff --git a/src/FastGenericNew.SourceGenerator.InternalGenerator/Gen/GeneratorOptionsRelatedGenerator.cs b/src/FastGenericNew.SourceGenerator.InternalGenerator/Gen/GeneratorOptionsRelatedGenerator.cs
@@ -55,13 +55,12 @@ private static void BuildSource(in SourceProductionContext context, Compilation
                 .ToArray();
             BuildGeneratorOptionsConstructor(in context, symbolsWithAttrData);
             BuildCodeBuilderPreProcessorDefinitions(in context, symbolsWithAttrData);
-            BuildCodeGeneratorExtraCheck(in context, symbolsWithAttrData);
         }
 
         public static void BuildGeneratorOptionsConstructor(in SourceProductionContext context, (IPropertySymbol symbol, AttributeData attrData)[] symbolsWithAttrData)
         {
             const string indent = "        ";
-            StringBuilder sb = new StringBuilder("""
+            StringBuilder sb = new("""
 #nullable enable
 
 namespace FastGenericNew.SourceGenerator;
@@ -94,7 +93,7 @@ public GeneratorOptions(AnalyzerConfigOptionsProvider? provider)
 
         public static void BuildCodeBuilderPreProcessorDefinitions(in SourceProductionContext context, (IPropertySymbol symbol, AttributeData attrData)[] symbolsWithAttrData)
         {
-            StringBuilder sb = new StringBuilder("""
+            StringBuilder sb = new("""
 #nullable enable
 
 namespace FastGenericNew.SourceGenerator.Utilities;
@@ -124,41 +123,5 @@ private partial void _Write_PreProcessorDefinitions()
 """);
             context.AddSource("CodeBuilder.PreProcessor.g.cs", SourceText.From(sb.ToString(), Encoding.UTF8));
         }
-
-        public static void BuildCodeGeneratorExtraCheck(in SourceProductionContext context, (IPropertySymbol symbol, AttributeData attrData)[] symbolsWithAttrData)
-        {
-            const string indent = "        ";
-            StringBuilder sb = new StringBuilder("""
-#nullable enable
-
-namespace FastGenericNew.SourceGenerator;
-
-partial class CodeGenerator
-{
-    private static partial bool PreProcessorRelatedCheck(in GeneratorOptions oldValue, in GeneratorOptions newValue) =>
-
-""", 4096);
-            bool isFirst = true;
-            foreach (var (symbol, attrData) in symbolsWithAttrData)
-            {
-                if (!attrData.TryGetNamedArgument(GeneratorOptionAttributeGenerator.Arg_PresentPreProcessor, out bool value) || !value)
-                    continue;
-                var propertyName = symbol.Name;
-                sb.Append(indent);
-
-                if (!isFirst)
-                {
-                    sb.Append("|| ");
-                }
-                else isFirst = false;
-                sb.AppendLine($"oldValue.{propertyName} != newValue.{propertyName}");
-            }
-            if (isFirst) sb.Append("false");
-            sb.Append("""
-;
-}
-""");
-            context.AddSource("CodeGenerator.PreProcessorRelatedCheck.g.cs", SourceText.From(sb.ToString(), Encoding.UTF8));
-        }
     }
 }
diff --git a/src/FastGenericNew.SourceGenerator/CodeGenerator.cs b/src/FastGenericNew.SourceGenerator/CodeGenerator.cs
@@ -4,14 +4,16 @@ public abstract partial class CodeGenerator
 {
     public abstract string Filename { get; }
 
-    public virtual bool ShouldUpdate(in GeneratorOptions oldValue, in GeneratorOptions newValue) =>
-        oldValue.Namespace != newValue.Namespace
-        || oldValue.MaxParameterCount != newValue.MaxParameterCount
-        || oldValue.AlertGeneratedFile != newValue.AlertGeneratedFile
-        || oldValue.PrettyOutput != newValue.PrettyOutput
-        || PreProcessorRelatedCheck(in oldValue, in newValue);
-
     public abstract CodeGenerationResult Generate(in GeneratorOptions options);
 
-    private static partial bool PreProcessorRelatedCheck(in GeneratorOptions oldValue, in GeneratorOptions newValue);
+    public virtual GeneratorOptions GetOptionsSubset(GeneratorOptions options)
+    {
+        return new GeneratorOptions() with
+        {
+            Namespace = options.Namespace,
+            MaxParameterCount = options.MaxParameterCount,
+            AlertGeneratedFile = options.AlertGeneratedFile,
+            PrettyOutput = options.PrettyOutput
+        };
+    }
 }
diff --git a/src/FastGenericNew.SourceGenerator/CodeGenerators/ClrAllocatorGenerator.cs b/src/FastGenericNew.SourceGenerator/CodeGenerators/ClrAllocatorGenerator.cs
@@ -145,8 +145,11 @@ public static T CreateInstance()
         return builder.BuildAndDispose(this);
     }
 
-    public override bool ShouldUpdate(in GeneratorOptions oldValue, in GeneratorOptions newValue)
+    public override GeneratorOptions GetOptionsSubset(GeneratorOptions options)
     {
-        return base.ShouldUpdate(oldValue, newValue) && newValue.AllowUnsafeImplementation;
+        return base.GetOptionsSubset(options) with
+        {
+            AllowUnsafeImplementation = options.AllowUnsafeImplementation,
+        };
     }
 }
diff --git a/src/FastGenericNew.SourceGenerator/CodeGenerators/FastCreateInstanceGenerator.cs b/src/FastGenericNew.SourceGenerator/CodeGenerators/FastCreateInstanceGenerator.cs
@@ -122,8 +122,11 @@ public static T NewOrDefault<
         return builder.BuildAndDispose(this);
     }
 
-    public override bool ShouldUpdate(in GeneratorOptions oldValue, in GeneratorOptions newValue)
+    public override GeneratorOptions GetOptionsSubset(GeneratorOptions options)
     {
-        return base.ShouldUpdate(oldValue, newValue) && newValue.GenerateCreateInstance;
+        return base.GetOptionsSubset(options) with
+        {
+            GenerateCreateInstance = options.GenerateCreateInstance,
+        };
     }
 }
diff --git a/src/FastGenericNew.SourceGenerator/CodeGenerators/FastNewCoreGenerator.cs b/src/FastGenericNew.SourceGenerator/CodeGenerators/FastNewCoreGenerator.cs
@@ -302,7 +302,11 @@ public override CodeGenerationResult Generate(in GeneratorOptions options)
         return builder.BuildAndDispose(this);
     }
 
-    public override bool ShouldUpdate(in GeneratorOptions oldValue, in GeneratorOptions newValue) =>
-        base.ShouldUpdate(oldValue, newValue)
-        || oldValue.ForceFastNewDelegate != newValue.ForceFastNewDelegate;
+    public override GeneratorOptions GetOptionsSubset(GeneratorOptions options)
+    {
+        return base.GetOptionsSubset(options) with
+        {
+            ForceFastNewDelegate = options.ForceFastNewDelegate,
+        };
+    }
 }
diff --git a/src/FastGenericNew.SourceGenerator/CodeGenerators/FastNewDelegateGenerator.cs b/src/FastGenericNew.SourceGenerator/CodeGenerators/FastNewDelegateGenerator.cs
@@ -34,7 +34,11 @@ public override CodeGenerationResult Generate(in GeneratorOptions options)
         return builder.BuildAndDispose(this);
     }
 
-    public override bool ShouldUpdate(in GeneratorOptions oldValue, in GeneratorOptions newValue) =>
-        base.ShouldUpdate(oldValue, newValue)
-        || oldValue.ForceFastNewDelegate != newValue.ForceFastNewDelegate;
+    public override GeneratorOptions GetOptionsSubset(GeneratorOptions options)
+    {
+        return base.GetOptionsSubset(options) with
+        {
+            ForceFastNewDelegate = options.ForceFastNewDelegate,
+        };
+    }
 }
diff --git a/src/FastGenericNew.SourceGenerator/CodeGenerators/FastNewVisibilityGenerator.cs b/src/FastGenericNew.SourceGenerator/CodeGenerators/FastNewVisibilityGenerator.cs
@@ -24,7 +24,11 @@ public override CodeGenerationResult Generate(in GeneratorOptions options)
         return builder.BuildAndDispose(this);
     }
 
-    public override bool ShouldUpdate(in GeneratorOptions oldValue, in GeneratorOptions newValue) =>
-        base.ShouldUpdate(oldValue, newValue)
-        || oldValue.PublicFastNew != newValue.PublicFastNew;
+    public override GeneratorOptions GetOptionsSubset(GeneratorOptions options)
+    {
+        return base.GetOptionsSubset(options) with
+        {
+            PublicFastNew = options.PublicFastNew,
+        };
+    }
 }
diff --git a/src/FastGenericNew.SourceGenerator/CodeGenerators/FastTryCreateInstanceGenerator.cs b/src/FastGenericNew.SourceGenerator/CodeGenerators/FastTryCreateInstanceGenerator.cs
@@ -123,8 +123,11 @@ public static bool TryNewOrDefault<
         return builder.BuildAndDispose(this);
     }
 
-    public override bool ShouldUpdate(in GeneratorOptions oldValue, in GeneratorOptions newValue)
+    public override GeneratorOptions GetOptionsSubset(GeneratorOptions options)
     {
-        return base.ShouldUpdate(oldValue, newValue) && newValue.GenerateTryCreateInstance;
+        return base.GetOptionsSubset(options) with
+        {
+            GenerateTryCreateInstance = options.GenerateTryCreateInstance,
+        };
     }
 }
diff --git a/src/FastGenericNew.SourceGenerator/CodeGenerators/GenerationInfoGenerator.cs b/src/FastGenericNew.SourceGenerator/CodeGenerators/GenerationInfoGenerator.cs
@@ -82,7 +82,11 @@ public override CodeGenerationResult Generate(in GeneratorOptions options)
         return builder.BuildAndDispose(this);
     }
 
-    // Since this won't be invoked if the oldValue equals the newValue.
-    // So just do it.
-    public override bool ShouldUpdate(in GeneratorOptions oldValue, in GeneratorOptions newValue) => newValue.OutputGenerationInfo;
+    public override GeneratorOptions GetOptionsSubset(GeneratorOptions options)
+    {
+        return base.GetOptionsSubset(options) with
+        {
+            OutputGenerationInfo = options.OutputGenerationInfo,
+        };
+    }
 }
diff --git a/src/FastGenericNew.SourceGenerator/CodeGenerators/ThrowHelperGenerator.cs b/src/FastGenericNew.SourceGenerator/CodeGenerators/ThrowHelperGenerator.cs
@@ -43,7 +43,11 @@ public static T SmartThrowImpl<T>()
         return builder.BuildAndDispose(this);
     }
 
-    public override bool ShouldUpdate(in GeneratorOptions oldValue, in GeneratorOptions newValue) =>
-        oldValue.Namespace != newValue.Namespace
-        || oldValue.AlertGeneratedFile != newValue.AlertGeneratedFile;
+    public override GeneratorOptions GetOptionsSubset(GeneratorOptions options)
+    {
+        return base.GetOptionsSubset(options) with
+        {
+            AlertGeneratedFile = options.AlertGeneratedFile,
+        };
+    }
 }
diff --git a/src/FastGenericNew.SourceGenerator/FastGenericNew.SourceGenerator.csproj b/src/FastGenericNew.SourceGenerator/FastGenericNew.SourceGenerator.csproj
@@ -40,8 +40,8 @@
 	<PropertyGroup>
 		<PackageId>FastGenericNew.SourceGenerator</PackageId>
 		<DescriptionPrefix>
-			Configurable Source Generator of FastGenericNew
-			Minimum required: .NET Standard 2.0 &amp; C# 8.0
+			Configurable Source Generator
+			Minimum requirement: .NET Standard 2.0 &amp; C# 8.0
 		</DescriptionPrefix>
 		<PackageTagsPostfix>Roslyn, DotNetAnalyzers, Analyzer, SourceGenerator, SourceGeneratorV2, IncrementalGenerator</PackageTagsPostfix>
 	</PropertyGroup>

diff --git a/src/FastGenericNew.SourceGenerator/FastGenericNew.SourceGenerator.props b/src/FastGenericNew.SourceGenerator/FastGenericNew.SourceGenerator.props
@@ -11,9 +11,7 @@
 		<CompilerVisibleProperty Include="FastNew_Namespace" />
 		<CompilerVisibleProperty Include="FastNew_ForceFastNewDelegate" />
 		<CompilerVisibleProperty Include="FastNew_AlertGeneratedFile" />
-		<CompilerVisibleProperty Include="FastNew_DisableGeneratorCache" />
 		<CompilerVisibleProperty Include="FastNew_PrettyOutput" />
-		<CompilerVisibleProperty Include="FastNew_MultiThreadedGeneration" />
 		<CompilerVisibleProperty Include="FastNew_OutputGenerationInfo" />
 		<CompilerVisibleProperty Include="FastNew_AllowUnsafeImplementation" />
 		<CompilerVisibleProperty Include="FastNew_PublicFastNew" />