Merge pull request #281 from CommunityToolkit/dev/remove-generator-temp-strings

Sergio0694 · web-flow · commit 7efbb553eea9 · 2022-05-30T18:06:18.000+02:00
Remove temporary strings in source generators formatting
diff --git a/CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/ObservablePropertyGenerator.cs b/CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/ObservablePropertyGenerator.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
+using System.Text;
 using CommunityToolkit.Mvvm.SourceGenerators.ComponentModel.Models;
 using CommunityToolkit.Mvvm.SourceGenerators.Extensions;
 using CommunityToolkit.Mvvm.SourceGenerators.Models;
@@ -93,7 +94,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
             // Insert all members into the same partial type declaration
             CompilationUnitSyntax compilationUnit = item.Hierarchy.GetCompilationUnit(memberDeclarations);
 
-            context.AddSource(item.Hierarchy.FilenameHint, compilationUnit.ToFullString());
+            context.AddSource(item.Hierarchy.FilenameHint, compilationUnit.GetText(Encoding.UTF8));
         });
 
         // Gather all property changing names
@@ -111,7 +112,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 
             if (compilationUnit is not null)
             {
-                context.AddSource("__KnownINotifyPropertyChangingArgs", compilationUnit.ToFullString());
+                context.AddSource("__KnownINotifyPropertyChangingArgs", compilationUnit.GetText(Encoding.UTF8));
             }
         });
 
@@ -130,7 +131,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 
             if (compilationUnit is not null)
             {
-                context.AddSource("__KnownINotifyPropertyChangedArgs", compilationUnit.ToFullString());
+                context.AddSource("__KnownINotifyPropertyChangedArgs", compilationUnit.GetText(Encoding.UTF8));
             }
         });
     }
diff --git a/CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/ObservableRecipientGenerator.cs b/CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/ObservableRecipientGenerator.cs
@@ -117,19 +117,18 @@ protected override ImmutableArray<MemberDeclarationSyntax> FilterDeclaredMembers
         // If the target type has no constructors, generate constructors as well
         if (!info.HasExplicitConstructors)
         {
-            foreach (ConstructorDeclarationSyntax ctor in memberDeclarations.OfType<ConstructorDeclarationSyntax>())
+            foreach (ConstructorDeclarationSyntax originalConstructor in memberDeclarations.OfType<ConstructorDeclarationSyntax>())
             {
-                string text = ctor.NormalizeWhitespace().ToFullString();
-                string replaced = text.Replace("ObservableRecipient", info.TypeName);
+                ConstructorDeclarationSyntax modifiedConstructor = originalConstructor.WithIdentifier(Identifier(info.TypeName));
 
                 // Adjust the visibility of the constructors based on whether the target type is abstract.
                 // If that is not the case, the constructors have to be declared as public and not protected.
                 if (!info.IsAbstract)
                 {
-                    replaced = replaced.Replace("protected", "public");
+                    modifiedConstructor = modifiedConstructor.WithModifiers(TokenList(Token(SyntaxKind.PublicKeyword)));
                 }
 
-                builder.Add((ConstructorDeclarationSyntax)ParseMemberDeclaration(replaced)!);
+                builder.Add(modifiedConstructor);
             }
         }
 
diff --git a/CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/ObservableValidatorValidateAllPropertiesGenerator.cs b/CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/ObservableValidatorValidateAllPropertiesGenerator.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Linq;
+using System.Text;
 using CommunityToolkit.Mvvm.SourceGenerators.Extensions;
 using CommunityToolkit.Mvvm.SourceGenerators.Input.Models;
 using Microsoft.CodeAnalysis;
@@ -58,15 +59,15 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
         {
             CompilationUnitSyntax compilationUnit = Execute.GetSyntax(item);
 
-            context.AddSource("__ObservableValidatorExtensions", compilationUnit.ToFullString());
+            context.AddSource("__ObservableValidatorExtensions", compilationUnit.GetText(Encoding.UTF8));
         });
 
         // Generate the class with all validation methods
         context.RegisterImplementationSourceOutput(validationInfo, static (context, item) =>
         {
             CompilationUnitSyntax compilationUnit = Execute.GetSyntax(item);
 
-            context.AddSource(item.FilenameHint, compilationUnit.ToFullString());
+            context.AddSource(item.FilenameHint, compilationUnit.GetText(Encoding.UTF8));
         });
     }
 }
diff --git a/CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/TransitiveMembersGenerator.cs b/CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/TransitiveMembersGenerator.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
+using System.Text;
 using CommunityToolkit.Mvvm.SourceGenerators.Extensions;
 using CommunityToolkit.Mvvm.SourceGenerators.Models;
 using Microsoft.CodeAnalysis;
