From a0088dc7115a2ca77d42c22e9d6bc68d85aa57e2 Mon Sep 17 00:00:00 2001 From: "Gregory.Shrago" Date: Tue, 1 Mar 2016 18:25:24 +0300 Subject: [PATCH] IDEA-152295 StringUtil.pluralize() is incorrect --- .../util/src/com/intellij/openapi/util/text/StringUtil.java | 3 ++- .../util/testSrc/com/intellij/util/text/StringUtilTest.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/util/src/com/intellij/openapi/util/text/StringUtil.java b/platform/util/src/com/intellij/openapi/util/text/StringUtil.java index 449323a395a9..456a0ac0d5c0 100644 --- a/platform/util/src/com/intellij/openapi/util/text/StringUtil.java +++ b/platform/util/src/com/intellij/openapi/util/text/StringUtil.java @@ -852,7 +852,8 @@ public class StringUtil extends StringUtilRt { return suggestion.substring(0, len - 2) + "en"; } - if (endsWithIgnoreCase(suggestion, "s") || endsWithIgnoreCase(suggestion, "x") || endsWithIgnoreCase(suggestion, "ch")) { + if (endsWithIgnoreCase(suggestion, "s") || endsWithIgnoreCase(suggestion, "x") || + endsWithIgnoreCase(suggestion, "ch") || endsWithIgnoreCase(suggestion, "sh")) { return suggestion + "es"; } diff --git a/platform/util/testSrc/com/intellij/util/text/StringUtilTest.java b/platform/util/testSrc/com/intellij/util/text/StringUtilTest.java index 5282ab84f5f7..f8136aebdde0 100644 --- a/platform/util/testSrc/com/intellij/util/text/StringUtilTest.java +++ b/platform/util/testSrc/com/intellij/util/text/StringUtilTest.java @@ -110,6 +110,7 @@ public class StringUtilTest { assertEquals("fixes", StringUtil.pluralize("fix")); assertEquals("men", StringUtil.pluralize("man")); assertEquals("media", StringUtil.pluralize("medium")); + assertEquals("stashes", StringUtil.pluralize("stash")); } @Test