unpluralize: databases -> database

platform/util/src/com/intellij/openapi/util/text/Pluralizer.java

@@ -285,7 +285,7 @@ class Pluralizer {
     JBIterable.of(new String[][]{
       {"/(.)s$", "$1"},
       {"/([^aeiou]s)es$", "$1"},
-      {"/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)(?:sis|ses)$", "$1sis"},
+      {"/(analy|^ba|diagno|parenthe|progno|synop|the)(?:sis|ses)$", "$1sis"},
       {"/(^analy)(?:sis|ses)$", "$1sis"},
       {"/(wi|kni|(?:after|half|high|low|mid|non|night|[^\\w]|^)li)ves$", "$1fe"},
       {"/(ar|(?:wo|[ae])l|[eo][ao])ves$", "$1f"},
@@ -390,6 +390,7 @@ class Pluralizer {
       "species",
       "staff",
       "swine",
+      "tennis",
       "trout",
       "traffic",
       "transportation",

platform/util/testSrc/com/intellij/util/text/StringUtilTest.java

@@ -136,6 +136,8 @@ public class StringUtilTest {
     assertEquals("process", StringUtil.unpluralize("process"));
     assertEquals("PROPERTY", StringUtil.unpluralize("PROPERTIES"));
     assertEquals("THIS", StringUtil.unpluralize("THESE"));
+    assertEquals("database", StringUtil.unpluralize("databases"));
+    assertEquals("basis", StringUtil.unpluralize("bases"));
   }
 
   @Test
@@ -158,6 +160,9 @@ public class StringUtilTest {
     assertEquals("schemas", StringUtil.pluralize("schema")); // anglicized version
     assertEquals("PROPERTIES", StringUtil.pluralize("PROPERTY"));
     assertEquals("THESE", StringUtil.pluralize("THIS"));
+    assertEquals("databases", StringUtil.pluralize("database"));
+    assertEquals("bases", StringUtil.pluralize("base"));
+    assertEquals("bases", StringUtil.pluralize("basis"));
   }
 
   @Test