Remove unnecessary immutable array builders

Sergio0694 · Sergio0694 · commit 7f85c37caa68 · 2022-10-05T21:50:46.000+02:00
diff --git a/CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/INotifyPropertyChangedGenerator.cs b/CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/INotifyPropertyChangedGenerator.cs
@@ -30,14 +30,14 @@ public INotifyPropertyChangedGenerator()
     /// <inheritdoc/>
     private protected override INotifyPropertyChangedInfo? ValidateTargetTypeAndGetInfo(INamedTypeSymbol typeSymbol, AttributeData attributeData, Compilation compilation, out ImmutableArray<DiagnosticInfo> diagnostics)
     {
-        ImmutableArray<DiagnosticInfo>.Builder builder = ImmutableArray.CreateBuilder<DiagnosticInfo>();
+        diagnostics = ImmutableArray<DiagnosticInfo>.Empty;
 
         INotifyPropertyChangedInfo? info = null;
 
         // Check if the type already implements INotifyPropertyChanged
         if (typeSymbol.AllInterfaces.Any(i => i.HasFullyQualifiedName("global::System.ComponentModel.INotifyPropertyChanged")))
         {
-            builder.Add(DuplicateINotifyPropertyChangedInterfaceForINotifyPropertyChangedAttributeError, typeSymbol, typeSymbol);
+            diagnostics = ImmutableArray.Create(DiagnosticInfo.Create(DuplicateINotifyPropertyChangedInterfaceForINotifyPropertyChangedAttributeError, typeSymbol, typeSymbol));
 
             goto End;
         }
@@ -46,7 +46,7 @@ public INotifyPropertyChangedGenerator()
         if (typeSymbol.HasOrInheritsAttributeWithFullyQualifiedName("global::CommunityToolkit.Mvvm.ComponentModel.ObservableObjectAttribute") ||
             typeSymbol.InheritsAttributeWithFullyQualifiedName("global::CommunityToolkit.Mvvm.ComponentModel.INotifyPropertyChangedAttribute"))
         {
-            builder.Add(InvalidAttributeCombinationForINotifyPropertyChangedAttributeError, typeSymbol, typeSymbol);
+            diagnostics = ImmutableArray.Create(DiagnosticInfo.Create(InvalidAttributeCombinationForINotifyPropertyChangedAttributeError, typeSymbol, typeSymbol));
 
             goto End;
         }
@@ -56,8 +56,6 @@ public INotifyPropertyChangedGenerator()
         info = new INotifyPropertyChangedInfo(includeAdditionalHelperMethods);
 
         End:
-        diagnostics = builder.ToImmutable();
-
         return info;
     }
 
diff --git a/CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/ObservableObjectGenerator.cs b/CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/ObservableObjectGenerator.cs
@@ -29,20 +29,20 @@ public ObservableObjectGenerator()
     /// <inheritdoc/>
     private protected override object? ValidateTargetTypeAndGetInfo(INamedTypeSymbol typeSymbol, AttributeData attributeData, Compilation compilation, out ImmutableArray<DiagnosticInfo> diagnostics)
     {
-        ImmutableArray<DiagnosticInfo>.Builder builder = ImmutableArray.CreateBuilder<DiagnosticInfo>();
+        diagnostics = ImmutableArray<DiagnosticInfo>.Empty;
 
         // Check if the type already implements INotifyPropertyChanged...
         if (typeSymbol.AllInterfaces.Any(i => i.HasFullyQualifiedName("global::System.ComponentModel.INotifyPropertyChanged")))
         {
-            builder.Add(DuplicateINotifyPropertyChangedInterfaceForObservableObjectAttributeError, typeSymbol, typeSymbol);
+            diagnostics = ImmutableArray.Create(DiagnosticInfo.Create(DuplicateINotifyPropertyChangedInterfaceForObservableObjectAttributeError, typeSymbol, typeSymbol));
 
             goto End;
         }
 
         // ...or INotifyPropertyChanging
         if (typeSymbol.AllInterfaces.Any(i => i.HasFullyQualifiedName("global::System.ComponentModel.INotifyPropertyChanging")))
         {
-            builder.Add(DuplicateINotifyPropertyChangingInterfaceForObservableObjectAttributeError, typeSymbol, typeSymbol);
+            diagnostics = ImmutableArray.Create(DiagnosticInfo.Create(DuplicateINotifyPropertyChangingInterfaceForObservableObjectAttributeError, typeSymbol, typeSymbol));
 
             goto End;
         }
@@ -51,14 +51,12 @@ public ObservableObjectGenerator()
         if (typeSymbol.InheritsAttributeWithFullyQualifiedName("global::CommunityToolkit.Mvvm.ComponentModel.ObservableObjectAttribute") ||
             typeSymbol.HasOrInheritsAttributeWithFullyQualifiedName("global::CommunityToolkit.Mvvm.ComponentModel.INotifyPropertyChangedAttribute"))
         {
-            builder.Add(InvalidAttributeCombinationForObservableObjectAttributeError, typeSymbol, typeSymbol);
+            diagnostics = ImmutableArray.Create(DiagnosticInfo.Create(InvalidAttributeCombinationForObservableObjectAttributeError, typeSymbol, typeSymbol));
 
             goto End;
         }
 
         End:
-        diagnostics = builder.ToImmutable();
-
         return null;
     }
 
