IDEA-136624 Bad pluralization in suggested names

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 9a3ad2110a515ee53aeeaa09c6cb54163478c39c..155d18059f71c1513a5aa3110626b669e2767e43 100644 (file)
--- a/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
+++ b/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
@@ -765,6 +765,10 @@ public class StringUtil extends StringUtilRt {
       return "These";
     }
 
+    if (endsWithIgnoreCase(suggestion, "es")) {
+      return suggestion;
+    }
+
     if (endsWithIgnoreCase(suggestion, "s") || endsWithIgnoreCase(suggestion, "x") || endsWithIgnoreCase(suggestion, "ch")) {
       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 d4df36477e2eed4f83f0db9c771c114cc81da8a2..bd5365df0e0687a551d03e506cd55660f32ec88f 100644 (file)
--- a/platform/util/testSrc/com/intellij/util/text/StringUtilTest.java
+++ b/platform/util/testSrc/com/intellij/util/text/StringUtilTest.java
@@ -76,6 +76,11 @@ public class StringUtilTest extends TestCase {
     assertEquals("z", StringUtil.unpluralize("zs"));
   }
 
+  public void testPluralize() {
+    assertEquals("values", StringUtil.pluralize("value"));
+    assertEquals("values", StringUtil.pluralize("values"));
+  }
+
   public void testStartsWithConcatenation() {
     assertTrue(StringUtil.startsWithConcatenation("something.with.dot", "something", "."));
     assertTrue(StringUtil.startsWithConcatenation("something.with.dot", "", "something."));