From bec07ae7d9ce0e2e3a6c90dcb3d8191542273f81 Mon Sep 17 00:00:00 2001
From: Anton Yalyshev <anton.yalyshev@jetbrains.com>
Date: Fri, 28 Dec 2018 18:13:39 +0300
Subject: [PATCH] createFileFromTemplate() call from ExtractSuperRefactoring
 doesn't affect statistics trigger anymore

---
 .../jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt  | 8 ++++++--
 .../kotlin/idea/actions/NewKotlinScriptAction.kt          | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt
index 2fdb5d6e9e8..e7cb58314c2 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt
@@ -117,7 +117,7 @@ class NewKotlinFileAction : CreateFileFromTemplateAction(
     override fun startInWriteAction() = false
 
     override fun createFileFromTemplate(name: String, template: FileTemplate, dir: PsiDirectory) =
-        Companion.createFileFromTemplate(name, template, dir)
+        createFileFromTemplateWithStat(name, template, dir)
 
     companion object {
         private object NameValidator : InputValidatorEx {
@@ -193,9 +193,13 @@ class NewKotlinFileAction : CreateFileFromTemplateAction(
         private val FILE_SEPARATORS = charArrayOf('/', '\\')
         private val FQNAME_SEPARATORS = charArrayOf('/', '\\', '.')
 
-        fun createFileFromTemplate(name: String, template: FileTemplate, dir: PsiDirectory): PsiFile? {
+        fun createFileFromTemplateWithStat(name: String, template: FileTemplate, dir: PsiDirectory): PsiFile? {
             KotlinStatisticsTrigger.trigger(KotlinIdeNewFileTemplateTrigger::class.java, template.name)
+            return createFileFromTemplate(name, template, dir)
+        }
 
+
+        fun createFileFromTemplate(name: String, template: FileTemplate, dir: PsiDirectory): PsiFile? {
             val directorySeparators = if (template.name == "Kotlin File") FILE_SEPARATORS else FQNAME_SEPARATORS
             val (className, targetDir) = findOrCreateTarget(dir, name, directorySeparators)
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinScriptAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinScriptAction.kt
index 7354f4a1fab..4f1e52f83df 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinScriptAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinScriptAction.kt
@@ -38,7 +38,7 @@ class NewKotlinScriptAction : CreateFileFromTemplateAction(
     }
 
     override fun createFileFromTemplate(name: String, template: FileTemplate, dir: PsiDirectory) =
-        NewKotlinFileAction.createFileFromTemplate(name, template, dir)
+        NewKotlinFileAction.createFileFromTemplateWithStat(name, template, dir)
 
     override fun getActionName(directory: PsiDirectory, newName: String, templateName: String) = "Kotlin Script"