From 40caaf89f1cb6754752147330368b95fcb6c0bf6 Mon Sep 17 00:00:00 2001 From: Semyon Kolton Date: Tue, 16 Jan 2018 16:49:59 +0300 Subject: [PATCH] Revert changes for CPP-11686 as error-prone This reverts commit 1e05cba CPP-11686 When selecting CMakeLists.txt after its creation force explicit search for it --- .../fileTemplates/actions/CreateFromTemplateActionBase.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/actions/CreateFromTemplateActionBase.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/actions/CreateFromTemplateActionBase.java index 6c9a5adc83c4..fe50d4775684 100644 --- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/actions/CreateFromTemplateActionBase.java +++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/actions/CreateFromTemplateActionBase.java @@ -69,7 +69,7 @@ public abstract class CreateFromTemplateActionBase extends AnAction { PsiElement createdElement = dialog.create(); if (createdElement != null) { elementCreated(dialog, createdElement); - selectElement(createdElement, dir, view); + view.selectElement(createdElement); if (selectedTemplate.isLiveTemplateEnabled() && createdElement instanceof PsiFile) { Map defaultValues = getLiveTemplateDefaults(dataContext, ((PsiFile)createdElement)); startLiveTemplate((PsiFile)createdElement, notNull(defaultValues, Collections.emptyMap())); @@ -128,10 +128,6 @@ public abstract class CreateFromTemplateActionBase extends AnAction { protected void elementCreated(CreateFromTemplateDialog dialog, PsiElement createdElement) { } - protected void selectElement(@NotNull PsiElement element, @NotNull PsiDirectory directory, @NotNull IdeView view) { - view.selectElement(element); - } - @Nullable protected Map getLiveTemplateDefaults(DataContext dataContext, @NotNull PsiFile file) { return null;