From 9edbf08ea2db9f303624e43d6c922f0b2fa58900 Mon Sep 17 00:00:00 2001 From: Alexander Zolotov Date: Tue, 24 Dec 2013 00:59:54 +0400 Subject: [PATCH] Fix live templates tests --- .../template/impl/ListTemplatesHandler.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/ListTemplatesHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/ListTemplatesHandler.java index 73e3ca8f650b..b65fd444b939 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/ListTemplatesHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/ListTemplatesHandler.java @@ -210,16 +210,13 @@ public class ListTemplatesHandler implements CodeInsightActionHandler { final LookupElement item = event.getItem(); if (item instanceof LiveTemplateLookupElementImpl) { final TemplateImpl template = ((LiveTemplateLookupElementImpl)item).getTemplate(); - final String argument; - if (myTemplate2Argument != null) { - argument = myTemplate2Argument.get(template); - new WriteCommandAction(myProject) { - @Override - protected void run(@NotNull Result result) throws Throwable { - ((TemplateManagerImpl)TemplateManager.getInstance(myProject)).startTemplateWithPrefix(myEditor, template, null, argument); - } - }.execute(); - } + final String argument = myTemplate2Argument != null ? myTemplate2Argument.get(template) : null; + new WriteCommandAction(myProject) { + @Override + protected void run(@NotNull Result result) throws Throwable { + ((TemplateManagerImpl)TemplateManager.getInstance(myProject)).startTemplateWithPrefix(myEditor, template, null, argument); + } + }.execute(); } else if (item instanceof CustomLiveTemplateLookupElement) { if (myFile != null) {