From 1e05cba730dbf6875f6619f52da4a3881a01bced Mon Sep 17 00:00:00 2001 From: Semyon Kolton Date: Fri, 12 Jan 2018 13:00:38 +0300 Subject: [PATCH] CPP-11686 When selecting CMakeLists.txt after its creation force explicit search for it After creation of CMakeLists.txt in root project directory all files in project are invalidated. This prevents IdeView.selectElement() from finding CMakeLists.txt and selecting it in project view. --- .../fileTemplates/actions/CreateFromTemplateActionBase.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 fe50d4775684..6c9a5adc83c4 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); - view.selectElement(createdElement); + selectElement(createdElement, dir, view); if (selectedTemplate.isLiveTemplateEnabled() && createdElement instanceof PsiFile) { Map defaultValues = getLiveTemplateDefaults(dataContext, ((PsiFile)createdElement)); startLiveTemplate((PsiFile)createdElement, notNull(defaultValues, Collections.emptyMap())); @@ -128,6 +128,10 @@ 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;