From 63ffff175b80ee69934f7a905fa38ab313623078 Mon Sep 17 00:00:00 2001 From: Anton Yalyshev Date: Fri, 5 Apr 2019 21:57:08 +0300 Subject: [PATCH] now we send FUS for ModuleBuilders and FrameworkSupportProviders --- .../configuration/GradleKotlinFrameworkSupportProvider.kt | 3 +++ .../KotlinDslGradleKotlinFrameworkSupportProvider.kt | 4 ++++ .../KotlinGradleAbstractMultiplatformModuleBuilder.kt | 3 +++ .../jetbrains/kotlin/idea/framework/KotlinModuleBuilder.kt | 3 +++ 4 files changed, 13 insertions(+) diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinFrameworkSupportProvider.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinFrameworkSupportProvider.kt index fa2c3f16b4b..54407066c5e 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinFrameworkSupportProvider.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinFrameworkSupportProvider.kt @@ -28,6 +28,8 @@ import com.intellij.openapi.roots.ModifiableRootModel import org.jetbrains.kotlin.idea.KotlinIcons import org.jetbrains.kotlin.idea.formatter.KotlinStyleGuideCodeStyle import org.jetbrains.kotlin.idea.formatter.ProjectCodeStyleImporter +import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger import org.jetbrains.kotlin.idea.versions.* import org.jetbrains.plugins.gradle.frameworkSupport.BuildScriptDataBuilder import org.jetbrains.plugins.gradle.frameworkSupport.GradleFrameworkSupportProvider @@ -142,6 +144,7 @@ abstract class GradleKotlinFrameworkSupportProvider( ProjectCodeStyleImporter.apply(module.project, KotlinStyleGuideCodeStyle.INSTANCE) GradlePropertiesFileFacade.forProject(module.project).addCodeStyleProperty(KotlinStyleGuideCodeStyle.CODE_STYLE_SETTING) } + KotlinStatisticsTrigger.trigger(KotlinEventTrigger.KotlinIdeWizardsTrigger, this.javaClass.simpleName) } protected open fun updateSettingsScript(settingsBuilder: SettingsScriptBuilder, specifyPluginVersionIfNeeded: Boolean) { } diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinDslGradleKotlinFrameworkSupportProvider.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinDslGradleKotlinFrameworkSupportProvider.kt index 91b4c8c07d5..92444fcbc3f 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinDslGradleKotlinFrameworkSupportProvider.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinDslGradleKotlinFrameworkSupportProvider.kt @@ -30,6 +30,8 @@ import org.jetbrains.kotlin.idea.configuration.KotlinBuildScriptManipulator.Comp import org.jetbrains.kotlin.idea.configuration.KotlinBuildScriptManipulator.Companion.getKotlinModuleDependencySnippet import org.jetbrains.kotlin.idea.formatter.KotlinStyleGuideCodeStyle import org.jetbrains.kotlin.idea.formatter.ProjectCodeStyleImporter +import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger import org.jetbrains.kotlin.idea.versions.* import org.jetbrains.plugins.gradle.frameworkSupport.BuildScriptDataBuilder import org.jetbrains.plugins.gradle.frameworkSupport.KotlinDslGradleFrameworkSupportProvider @@ -104,6 +106,8 @@ abstract class KotlinDslGradleKotlinFrameworkSupportProvider( ProjectCodeStyleImporter.apply(module.project, KotlinStyleGuideCodeStyle.INSTANCE) GradlePropertiesFileFacade.forProject(module.project).addCodeStyleProperty(KotlinStyleGuideCodeStyle.CODE_STYLE_SETTING) } + + KotlinStatisticsTrigger.trigger(KotlinEventTrigger.KotlinIdeWizardsTrigger, this.javaClass.simpleName) } private fun RepositoryDescription.toKotlinRepositorySnippet() = "maven { setUrl(\"$url\") }" diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt index eb6992a45af..e88ce92b786 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt @@ -26,6 +26,8 @@ import org.jetbrains.plugins.gradle.service.project.wizard.GradleModuleBuilder import org.jetbrains.plugins.gradle.service.settings.GradleProjectSettingsControl import org.jetbrains.plugins.gradle.settings.DistributionType import com.intellij.openapi.externalSystem.model.project.ProjectData +import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger import javax.swing.Icon abstract class KotlinGradleAbstractMultiplatformModuleBuilder( @@ -75,6 +77,7 @@ abstract class KotlinGradleAbstractMultiplatformModuleBuilder( override fun setupModule(module: Module) { try { + KotlinStatisticsTrigger.trigger(KotlinEventTrigger.KotlinIdeWizardsTrigger, this.javaClass.simpleName) module.gradleModuleBuilder = this super.setupModule(module) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/KotlinModuleBuilder.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/KotlinModuleBuilder.kt index 1728af7ff88..d32bd21a4be 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/KotlinModuleBuilder.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/KotlinModuleBuilder.kt @@ -24,6 +24,8 @@ import com.intellij.openapi.projectRoots.SdkTypeId import com.intellij.openapi.roots.ModifiableRootModel import com.intellij.openapi.roots.ui.configuration.ModulesProvider import org.jetbrains.kotlin.idea.roots.migrateNonJvmSourceFolders +import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger +import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger import org.jetbrains.kotlin.resolve.TargetPlatform import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform import javax.swing.Icon @@ -55,6 +57,7 @@ class KotlinModuleBuilder( } override fun setupRootModel(rootModel: ModifiableRootModel) { + KotlinStatisticsTrigger.trigger(KotlinEventTrigger.KotlinIdeWizardsTrigger, this.javaClass.simpleName + ": ${this.targetPlatform}") super.setupRootModel(rootModel) if (targetPlatform !is JvmPlatform) { migrateNonJvmSourceFolders(rootModel)