SourceCodeTransformation now makes enums internal and contains logging messages to the console

Author: feO2x

Code/Light.GuardClauses.SourceCodeTransformation/Light.GuardClauses.SourceCodeTransformation.csproj

@@ -14,7 +14,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.8.2" />
-    <PackageReference Include="Light.Undefine" Version="0.1.1" />
+    <PackageReference Include="Light.Undefine" Version="0.2.0" />
   </ItemGroup>
 
   <ItemGroup>

Code/Light.GuardClauses.SourceCodeTransformation/Program.cs

@@ -1,12 +1,14 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 using Microsoft.Extensions.Configuration;
 
 namespace Light.GuardClauses.SourceCodeTransformation
 {
     public static class Program
     {
-        public static async Task Main(string[] args)
+        public static async Task<int> Main(string[] args)
         {
+            Console.WriteLine("Creating configuration...");
             var configuration =
                 new ConfigurationBuilder()
                    .AddJsonFile("settings.json", true)
@@ -16,7 +18,19 @@ public static async Task Main(string[] args)
             var mergeOptionsBuilder = new SourceFileMergeOptions.Builder();
             configuration.Bind(mergeOptionsBuilder);
             var merger = new SourceFileMerger(mergeOptionsBuilder.Build());
-            await merger.CreateSingleSourceFileAsync();
+            try
+            {
+                Console.WriteLine("Merging source files...");
+                await merger.CreateSingleSourceFileAsync();
+                Console.WriteLine("Source file export completed successfully.");
+                return 0;
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine("Exception occured during source file export:");
+                Console.WriteLine(ex);
+                return -1;
+            }
         }
     }
 }

Code/Light.GuardClauses.SourceCodeTransformation/SourceFileMerger.cs

@@ -26,11 +26,15 @@ public async Task CreateSingleSourceFileAsync()
             var stringBuilder = new StringBuilder();
 
             if (_options.IncludeVersionComment)
+            {
+                Console.WriteLine("Appending version header...");
                 stringBuilder.AppendLine("/* ------------------------------")
                              .AppendLine($"   Light.GuardClauses {typeof(SourceFileMerger).Assembly.GetName().Version.ToString(3)}")
                              .AppendLine("   ------------------------------")
                              .AppendLine();
-               
+            }
+
+            Console.WriteLine("Creating default file layout...");
             stringBuilder.AppendLineIf(!_options.IncludeVersionComment, "/*")
                          .AppendLine($@"License information for Light.GuardClauses
 
@@ -76,8 +80,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 {(_options.IncludeJetBrainsAnnotationsUsing ? "using JetBrains.Annotations;" + Environment.NewLine : string.Empty)}using {_options.BaseNamespace}.Exceptions;
 using {_options.BaseNamespace}.FrameworkExtensions;
 
-// ReSharper disable StaticMemberInGenericType
-
 namespace {_options.BaseNamespace}
 {{
 }}
@@ -146,6 +148,7 @@ namespace JetBrains.Annotations
                                                                          .ToDictionary(f => f.Name);
 
             // Start with Check.CommonAssertions before all other files to prepare the Check class
+            Console.WriteLine("Merging source files of the Check class...");
             var currentFile = allSourceFiles["Check.CommonAssertions.cs"];
 
             var sourceSyntaxTree = CSharpSyntaxTree.ParseText(await currentFile.ReadContentAsync());
@@ -155,6 +158,7 @@ namespace JetBrains.Annotations
             checkClassDeclaration = checkClassDeclaration.WithModifiers(checkClassDeclaration.Modifiers.Remove(checkClassDeclaration.Modifiers.First(token => token.Kind() == SyntaxKind.PartialKeyword)));
 
             // Process all other files
+            Console.WriteLine("Merging remaining files...");
             foreach (var fileName in allSourceFiles.Keys)
             {
                 if (fileName == "Check.CommonAssertions.cs")
@@ -227,10 +231,12 @@ namespace JetBrains.Annotations
             // Make types internal if necessary
             if (_options.ChangePublicTypesToInternalTypes)
             {
+                Console.WriteLine("Types are changed from public to internal...");
                 var changedTypeDeclarations = new Dictionary<BaseTypeDeclarationSyntax, BaseTypeDeclarationSyntax>();
 
                 foreach (var typeDeclaration in targetRoot.DescendantNodes().Where(node => node.Kind() == SyntaxKind.ClassDeclaration ||
-                                                                                           node.Kind() == SyntaxKind.StructDeclaration)
+                                                                                           node.Kind() == SyntaxKind.StructDeclaration ||
+                                                                                           node.Kind() == SyntaxKind.EnumDeclaration)
                                                                             .Cast<BaseTypeDeclarationSyntax>())
                 {
                     var publicModifier = typeDeclaration.Modifiers[0];
@@ -245,6 +251,9 @@ namespace JetBrains.Annotations
 
                     else if (typeDeclaration is StructDeclarationSyntax structDeclaration)
                         changedTypeDeclarations[structDeclaration] = structDeclaration.WithModifiers(adjustedModifiers);
+
+                    else if (typeDeclaration is EnumDeclarationSyntax enumDeclaration)
+                        changedTypeDeclarations[enumDeclaration] = enumDeclaration.WithModifiers(adjustedModifiers);
                 }
 
                 targetRoot = targetRoot.ReplaceNodes(changedTypeDeclarations.Keys, (originalNode, _) => changedTypeDeclarations[originalNode]);
@@ -253,11 +262,16 @@ namespace JetBrains.Annotations
             // Remove preprocessor directives if necessary
             var targetFileContent = targetRoot.ToFullString();
             if (_options.RemovePreprocessorDirectives)
+            {
+                Console.WriteLine("Preprocessor directives are removed...");
                 targetFileContent = new UndefineTransformation().Undefine(targetFileContent, _options.DefinedPreprocessorSymbols).ToString();
+            }
 
+            Console.WriteLine("File is cleaned up...");
             targetFileContent = CleanupStep.Cleanup(targetFileContent, _options.RemoveContractAnnotations).ToString();
 
             // Write the target file 
+            Console.WriteLine("File is written to disk...");
             await File.WriteAllTextAsync(_options.TargetFile, targetFileContent);
         }
     }

Code/Light.GuardClauses/EnumInfo.cs

@@ -14,8 +14,6 @@
 using System.Runtime.CompilerServices;
 #endif
 
-// ReSharper disable StaticMemberInGenericType
-
 namespace Light.GuardClauses
 {
     /// <summary>
@@ -28,6 +26,8 @@ public static class EnumInfo<T> where T : Enum
       , IConvertible
 #endif
     {
+        // ReSharper disable StaticMemberInGenericType
+
         /// <summary>
         /// Gets the value indicating whether the enum type is marked with the flags attribute.
         /// </summary>