optimize EnglishArticle.AppendArticlePrefix (#1418)

Humanizr · Feb 21, 2024 · daf7ea8 · daf7ea8
1 parent 287d2ff
commit daf7ea8
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/src/Benchmarks/Benchmarks.csproj b/src/Benchmarks/Benchmarks.csproj
@@ -8,6 +8,7 @@
     <ItemGroup>
       <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
       <ProjectReference Include="..\Humanizer\Humanizer.csproj" />
+<!--      <PackageReference Include="Humanizer" Version="2.14.1" />-->
     </ItemGroup>
 
 </Project>
diff --git a/src/Benchmarks/EnglishArticleBenchmarks.cs b/src/Benchmarks/EnglishArticleBenchmarks.cs
@@ -0,0 +1,7 @@
+[MemoryDiagnoser(false)]
+public class EnglishArticleBenchmarks
+{
+    [Benchmark]
+    public string[] AppendArticlePrefix() =>
+        EnglishArticle.AppendArticlePrefix([ "Ant", "The Theater", "The apple", "Fox", "Bear"]);
+}
diff --git a/src/Benchmarks/Program.cs b/src/Benchmarks/Program.cs
@@ -1 +1,2 @@
-BenchmarkRunner.Run<EnumBenchmarks>();
+BenchmarkRunner.Run(
+    typeof(Program).Assembly);
diff --git a/src/Humanizer.Tests.Shared/ArticlePrefixSortTests.cs b/src/Humanizer.Tests.Shared/ArticlePrefixSortTests.cs
@@ -6,6 +6,7 @@ public class ArticlePrefixSortTests
         [InlineData(new[] { "Ant", "The Theater", "The apple", "Fox", "Bear" }, new[] { "Ant", "The apple", "Bear", "Fox", "The Theater" })]
         [InlineData(new[] { "An Ant", "The Theater", "the apple", "a Fox", "Bear" }, new[] { "An Ant", "the apple", "Bear", "a Fox", "The Theater" })]
         [InlineData(new[] { "Ant", "A Theater", "an apple", "Fox", "Bear" }, new[] { "Ant", "an apple", "Bear", "Fox", "A Theater" })]
+        [InlineData(new[] { " Ant ", " A  Theater ", "  an apple  ", " Fox", "Bear " }, new[] { "A  Theater", "an apple", "Ant", "Bear", "Fox" })]
         public void SortStringArrayIgnoringArticlePrefixes(string[] input, string[] expectedOutput) =>
             Assert.Equal(expectedOutput, EnglishArticle.PrependArticleSuffix(EnglishArticle.AppendArticlePrefix(input)));
 

diff --git a/src/Humanizer/ArticlePrefixSort.cs b/src/Humanizer/ArticlePrefixSort.cs
@@ -22,17 +22,17 @@ public static string[] AppendArticlePrefix(string[] items)
 
             for (var i = 0; i < items.Length; i++)
             {
-                var item = items[i];
+                var item = items[i].AsSpan();
                 if (_regex.IsMatch(item))
                 {
-                    var article = item.Substring(0, item.IndexOf(" ", StringComparison.CurrentCulture));
-                    var removed = item.Remove(0, item.IndexOf(" ", StringComparison.CurrentCulture));
-                    var appended = $"{removed} {article}";
-                    transformed[i] = appended.Trim();
+                    var indexOf = item.IndexOf(' ');
+                    var removed = item[indexOf..].TrimStart();
+                    var article = item[..indexOf].TrimEnd();
+                    transformed[i] = $"{removed} {article}";
                 }
                 else
                 {
-                    transformed[i] = item.Trim();
+                    transformed[i] = item.Trim().ToString();
                 }
             }
             Array.Sort(transformed);