Use SearchValues<char>

ltrzesniewski · Nov 27, 2023 · d9bc7ad · d9bc7ad
1 parent af28a3b
commit d9bc7ad
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,7 +22,9 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: |
+            6.0.x
+            8.0.x
 
       - name: Restore
         run: dotnet restore src/RazorBlade.sln

diff --git a/src/RazorBlade.Library/HtmlHelper.cs b/src/RazorBlade.Library/HtmlHelper.cs
@@ -13,6 +13,12 @@ namespace RazorBlade;
 [SuppressMessage("ReSharper", "MemberCanBeMadeStatic.Global")]
 public sealed class HtmlHelper
 {
+#if NET8_0_OR_GREATER
+    private static readonly System.Buffers.SearchValues<char> _charsToEscape = System.Buffers.SearchValues.Create("&<>\"\'");
+#elif NET6_0_OR_GREATER
+    private const string _charsToEscape = "&<>\"\'";
+#endif
+
     internal static HtmlHelper Instance { get; } = new();
 
     /// <summary>
@@ -34,14 +40,16 @@ public string Encode(object? value)
 
 #if NET6_0_OR_GREATER
         var valueSpan = valueString.AsSpan();
-        var sb = new StringBuilder();
+        var sb = default(StringBuilder);
 
         while (true)
         {
-            var idx = valueSpan.IndexOfAny("&<>\"\'");
+            var idx = valueSpan.IndexOfAny(_charsToEscape);
             if (idx < 0)
                 break;
 
+            sb ??= new StringBuilder();
+
             if (idx != 0)
                 sb.Append(valueSpan[..idx]);
 
@@ -58,6 +66,9 @@ public string Encode(object? value)
             valueSpan = valueSpan[(idx + 1)..];
         }
 
+        if (sb is null)
+            return valueString;
+
         if (valueSpan.Length != 0)
             sb.Append(valueSpan);
 

diff --git a/src/RazorBlade.Library/HtmlTemplate.cs b/src/RazorBlade.Library/HtmlTemplate.cs
@@ -13,6 +13,12 @@ namespace RazorBlade;
 /// </remarks>
 public abstract class HtmlTemplate : RazorTemplate
 {
+#if NET8_0_OR_GREATER
+    private static readonly System.Buffers.SearchValues<char> _charsToEscape = System.Buffers.SearchValues.Create("&<>\"\'");
+#elif NET6_0_OR_GREATER
+    private const string _charsToEscape = "&<>\"\'";
+#endif
+
     private AttributeInfo _currentAttribute;
 
     // ReSharper disable once RedundantDisableWarningComment
@@ -47,7 +53,7 @@ protected internal override void Write(object? value)
 
         while (true)
         {
-            var idx = valueSpan.IndexOfAny("&<>\"\'");
+            var idx = valueSpan.IndexOfAny(_charsToEscape);
             if (idx < 0)
                 break;
 

diff --git a/src/RazorBlade.Library/RazorBlade.Library.csproj b/src/RazorBlade.Library/RazorBlade.Library.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0;netstandard2.0</TargetFrameworks>
     <RootNamespace>RazorBlade</RootNamespace>
     <LangVersion>10.0</LangVersion>
   </PropertyGroup>

diff --git a/src/RazorBlade.Tests/RazorBlade.Tests.csproj b/src/RazorBlade.Tests/RazorBlade.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net48</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0;net48</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/RazorBlade/RazorBlade.csproj b/src/RazorBlade/RazorBlade.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0;netstandard2.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
@@ -16,7 +16,7 @@
     <ProjectReference Include="../RazorBlade.Library/RazorBlade.Library.csproj" ReferenceOutputAssembly="false" />
     <Compile Include="../RazorBlade.Library/**/*.cs" Exclude="../RazorBlade.Library/obj/**/*.cs" Visible="false" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <ProjectReference Include="../RazorBlade.Analyzers/RazorBlade.Analyzers.csproj" ReferenceOutputAssembly="false" />
     <None Include="../RazorBlade.Analyzers/bin/$(Configuration)/netstandard2.0/RazorBlade.Analyzers.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />