Merge pull request #135 from ApiApprover/brackets-static

More terse
PublicApiGenerator · Nov 8, 2019 · 987f9ce · 987f9ce
2 parents bde14bb + 12e273d
commit 987f9ce
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/src/PublicApiGenerator/EventNameBuilder.cs b/src/PublicApiGenerator/EventNameBuilder.cs
@@ -2,6 +2,7 @@
 using System.CodeDom;
 using System.Linq;
 using Mono.Cecil;
+using static System.String;
 
 namespace PublicApiGenerator
 {
@@ -19,8 +20,8 @@ public static class EventNameBuilder
             if (eventDefinition.DeclaringType.IsInterface)
             {
                 return (addAccessorAttributes & MemberAttributes.VTableMask) == MemberAttributes.New
-                    ? string.Format(CodeNormalizer.EventModifierMarkerTemplate, $"new{CodeNormalizer.EventRemovePublicMarker}") + name
-                    : string.Format(CodeNormalizer.EventModifierMarkerTemplate, CodeNormalizer.EventRemovePublicMarker) + name;
+                    ? Format(CodeNormalizer.EventModifierMarkerTemplate, $"new{CodeNormalizer.EventRemovePublicMarker}") + name
+                    : Format(CodeNormalizer.EventModifierMarkerTemplate, CodeNormalizer.EventRemovePublicMarker) + name;
             }
 
             bool? isNew = null;
@@ -39,16 +40,16 @@ public static class EventNameBuilder
             return (addAccessorAttributes & MemberAttributes.ScopeMask, isNew, eventDefinition.AddMethod.IsVirtual,
                     eventDefinition.AddMethod.IsAbstract) switch
                 {
-                    (MemberAttributes.Static, null, _, _) => (string.Format(CodeNormalizer.EventModifierMarkerTemplate, "static") + name),
-                    (MemberAttributes.Static, true, _, _) => (string.Format(CodeNormalizer.EventModifierMarkerTemplate, "static new") + name),
-                    (MemberAttributes.Override, _, _, _) => (string.Format(CodeNormalizer.EventModifierMarkerTemplate, "override") + name),
-                    (MemberAttributes.Final | MemberAttributes.Override, _, _, _) => (string.Format(CodeNormalizer.EventModifierMarkerTemplate,"sealed override") + name),
-                    (MemberAttributes.Final, true, _, _) => (string.Format(CodeNormalizer.EventModifierMarkerTemplate, "new") + name),
-                    (MemberAttributes.Abstract, null, _, _) => (string.Format(CodeNormalizer.EventModifierMarkerTemplate, "abstract") + name),
-                    (MemberAttributes.Abstract, true, _, _) => (string.Format(CodeNormalizer.EventModifierMarkerTemplate, "new abstract") + name),
-                    (MemberAttributes.Const, _, _, _) => (string.Format(CodeNormalizer.EventModifierMarkerTemplate, "abstract override") + name),
-                    (_, null, true, false) => (string.Format(CodeNormalizer.EventModifierMarkerTemplate, "virtual") + name),
-                    (_, true, true, false) => (string.Format(CodeNormalizer.EventModifierMarkerTemplate, "new virtual") + name),
+                    (MemberAttributes.Static, null, _, _) => Format(CodeNormalizer.EventModifierMarkerTemplate, "static") + name,
+                    (MemberAttributes.Static, true, _, _) => Format(CodeNormalizer.EventModifierMarkerTemplate, "static new") + name,
+                    (MemberAttributes.Override, _, _, _) => Format(CodeNormalizer.EventModifierMarkerTemplate, "override") + name,
+                    (MemberAttributes.Final | MemberAttributes.Override, _, _, _) => Format(CodeNormalizer.EventModifierMarkerTemplate,"sealed override") + name,
+                    (MemberAttributes.Final, true, _, _) => Format(CodeNormalizer.EventModifierMarkerTemplate, "new") + name,
+                    (MemberAttributes.Abstract, null, _, _) => Format(CodeNormalizer.EventModifierMarkerTemplate, "abstract") + name,
+                    (MemberAttributes.Abstract, true, _, _) => Format(CodeNormalizer.EventModifierMarkerTemplate, "new abstract") + name,
+                    (MemberAttributes.Const, _, _, _) => Format(CodeNormalizer.EventModifierMarkerTemplate, "abstract override") + name,
+                    (_, null, true, false) => Format(CodeNormalizer.EventModifierMarkerTemplate, "virtual") + name,
+                    (_, true, true, false) => Format(CodeNormalizer.EventModifierMarkerTemplate, "new virtual") + name,
                     _ => name
                 };
         }