From 4569a1cbf24a18f783c4e2dd3655b9b573ff3159 Mon Sep 17 00:00:00 2001
From: Andrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Date: Thu, 6 Mar 2014 15:53:33 +0400
Subject: [PATCH] Don't suggest the initial name if un-pluralization failed
 (PY-12308)

---
 .../codeInsight/liveTemplates/CollectionElementNameMacro.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/python/src/com/jetbrains/python/codeInsight/liveTemplates/CollectionElementNameMacro.java b/python/src/com/jetbrains/python/codeInsight/liveTemplates/CollectionElementNameMacro.java
index 4cd68c6cebc9..84f1a7c32caa 100644
--- a/python/src/com/jetbrains/python/codeInsight/liveTemplates/CollectionElementNameMacro.java
+++ b/python/src/com/jetbrains/python/codeInsight/liveTemplates/CollectionElementNameMacro.java
@@ -69,8 +69,7 @@ public class CollectionElementNameMacro extends Macro {
     if (param.endsWith("_list")) {
       return param.substring(0, param.length()-5);
     }
-    final String result = StringUtil.unpluralize(param);
-    return result == null ? param : result;
+    return StringUtil.unpluralize(param);
   }
 
   public LookupElement[] calculateLookupItems(@NotNull Expression[] params, ExpressionContext context) {