diff --git a/CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/ObservableRecipientGenerator.cs b/CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/ObservableRecipientGenerator.cs
@@ -6,6 +6,7 @@
 using System.Linq;
 using CommunityToolkit.Mvvm.SourceGenerators.ComponentModel.Models;
 using CommunityToolkit.Mvvm.SourceGenerators.Extensions;
+using CommunityToolkit.Mvvm.SourceGenerators.Input.Models;
 using CommunityToolkit.Mvvm.SourceGenerators.Models;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
@@ -32,22 +33,22 @@ public ObservableRecipientGenerator()
     /// <inheritdoc/>
     private protected override ObservableRecipientInfo? ValidateTargetTypeAndGetInfo(INamedTypeSymbol typeSymbol, AttributeData attributeData, Compilation compilation, out ImmutableArray<DiagnosticInfo> diagnostics)
     {
-        ImmutableArray<DiagnosticInfo>.Builder builder = ImmutableArray.CreateBuilder<DiagnosticInfo>();
+        diagnostics = ImmutableArray<DiagnosticInfo>.Empty;
 
         ObservableRecipientInfo? info = null;
 
         // Check if the type already inherits from ObservableRecipient
         if (typeSymbol.InheritsFromFullyQualifiedName("global::CommunityToolkit.Mvvm.ComponentModel.ObservableRecipient"))
         {
-            builder.Add(DuplicateObservableRecipientError, typeSymbol, typeSymbol);
+            diagnostics = ImmutableArray.Create(DiagnosticInfo.Create(DuplicateObservableRecipientError, typeSymbol, typeSymbol));
 
             goto End;
         }
 
         // Check if the type already inherits [ObservableRecipient]
         if (typeSymbol.InheritsAttributeWithFullyQualifiedName("global::CommunityToolkit.Mvvm.ComponentModel.ObservableRecipientAttribute"))
         {
-            builder.Add(InvalidAttributeCombinationForObservableRecipientAttributeError, typeSymbol, typeSymbol);
+            diagnostics = ImmutableArray.Create(DiagnosticInfo.Create(InvalidAttributeCombinationForObservableRecipientAttributeError, typeSymbol, typeSymbol));
 
             goto End;
         }
@@ -60,7 +61,7 @@ public ObservableRecipientGenerator()
                 a.AttributeClass?.HasFullyQualifiedName("global::CommunityToolkit.Mvvm.ComponentModel.INotifyPropertyChangedAttribute") == true &&
                 !a.HasNamedArgument("IncludeAdditionalHelperMethods", false)))
         {
-            builder.Add(MissingBaseObservableObjectFunctionalityError, typeSymbol, typeSymbol);
+            diagnostics = ImmutableArray.Create(DiagnosticInfo.Create(MissingBaseObservableObjectFunctionalityError, typeSymbol, typeSymbol));
 
             goto End;
         }
@@ -84,8 +85,6 @@ public ObservableRecipientGenerator()
             hasOnDeactivatedMethod);
 
         End:
-        diagnostics = builder.ToImmutable();
-
         return info;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -30,14 +30,14 @@ public INotifyPropertyChangedGenerator()`
`30`	`30`	`/// <inheritdoc/>`
`31`	`31`	`private protected override INotifyPropertyChangedInfo? ValidateTargetTypeAndGetInfo(INamedTypeSymbol typeSymbol, AttributeData attributeData, Compilation compilation, out ImmutableArray<DiagnosticInfo> diagnostics)`
`32`	`32`	`{`
`33`		`- ImmutableArray<DiagnosticInfo>.Builder builder = ImmutableArray.CreateBuilder<DiagnosticInfo>();`
	`33`	`+ diagnostics = ImmutableArray<DiagnosticInfo>.Empty;`
