Add literal formatting

Author: ErikSchierboom

exercises/practice/acronym/.meta/Generator.tpl

@@ -6,7 +6,7 @@ public class AcronymTests
     [Fact{{#unless @first}}(Skip = "Remove this Skip property to run this test"){{/unless}}]
     public void {{test_method_name}}()
     {
-        Assert.Equal({{literal expected}}, Acronym.Abbreviate({{literal input.phrase}}));
+        Assert.Equal({{lit expected}}, Acronym.Abbreviate({{lit input.phrase}}));
     }
     {{/test_cases}}
 }

exercises/practice/hamming/.meta/Generator.tpl

@@ -7,9 +7,9 @@ public class HammingTests
     public void {{test_method_name}}()
     {
         {{#if error}}
-        Assert.Throws<ArgumentException>(() => Hamming.Distance({{literal input.strand1}}, {{literal input.strand2}}));
+        Assert.Throws<ArgumentException>(() => Hamming.Distance({{lit input.strand1}}, {{lit input.strand2}}));
         {{else}}
-        Assert.Equal({{expected}}, Hamming.Distance({{literal input.strand1}}, {{literal input.strand2}}));
+        Assert.Equal({{expected}}, Hamming.Distance({{lit input.strand1}}, {{lit input.strand2}}));
         {{/if}}
     }
     {{/test_cases}}

exercises/practice/isogram/.meta/Generator.tpl

@@ -6,7 +6,7 @@ public class IsogramTests
     [Fact{{#unless @first}}(Skip = "Remove this Skip property to run this test"){{/unless}}]
     public void {{test_method_name}}()
     {
-        Assert.{{expected}}(Isogram.IsIsogram({{literal input.phrase}}));
+        Assert.{{expected}}(Isogram.IsIsogram({{lit input.phrase}}));
     }
     {{/test_cases}}
 }

exercises/practice/pangram/.meta/Generator.tpl

@@ -6,7 +6,7 @@ public class PangramTests
     [Fact{{#unless @first}}(Skip = "Remove this Skip property to run this test"){{/unless}}]
     public void {{test_method_name}}()
     {
-        Assert.{{literal expected}}(Pangram.IsPangram({{literal input.sentence}}));
+        Assert.{{lit expected}}(Pangram.IsPangram({{lit input.sentence}}));
     }
     {{/test_cases}}
 }

exercises/practice/perfect-numbers/.meta/Generator.tpl

@@ -9,7 +9,7 @@ public class PerfectNumbersTests
         {{#if error}}
         Assert.Throws<ArgumentOutOfRangeException>(() => PerfectNumbers.Classify({{input.number}}));
         {{else}}
-        Assert.Equal(Classification.{{Capitalize (raw expected)}}, PerfectNumbers.Classify({{input.number}}));
+        Assert.Equal(Classification.{{Capitalize expected}}, PerfectNumbers.Classify({{input.number}}));
         {{/if}}
     }
     {{/test_cases}}

exercises/practice/space-age/.meta/Generator.tpl

@@ -7,7 +7,7 @@ public class SpaceAgeTests
     public void {{test_method_name}}()
     {
         var sut = new SpaceAge({{input.seconds}});
-        Assert.Equal({{literal expected}}, sut.On{{input.planet}}(), precision: 2);
+        Assert.Equal({{lit expected}}, sut.On{{input.planet}}(), precision: 2);
     }
     {{/test_cases}}
 }

exercises/practice/two-fer/.meta/Generator.tpl

@@ -6,7 +6,7 @@ public class TwoFerTests
     [Fact{{#unless @first}}(Skip = "Remove this Skip property to run this test"){{/unless}}]
     public void {{test_method_name}}()
     {
-        Assert.Equal({{literal expected}}, TwoFer.Speak({{#if input.name}}{{literal input.name}}{{/if}}));
+        Assert.Equal({{lit expected}}, TwoFer.Speak({{#if input.name}}{{lit input.name}}{{/if}}));
     }
     {{/test_cases}}
 }

generators.new/Formatting.cs

@@ -1,3 +1,5 @@
+using System.Globalization;
+
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Formatting;
@@ -14,6 +16,7 @@ internal static string FormatCode(string code) =>
 
     private static SyntaxNode Parse(string code) =>
         CSharpSyntaxTree.ParseText(code).GetRoot();
-    
-    // SymbolDisplay.FormatLiteral(Convert.ToString(first, CultureInfo.InvariantCulture)!, first is string))
+
+    internal static string FormatLiteral(object obj) =>
+        SymbolDisplay.FormatLiteral(Convert.ToString(obj, CultureInfo.InvariantCulture)!, obj is string);
 }

generators.new/Templates.cs

@@ -4,8 +4,6 @@
 using HandlebarsDotNet;
 using HandlebarsDotNet.Helpers;
 
-using Humanizer;
-
 using Microsoft.CodeAnalysis.CSharp;
 
 using Newtonsoft.Json.Linq;
@@ -20,14 +18,9 @@ static Templates()
     {
         HandlebarsHelpers.Register(HandlebarsContext, options => { options.UseCategoryPrefix = false; });
         HandlebarsContext.Configuration.FormatProvider = CultureInfo.InvariantCulture;
-        HandlebarsContext.RegisterHelper("raw", (writer, context, parameters) =>
-        {
-            writer.WriteSafeString(parameters.First().ToString());
-        });
-        HandlebarsContext.RegisterHelper("literal", (writer, context, parameters) =>
+        HandlebarsContext.RegisterHelper("lit", (writer, context, parameters) =>
         {
-            var first = parameters.First();
-            writer.WriteSafeString(SymbolDisplay.FormatLiteral(Convert.ToString(first, CultureInfo.InvariantCulture)!, first is string));
+            writer.WriteSafeString(Formatting.FormatLiteral(parameters.First()));
         });
     }