Don't suggest the initial name if un-pluralization failed (PY-12308)

This commit is contained in:
Andrey Vlasovskikh
2014-03-06 15:53:33 +04:00
parent 816b0e43e2
commit 4569a1cbf2
@@ -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) {