From 1a4a6bb0ff6a5d386820af7b270bddf7647bed68 Mon Sep 17 00:00:00 2001 From: Anton Yalyshev Date: Mon, 17 Jun 2019 16:17:05 +0300 Subject: [PATCH] added lists of possible values for Refactoring, NewFileTemplate and NPWizards collectors --- .../kotlin/idea/statistics/FUSEventGroups.kt | 50 +++++++++++++++++-- .../kotlin/idea/statistics/KotlinFUSLogger.kt | 2 +- 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/FUSEventGroups.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/FUSEventGroups.kt index 3719ced7871..df6be73ffbd 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/FUSEventGroups.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/FUSEventGroups.kt @@ -15,9 +15,9 @@ enum class FUSEventGroups(groupIdSuffix: String, val events: Set = hashS GradleTarget("gradle.target", gradleTargetEvents), MavenTarget("maven.target", mavenTargetEvents), JPSTarget("jps.target", JPSTargetEvents), - Refactoring("ide.action.refactoring"), - NewFileTemplate("ide.newFileTempl"), - NPWizards("ide.npwizards"), + Refactoring("ide.action.refactoring", refactoringEvents), + NewFileTemplate("ide.newFileTempl", newFileTemplateEvents), + NPWizards("ide.npwizards", NPWizardsEvents), DebugEval("ide.debugger.eval"); val GROUP_ID: String = "kotlin.$groupIdSuffix" @@ -64,4 +64,48 @@ val JPSTargetEvents = hashSetOf( "js", "jvm", "native" +) +val refactoringEvents = hashSetOf( + "RenameKotlinFileProcessor", + "RenameKotlinFunctionProcessor", + "RenameKotlinPropertyProcessor", + "RenameKotlinPropertyProcessor", + "RenameKotlinClassifierProcessor", + "RenameKotlinClassifierProcessor", + "RenameKotlinClassifierProcessor", + "RenameKotlinParameterProcessor", + "JavaMemberByKotlinReferenceInplaceRenameHandler" +) +val newFileTemplateEvents = hashSetOf( + "Kotlin_File", + "Kotlin_Class", + "Kotlin_Interface", + "Kotlin_Object", + "Kotlin_Enum", + "Kotlin_Scratch", + "Kotlin_Script" +) +val NPWizardsEvents = hashSetOf( + "KotlinModuleBuilder: JVM (JVM_1_6)", + "KotlinModuleBuilder: JVM (JVM_1_8)", + "KotlinModuleBuilder: JVM (JVM_9)", + "KotlinModuleBuilder: JVM (JVM_10)", + "KotlinModuleBuilder: JVM (JVM_11)", + "KotlinModuleBuilder: JVM (JVM_12)", + "KotlinModuleBuilder: JS", + "KotlinGradleNativeMultiplatformModuleBuilder", + "KotlinGradleSharedMultiplatformModuleBuilder", + "KotlinGradleWebMultiplatformModuleBuilder", + "KotlinGradleMobileMultiplatformModuleBuilder", + "KotlinGradleMobileSharedMultiplatformModuleBuilder", + "KotlinJavaFrameworkSupportProvider", + "GradleKotlinJavaFrameworkSupportProvider", + "GradleKotlinJSFrameworkSupportProvider", + "GradleKotlinJSBrowserFrameworkSupportProvider", + "GradleKotlinJSNodeFrameworkSupportProvider", + "GradleKotlinMPPFrameworkSupportProvider", + "KotlinDslGradleKotlinJavaFrameworkSupportProvider", + "KotlinDslGradleKotlinJSFrameworkSupportProvider", + "KotlinDslGradleKotlinJSBrowserFrameworkSupportProvider", + "KotlinDslGradleKotlinJSNodeFrameworkSupportProvider" ) \ No newline at end of file diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/KotlinFUSLogger.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/KotlinFUSLogger.kt index 3c2b2156cbe..5f3d84b183b 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/KotlinFUSLogger.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/statistics/KotlinFUSLogger.kt @@ -17,7 +17,7 @@ open class KotlinFUSLogger { private val logger = FUCounterUsageLogger.getInstance() fun log(group: FUSEventGroups, event: String) { - if (group.events.contains(event)) { + if (group.events.contains(event) || group.events.isEmpty()) { logger.logEvent(group.GROUP_ID, event, context) } else { logger.logEvent(group.GROUP_ID, "unknown", context)