azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

createFileFromTemplate() call from ExtractSuperRefactoring doesn't affect statistics trigger anymore

Browse Source
This commit is contained in:
Anton Yalyshev
2018-12-28 18:13:39 +03:00
parent a893a26585
commit bec07ae7d9
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt
+6 -2
View File
@@ -117,7 +117,7 @@ class NewKotlinFileAction : CreateFileFromTemplateAction(
override fun startInWriteAction() = false override fun startInWriteAction() = false
override fun createFileFromTemplate(name: String, template: FileTemplate, dir: PsiDirectory) = override fun createFileFromTemplate(name: String, template: FileTemplate, dir: PsiDirectory) =
Companion.createFileFromTemplate(name, template, dir) createFileFromTemplateWithStat(name, template, dir)
companion object { companion object {
private object NameValidator : InputValidatorEx { private object NameValidator : InputValidatorEx {
@@ -193,9 +193,13 @@ class NewKotlinFileAction : CreateFileFromTemplateAction(
private val FILE_SEPARATORS = charArrayOf('/', '\\') private val FILE_SEPARATORS = charArrayOf('/', '\\')
private val FQNAME_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) 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 directorySeparators = if (template.name == "Kotlin File") FILE_SEPARATORS else FQNAME_SEPARATORS
val (className, targetDir) = findOrCreateTarget(dir, name, directorySeparators) val (className, targetDir) = findOrCreateTarget(dir, name, directorySeparators)
idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinScriptAction.kt
+1 -1
View File
@@ -38,7 +38,7 @@ class NewKotlinScriptAction : CreateFileFromTemplateAction(
} }
override fun createFileFromTemplate(name: String, template: FileTemplate, dir: PsiDirectory) = 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" override fun getActionName(directory: PsiDirectory, newName: String, templateName: String) = "Kotlin Script"