@@ -121,7 +122,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
             ImmutableArray<MemberDeclarationSyntax> filteredMemberDeclarations = FilterDeclaredMembers(item.Info, sourceMemberDeclarations);
             CompilationUnitSyntax compilationUnit = item.Hierarchy.GetCompilationUnit(filteredMemberDeclarations, this.classDeclaration.BaseList);
 
-            context.AddSource(item.Hierarchy.FilenameHint, compilationUnit.ToFullString());
+            context.AddSource(item.Hierarchy.FilenameHint, compilationUnit.GetText(Encoding.UTF8));
         });
     }
 
diff --git a/CommunityToolkit.Mvvm.SourceGenerators/Input/ICommandGenerator.cs b/CommunityToolkit.Mvvm.SourceGenerators/Input/ICommandGenerator.cs
@@ -4,6 +4,7 @@
 
 using System.Collections.Immutable;
 using System.Linq;
+using System.Text;
 using CommunityToolkit.Mvvm.SourceGenerators.Extensions;
 using CommunityToolkit.Mvvm.SourceGenerators.Input.Models;
 using CommunityToolkit.Mvvm.SourceGenerators.Models;
@@ -68,7 +69,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
             ImmutableArray<MemberDeclarationSyntax> memberDeclarations = Execute.GetSyntax(item.Info);
             CompilationUnitSyntax compilationUnit = item.Hierarchy.GetCompilationUnit(memberDeclarations);
 
-            context.AddSource($"{item.Hierarchy.FilenameHint}.{item.Info.MethodName}", compilationUnit.ToFullString());
+            context.AddSource($"{item.Hierarchy.FilenameHint}.{item.Info.MethodName}", compilationUnit.GetText(Encoding.UTF8));
         });
     }
 }
diff --git a/CommunityToolkit.Mvvm.SourceGenerators/Messaging/IMessengerRegisterAllGenerator.cs b/CommunityToolkit.Mvvm.SourceGenerators/Messaging/IMessengerRegisterAllGenerator.cs
@@ -4,6 +4,7 @@
 
 using System.Collections.Immutable;
 using System.Linq;
+using System.Text;
 using CommunityToolkit.Mvvm.SourceGenerators.Extensions;
 using CommunityToolkit.Mvvm.SourceGenerators.Input.Models;
 using Microsoft.CodeAnalysis;
@@ -66,15 +67,15 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
         {
             CompilationUnitSyntax compilationUnit = Execute.GetSyntax(item);
 
-            context.AddSource("__IMessengerExtensions", compilationUnit.ToFullString());
+            context.AddSource("__IMessengerExtensions", compilationUnit.GetText(Encoding.UTF8));
         });
 
         // Generate the class with all registration methods
         context.RegisterImplementationSourceOutput(recipientInfo, static (context, item) =>
         {
             CompilationUnitSyntax compilationUnit = Execute.GetSyntax(item);
 
-            context.AddSource(item.FilenameHint, compilationUnit.ToFullString());
+            context.AddSource(item.FilenameHint, compilationUnit.GetText(Encoding.UTF8));
         });
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using System.Collections.Generic;`
`6`	`6`	`using System.Collections.Immutable;`
`7`	`7`	`using System.Linq;`
	`8`	`+using System.Text;`
`8`	`9`	`using CommunityToolkit.Mvvm.SourceGenerators.ComponentModel.Models;`
`9`	`10`	`using CommunityToolkit.Mvvm.SourceGenerators.Extensions;`
`10`	`11`	`using CommunityToolkit.Mvvm.SourceGenerators.Models;`
`@@ -93,7 +94,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)`
`93`	`94`	`// Insert all members into the same partial type declaration`
`94`	`95`	`CompilationUnitSyntax compilationUnit = item.Hierarchy.GetCompilationUnit(memberDeclarations);`
`95`	`96`
`96`		`- context.AddSource(item.Hierarchy.FilenameHint, compilationUnit.ToFullString());`
	`97`	`+ context.AddSource(item.Hierarchy.FilenameHint, compilationUnit.GetText(Encoding.UTF8));`
`97`	`98`	`});`
`98`	`99`
`99`	`100`	`// Gather all property changing names`
`@@ -111,7 +112,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)`
`111`	`112`
`112`	`113`	`if (compilationUnit is not null)`
`113`	`114`	`{`
`114`		`- context.AddSource("__KnownINotifyPropertyChangingArgs", compilationUnit.ToFullString());`
	`115`	`+ context.AddSource("__KnownINotifyPropertyChangingArgs", compilationUnit.GetText(Encoding.UTF8));`
`115`	`116`	`}`
`116`	`117`	`});`
`117`	`118`
`@@ -130,7 +131,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)`
`130`	`131`
`131`	`132`	`if (compilationUnit is not null)`
`132`	`133`	`{`
`133`		`- context.AddSource("__KnownINotifyPropertyChangedArgs", compilationUnit.ToFullString());`
	`134`	`+ context.AddSource("__KnownINotifyPropertyChangedArgs", compilationUnit.GetText(Encoding.UTF8));`
