Small cleanup

PublicApiGenerator · Nov 4, 2019 · 1cfb39e · 1cfb39e
1 parent 82effdb
commit 1cfb39e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 23 deletions.
diff --git a/src/PublicApiGenerator/ApiGenerator.cs b/src/PublicApiGenerator/ApiGenerator.cs
@@ -193,9 +193,9 @@ static CodeTypeDeclaration CreateTypeDeclaration(TypeDefinition publicType, stri
 
             var declarationName = string.Empty;
             if (@readonly)
-                declarationName += CodeNormalizer.readonlyMarker;
+                declarationName += CodeNormalizer.ReadonlyMarker;
             if (@static)
-                declarationName += CodeNormalizer.staticMarker;
+                declarationName += CodeNormalizer.StaticMarker;
 
             declarationName += name;
 

diff --git a/src/PublicApiGenerator/CodeNormalizer.cs b/src/PublicApiGenerator/CodeNormalizer.cs
@@ -4,37 +4,37 @@
 
 namespace PublicApiGenerator
 {
-    class CodeNormalizer
+    internal static class CodeNormalizer
     {
-        const string autoGeneratedHeader = @"^//-+\s*$.*^//-+\s*$";
-        const string emptyGetSet = @"\s+{\s+get\s+{\s+}\s+set\s+{\s+}\s+}";
-        const string emptyGet = @"\s+{\s+get\s+{\s+}\s+}";
-        const string emptySet = @"\s+{\s+set\s+{\s+}\s+}";
-        const string getSet = @"\s+{\s+get;\s+set;\s+}";
-        const string get = @"\s+{\s+get;\s+}";
-        const string set = @"\s+{\s+set;\s+}";
+        const string AutoGeneratedHeader = @"^//-+\s*$.*^//-+\s*$";
+        const string EmptyGetSet = @"\s+{\s+get\s+{\s+}\s+set\s+{\s+}\s+}";
+        const string EmptyGet = @"\s+{\s+get\s+{\s+}\s+}";
+        const string EmptySet = @"\s+{\s+set\s+{\s+}\s+}";
+        const string GetSet = @"\s+{\s+get;\s+set;\s+}";
+        const string Get = @"\s+{\s+get;\s+}";
+        const string Set = @"\s+{\s+set;\s+}";
 
         // https://github.com/ApiApprover/ApiApprover/issues/80
-        internal const string staticMarker = "static_C91E2709-C00B-4CAB-8BBC-B2B11DC75E50 ";
-        internal const string readonlyMarker = "readonly_79D3ED2A-0B60-4C3B-8432-941FE471A38B ";
+        internal const string StaticMarker = "static_C91E2709_C00B-4CAB_8BBC_B2B11DC75E50 ";
+        internal const string ReadonlyMarker = "readonly_79D3ED2A_0B60_4C3B_8432_941FE471A38B ";
 
-        internal static string NormalizeGeneratedCode(StringWriter writer)
+        public static string NormalizeGeneratedCode(StringWriter writer)
         {
             var gennedClass = writer.ToString();
-            
-            gennedClass = Regex.Replace(gennedClass, autoGeneratedHeader, string.Empty,
+
+            gennedClass = Regex.Replace(gennedClass, AutoGeneratedHeader, string.Empty,
                 RegexOptions.IgnorePatternWhitespace | RegexOptions.Multiline | RegexOptions.Singleline);
-            gennedClass = Regex.Replace(gennedClass, emptyGetSet, " { get; set; }", RegexOptions.IgnorePatternWhitespace);
-            gennedClass = Regex.Replace(gennedClass, getSet, " { get; set; }", RegexOptions.IgnorePatternWhitespace);
-            gennedClass = Regex.Replace(gennedClass, emptyGet, " { get; }", RegexOptions.IgnorePatternWhitespace);
-            gennedClass = Regex.Replace(gennedClass, emptySet, " { set; }", RegexOptions.IgnorePatternWhitespace);
-            gennedClass = Regex.Replace(gennedClass, get, " { get; }", RegexOptions.IgnorePatternWhitespace);
-            gennedClass = Regex.Replace(gennedClass, set, " { set; }", RegexOptions.IgnorePatternWhitespace);
+            gennedClass = Regex.Replace(gennedClass, EmptyGetSet, " { get; set; }", RegexOptions.IgnorePatternWhitespace);
+            gennedClass = Regex.Replace(gennedClass, GetSet, " { get; set; }", RegexOptions.IgnorePatternWhitespace);
+            gennedClass = Regex.Replace(gennedClass, EmptyGet, " { get; }", RegexOptions.IgnorePatternWhitespace);
+            gennedClass = Regex.Replace(gennedClass, EmptySet, " { set; }", RegexOptions.IgnorePatternWhitespace);
+            gennedClass = Regex.Replace(gennedClass, Get, " { get; }", RegexOptions.IgnorePatternWhitespace);
+            gennedClass = Regex.Replace(gennedClass, Set, " { set; }", RegexOptions.IgnorePatternWhitespace);
             gennedClass = Regex.Replace(gennedClass, @"\s+{\s+}", " { }", RegexOptions.IgnorePatternWhitespace);
             gennedClass = Regex.Replace(gennedClass, @"\)\s+;", ");", RegexOptions.IgnorePatternWhitespace);
 
-            gennedClass = gennedClass.Replace("class " + staticMarker, "static class ");
-            gennedClass = gennedClass.Replace("struct " + readonlyMarker, "readonly struct ");
+            gennedClass = gennedClass.Replace("class " + StaticMarker, "static class ");
+            gennedClass = gennedClass.Replace("struct " + ReadonlyMarker, "readonly struct ");
             gennedClass = Regex.Replace(gennedClass, @"\r\n|\n\r|\r|\n", Environment.NewLine);
 
             return gennedClass;