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) {