diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectResolverExtension.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectResolverExtension.kt index 340ec58da80..3bccbfb52e3 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectResolverExtension.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectResolverExtension.kt @@ -35,8 +35,8 @@ import org.jetbrains.kotlin.idea.util.CopyableDataNodeUserDataProperty import org.jetbrains.kotlin.idea.util.DataNodeUserDataProperty import org.jetbrains.kotlin.idea.util.NotNullableCopyableDataNodeUserDataProperty import org.jetbrains.kotlin.idea.util.PsiPrecedences -import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger -import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger +import org.jetbrains.kotlin.idea.statistics.FUSEventGroups +import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger import org.jetbrains.plugins.gradle.model.ExternalProjectDependency import org.jetbrains.plugins.gradle.model.ExternalSourceSet import org.jetbrains.plugins.gradle.model.FileCollectionDependency @@ -199,8 +199,8 @@ class KotlinGradleProjectResolverExtension : AbstractProjectResolverExtension() val mppModel = resolverCtx.getMppModel(gradleModule) if (mppModel != null) { mppModel.targets.forEach { target -> - KotlinStatisticsTrigger.trigger( - KotlinEventTrigger.KotlinGradleTargetTrigger, + KotlinFUSLogger.log( + FUSEventGroups.GradleTarget, "MPP.${target.platform.id + (target.presetName?.let { ".$it" } ?: "")}" ) } @@ -223,8 +223,8 @@ class KotlinGradleProjectResolverExtension : AbstractProjectResolverExtension() ideModule.coroutines = gradleModel.coroutines ideModule.platformPluginId = gradleModel.platformPluginId - KotlinStatisticsTrigger.trigger( - KotlinEventTrigger.KotlinGradleTargetTrigger, + KotlinFUSLogger.log( + FUSEventGroups.GradleTarget, gradleModel.kotlinTarget ?: "unknown" ) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/KtScratchFileCreationHelper.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/KtScratchFileCreationHelper.kt index 19f43235239..5957345f143 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/KtScratchFileCreationHelper.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/KtScratchFileCreationHelper.kt @@ -9,13 +9,13 @@ import com.intellij.ide.scratch.ScratchFileCreationHelper import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.project.Project import org.jetbrains.kotlin.parsing.KotlinParserDefinition -import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger -import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger +import org.jetbrains.kotlin.idea.statistics.FUSEventGroups +import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger class KtScratchFileCreationHelper: ScratchFileCreationHelper() { override fun prepareText(project: Project, context: Context, dataContext: DataContext): Boolean { - KotlinStatisticsTrigger.trigger(KotlinEventTrigger.KotlinIdeNewFileTemplateTrigger, "Kotlin Scratch") + KotlinFUSLogger.log(FUSEventGroups.NewFileTemplate, "Kotlin Scratch") context.fileExtension = KotlinParserDefinition.STD_SCRIPT_SUFFIX diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt index 5759abd0481..a480c855a64 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt @@ -47,8 +47,8 @@ import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.KtClass import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtNamedDeclaration -import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger -import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger +import org.jetbrains.kotlin.idea.statistics.FUSEventGroups +import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger import java.util.* class NewKotlinFileAction : CreateFileFromTemplateAction( @@ -194,7 +194,7 @@ class NewKotlinFileAction : CreateFileFromTemplateAction( private val FQNAME_SEPARATORS = charArrayOf('/', '\\', '.') fun createFileFromTemplateWithStat(name: String, template: FileTemplate, dir: PsiDirectory): PsiFile? { - KotlinStatisticsTrigger.trigger(KotlinEventTrigger.KotlinIdeNewFileTemplateTrigger, template.name) + KotlinFUSLogger.log(FUSEventGroups.NewFileTemplate, template.name) return createFileFromTemplate(name, template, dir) } diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/TargetRetrieveActivity.kt b/idea/src/org/jetbrains/kotlin/idea/framework/TargetRetrieveActivity.kt index f3afb43e4e0..24ee070084d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/framework/TargetRetrieveActivity.kt +++ b/idea/src/org/jetbrains/kotlin/idea/framework/TargetRetrieveActivity.kt @@ -15,8 +15,8 @@ import org.jetbrains.kotlin.platform.impl.isCommon import org.jetbrains.kotlin.platform.impl.isJavaScript import org.jetbrains.kotlin.platform.impl.isJvm import org.jetbrains.kotlin.platform.impl.isKotlinNative -import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger -import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger +import org.jetbrains.kotlin.idea.statistics.FUSEventGroups +import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger class TargetRetrieveActivity : StartupActivity { @@ -32,14 +32,14 @@ class TargetRetrieveActivity : StartupActivity { } when { buildSystem == BuildSystemType.JPS -> - KotlinStatisticsTrigger.trigger( - KotlinEventTrigger.KotlinJPSTargetTrigger, - platform + KotlinFUSLogger.log( + FUSEventGroups.JPSTarget, + platform ) buildSystem.toString().toLowerCase().contains("maven") -> - KotlinStatisticsTrigger.trigger( - KotlinEventTrigger.KotlinMavenTargetTrigger, - platform + KotlinFUSLogger.log( + FUSEventGroups.MavenTarget, + platform ) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHandler.kt index 8ac0791c2b1..f57ef60437f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHandler.kt @@ -39,8 +39,8 @@ import org.jetbrains.kotlin.psi.KtClass import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtNamedDeclaration import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType -import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger -import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger +import org.jetbrains.kotlin.idea.statistics.FUSEventGroups +import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger import org.jetbrains.kotlin.types.typeUtil.supertypes class KotlinPullUpHandler : AbstractPullPushMembersHandler( @@ -118,12 +118,12 @@ class KotlinPullUpHandler : AbstractPullPushMembersHandler( override fun invoke(project: Project, elements: Array, dataContext: DataContext?) { super.invoke(project, elements, dataContext) - KotlinStatisticsTrigger.trigger(KotlinEventTrigger.KotlinIdeRefactoringTrigger, this::class.java.name) + KotlinFUSLogger.log(FUSEventGroups.Refactoring, this::class.java.name) } override fun invoke(project: Project, editor: Editor, file: PsiFile, dataContext: DataContext?) { super.invoke(project, editor, file, dataContext) - KotlinStatisticsTrigger.trigger(KotlinEventTrigger.KotlinIdeRefactoringTrigger, this::class.java.name) + KotlinFUSLogger.log(FUSEventGroups.Refactoring, this::class.java.name) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/KotlinPushDownHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/KotlinPushDownHandler.kt index ffaf48ca4d1..1e96a1b2ca9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/KotlinPushDownHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/pushDown/KotlinPushDownHandler.kt @@ -36,8 +36,8 @@ import org.jetbrains.kotlin.psi.KtClass import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtNamedDeclaration import org.jetbrains.kotlin.psi.KtParameter -import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger -import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger +import org.jetbrains.kotlin.idea.statistics.FUSEventGroups +import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger val PUSH_MEMBERS_DOWN = "Push Members Down" @@ -91,11 +91,11 @@ class KotlinPushDownHandler : AbstractPullPushMembersHandler( override fun invoke(project: Project, elements: Array, dataContext: DataContext?) { super.invoke(project, elements, dataContext) - KotlinStatisticsTrigger.trigger(KotlinEventTrigger.KotlinIdeRefactoringTrigger, this::class.java.name) + KotlinFUSLogger.log(FUSEventGroups.Refactoring, this::class.java.name) } override fun invoke(project: Project, editor: Editor, file: PsiFile, dataContext: DataContext?) { super.invoke(project, editor, file, dataContext) - KotlinStatisticsTrigger.trigger(KotlinEventTrigger.KotlinIdeRefactoringTrigger, this::class.java.name) + KotlinFUSLogger.log(FUSEventGroups.Refactoring, this::class.java.name) } } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/JavaMemberByKotlinReferenceInplaceRenameHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/JavaMemberByKotlinReferenceInplaceRenameHandler.kt index 7af45604a23..14a28fe3439 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/JavaMemberByKotlinReferenceInplaceRenameHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/JavaMemberByKotlinReferenceInplaceRenameHandler.kt @@ -32,8 +32,8 @@ import org.jetbrains.kotlin.idea.references.mainReference import org.jetbrains.kotlin.psi.KtPsiUtil import org.jetbrains.kotlin.psi.KtSimpleNameExpression import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType -import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger -import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger +import org.jetbrains.kotlin.idea.statistics.FUSEventGroups +import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger class JavaMemberByKotlinReferenceInplaceRenameHandler : MemberInplaceRenameHandler() { class Renamer( @@ -61,12 +61,12 @@ class JavaMemberByKotlinReferenceInplaceRenameHandler : MemberInplaceRenameHandl override fun invoke(project: Project, elements: Array, dataContext: DataContext) { super.invoke(project, elements, dataContext) - KotlinStatisticsTrigger.trigger(KotlinEventTrigger.KotlinIdeRefactoringTrigger, this::class.java.name) + KotlinFUSLogger.log(FUSEventGroups.Refactoring, this::class.java.name) } override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext?) { super.invoke(project, editor, file, dataContext) - KotlinStatisticsTrigger.trigger(KotlinEventTrigger.KotlinIdeRefactoringTrigger, this::class.java.name) + KotlinFUSLogger.log(FUSEventGroups.Refactoring, this::class.java.name) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinAwareJavaGetterRenameProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinAwareJavaGetterRenameProcessor.kt index a93d8daa263..2c43f3409ec 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinAwareJavaGetterRenameProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinAwareJavaGetterRenameProcessor.kt @@ -14,8 +14,8 @@ import org.jetbrains.kotlin.asJava.elements.KtLightMethod import org.jetbrains.kotlin.idea.references.SyntheticPropertyAccessorReference import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger -import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger +import org.jetbrains.kotlin.idea.statistics.FUSEventGroups +import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger import org.jetbrains.kotlin.synthetic.SyntheticJavaPropertyDescriptor import org.jetbrains.kotlin.utils.ifEmpty @@ -28,7 +28,7 @@ class KotlinAwareJavaGetterRenameProcessor : RenameJavaMethodProcessor() { val propertyName = SyntheticJavaPropertyDescriptor.propertyNameByGetMethodName(Name.identifier(getter.name)) ?: return getterReferences val setterName = JvmAbi.setterName(propertyName.asString()) val containingClass = getter.containingClass ?: return getterReferences - KotlinStatisticsTrigger.trigger(KotlinEventTrigger.KotlinIdeRefactoringTrigger, this::class.java.name) + KotlinFUSLogger.log(FUSEventGroups.Refactoring, this::class.java.name) val setterReferences = containingClass .findMethodsByName(setterName, true) .filter { it.parameters.size == 1 && it.returnType == PsiType.VOID } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinDirectoryAsPackageRenameHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinDirectoryAsPackageRenameHandler.kt index b303df01ab1..2e3b735785d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinDirectoryAsPackageRenameHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/KotlinDirectoryAsPackageRenameHandler.kt @@ -24,19 +24,19 @@ import com.intellij.psi.PsiFile import com.intellij.refactoring.rename.DirectoryAsPackageRenameHandler import org.jetbrains.kotlin.psi.psiUtil.isIdentifier import org.jetbrains.kotlin.psi.psiUtil.quoteIfNeeded -import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger -import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger +import org.jetbrains.kotlin.idea.statistics.FUSEventGroups +import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger class KotlinDirectoryAsPackageRenameHandler : DirectoryAsPackageRenameHandler() { override fun isIdentifier(name: String, project: Project): Boolean = name.quoteIfNeeded().isIdentifier() override fun invoke(project: Project, elements: Array, dataContext: DataContext?) { super.invoke(project, elements, dataContext) - KotlinStatisticsTrigger.trigger(KotlinEventTrigger.KotlinIdeRefactoringTrigger, this.javaClass.simpleName) + KotlinFUSLogger.log(FUSEventGroups.Refactoring, this.javaClass.simpleName) } override fun invoke(project: Project, editor: Editor?, file: PsiFile?, dataContext: DataContext?) { super.invoke(project, editor, file, dataContext) - KotlinStatisticsTrigger.trigger(KotlinEventTrigger.KotlinIdeRefactoringTrigger, this.javaClass.simpleName) + KotlinFUSLogger.log(FUSEventGroups.Refactoring, this.javaClass.simpleName) } } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt index 47f2a034b46..590fe08e1b4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt @@ -30,8 +30,8 @@ import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.idea.util.ProjectRootsUtil import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger -import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger +import org.jetbrains.kotlin.idea.statistics.FUSEventGroups +import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger class RenameKotlinFileProcessor : RenamePsiFileProcessor() { class FileRenamingPsiClassWrapper( @@ -69,7 +69,7 @@ class RenameKotlinFileProcessor : RenamePsiFileProcessor() { override fun findReferences(element: PsiElement): MutableCollection { return super.findReferences(element).also { - KotlinStatisticsTrigger.trigger(KotlinEventTrigger.KotlinIdeRefactoringTrigger, this::class.java.name) + KotlinFUSLogger.log(FUSEventGroups.Refactoring, this::class.java.name) } } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt.173 b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt.173 index 47bf96d9077..c9414cf25d0 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt.173 +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFileProcessor.kt.173 @@ -30,8 +30,8 @@ import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.idea.util.ProjectRootsUtil import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger -import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger +import org.jetbrains.kotlin.idea.statistics.FUSEventGroups +import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger class RenameKotlinFileProcessor : RenamePsiFileProcessor() { class FileRenamingPsiClassWrapper( @@ -68,7 +68,7 @@ class RenameKotlinFileProcessor : RenamePsiFileProcessor() { } override fun findReferences(element: PsiElement): MutableCollection { return super.findReferences(element).also { - KotlinStatisticsTrigger.trigger(KotlinEventTrigger.KotlinIdeRefactoringTrigger, this::class.java.name) + KotlinFUSLogger.log(FUSEventGroups.Refactoring, this::class.java.name) } } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt index 054a2abe865..217f8eeeef7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinPsiProcessor.kt @@ -46,8 +46,8 @@ import org.jetbrains.kotlin.psi.psiUtil.isIdentifier import org.jetbrains.kotlin.psi.psiUtil.parents import org.jetbrains.kotlin.psi.psiUtil.quoteIfNeeded import org.jetbrains.kotlin.resolve.ImportPath -import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger -import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger +import org.jetbrains.kotlin.idea.statistics.FUSEventGroups +import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger import java.util.ArrayList import kotlin.collections.* @@ -69,7 +69,7 @@ abstract class RenameKotlinPsiProcessor : RenamePsiElementProcessor() { override fun canProcessElement(element: PsiElement): Boolean = element is KtNamedDeclaration override fun findReferences(element: PsiElement): Collection { - KotlinStatisticsTrigger.trigger(KotlinEventTrigger.KotlinIdeRefactoringTrigger, this.javaClass.simpleName) + KotlinFUSLogger.log(FUSEventGroups.Refactoring, this.javaClass.simpleName) val searchParameters = KotlinReferencesSearchParameters( element, diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt index ddb8eb1b9e6..d6abd90bf61 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameSyntheticDeclarationByReferenceHandler.kt @@ -16,8 +16,8 @@ import org.jetbrains.kotlin.idea.caches.resolve.resolveToCall import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils import org.jetbrains.kotlin.psi.KtSimpleNameExpression import org.jetbrains.kotlin.resolve.calls.tower.isSynthesized -import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger -import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger +import org.jetbrains.kotlin.idea.statistics.FUSEventGroups +import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger class RenameSyntheticDeclarationByReferenceHandler : RenameHandler { override fun isAvailableOnDataContext(dataContext: DataContext): Boolean { @@ -31,7 +31,7 @@ class RenameSyntheticDeclarationByReferenceHandler : RenameHandler { override fun invoke(project: Project, editor: Editor, file: PsiFile, dataContext: DataContext?) { CodeInsightUtils.showErrorHint(project, editor, "Rename is not applicable to synthetic declaration", "Rename", null) - KotlinStatisticsTrigger.trigger(KotlinEventTrigger.KotlinIdeRefactoringTrigger, this::class.java.name) + KotlinFUSLogger.log(FUSEventGroups.Refactoring, this::class.java.name) } override fun invoke(project: Project, elements: Array, dataContext: DataContext?) { diff --git a/idea/src/org/jetbrains/kotlin/idea/statistics/FUSEventGroups.kt b/idea/src/org/jetbrains/kotlin/idea/statistics/FUSEventGroups.kt new file mode 100644 index 00000000000..89cceed5a20 --- /dev/null +++ b/idea/src/org/jetbrains/kotlin/idea/statistics/FUSEventGroups.kt @@ -0,0 +1,18 @@ +/* + * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.idea.statistics + +// Note: along with adding a group to this enum you should also add its GROUP_ID to plugin.xml and get it whitelisted +// (see https://confluence.jetbrains.com/display/FUS/IntelliJ+Reporting+API). +enum class FUSEventGroups(groupIdSuffix: String) { + GradleTarget("gradle.target"), + MavenTarget("maven.target"), + JPSTarget("jps.target"), + Refactoring("ide.action.refactoring"), + NewFileTemplate("ide.newFileTempl"); + + val GROUP_ID: String = "kotlin.$groupIdSuffix" +} \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/statistics/KotlinEventTriggers.kt b/idea/src/org/jetbrains/kotlin/idea/statistics/KotlinEventTriggers.kt deleted file mode 100644 index 271155fc304..00000000000 --- a/idea/src/org/jetbrains/kotlin/idea/statistics/KotlinEventTriggers.kt +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.idea.statistics - -// Note: along with adding a trigger to this enum you sould also add its GROUP_ID to plugin.xml and get it whitelisted -// (see https://confluence.jetbrains.com/display/FUS/IntelliJ+Reporting+API). -enum class KotlinEventTrigger(groupIdSufix: String) { - KotlinGradleTargetTrigger("gradle.target"), - KotlinMavenTargetTrigger("maven.target"), - KotlinJPSTargetTrigger("jps.target"), - KotlinProjectLibraryUsageTrigger("gradle.library"), - KotlinIdeRefactoringTrigger("ide.action.refactoring"), - KotlinIdeNewFileTemplateTrigger("ide.newFileTempl"); - - val GROUP_ID: String = "kotlin.$groupIdSufix" -} \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/statistics/ProjectScopeStatsReporters.kt b/idea/src/org/jetbrains/kotlin/idea/statistics/KotlinFUSLogger.kt similarity index 75% rename from idea/src/org/jetbrains/kotlin/idea/statistics/ProjectScopeStatsReporters.kt rename to idea/src/org/jetbrains/kotlin/idea/statistics/KotlinFUSLogger.kt index b5863536dd5..0869c36fb2d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/statistics/ProjectScopeStatsReporters.kt +++ b/idea/src/org/jetbrains/kotlin/idea/statistics/KotlinFUSLogger.kt @@ -10,12 +10,13 @@ import com.intellij.internal.statistic.eventLog.FeatureUsageData import org.jetbrains.kotlin.idea.KotlinPluginUtil -open class KotlinStatisticsTrigger { +open class KotlinFUSLogger { + companion object { private val context = FeatureUsageData().addData("plugin_version", KotlinPluginUtil.getPluginVersion()) - fun trigger(trigger: KotlinEventTrigger, event: String) { - FUCounterUsageLogger.getInstance().logEvent(trigger.GROUP_ID, event, context) + fun log(group: FUSEventGroups, event: String) { + FUCounterUsageLogger.getInstance().logEvent(group.GROUP_ID, event, context) } } } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/statistics/ProjectScopeStatsReporters.kt.182 b/idea/src/org/jetbrains/kotlin/idea/statistics/KotlinFUSLogger.kt.182 similarity index 75% rename from idea/src/org/jetbrains/kotlin/idea/statistics/ProjectScopeStatsReporters.kt.182 rename to idea/src/org/jetbrains/kotlin/idea/statistics/KotlinFUSLogger.kt.182 index 44e7ab4e416..8c990670d21 100644 --- a/idea/src/org/jetbrains/kotlin/idea/statistics/ProjectScopeStatsReporters.kt.182 +++ b/idea/src/org/jetbrains/kotlin/idea/statistics/KotlinFUSLogger.kt.182 @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.idea.statistics -open class KotlinStatisticsTrigger { +open class KotlinFUSLogger { companion object { - public fun trigger(trigger: KotlinEventTrigger, event: String) { + fun log(group: FUSEventGroups, event: String) { // Not whitelisted for 182 } } diff --git a/idea/src/org/jetbrains/kotlin/idea/statistics/ProjectScopeStatsReporters.kt.183 b/idea/src/org/jetbrains/kotlin/idea/statistics/KotlinFUSLogger.kt.183 similarity index 75% rename from idea/src/org/jetbrains/kotlin/idea/statistics/ProjectScopeStatsReporters.kt.183 rename to idea/src/org/jetbrains/kotlin/idea/statistics/KotlinFUSLogger.kt.183 index a187cd3e121..f31daac3c0f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/statistics/ProjectScopeStatsReporters.kt.183 +++ b/idea/src/org/jetbrains/kotlin/idea/statistics/KotlinFUSLogger.kt.183 @@ -5,9 +5,9 @@ package org.jetbrains.kotlin.idea.statistics -open class KotlinStatisticsTrigger { +open class KotlinFUSLogger { companion object { - public fun trigger(trigger: KotlinEventTrigger, event: String) { + fun log(group: FUSEventGroups, event: String) { // Not whitelisted for 183 } }