now we send FUS for ModuleBuilders and FrameworkSupportProviders
This commit is contained in:
+3
@@ -28,6 +28,8 @@ import com.intellij.openapi.roots.ModifiableRootModel
|
|||||||
import org.jetbrains.kotlin.idea.KotlinIcons
|
import org.jetbrains.kotlin.idea.KotlinIcons
|
||||||
import org.jetbrains.kotlin.idea.formatter.KotlinStyleGuideCodeStyle
|
import org.jetbrains.kotlin.idea.formatter.KotlinStyleGuideCodeStyle
|
||||||
import org.jetbrains.kotlin.idea.formatter.ProjectCodeStyleImporter
|
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.kotlin.idea.versions.*
|
||||||
import org.jetbrains.plugins.gradle.frameworkSupport.BuildScriptDataBuilder
|
import org.jetbrains.plugins.gradle.frameworkSupport.BuildScriptDataBuilder
|
||||||
import org.jetbrains.plugins.gradle.frameworkSupport.GradleFrameworkSupportProvider
|
import org.jetbrains.plugins.gradle.frameworkSupport.GradleFrameworkSupportProvider
|
||||||
@@ -142,6 +144,7 @@ abstract class GradleKotlinFrameworkSupportProvider(
|
|||||||
ProjectCodeStyleImporter.apply(module.project, KotlinStyleGuideCodeStyle.INSTANCE)
|
ProjectCodeStyleImporter.apply(module.project, KotlinStyleGuideCodeStyle.INSTANCE)
|
||||||
GradlePropertiesFileFacade.forProject(module.project).addCodeStyleProperty(KotlinStyleGuideCodeStyle.CODE_STYLE_SETTING)
|
GradlePropertiesFileFacade.forProject(module.project).addCodeStyleProperty(KotlinStyleGuideCodeStyle.CODE_STYLE_SETTING)
|
||||||
}
|
}
|
||||||
|
KotlinStatisticsTrigger.trigger(KotlinEventTrigger.KotlinIdeWizardsTrigger, this.javaClass.simpleName)
|
||||||
}
|
}
|
||||||
|
|
||||||
protected open fun updateSettingsScript(settingsBuilder: SettingsScriptBuilder, specifyPluginVersionIfNeeded: Boolean) { }
|
protected open fun updateSettingsScript(settingsBuilder: SettingsScriptBuilder, specifyPluginVersionIfNeeded: Boolean) { }
|
||||||
|
|||||||
+4
@@ -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.configuration.KotlinBuildScriptManipulator.Companion.getKotlinModuleDependencySnippet
|
||||||
import org.jetbrains.kotlin.idea.formatter.KotlinStyleGuideCodeStyle
|
import org.jetbrains.kotlin.idea.formatter.KotlinStyleGuideCodeStyle
|
||||||
import org.jetbrains.kotlin.idea.formatter.ProjectCodeStyleImporter
|
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.kotlin.idea.versions.*
|
||||||
import org.jetbrains.plugins.gradle.frameworkSupport.BuildScriptDataBuilder
|
import org.jetbrains.plugins.gradle.frameworkSupport.BuildScriptDataBuilder
|
||||||
import org.jetbrains.plugins.gradle.frameworkSupport.KotlinDslGradleFrameworkSupportProvider
|
import org.jetbrains.plugins.gradle.frameworkSupport.KotlinDslGradleFrameworkSupportProvider
|
||||||
@@ -104,6 +106,8 @@ abstract class KotlinDslGradleKotlinFrameworkSupportProvider(
|
|||||||
ProjectCodeStyleImporter.apply(module.project, KotlinStyleGuideCodeStyle.INSTANCE)
|
ProjectCodeStyleImporter.apply(module.project, KotlinStyleGuideCodeStyle.INSTANCE)
|
||||||
GradlePropertiesFileFacade.forProject(module.project).addCodeStyleProperty(KotlinStyleGuideCodeStyle.CODE_STYLE_SETTING)
|
GradlePropertiesFileFacade.forProject(module.project).addCodeStyleProperty(KotlinStyleGuideCodeStyle.CODE_STYLE_SETTING)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
KotlinStatisticsTrigger.trigger(KotlinEventTrigger.KotlinIdeWizardsTrigger, this.javaClass.simpleName)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun RepositoryDescription.toKotlinRepositorySnippet() = "maven { setUrl(\"$url\") }"
|
private fun RepositoryDescription.toKotlinRepositorySnippet() = "maven { setUrl(\"$url\") }"
|
||||||
|
|||||||
+3
@@ -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.service.settings.GradleProjectSettingsControl
|
||||||
import org.jetbrains.plugins.gradle.settings.DistributionType
|
import org.jetbrains.plugins.gradle.settings.DistributionType
|
||||||
import com.intellij.openapi.externalSystem.model.project.ProjectData
|
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
|
import javax.swing.Icon
|
||||||
|
|
||||||
abstract class KotlinGradleAbstractMultiplatformModuleBuilder(
|
abstract class KotlinGradleAbstractMultiplatformModuleBuilder(
|
||||||
@@ -75,6 +77,7 @@ abstract class KotlinGradleAbstractMultiplatformModuleBuilder(
|
|||||||
|
|
||||||
override fun setupModule(module: Module) {
|
override fun setupModule(module: Module) {
|
||||||
try {
|
try {
|
||||||
|
KotlinStatisticsTrigger.trigger(KotlinEventTrigger.KotlinIdeWizardsTrigger, this.javaClass.simpleName)
|
||||||
module.gradleModuleBuilder = this
|
module.gradleModuleBuilder = this
|
||||||
super.setupModule(module)
|
super.setupModule(module)
|
||||||
|
|
||||||
|
|||||||
@@ -24,6 +24,8 @@ import com.intellij.openapi.projectRoots.SdkTypeId
|
|||||||
import com.intellij.openapi.roots.ModifiableRootModel
|
import com.intellij.openapi.roots.ModifiableRootModel
|
||||||
import com.intellij.openapi.roots.ui.configuration.ModulesProvider
|
import com.intellij.openapi.roots.ui.configuration.ModulesProvider
|
||||||
import org.jetbrains.kotlin.idea.roots.migrateNonJvmSourceFolders
|
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.TargetPlatform
|
||||||
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
|
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
|
||||||
import javax.swing.Icon
|
import javax.swing.Icon
|
||||||
@@ -55,6 +57,7 @@ class KotlinModuleBuilder(
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun setupRootModel(rootModel: ModifiableRootModel) {
|
override fun setupRootModel(rootModel: ModifiableRootModel) {
|
||||||
|
KotlinStatisticsTrigger.trigger(KotlinEventTrigger.KotlinIdeWizardsTrigger, this.javaClass.simpleName + ": ${this.targetPlatform}")
|
||||||
super.setupRootModel(rootModel)
|
super.setupRootModel(rootModel)
|
||||||
if (targetPlatform !is JvmPlatform) {
|
if (targetPlatform !is JvmPlatform) {
|
||||||
migrateNonJvmSourceFolders(rootModel)
|
migrateNonJvmSourceFolders(rootModel)
|
||||||
|
|||||||
Reference in New Issue
Block a user