Skip to content

Fix incorrect singularization for words ending with -ves (arrives/drives/curves/behaves) and add tests #1704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jesi318 wants to merge 3 commits into
base: main
Choose a base branch
from
+24 −3
Open

Fix incorrect singularization for words ending with -ves (arrives/drives/curves/behaves) and add tests #1704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86d429a
- fixed -ves issue by removing greedy[^f]ves and adding additional ru…
jesi318 Apr 3, 2026
864f993
- fixed the test for safe and safes
jesi318 Apr 3, 2026
6d5de66
- resolved comments and added changes
jesi318 Apr 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/Humanizer/Inflections/Vocabularies.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,12 @@ static Vocabulary BuildDefault()
_default.AddSingular("(n)ews$", "$1ews");
_default.AddSingular("([dti])a$", "$1um");
_default.AddSingular("(analy|ba|diagno|parenthe|progno|synop|the|ellip|empha|neuro|oa|paraly)ses$", "$1sis");
_default.AddSingular("([^f])ves$", "$1fe");
_default.AddSingular("(.+)ves$", "$1ve");
_default.AddSingular("(hive)s$", "$1");
_default.AddSingular("(tive)s$", "$1");
_default.AddSingular("([lr]|hoo|lea|loa|thie)ves$", "$1f");
_default.AddSingular("([lr])ves$", "$1f");
_default.AddSingular("(li|wi|kni)ves$", "$1fe");
_default.AddSingular("(thie|hoo|loa|lea)ves$", "$1f");
_default.AddSingular("(^zomb)?([^aeiouy]|qu)ies$", "$2y");
_default.AddSingular("(s)eries$", "$1eries");
_default.AddSingular("(m)ovies$", "$1ovie");
Expand Down Expand Up @@ -92,7 +94,9 @@ static Vocabulary BuildDefault()
_default.AddIrregular("tie", "ties", matchEnding: false);
_default.AddIrregular("lens", "lenses");
_default.AddIrregular("clove", "cloves");
_default.AddIrregular("curve", "curves");
_default.AddIrregular("valve", "valves");
_default.AddIrregular("safe", "safes");
_default.AddIrregular("explosive", "explosives");

_default.AddUncountable("staff");
Expand Down
19 changes: 18 additions & 1 deletion tests/Humanizer.Tests/InflectorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,23 @@ public void SingularizeWordsWithUnknownSingularity(string singular, string plura
public void SingularizeSkipSimpleWords(string singular, string plural) =>
Assert.Equal(singular, plural.Singularize(skipSimpleWords: true));

[Theory]
[InlineData("arrives", "arrive")]
[InlineData("drives", "drive")]
[InlineData("curves", "curve")]
[InlineData("behaves", "behave")]
[InlineData("survives", "survive")]
[InlineData("derives", "derive")]
[InlineData("knives", "knife")]
[InlineData("wives", "wife")]
[InlineData("leaves", "leaf")]
[InlineData("lives", "life")]
[InlineData("scarves", "scarf")]
[InlineData("hooves", "hoof")]
[InlineData("thieves", "thief")]
public void Singularize_Ves_EdgeCases(string plural, string expected) =>
Assert.Equal(expected, plural.Singularize());

[Theory]
[InlineData("a")]
[InlineData("A")]
Expand Down Expand Up @@ -189,7 +206,7 @@ public IEnumerator<object[]> GetEnumerator()
yield return ["index", "indices"];

yield return ["wife", "wives"];
yield return ["safe", "saves"];
yield return ["safe", "safes"];
yield return ["half", "halves"];

yield return ["glove", "gloves"];
Expand Down
Loading