`34`	`34`
`35`	`35`	`INotifyPropertyChangedInfo? info = null;`
`36`	`36`
`37`	`37`	`// Check if the type already implements INotifyPropertyChanged`
`38`	`38`	`if (typeSymbol.AllInterfaces.Any(i => i.HasFullyQualifiedName("global::System.ComponentModel.INotifyPropertyChanged")))`
`39`	`39`	`{`
`40`		`- builder.Add(DuplicateINotifyPropertyChangedInterfaceForINotifyPropertyChangedAttributeError, typeSymbol, typeSymbol);`
	`40`	`+ diagnostics = ImmutableArray.Create(DiagnosticInfo.Create(DuplicateINotifyPropertyChangedInterfaceForINotifyPropertyChangedAttributeError, typeSymbol, typeSymbol));`
`41`	`41`
`42`	`42`	`goto End;`
`43`	`43`	`}`
`@@ -46,7 +46,7 @@ public INotifyPropertyChangedGenerator()`
`46`	`46`	`if (typeSymbol.HasOrInheritsAttributeWithFullyQualifiedName("global::CommunityToolkit.Mvvm.ComponentModel.ObservableObjectAttribute") \|\|`
`47`	`47`	`typeSymbol.InheritsAttributeWithFullyQualifiedName("global::CommunityToolkit.Mvvm.ComponentModel.INotifyPropertyChangedAttribute"))`
`48`	`48`	`{`
`49`		`- builder.Add(InvalidAttributeCombinationForINotifyPropertyChangedAttributeError, typeSymbol, typeSymbol);`
	`49`	`+ diagnostics = ImmutableArray.Create(DiagnosticInfo.Create(InvalidAttributeCombinationForINotifyPropertyChangedAttributeError, typeSymbol, typeSymbol));`
`50`	`50`
`51`	`51`	`goto End;`
`52`	`52`	`}`
`@@ -56,8 +56,6 @@ public INotifyPropertyChangedGenerator()`
`56`	`56`	`info = new INotifyPropertyChangedInfo(includeAdditionalHelperMethods);`
`57`	`57`
`58`	`58`	`End:`
`59`		`- diagnostics = builder.ToImmutable();`
`60`		`-`
`61`	`59`	`return info;`
`62`	`60`	`}`
`63`	`61`
Original file line number	Diff line number	Diff line change
`@@ -29,20 +29,20 @@ public ObservableObjectGenerator()`
`29`	`29`	`/// <inheritdoc/>`
`30`	`30`	`private protected override object? ValidateTargetTypeAndGetInfo(INamedTypeSymbol typeSymbol, AttributeData attributeData, Compilation compilation, out ImmutableArray<DiagnosticInfo> diagnostics)`
`31`	`31`	`{`
`32`		`- ImmutableArray<DiagnosticInfo>.Builder builder = ImmutableArray.CreateBuilder<DiagnosticInfo>();`
	`32`	`+ diagnostics = ImmutableArray<DiagnosticInfo>.Empty;`
`33`	`33`
`34`	`34`	`// Check if the type already implements INotifyPropertyChanged...`
`35`	`35`	`if (typeSymbol.AllInterfaces.Any(i => i.HasFullyQualifiedName("global::System.ComponentModel.INotifyPropertyChanged")))`
`36`	`36`	`{`
`37`		`- builder.Add(DuplicateINotifyPropertyChangedInterfaceForObservableObjectAttributeError, typeSymbol, typeSymbol);`
	`37`	`+ diagnostics = ImmutableArray.Create(DiagnosticInfo.Create(DuplicateINotifyPropertyChangedInterfaceForObservableObjectAttributeError, typeSymbol, typeSymbol));`
`38`	`38`
`39`	`39`	`goto End;`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`// ...or INotifyPropertyChanging`
`43`	`43`	`if (typeSymbol.AllInterfaces.Any(i => i.HasFullyQualifiedName("global::System.ComponentModel.INotifyPropertyChanging")))`
`44`	`44`	`{`
`45`		`- builder.Add(DuplicateINotifyPropertyChangingInterfaceForObservableObjectAttributeError, typeSymbol, typeSymbol);`
	`45`	`+ diagnostics = ImmutableArray.Create(DiagnosticInfo.Create(DuplicateINotifyPropertyChangingInterfaceForObservableObjectAttributeError, typeSymbol, typeSymbol));`
