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

Improve wizards names composition for FUS reporter

Browse Source
This commit is contained in:
Anton Yalyshev
2020-03-13 17:27:34 +03:00
parent 47bb73d90b
commit e863d81f30
7 changed files with 13 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/NewProjectWizardsFUSCollector.kt
+4 -47
View File
@@ -6,54 +6,11 @@
package org.jetbrains.kotlin.idea.statistics
object NewProjectWizardsFUSCollector {
data class WizardDescription(val name: String, val group: String, val isKotlinDsl: Boolean?)
private val classToNameMap = mapOf(
"KotlinModuleBuilder__JVM_(JVM_1_6)" to "JVM | IDEA",
"KotlinModuleBuilder__JS" to "JS | IDEA",
"KotlinGradleNativeMultiplatformModuleBuilder" to "Native | Gradle",
"KotlinGradleSharedMultiplatformModuleBuilder" to "Multiplatform Library | Gradle",
"KotlinGradleWebMultiplatformModuleBuilder" to "JS Client and JVM Server | Gradle",
"KotlinGradleMobileMultiplatformModuleBuilder" to "Mobile Android/iOS | Gradle",
"KotlinGradleMobileSharedMultiplatformModuleBuilder" to "Mobile Shared Library | Gradle",
"KotlinJavaFrameworkSupportProvider" to "Kotlin/JVM",
"GradleKotlinJavaFrameworkSupportProvider" to "Kotlin/JVM",
"GradleKotlinJSFrameworkSupportProvider" to "Kotlin/JS",
"GradleKotlinJSBrowserFrameworkSupportProvider" to "Kotlin/JS for browser",
"GradleKotlinJSNodeFrameworkSupportProvider" to "Kotlin/JS for Node.js",
"GradleKotlinMPPFrameworkSupportProvider" to "Kotlin/Multiplatform_aggregated",
"GradleKotlinMPPSourceSetsFrameworkSupportProvider" to "Kotlin/Multiplatform",
"KotlinDslGradleKotlinJavaFrameworkSupportProvider" to "Kotlin/JVM",
"KotlinDslGradleKotlinJSBrowserFrameworkSupportProvider" to "Kotlin/JS for browser",
"KotlinDslGradleKotlinJSNodeFrameworkSupportProvider" to "Kotlin/JS for Node.js",
"KotlinDslGradleKotlinMPPFrameworkSupportProvider" to "Kotlin/Multiplatform"
)
private fun parseWizardClass(className: String): WizardDescription {
val wizardName = classToNameMap[className] ?: "unknown"
val wizardGroup = if (wizardName == "unknown") "unknown"
else if (className.startsWith("KotlinJava")) "Java"
else if (className.startsWith("Gradle") || className.startsWith("KotlinDslGradle")) "Gradle"
else "Kotlin"
val isBasedOnKotlinDSL = if (wizardName != "unknown") className.startsWith("KotlinDsl")
else null
return WizardDescription(wizardName, wizardGroup, isBasedOnKotlinDSL)
}
fun log(wizardClassName: String) {
val wizardDescription = parseWizardClass(wizardClassName)
fun log(name: String, group: String, isKotlinDsl: Boolean) {
val contextData = mapOf(
"name" to wizardDescription.name,
"group" to wizardDescription.group,
"isKotlinDsl" to wizardDescription.isKotlinDsl.toString()
"name" to name,
"group" to group,
"isKotlinDsl" to isKotlinDsl.toString()
)
KotlinFUSLogger.log(FUSEventGroups.NPWizards, "Finished", contextData)
}
}
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinFrameworkSupportProvider.kt
+2 -1
View File
@@ -154,7 +154,7 @@ abstract class GradleKotlinFrameworkSupportProvider(
ProjectCodeStyleImporter.apply(module.project, KotlinStyleGuideCodeStyle.INSTANCE)
GradlePropertiesFileFacade.forProject(module.project).addCodeStyleProperty(KotlinStyleGuideCodeStyle.CODE_STYLE_SETTING)
}
NewProjectWizardsFUSCollector.log(this.javaClass.simpleName)
NewProjectWizardsFUSCollector.log(this.presentableName, "Gradle", false)
}
protected open fun updateSettingsScript(settingsBuilder: SettingsScriptBuilder<out PsiFile>, specifyPluginVersionIfNeeded: Boolean) {}
@@ -331,6 +331,7 @@ open class GradleKotlinMPPSourceSetsFrameworkSupportProvider : GradleKotlinMPPFr
explicitPluginVersion: String?
) {
super.addSupport(buildScriptData, module, sdk, specifyPluginVersionIfNeeded, explicitPluginVersion)
NewProjectWizardsFUSCollector.log(this.presentableName + " as framework", "Gradle", false)
buildScriptData.addOther(
"""kotlin {
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinDslGradleKotlinFrameworkSupportProvider.kt
+1 -1
View File
@@ -106,7 +106,7 @@ abstract class KotlinDslGradleKotlinFrameworkSupportProvider(
GradlePropertiesFileFacade.forProject(module.project).addCodeStyleProperty(KotlinStyleGuideCodeStyle.CODE_STYLE_SETTING)
}
NewProjectWizardsFUSCollector.log(this.javaClass.simpleName)
NewProjectWizardsFUSCollector.log(this.presentableName, "Gradle", true)
}
protected abstract fun getOldSyntaxPluginDefinition(): String
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt
+2 -3
View File
@@ -25,8 +25,7 @@ import org.jetbrains.plugins.gradle.settings.DistributionType
import com.intellij.openapi.externalSystem.model.project.ProjectData
import com.intellij.openapi.externalSystem.service.project.wizard.ExternalModuleSettingsStep
import com.intellij.openapi.roots.ui.configuration.ModulesProvider
import org.jetbrains.kotlin.idea.statistics.FUSEventGroups
import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger
import org.jetbrains.kotlin.idea.statistics.NewProjectWizardsFUSCollector
import org.jetbrains.plugins.gradle.service.settings.GradleProjectSettingsControl
import javax.swing.Icon
@@ -91,7 +90,7 @@ abstract class KotlinGradleAbstractMultiplatformModuleBuilder(
override fun setupModule(module: Module) {
try {
KotlinFUSLogger.log(FUSEventGroups.NPWizards, this.javaClass.simpleName)
NewProjectWizardsFUSCollector.log(this.presentableName, "Kotlin", false)
module.gradleModuleBuilder = this
super.setupModule(module)
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt.192
+2 -3
View File
@@ -26,8 +26,7 @@ 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.FUSEventGroups
import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger
import org.jetbrains.kotlin.idea.statistics.NewProjectWizardsFUSCollector
import javax.swing.Icon
abstract class KotlinGradleAbstractMultiplatformModuleBuilder(
@@ -77,7 +76,7 @@ abstract class KotlinGradleAbstractMultiplatformModuleBuilder(
override fun setupModule(module: Module) {
try {
KotlinFUSLogger.log(FUSEventGroups.NPWizards, this.javaClass.simpleName)
NewProjectWizardsFUSCollector.log(this.presentableName, "Kotlin", false)
module.gradleModuleBuilder = this
super.setupModule(module)
idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/JavaFrameworkSupportProvider.kt
+1 -1
View File
@@ -57,7 +57,7 @@ class JavaFrameworkSupportProvider : FrameworkSupportInModuleProvider() {
if (isNewProject) {
ProjectCodeStyleImporter.apply(module.project, KotlinStyleGuideCodeStyle.INSTANCE)
}
NewProjectWizardsFUSCollector.log("KotlinJavaFrameworkSupportProvider")
NewProjectWizardsFUSCollector.log("Kotlin/JVM", "Java", false)
}
override fun onFrameworkSelectionChanged(selected: Boolean) {
idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/KotlinModuleBuilder.kt
+1 -1
View File
@@ -45,7 +45,7 @@ class KotlinModuleBuilder(
}
override fun setupRootModel(rootModel: ModifiableRootModel) {
NewProjectWizardsFUSCollector.log(this.javaClass.simpleName + ": ${this.targetPlatform}")
NewProjectWizardsFUSCollector.log(this.builderName, "Kotlin", false)
super.setupRootModel(rootModel)
if (!targetPlatform.isJvm()) {
migrateNonJvmSourceFolders(rootModel)