`134`	`135`	`}`
`135`	`136`	`});`
`136`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,19 +117,18 @@ protected override ImmutableArray<MemberDeclarationSyntax> FilterDeclaredMembers`
`117`	`117`	`// If the target type has no constructors, generate constructors as well`
`118`	`118`	`if (!info.HasExplicitConstructors)`
`119`	`119`	`{`
`120`		`- foreach (ConstructorDeclarationSyntax ctor in memberDeclarations.OfType<ConstructorDeclarationSyntax>())`
	`120`	`+ foreach (ConstructorDeclarationSyntax originalConstructor in memberDeclarations.OfType<ConstructorDeclarationSyntax>())`
`121`	`121`	`{`
`122`		`- string text = ctor.NormalizeWhitespace().ToFullString();`
`123`		`- string replaced = text.Replace("ObservableRecipient", info.TypeName);`
	`122`	`+ ConstructorDeclarationSyntax modifiedConstructor = originalConstructor.WithIdentifier(Identifier(info.TypeName));`
`124`	`123`
`125`	`124`	`// Adjust the visibility of the constructors based on whether the target type is abstract.`
`126`	`125`	`// If that is not the case, the constructors have to be declared as public and not protected.`
`127`	`126`	`if (!info.IsAbstract)`
`128`	`127`	`{`
`129`		`- replaced = replaced.Replace("protected", "public");`
	`128`	`+ modifiedConstructor = modifiedConstructor.WithModifiers(TokenList(Token(SyntaxKind.PublicKeyword)));`
`130`	`129`	`}`
`131`	`130`
`132`		`- builder.Add((ConstructorDeclarationSyntax)ParseMemberDeclaration(replaced)!);`
	`131`	`+ builder.Add(modifiedConstructor);`
`133`	`132`	`}`
`134`	`133`	`}`
`135`	`134`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`// See the LICENSE file in the project root for more information.`
`4`	`4`
`5`	`5`	`using System.Linq;`
	`6`	`+using System.Text;`
`6`	`7`	`using CommunityToolkit.Mvvm.SourceGenerators.Extensions;`
`7`	`8`	`using CommunityToolkit.Mvvm.SourceGenerators.Input.Models;`
`8`	`9`	`using Microsoft.CodeAnalysis;`
`@@ -58,15 +59,15 @@ public void Initialize(IncrementalGeneratorInitializationContext context)`
`58`	`59`	`{`
`59`	`60`	`CompilationUnitSyntax compilationUnit = Execute.GetSyntax(item);`
`60`	`61`
`61`		`- context.AddSource("__ObservableValidatorExtensions", compilationUnit.ToFullString());`
	`62`	`+ context.AddSource("__ObservableValidatorExtensions", compilationUnit.GetText(Encoding.UTF8));`
`62`	`63`	`});`
`63`	`64`
`64`	`65`	`// Generate the class with all validation methods`
`65`	`66`	`context.RegisterImplementationSourceOutput(validationInfo, static (context, item) =>`
`66`	`67`	`{`
`67`	`68`	`CompilationUnitSyntax compilationUnit = Execute.GetSyntax(item);`
`68`	`69`
`69`		`- context.AddSource(item.FilenameHint, compilationUnit.ToFullString());`
	`70`	`+ context.AddSource(item.FilenameHint, compilationUnit.GetText(Encoding.UTF8));`
`70`	`71`	`});`
`71`	`72`	`}`
`72`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`using System.Collections.Immutable;`
`6`	`6`	`using System.Linq;`
	`7`	`+using System.Text;`
`7`	`8`	`using CommunityToolkit.Mvvm.SourceGenerators.Extensions;`
`8`	`9`	`using CommunityToolkit.Mvvm.SourceGenerators.Input.Models;`
`9`	`10`	`using CommunityToolkit.Mvvm.SourceGenerators.Models;`
`@@ -68,7 +69,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)`
`68`	`69`	`ImmutableArray<MemberDeclarationSyntax> memberDeclarations = Execute.GetSyntax(item.Info);`
`69`	`70`	`CompilationUnitSyntax compilationUnit = item.Hierarchy.GetCompilationUnit(memberDeclarations);`
`70`	`71`
`71`		`- context.AddSource($"{item.Hierarchy.FilenameHint}.{item.Info.MethodName}", compilationUnit.ToFullString());`
	`72`	`+ context.AddSource($"{item.Hierarchy.FilenameHint}.{item.Info.MethodName}", compilationUnit.GetText(Encoding.UTF8));`
`72`	`73`	`});`
`73`	`74`	`}`
`74`	`75`	`}`