`46`	`46`
`47`	`47`	`goto End;`
`48`	`48`	`}`
`@@ -51,14 +51,12 @@ public ObservableObjectGenerator()`
`51`	`51`	`if (typeSymbol.InheritsAttributeWithFullyQualifiedName("global::CommunityToolkit.Mvvm.ComponentModel.ObservableObjectAttribute") \|\|`
`52`	`52`	`typeSymbol.HasOrInheritsAttributeWithFullyQualifiedName("global::CommunityToolkit.Mvvm.ComponentModel.INotifyPropertyChangedAttribute"))`
`53`	`53`	`{`
`54`		`- builder.Add(InvalidAttributeCombinationForObservableObjectAttributeError, typeSymbol, typeSymbol);`
	`54`	`+ diagnostics = ImmutableArray.Create(DiagnosticInfo.Create(InvalidAttributeCombinationForObservableObjectAttributeError, typeSymbol, typeSymbol));`
`55`	`55`
`56`	`56`	`goto End;`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`End:`
`60`		`- diagnostics = builder.ToImmutable();`
`61`		`-`
`62`	`60`	`return null;`
`63`	`61`	`}`
`64`	`62`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`using System.Linq;`
`7`	`7`	`using CommunityToolkit.Mvvm.SourceGenerators.ComponentModel.Models;`
`8`	`8`	`using CommunityToolkit.Mvvm.SourceGenerators.Extensions;`
	`9`	`+using CommunityToolkit.Mvvm.SourceGenerators.Input.Models;`
`9`	`10`	`using CommunityToolkit.Mvvm.SourceGenerators.Models;`
`10`	`11`	`using Microsoft.CodeAnalysis;`
`11`	`12`	`using Microsoft.CodeAnalysis.CSharp;`
`@@ -32,22 +33,22 @@ public ObservableRecipientGenerator()`
`32`	`33`	`/// <inheritdoc/>`
`33`	`34`	`private protected override ObservableRecipientInfo? ValidateTargetTypeAndGetInfo(INamedTypeSymbol typeSymbol, AttributeData attributeData, Compilation compilation, out ImmutableArray<DiagnosticInfo> diagnostics)`
`34`	`35`	`{`
`35`		`- ImmutableArray<DiagnosticInfo>.Builder builder = ImmutableArray.CreateBuilder<DiagnosticInfo>();`
	`36`	`+ diagnostics = ImmutableArray<DiagnosticInfo>.Empty;`
`36`	`37`
`37`	`38`	`ObservableRecipientInfo? info = null;`
`38`	`39`
`39`	`40`	`// Check if the type already inherits from ObservableRecipient`
`40`	`41`	`if (typeSymbol.InheritsFromFullyQualifiedName("global::CommunityToolkit.Mvvm.ComponentModel.ObservableRecipient"))`
`41`	`42`	`{`
`42`		`- builder.Add(DuplicateObservableRecipientError, typeSymbol, typeSymbol);`
	`43`	`+ diagnostics = ImmutableArray.Create(DiagnosticInfo.Create(DuplicateObservableRecipientError, typeSymbol, typeSymbol));`
`43`	`44`
`44`	`45`	`goto End;`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`// Check if the type already inherits [ObservableRecipient]`
`48`	`49`	`if (typeSymbol.InheritsAttributeWithFullyQualifiedName("global::CommunityToolkit.Mvvm.ComponentModel.ObservableRecipientAttribute"))`
`49`	`50`	`{`
`50`		`- builder.Add(InvalidAttributeCombinationForObservableRecipientAttributeError, typeSymbol, typeSymbol);`
	`51`	`+ diagnostics = ImmutableArray.Create(DiagnosticInfo.Create(InvalidAttributeCombinationForObservableRecipientAttributeError, typeSymbol, typeSymbol));`
`51`	`52`
`52`	`53`	`goto End;`
`53`	`54`	`}`
`@@ -60,7 +61,7 @@ public ObservableRecipientGenerator()`
`60`	`61`	`a.AttributeClass?.HasFullyQualifiedName("global::CommunityToolkit.Mvvm.ComponentModel.INotifyPropertyChangedAttribute") == true &&`
`61`	`62`	`!a.HasNamedArgument("IncludeAdditionalHelperMethods", false)))`
`62`	`63`	`{`
`63`		`- builder.Add(MissingBaseObservableObjectFunctionalityError, typeSymbol, typeSymbol);`
	`64`	`+ diagnostics = ImmutableArray.Create(DiagnosticInfo.Create(MissingBaseObservableObjectFunctionalityError, typeSymbol, typeSymbol));`
`64`	`65`
`65`	`66`	`goto End;`
`66`	`67`	`}`
`@@ -84,8 +85,6 @@ public ObservableRecipientGenerator()`
`84`	`85`	`hasOnDeactivatedMethod);`
`85`	`86`
`86`	`87`	`End:`
`87`		`- diagnostics = builder.ToImmutable();`
`88`		`-`
`89`	`88`	`return info;`
`90`	`89`	`}`
`91`	`90`